mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-06 19:10:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

naming work

Browse Source
This commit is contained in:
theo3
2022-01-03 23:58:02 -08:00
parent f26b2e286a
commit 52db70bb9d
212 changed files with 1762 additions and 1736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/enemy/armos.s
+3 -3
View File
@@ -150,7 +150,7 @@ sub_0803026C: @ 0x0803026C
str r0, [r2]
b _080302BA
.align 2, 0
_080302A8: .4byte gScreenTransition + 0x6c
_080302A8: .4byte gRoomTransition + 0x6c
_080302AC:
adds r0, r4, #0
adds r0, #0x84
@@ -1014,7 +1014,7 @@ _0803088E:
strb r0, [r2]
ldr r0, [r5, #0x7c]
bl DoExitTransition
ldr r0, _08030938 @ =gScreenTransition
ldr r0, _08030938 @ =gRoomTransition
adds r1, r5, #0
adds r1, #0x80
ldrb r1, [r1]
@@ -1027,7 +1027,7 @@ _08030928: .4byte gPlayerState
_0803092C: .4byte gRoomControls
_08030930: .4byte 0x00004049
_08030934: .4byte gPlayerEntity
_08030938: .4byte gScreenTransition
_08030938: .4byte gRoomTransition
_0803093C:
ldr r0, _0803094C @ =0x00004022
mov r3, r8
asm/enemy/chuchuBoss.s
+7 -7
View File
@@ -1333,7 +1333,7 @@ _080266B0:
strh r0, [r4, #0x24]
b _08026742
_080266D6:
ldr r0, _08026700 @ =gScreenTransition
ldr r0, _08026700 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0x7f
ands r0, r1
@@ -1354,7 +1354,7 @@ _080266EC:
lsls r0, r0, #1
b _0802670A
.align 2, 0
_08026700: .4byte gScreenTransition
_08026700: .4byte gRoomTransition
_08026704: .4byte gPlayerEntity
_08026708:
movs r0, #0xc0
@@ -1363,7 +1363,7 @@ _0802670A:
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _0802672C
ldr r0, _0802674C @ =gScreenTransition
ldr r0, _0802674C @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@@ -1394,7 +1394,7 @@ _08026748:
add sp, #4
pop {r4, r5, pc}
.align 2, 0
_0802674C: .4byte gScreenTransition
_0802674C: .4byte gRoomTransition
thumb_func_start sub_08026750
sub_08026750: @ 0x08026750
@@ -2885,7 +2885,7 @@ sub_08027064: @ 0x08027064
ldrb r0, [r0]
cmp r0, #0xa
beq _08027098
ldr r0, _080270C8 @ =gScreenTransition
ldr r0, _080270C8 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@@ -2908,7 +2908,7 @@ _08027098:
ldrsh r2, [r0, r1]
cmp r4, r2
beq _080270E0
ldr r0, _080270C8 @ =gScreenTransition
ldr r0, _080270C8 @ =gRoomTransition
ldr r1, [r0]
movs r0, #0xf
ands r1, r0
@@ -2919,7 +2919,7 @@ _08027098:
strb r1, [r3, #0xc]
b _080270D4
.align 2, 0
_080270C8: .4byte gScreenTransition
_080270C8: .4byte gRoomTransition
_080270CC: .4byte gPlayerEntity
_080270D0:
movs r0, #0x10
asm/enemy/code_080300AC.s
+6 -6
View File
@@ -9,7 +9,7 @@
thumb_func_start sub_080300E8
sub_080300E8: @ 0x080300E8
push {lr}
ldr r1, _08030110 @ =gScreenTransition
ldr r1, _08030110 @ =gRoomTransition
adds r3, r1, #0
adds r3, #0xae
ldrh r0, [r3]
@@ -29,14 +29,14 @@ sub_080300E8: @ 0x080300E8
_0803010C:
pop {pc}
.align 2, 0
_08030110: .4byte gScreenTransition
_08030110: .4byte gRoomTransition
_08030114: .4byte gPlayerEntity
thumb_func_start sub_08030118
sub_08030118: @ 0x08030118
push {lr}
adds r2, r0, #0
ldr r0, _0803013C @ =gScreenTransition
ldr r0, _0803013C @ =gRoomTransition
adds r0, #0xac
ldrh r0, [r0]
asrs r0, r2
@@ -51,7 +51,7 @@ sub_08030118: @ 0x08030118
bl SetLocalFlagByBank
b _0803014C
.align 2, 0
_0803013C: .4byte gScreenTransition
_0803013C: .4byte gRoomTransition
_08030140:
movs r0, #0xc0
lsls r0, r0, #2
@@ -66,7 +66,7 @@ _0803014C:
sub_08030150: @ 0x08030150
push {r4, r5, lr}
mov ip, r0
ldr r2, _08030194 @ =gScreenTransition
ldr r2, _08030194 @ =gRoomTransition
adds r5, r2, #0
adds r5, #0xac
mov r3, ip
@@ -98,4 +98,4 @@ sub_08030150: @ 0x08030150
strh r1, [r0]
pop {r4, r5, pc}
.align 2, 0
_08030194: .4byte gScreenTransition
_08030194: .4byte gRoomTransition
asm/enemy/gleerok.s
+10 -10
View File
@@ -364,7 +364,7 @@ _0802D2D0:
movs r2, #0x40
bl sub_0802EA68
_0802D2E4:
ldr r5, _0802D338 @ =gScreenTransition
ldr r5, _0802D338 @ =gRoomTransition
ldr r0, [r5]
movs r1, #0x1f
ands r0, r1
@@ -405,7 +405,7 @@ _0802D32E:
_0802D334:
pop {r4, r5, pc}
.align 2, 0
_0802D338: .4byte gScreenTransition
_0802D338: .4byte gRoomTransition
thumb_func_start sub_0802D33C
sub_0802D33C: @ 0x0802D33C
@@ -964,7 +964,7 @@ _0802D77A:
sub_0802D77C: @ 0x0802D77C
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0802D7B0 @ =gScreenTransition
ldr r0, _0802D7B0 @ =gRoomTransition
ldr r4, [r0]
movs r0, #1
ands r4, r0
@@ -988,7 +988,7 @@ sub_0802D77C: @ 0x0802D77C
_0802D7AC:
pop {r4, r5, pc}
.align 2, 0
_0802D7B0: .4byte gScreenTransition
_0802D7B0: .4byte gRoomTransition
thumb_func_start sub_0802D7B4
sub_0802D7B4: @ 0x0802D7B4
@@ -1325,7 +1325,7 @@ _0802D99C:
bl DeleteThisEntity
b _0802DB7E
_0802D9A2:
ldr r0, _0802D9F4 @ =gScreenTransition
ldr r0, _0802D9F4 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@@ -1367,9 +1367,9 @@ _0802D9CE:
str r1, [r0]
b _0802D99C
.align 2, 0
_0802D9F4: .4byte gScreenTransition
_0802D9F4: .4byte gRoomTransition
_0802D9F8:
ldr r0, _0802DA50 @ =gScreenTransition
ldr r0, _0802DA50 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@@ -1414,7 +1414,7 @@ _0802DA24:
str r1, [r0]
b _0802D99C
.align 2, 0
_0802DA50: .4byte gScreenTransition
_0802DA50: .4byte gRoomTransition
_0802DA54:
adds r0, r4, #0
adds r0, #0x74
@@ -2702,7 +2702,7 @@ _0802E400:
.align 2, 0
_0802E408: .4byte gPlayerEntity
_0802E40C:
ldr r0, _0802E42C @ =gScreenTransition
ldr r0, _0802E42C @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@@ -2718,7 +2718,7 @@ _0802E422:
_0802E428:
pop {r4, r5, r6, pc}
.align 2, 0
_0802E42C: .4byte gScreenTransition
_0802E42C: .4byte gRoomTransition
thumb_func_start sub_0802E430
sub_0802E430: @ 0x0802E430
asm/enemy/gyorgChild.s
+2 -2
View File
@@ -11,7 +11,7 @@
GyorgChild: @ 0x08048640
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0804867C @ =gScreenTransition
ldr r0, _0804867C @ =gRoomTransition
adds r0, #0x39
ldrb r2, [r0]
cmp r2, #0
@@ -38,7 +38,7 @@ _08048664:
bl _call_via_r1
pop {r4, r5, pc}
.align 2, 0
_0804867C: .4byte gScreenTransition
_0804867C: .4byte gRoomTransition
_08048680: .4byte gUnk_080D1E6C
thumb_func_start sub_08048684