mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-29 15:43:29 -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/beanstalkSubtask.s
+13 -13
View File
@@ -50,7 +50,7 @@ sub_08019698: @ 0x08019698
ldr r1, _08019730 @ =gUpdateVisibleTiles
movs r0, #1
strb r0, [r1]
bl sub_08000108
bl UpdateScrollVram
ldr r2, _08019734 @ =gScreen
ldrh r1, [r2]
ldr r0, _08019738 @ =0x0000FEFF
@@ -75,8 +75,8 @@ _08019700:
movs r0, #0x11
bl LoadGfxGroup
bl FlushSprites
bl sub_080AD9B0
bl sub_080AD918
bl DrawEntities
bl CopyOAM
movs r0, #4
movs r1, #8
bl DoFade
@@ -119,8 +119,8 @@ sub_08019764: @ 0x08019764
push {lr}
bl FlushSprites
bl UpdateEntities
bl sub_080AD9B0
bl sub_080AD918
bl DrawEntities
bl CopyOAM
ldr r2, _08019798 @ =gUnk_02018EB0
ldrh r0, [r2, #4]
subs r0, #1
@@ -152,8 +152,8 @@ sub_080197A0: @ 0x080197A0
bl MenuFadeIn
pop {pc}
thumb_func_start sub_080197AC
sub_080197AC: @ 0x080197AC
thumb_func_start SetBGDefaults
SetBGDefaults: @ 0x080197AC
ldr r0, _080197C4 @ =gUnk_02025EB0
ldr r1, _080197C8 @ =gBGAffSettings
str r1, [r0]
@@ -3178,11 +3178,11 @@ sub_0801AE44: @ 0x0801AE44
bl sub_0807BFD0
cmp r4, #0
beq _0801AE5A
bl sub_0807C0DC
bl LoadRoomGfx
_0801AE5A:
bl sub_080809D4
bl sub_080805F8
ldr r0, _0801AEE4 @ =gScreenTransition
ldr r0, _0801AEE4 @ =gRoomTransition
adds r0, #0x2d
ldrb r0, [r0]
cmp r0, #0
@@ -3244,7 +3244,7 @@ _0801AED0:
b _0801AF10
.align 2, 0
_0801AEE0: .4byte gRoomControls
_0801AEE4: .4byte gScreenTransition
_0801AEE4: .4byte gRoomTransition
_0801AEE8: .4byte gArea
_0801AEEC: .4byte 0x0600F000
_0801AEF0: .4byte gUnk_03004030
@@ -3257,7 +3257,7 @@ _0801AF08: .4byte gMapDataTopSpecial
_0801AF0C:
bl sub_0807C4F8
_0801AF10:
bl sub_08000108
bl UpdateScrollVram
pop {r4, pc}
.align 2, 0
@@ -3298,7 +3298,7 @@ sub_0801AF48: @ 0x0801AF48
ldr r0, _0801AF7C @ =0x00003FFF
cmp r4, r0
bhi _0801AF7A
ldr r0, _0801AF80 @ =gScreenTransition
ldr r0, _0801AF80 @ =gRoomTransition
adds r0, #0x30
ldrb r0, [r0]
cmp r0, #0
@@ -3320,7 +3320,7 @@ _0801AF7A:
pop {r4, r5, r6, pc}
.align 2, 0
_0801AF7C: .4byte 0x00003FFF
_0801AF80: .4byte gScreenTransition
_0801AF80: .4byte gRoomTransition
_0801AF84: .4byte gRoomVars
_0801AF88: .4byte gUnk_0200B240
asm/code_08049D30.s
+6 -6
View File
@@ -10,7 +10,7 @@
UpdateRoomTracker: @ 0x08049D30
push {r4, r5, r6, lr}
ldr r1, _08049D58 @ =gUnk_020354B0
ldr r0, _08049D5C @ =gUnk_02024050
ldr r0, _08049D5C @ =gRoomMemory
str r0, [r1]
adds r5, r1, #0
ldr r6, _08049D60 @ =gRoomControls
@@ -30,7 +30,7 @@ _08049D3E:
b _08049D7C
.align 2, 0
_08049D58: .4byte gUnk_020354B0
_08049D5C: .4byte gUnk_02024050
_08049D5C: .4byte gRoomMemory
_08049D60: .4byte gRoomControls
_08049D64: .4byte 0x0000FFFF
_08049D68:
@@ -52,7 +52,7 @@ _08049D84: .4byte gUnk_020354B0
thumb_func_start sub_08049D88
sub_08049D88: @ 0x08049D88
push {r4, r5, lr}
ldr r4, _08049DC0 @ =gUnk_02024050
ldr r4, _08049DC0 @ =gRoomMemory
adds r1, r4, #0
adds r1, #8
ldr r3, _08049DC4 @ =gRoomControls
@@ -81,7 +81,7 @@ _08049DA0:
adds r0, r4, #0
pop {r4, r5, pc}
.align 2, 0
_08049DC0: .4byte gUnk_02024050
_08049DC0: .4byte gRoomMemory
_08049DC4: .4byte gRoomControls
_08049DC8: .4byte 0x0000FFFF
@@ -89,7 +89,7 @@ _08049DC8: .4byte 0x0000FFFF
sub_08049DCC: @ 0x08049DCC
push {r4, lr}
adds r2, r0, #0
ldr r1, _08049DF0 @ =gUnk_02024050
ldr r1, _08049DF0 @ =gRoomMemory
adds r3, r1, #0
adds r3, #0x40
_08049DD6:
@@ -107,7 +107,7 @@ _08049DE2:
strh r0, [r2, #2]
pop {r4, pc}
.align 2, 0
_08049DF0: .4byte gUnk_02024050
_08049DF0: .4byte gRoomMemory
thumb_func_start sub_08049DF4
sub_08049DF4: @ 0x08049DF4
asm/code_080526F8.s
+9 -9
View File
@@ -409,7 +409,7 @@ sub_08053894: @ 0x08053894
_080538B4: .4byte gFadeControl
_080538B8: .4byte gMenu
_080538BC:
ldr r0, _080538FC @ =gScreenTransition
ldr r0, _080538FC @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@@ -442,7 +442,7 @@ _080538E4:
_080538F8:
pop {r4, pc}
.align 2, 0
_080538FC: .4byte gScreenTransition
_080538FC: .4byte gRoomTransition
_08053900: .4byte gScreen
thumb_func_start sub_08053904
@@ -467,7 +467,7 @@ sub_08053904: @ 0x08053904
_08053924: .4byte gFadeControl
_08053928: .4byte gMenu
_0805392C:
ldr r0, _0805396C @ =gScreenTransition
ldr r0, _0805396C @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@@ -500,7 +500,7 @@ _08053954:
_08053968:
pop {r4, pc}
.align 2, 0
_0805396C: .4byte gScreenTransition
_0805396C: .4byte gRoomTransition
_08053970: .4byte gScreen
thumb_func_start sub_08053974
@@ -513,7 +513,7 @@ sub_08053974: @ 0x08053974
bl InitFade
movs r0, #1
bl DispReset
bl sub_080197AC
bl SetBGDefaults
bl sub_08051F78
ldr r0, _080539B0 @ =gUnk_080FCBC4
bl LoadRoomEntityList
@@ -540,7 +540,7 @@ nullsub_482: @ 0x080539B8
thumb_func_start sub_080539BC
sub_080539BC: @ 0x080539BC
push {lr}
bl sub_080197AC
bl SetBGDefaults
bl DeleteAllEntities
movs r0, #0x22
movs r1, #0x11
@@ -652,7 +652,7 @@ sub_08053A90: @ 0x08053A90
ldr r1, _08053AAC @ =gUnk_02032EC0
movs r0, #3
strb r0, [r1]
bl sub_080197AC
bl SetBGDefaults
_08053AA4:
pop {pc}
.align 2, 0
@@ -887,7 +887,7 @@ sub_08053C60: @ 0x08053C60
ldr r0, _08053C80 @ =0x80100000
bl SoundReq
movs r0, #3
bl InitScreen
bl SetTask
pop {pc}
.align 2, 0
_08053C80: .4byte 0x80100000
@@ -1537,7 +1537,7 @@ _080541AA:
movs r0, #0x63
bl ModBombs
_080541B0:
bl sub_08053390
bl LoadItemGfx
b _0805427C
_080541B6:
cmp r5, #0
asm/code_0805436C.s
+4 -4
View File
@@ -59,11 +59,11 @@ sub_080548E8: @ 0x080548E8
bl _call_via_r0
bl FlushSprites
bl UpdateEntities
bl sub_080AD9B0
bl sub_080AD918
bl DrawEntities
bl CopyOAM
bl UpdateScroll
bl UpdateBgAnim
bl sub_08000108
bl UpdateScrollVram
pop {pc}
.align 2, 0
_08054918: .4byte gUnk_080FE2AC
@@ -129,7 +129,7 @@ sub_08054974: @ 0x08054974
strb r0, [r4, #4]
ldrb r0, [r6, #3]
strb r0, [r4, #5]
bl sub_08053320
bl LoadGfxGroups
ldrb r0, [r4, #4]
bl GetFlagBankOffset
ldr r1, _080549B8 @ =gArea
asm/code_08054C04.s
+2 -2
View File
@@ -853,7 +853,7 @@ sub_0805524C: @ 0x0805524C
.align 2, 0
_08055270: .4byte gMenu
_08055274:
ldr r0, _080552A4 @ =gScreenTransition
ldr r0, _080552A4 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@@ -877,7 +877,7 @@ _08055274:
strh r0, [r1]
b _080552D6
.align 2, 0
_080552A4: .4byte gScreenTransition
_080552A4: .4byte gRoomTransition
_080552A8: .4byte gUnk_080FF204
_080552AC: .4byte 0x0000FFFF
_080552B0: .4byte gScreen
asm/code_0805EC04.s
+2 -2
View File
@@ -200,7 +200,7 @@ _0805EE82:
thumb_func_start sub_0805EE88
sub_0805EE88: @ 0x0805EE88
push {lr}
ldr r1, _0805EEB0 @ =gScreenTransition
ldr r1, _0805EEB0 @ =gRoomTransition
adds r0, r1, #0
adds r0, #0x2f
ldrb r0, [r0]
@@ -219,5 +219,5 @@ sub_0805EE88: @ 0x0805EE88
_0805EEAC:
pop {pc}
.align 2, 0
_0805EEB0: .4byte gScreenTransition
_0805EEB0: .4byte gRoomTransition
asm/code_08078778.s
+12 -12
View File
@@ -310,7 +310,7 @@ CreateEzloHint: @ 0x08078AA8
ldr r3, _08078AB8 @ =gPlayerState
movs r2, #0x16
strb r2, [r3, #0xc]
ldr r2, _08078ABC @ =gScreenTransition
ldr r2, _08078ABC @ =gRoomTransition
strh r0, [r2, #0x36]
.ifdef JP
adds r2, #0x34
@@ -325,7 +325,7 @@ CreateEzloHint: @ 0x08078AA8
bx lr
.align 2, 0
_08078AB8: .4byte gPlayerState
_08078ABC: .4byte gScreenTransition
_08078ABC: .4byte gRoomTransition
thumb_func_start sub_08078AC0
sub_08078AC0: @ 0x08078AC0
@@ -556,8 +556,8 @@ sub_08078C24: @ 0x08078C24
_08078CAC: .4byte gPlayerState
_08078CB0: .4byte gUnk_03003DF0
thumb_func_start sub_08078CB4
sub_08078CB4: @ 0x08078CB4
thumb_func_start UpdateCarriedObject
UpdateCarriedObject: @ 0x08078CB4
push {lr}
ldr r0, _08078CCC @ =gPlayerState
ldrb r0, [r0, #5]
@@ -744,7 +744,7 @@ _08078DE0:
ands r0, r1
cmp r0, #2
bne _08078E82
ldr r0, _08078E38 @ =gScreenTransition
ldr r0, _08078E38 @ =gRoomTransition
ldr r1, [r0]
movs r0, #3
ands r1, r0
@@ -755,7 +755,7 @@ _08078DE0:
b _08078E82
.align 2, 0
_08078E34: .4byte gPlayerState
_08078E38: .4byte gScreenTransition
_08078E38: .4byte gRoomTransition
_08078E3C:
ldrh r0, [r4, #0x2e]
adds r0, #1
@@ -5105,7 +5105,7 @@ _0807AEA8:
ands r0, r1
cmp r0, #0
beq _0807AECC
ldr r0, _0807AEC8 @ =gScreenTransition
ldr r0, _0807AEC8 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@@ -5116,9 +5116,9 @@ _0807AEA8:
bl sub_080A2A84
b _0807AEDE
.align 2, 0
_0807AEC8: .4byte gScreenTransition
_0807AEC8: .4byte gRoomTransition
_0807AECC:
ldr r0, _0807AEE0 @ =gScreenTransition
ldr r0, _0807AEE0 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@@ -5129,7 +5129,7 @@ _0807AECC:
_0807AEDE:
pop {r4, pc}
.align 2, 0
_0807AEE0: .4byte gScreenTransition
_0807AEE0: .4byte gRoomTransition
thumb_func_start UpdatePlayerSkills
UpdatePlayerSkills: @ 0x0807AEE4
@@ -5518,7 +5518,7 @@ sub_0807B1A8: @ 0x0807B1A8
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
ldr r0, _0807B1D8 @ =gScreenTransition
ldr r0, _0807B1D8 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@@ -5530,7 +5530,7 @@ _0807B1D0:
pop {r4, pc}
.align 2, 0
_0807B1D4: .4byte gUnk_0811C298
_0807B1D8: .4byte gScreenTransition
_0807B1D8: .4byte gRoomTransition
thumb_func_start sub_0807B1DC
sub_0807B1DC: @ 0x0807B1DC
asm/code_0807B9B8.s
+10 -10
View File
@@ -931,8 +931,8 @@ _0807C0D0: .4byte gPaletteBuffer
_0807C0D4: .4byte gUsedPalettes
_0807C0D8: .4byte 0x000007FF
thumb_func_start sub_0807C0DC
sub_0807C0DC: @ 0x0807C0DC
thumb_func_start LoadRoomGfx
LoadRoomGfx: @ 0x0807C0DC
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
@@ -1003,7 +1003,7 @@ _0807C178:
movs r3, #1
mov sb, r3
_0807C184:
ldr r0, _0807C1B0 @ =gScreenTransition
ldr r0, _0807C1B0 @ =gRoomTransition
adds r0, #0x2d
ldrb r0, [r0]
cmp r0, #0
@@ -1024,7 +1024,7 @@ _0807C184:
bl MemCopy
b _0807C26C
.align 2, 0
_0807C1B0: .4byte gScreenTransition
_0807C1B0: .4byte gRoomTransition
_0807C1B4: .4byte gMapDataBottom
_0807C1B8: .4byte gMapDataTop
_0807C1BC:
@@ -1710,7 +1710,7 @@ _0807C736:
sub_0807C740: @ 0x0807C740
push {r4, r5, lr}
bl sub_0807BFD0
bl sub_0807C0DC
bl LoadRoomGfx
ldr r4, _0807C780 @ =gRoomControls
ldr r2, [r4, #0x30]
cmp r2, #0
@@ -1859,7 +1859,7 @@ _0807C85C: .4byte gUpdateVisibleTiles
thumb_func_start sub_0807C860
sub_0807C860: @ 0x0807C860
push {r4, lr}
ldr r0, _0807C88C @ =gScreenTransition
ldr r0, _0807C88C @ =gRoomTransition
adds r0, #0x2d
movs r1, #1
strb r1, [r0]
@@ -1879,23 +1879,23 @@ sub_0807C860: @ 0x0807C860
bl MemCopy
pop {r4, pc}
.align 2, 0
_0807C88C: .4byte gScreenTransition
_0807C88C: .4byte gRoomTransition
_0807C890: .4byte gMapDataBottom
_0807C894: .4byte gMapDataTop
thumb_func_start sub_0807C898
sub_0807C898: @ 0x0807C898
push {r4, r5, lr}
ldr r4, _0807C8AC @ =gScreenTransition
ldr r4, _0807C8AC @ =gRoomTransition
adds r4, #0x2d
movs r5, #0
movs r0, #2
strb r0, [r4]
bl sub_0807C0DC
bl LoadRoomGfx
strb r5, [r4]
pop {r4, r5, pc}
.align 2, 0
_0807C8AC: .4byte gScreenTransition
_0807C8AC: .4byte gRoomTransition
thumb_func_start sub_0807C8B0
sub_0807C8B0: @ 0x0807C8B0
asm/code_0808091C.s
+6 -6
View File
@@ -6,8 +6,8 @@
.text
thumb_func_start sub_08080A40
sub_08080A40: @ 0x08080A40
thumb_func_start UpdateDoorTransition
UpdateDoorTransition: @ 0x08080A40
push {r4, r5, r6, r7, lr}
ldr r7, _08080A70 @ =gRoomControls
ldr r1, [r7, #0x30]
@@ -100,7 +100,7 @@ _08080AFA:
adds r0, r5, #0
adds r1, r6, #0
bl sub_080002A8
ldr r1, _08080B48 @ =gScreenTransition
ldr r1, _08080B48 @ =gRoomTransition
strh r0, [r1, #0xa]
cmp r4, #0x3f
beq _08080B50
@@ -112,7 +112,7 @@ _08080AFA:
blo _08080B5C
b _08080B50
.align 2, 0
_08080B48: .4byte gScreenTransition
_08080B48: .4byte gRoomTransition
_08080B4C:
cmp r4, #0xf1
bne _08080B5C
@@ -422,7 +422,7 @@ _08080DB4:
bl ResolveEntityOnTop
b _08080E00
_08080DEE:
ldr r0, _08080E04 @ =gScreenTransition
ldr r0, _08080E04 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@@ -433,4 +433,4 @@ _08080DEE:
_08080E00:
pop {r4, r5, pc}
.align 2, 0
_08080E04: .4byte gScreenTransition
_08080E04: .4byte gRoomTransition
asm/coord.s
+2 -2
View File
@@ -106,7 +106,7 @@ _0806FBB2:
sub_0806FBB4: @ 0x0806FBB4
push {lr}
adds r1, r0, #0
ldr r0, _0806FBD0 @ =gScreenTransition
ldr r0, _0806FBD0 @ =gRoomTransition
ldrb r0, [r0, #5]
cmp r0, #0
bne _0806FBC8
@@ -120,7 +120,7 @@ _0806FBC8:
_0806FBCC:
pop {pc}
.align 2, 0
_0806FBD0: .4byte gScreenTransition
_0806FBD0: .4byte gRoomTransition
_0806FBD4: .4byte gPlayerState
thumb_func_start AllocMutableHitbox
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
asm/enemyUtils.s
+2 -2
View File
@@ -162,7 +162,7 @@ _0804A81C:
ldrb r0, [r5, #9]
cmp r0, #0x37
bne _0804A84A
ldr r0, _0804A85C @ =gScreenTransition
ldr r0, _0804A85C @ =gRoomTransition
adds r0, #0x39
ldrb r0, [r0]
cmp r0, #0
@@ -175,7 +175,7 @@ _0804A84A:
bl DeleteThisEntity
b _0804A982
.align 2, 0
_0804A85C: .4byte gScreenTransition
_0804A85C: .4byte gRoomTransition
_0804A860: .4byte 0x80100000
_0804A864:
adds r4, r5, #0
asm/enterPortalSubtask.s
+5 -5
View File
@@ -121,8 +121,8 @@ _0804AC5E:
ldrh r0, [r1, #0xc]
strh r0, [r2, #0x18]
bl FlushSprites
bl sub_080AD9B0
bl sub_080AD918
bl DrawEntities
bl CopyOAM
ldr r0, _0804AC98 @ =gUnk_02018EB0
ldrb r0, [r0, #0x1b]
cmp r0, #0
@@ -248,7 +248,7 @@ sub_0804AD6C: @ 0x0804AD6C
push {r4, r5, r6, lr}
mov r6, r8
push {r6}
ldr r3, _0804ADD0 @ =gScreenTransition
ldr r3, _0804ADD0 @ =gRoomTransition
movs r1, #0
movs r6, #1
strb r6, [r3, #8]
@@ -287,12 +287,12 @@ sub_0804AD6C: @ 0x0804AD6C
strb r0, [r3, #0xd]
mov r0, r8
strb r0, [r3, #0x14]
bl sub_080300AC
bl ClearArmosData
bl sub_080300C4
pop {r3}
mov r8, r3
pop {r4, r5, r6, pc}
.align 2, 0
_0804ADD0: .4byte gScreenTransition
_0804ADD0: .4byte gRoomTransition
_0804ADD4: .4byte gArea
_0804ADD8: .4byte gUnk_080D4140
asm/intr.s
+6 -6
View File
@@ -835,7 +835,7 @@ _080B23EC: .4byte gUnk_0800464E
sub_080B23F0: @ 0x080B23F0
.ifdef EU
push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
ldr fp, _080B2A30 @ =gUnk_03000000
ldr fp, _080B2A30 @ =gOAMControls
ldrb r2, [fp, #3]
cmp r2, #0x80
bhs _080B19C0EU
@@ -885,7 +885,7 @@ sub_080B19C8: @ 0x080B19C8
.else
.ifdef DEMO_JP @ TODO deduplicate same as EU
push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
ldr fp, _080B2A30 @ =gUnk_03000000
ldr fp, _080B2A30 @ =gOAMControls
ldrb r2, [fp, #3]
cmp r2, #0x80
bhs _080B19C0EU
@@ -934,7 +934,7 @@ sub_080B19C8: @ 0x080B19C8
b _080B1C40EU
.else
push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
ldr fp, _080B2A30 @ =gUnk_03000000
ldr fp, _080B2A30 @ =gOAMControls
ldrb r2, [fp, #3]
cmp r2, #0x80
bhs _080B2440
@@ -1527,7 +1527,7 @@ sub_080B280C: @ 0x080B280C
cmp r2, #0
bxeq lr
push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
ldr fp, _080B2A64 @ =gUnk_03000000
ldr fp, _080B2A64 @ =gOAMControls
ldrb r3, [fp, #3]
cmp r3, #0x80
bhs _080B286C
@@ -1898,7 +1898,7 @@ _080B2144:
.4byte gUnk_0300689C
.endif
_080B2A30: .4byte gUnk_03000000
_080B2A30: .4byte gOAMControls
.ifdef EU
_080B2154: .4byte 0x03006958 @TODO make pointer?
.endif
@@ -1917,7 +1917,7 @@ _080B2A54: .4byte gUnk_0300694C
_080B2A58: .4byte gUnk_020000C0
_080B2A5C: .4byte gFrameObjLists
_080B2A60: .4byte gFrameObjLists
_080B2A64: .4byte gUnk_03000000
_080B2A64: .4byte gOAMControls
_080B2A68: .4byte gUnk_0300695C
_080B2A6C: .4byte 0x3E003F00
.ifdef EU
asm/kinstone.s
+2 -2
View File
@@ -167,7 +167,7 @@ GenerateAreaHint: @ 0x0801862C
movs r2, #0
movs r0, #0x16
strb r0, [r1, #0xc]
ldr r5, _08018650 @ =gScreenTransition
ldr r5, _08018650 @ =gRoomTransition
adds r0, r5, #0
.ifdef JP
adds r0, #0x34
@@ -188,7 +188,7 @@ GenerateAreaHint: @ 0x0801862C
b _0801868C
.align 2, 0
_0801864C: .4byte gPlayerState
_08018650: .4byte gScreenTransition
_08018650: .4byte gRoomTransition
_08018654: .4byte gUnk_02033AB8
_08018658:
ldrb r0, [r4, #2]
asm/non_matching/color/sub_0801D000.inc
+2 -2
View File
@@ -1,7 +1,7 @@
.syntax unified
push {lr}
adds r2, r0, #0
ldr r0, _0801D024 @ =gScreenTransition
ldr r0, _0801D024 @ =gRoomTransition
movs r1, #0
cmp r2, #0
beq _0801D00E
@@ -16,7 +16,7 @@ _0801D00E:
bl sub_0801CFD0
b _0801D03A
.align 2, 0
_0801D024: .4byte gScreenTransition
_0801D024: .4byte gRoomTransition
_0801D028:
ldr r3, _0801D03C @ =gUnk_02001A3C
ldrb r1, [r3]
asm/non_matching/common/DrawDungeonMap.inc
+4 -4
View File
@@ -11,7 +11,7 @@
bl MemClear
movs r0, #1
strb r0, [r5]
ldr r2, _0801DBE4 @ =gScreenTransition
ldr r2, _0801DBE4 @ =gRoomTransition
ldrh r0, [r2, #0x1c]
lsrs r0, r0, #4
movs r1, #0x7f
@@ -33,7 +33,7 @@
ldr r6, [r4]
b _0801DD3A
.align 2, 0
_0801DBE4: .4byte gScreenTransition
_0801DBE4: .4byte gRoomTransition
_0801DBE8: .4byte gUnk_080C9C50
_0801DBEC: .4byte gArea
_0801DBF0:
@@ -184,7 +184,7 @@ _0801DCF8:
strb r0, [r5, #2]
adds r5, #3
_0801DD16:
ldr r2, _0801DD54 @ =gScreenTransition
ldr r2, _0801DD54 @ =gRoomTransition
ldrh r0, [r6]
ldrh r1, [r2, #0x16]
cmp r0, r1
@@ -217,5 +217,5 @@ _0801DD42:
.align 2, 0
_0801DD4C: .4byte gArea
_0801DD50: .4byte gAreaRoomHeaders
_0801DD54: .4byte gScreenTransition
_0801DD54: .4byte gRoomTransition
.syntax divided
asm/non_matching/eu/HandlePlayerLife.inc
+2 -2
View File
@@ -111,7 +111,7 @@ _08017112:
ldrb r0, [r0, #1]
cmp r0, #0
bne _0801714E
ldr r0, _08017168 @ =gScreenTransition
ldr r0, _08017168 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0x5a
bl __modsi3
@@ -150,7 +150,7 @@ _0801714E:
.align 2, 0
_08017160: .4byte gMessage
_08017164: .4byte gUnk_0200AF00
_08017168: .4byte gScreenTransition
_08017168: .4byte gRoomTransition
_0801716C: .4byte gSave
_08017170: .4byte 0x0000011F
_08017174:
asm/non_matching/eu/sub_08057A18.inc
+2 -2
View File
@@ -11,7 +11,7 @@
ldr r3, _080575EC @ =gRoomControls
ldrb r0, [r3, #4]
strb r0, [r5, #9]
ldr r1, _080575F0 @ =gScreenTransition
ldr r1, _080575F0 @ =gRoomTransition
ldrb r0, [r4, #4]
strb r0, [r1, #0xc]
ldrb r0, [r4, #5]
@@ -51,6 +51,6 @@
.align 2, 0
_080575E8: .4byte gUnk_03004030
_080575EC: .4byte gRoomControls
_080575F0: .4byte gScreenTransition
_080575F0: .4byte gRoomTransition
_080575F4: .4byte gPlayerEntity
.syntax divided
asm/non_matching/guardWithSpear/sub_08064198.inc
+2 -2
View File
@@ -63,7 +63,7 @@ _080641E6:
lsls r0, r0, #1
cmp r1, r0
ble _08064222
ldr r0, _080642B4 @ =gScreenTransition
ldr r0, _080642B4 @ =gRoomTransition
ldr r0, [r0]
movs r1, #6
bl __modsi3
@@ -140,5 +140,5 @@ _080642AC:
pop {r4, r5, r6, pc}
.align 2, 0
_080642B0: .4byte gPlayerEntity
_080642B4: .4byte gScreenTransition
_080642B4: .4byte gRoomTransition
.syntax divided
asm/non_matching/guardWithSpear/sub_080642B8.inc
+2 -2
View File
@@ -63,7 +63,7 @@ _08064306:
lsls r0, r0, #1
cmp r1, r0
ble _08064342
ldr r0, _080643D4 @ =gScreenTransition
ldr r0, _080643D4 @ =gRoomTransition
ldr r0, [r0]
movs r1, #6
bl __modsi3
@@ -140,5 +140,5 @@ _080643CC:
pop {r4, r5, r6, pc}
.align 2, 0
_080643D0: .4byte gPlayerEntity
_080643D4: .4byte gScreenTransition
_080643D4: .4byte gRoomTransition
.syntax divided
asm/non_matching/itemSword/sub_08075900.inc
+2 -2
View File
@@ -55,7 +55,7 @@ _08075962:
lsls r0, r0, #2
strh r0, [r4, #0x24]
bl UpdatePlayerMovement
ldr r0, _08075994 @ =gScreenTransition
ldr r0, _08075994 @ =gRoomTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@@ -68,7 +68,7 @@ _08075962:
b _080759B2
.align 2, 0
_08075990: .4byte gPlayerEntity
_08075994: .4byte gScreenTransition
_08075994: .4byte gRoomTransition
_08075998:
ldrb r1, [r4, #0xe]
adds r0, r2, #0
asm/non_matching/manager1/sub_080573AC.inc
+2 -2
View File
@@ -28,7 +28,7 @@
adds r0, r0, r2
strh r0, [r5, #0x30]
ldr r2, _08057444 @ =gSineTable
ldr r4, _08057448 @ =gScreenTransition
ldr r4, _08057448 @ =gRoomTransition
ldr r1, [r4]
ldrb r0, [r4]
adds r0, #0x40
@@ -72,6 +72,6 @@ _08057438: .4byte 0xFFFFE000
_0805743C: .4byte 0xFFFFF000
_08057440: .4byte gScreen
_08057444: .4byte gSineTable
_08057448: .4byte gScreenTransition
_08057448: .4byte gRoomTransition
_0805744C: .4byte gUnk_08107C30
.syntax divided
asm/non_matching/manager1/sub_08057450.inc
+2 -2
View File
@@ -33,7 +33,7 @@ _0805748A:
adds r0, r3, #0
adds r0, #0x22
ldrb r0, [r0]
ldr r5, _08057510 @ =gScreenTransition
ldr r5, _08057510 @ =gRoomTransition
cmp r0, #0
bne _080574BE
ldr r0, [r5]
@@ -96,7 +96,7 @@ _08057502:
_08057504: .4byte gScreen
_08057508: .4byte gRoomControls
_0805750C: .4byte gBG3Buffer
_08057510: .4byte gScreenTransition
_08057510: .4byte gRoomTransition
_08057514: .4byte gUnk_08107C30
_08057518: .4byte gUnk_085B4180
.syntax divided
asm/non_matching/manager22/Manager22_Main.inc
+2 -2
View File
@@ -121,7 +121,7 @@ _0805B9EC: .4byte 0x0000DFFF
_0805B9F0: .4byte gPlayerState
_0805B9F4: .4byte gArea
_0805B9F8:
ldr r0, _0805BA24 @ =gScreenTransition
ldr r0, _0805BA24 @ =gRoomTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@@ -142,7 +142,7 @@ _0805B9F8:
bl sub_0801E154
b _0805BA42
.align 2, 0
_0805BA24: .4byte gScreenTransition
_0805BA24: .4byte gRoomTransition
_0805BA28: .4byte gSineTable
_0805BA2C:
movs r0, #0
asm/non_matching/picolyteBottles/sub_0806E140.inc
+2 -2
View File
@@ -62,7 +62,7 @@ _0806E1AC:
ldr r0, _0806E1D4 @ =0x0000421C
bl MessageFromTarget
_0806E1C0:
ldr r1, _0806E1D8 @ =gScreenTransition
ldr r1, _0806E1D8 @ =gRoomTransition
ldrh r0, [r4]
strh r0, [r1, #6]
ldr r2, _0806E1DC @ =gActiveScriptInfo
@@ -73,6 +73,6 @@ _0806E1C0:
pop {r4, r5, pc}
.align 2, 0
_0806E1D4: .4byte 0x0000421C
_0806E1D8: .4byte gScreenTransition
_0806E1D8: .4byte gRoomTransition
_0806E1DC: .4byte gActiveScriptInfo
.syntax divided
asm/non_matching/player/PlayerNormal.inc
+2 -2
View File
@@ -529,7 +529,7 @@ _08070BC8:
ldrb r0, [r0]
cmp r0, #0
beq _08070BE4
ldr r0, _08070BE8 @ =gScreenTransition
ldr r0, _08070BE8 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@@ -540,5 +540,5 @@ _08070BC8:
_08070BE4:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08070BE8: .4byte gScreenTransition
_08070BE8: .4byte gRoomTransition
.syntax divided
asm/non_matching/player/sub_08074678.inc
+2 -2
View File
@@ -85,7 +85,7 @@ _08074714:
.align 2, 0
_0807471C: .4byte 0x00000161
_08074720:
ldr r0, _08074760 @ =gScreenTransition
ldr r0, _08074760 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@@ -118,7 +118,7 @@ _08074732:
strb r0, [r1]
b _08074792
.align 2, 0
_08074760: .4byte gScreenTransition
_08074760: .4byte gRoomTransition
_08074764: .4byte 0x00000161
_08074768: .4byte gPlayerState
_0807476C:
asm/non_matching/playerItemSword/sub_080A78B8.inc
+2 -2
View File
@@ -13,7 +13,7 @@
ldrb r0, [r6, #0x1e]
subs r0, #0x6a
strb r0, [r4, #0x1e]
ldr r0, _080A78EC @ =gScreenTransition
ldr r0, _080A78EC @ =gRoomTransition
ldr r0, [r0]
movs r1, #4
ands r0, r1
@@ -25,7 +25,7 @@
b _080A78F2
.align 2, 0
_080A78E8: .4byte gPlayerState
_080A78EC: .4byte gScreenTransition
_080A78EC: .4byte gRoomTransition
_080A78F0:
ldrb r1, [r4, #0x1e]
_080A78F2:
asm/non_matching/rem/sub_0806A674.inc
+4 -4
View File
@@ -89,7 +89,7 @@ _0806A6E4:
strb r1, [r0]
b _0806A75A
_0806A724:
ldr r0, _0806A780 @ =gScreenTransition
ldr r0, _0806A780 @ =gRoomTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@@ -137,9 +137,9 @@ _0806A75A:
strb r1, [r0]
b _0806A82A
.align 2, 0
_0806A780: .4byte gScreenTransition
_0806A780: .4byte gRoomTransition
_0806A784:
ldr r0, _0806A7C4 @ =gScreenTransition
ldr r0, _0806A7C4 @ =gRoomTransition
ldr r0, [r0]
lsrs r0, r0, #4
movs r1, #3
@@ -174,7 +174,7 @@ _0806A7BA:
strb r0, [r3]
b _0806A82A
.align 2, 0
_0806A7C4: .4byte gScreenTransition
_0806A7C4: .4byte gRoomTransition
_0806A7C8:
adds r2, r4, #0
adds r2, #0x29
asm/non_matching/sub_0804C258.inc
+2 -2
View File
@@ -10,7 +10,7 @@
movs r0, #0xf
ands r2, r0
strb r2, [r3, #0xd]
ldr r0, _0804C28C @ =gScreenTransition
ldr r0, _0804C28C @ =gRoomTransition
ldrb r0, [r0, #0xe]
cmp r0, #4
bne _0804C284
@@ -24,5 +24,5 @@ _0804C284:
pop {pc}
.align 2, 0
_0804C288: .4byte gArea
_0804C28C: .4byte gScreenTransition
_0804C28C: .4byte gRoomTransition
.syntax divided
asm/non_matching/sub_08054524.inc
+2 -2
View File
@@ -4,7 +4,7 @@
ldrb r1, [r0, #1]
cmp r1, #0
bne _08054534
ldr r0, _08054554 @ =gScreenTransition
ldr r0, _08054554 @ =gRoomTransition
adds r0, #0x2e
ldrb r1, [r0]
_08054534:
@@ -24,7 +24,7 @@ _0805453A:
pop {pc}
.align 2, 0
_08054550: .4byte gArea
_08054554: .4byte gScreenTransition
_08054554: .4byte gRoomTransition
_08054558: .4byte gUnk_080FE1C6
_0805455C: .4byte gUnk_080015BC
_08054560: .4byte gUnk_02034398
asm/non_matching/sub_0805EC9C.inc
+2 -2
View File
@@ -16,7 +16,7 @@
movs r0, #0
b _0805ECE0
_0805ECBE:
ldr r1, _0805ECE4 @ =gUnk_03000000
ldr r1, _0805ECE4 @ =gOAMControls
ldr r0, _0805ECE8 @ =0x00000427
adds r2, r1, r0
movs r0, #1
@@ -36,6 +36,6 @@ _0805ECBE:
_0805ECE0:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0805ECE4: .4byte gUnk_03000000
_0805ECE4: .4byte gOAMControls
_0805ECE8: .4byte 0x00000427
.syntax divided
asm/non_matching/sub_unk3_HyruleTown_0.inc
+3 -3
View File
@@ -52,7 +52,7 @@ _0804DE5C:
movs r0, #0x15
strb r0, [r1, #4]
strb r2, [r1, #5]
bl sub_08052CFC
bl InitRoom
ldr r0, [r4]
movs r1, #0x98
lsls r1, r1, #1
@@ -60,7 +60,7 @@ _0804DE5C:
strh r5, [r0, #4]
ldr r0, [r4]
strh r6, [r0, #6]
ldr r1, _0804DEC0 @ =gScreenTransition
ldr r1, _0804DEC0 @ =gRoomTransition
ldr r0, [r4]
ldrh r0, [r0]
lsrs r0, r0, #1
@@ -92,7 +92,7 @@ _0804DE5C:
_0804DEB4: .4byte gArea
_0804DEB8: .4byte 0x0000085C
_0804DEBC: .4byte gRoomControls
_0804DEC0: .4byte gScreenTransition
_0804DEC0: .4byte gRoomTransition
_0804DEC4:
movs r0, #6
movs r1, #0x10
asm/non_matching/vaati/sub_08043770.inc
+2 -2
View File
@@ -10,7 +10,7 @@
bne _080437D8
ldr r0, [r2, #0x64]
ldr r3, [r0, #0x14]
ldr r0, _080437AC @ =gScreenTransition
ldr r0, _080437AC @ =gRoomTransition
adds r5, r0, #0
adds r5, #0x39
ldrb r1, [r5]
@@ -30,7 +30,7 @@ _0804379A:
movs r0, #0xfe
b _080437B8
.align 2, 0
_080437AC: .4byte gScreenTransition
_080437AC: .4byte gRoomTransition
_080437B0:
ldr r0, [r3, #0x64]
str r4, [r0, #0x18]
asm/non_matching/vram/sub_080AD918.inc
+4 -4
View File
@@ -5,7 +5,7 @@
adds r2, r0, #0
cmp r2, #0
bne _080AD958
ldr r1, _080AD94C @ =gUnk_03000000
ldr r1, _080AD94C @ =gOAMControls
movs r3, #0xa4
lsls r3, r3, #3
adds r0, r1, r3
@@ -24,13 +24,13 @@
b _080AD95E
.align 2, 0
_080AD948: .4byte gMain
_080AD94C: .4byte gUnk_03000000
_080AD94C: .4byte gOAMControls
_080AD950: .4byte 0x00000664
_080AD954: .4byte 0x000008EC
_080AD958:
subs r0, #1
strb r0, [r1, #0xb]
ldr r4, _080AD9A8 @ =gUnk_03000000
ldr r4, _080AD9A8 @ =gOAMControls
_080AD95E:
ldrb r1, [r4, #3]
movs r0, #0x80
@@ -71,6 +71,6 @@ _080AD9A0:
strb r0, [r4]
pop {r4, pc}
.align 2, 0
_080AD9A8: .4byte gUnk_03000000
_080AD9A8: .4byte gOAMControls
_080AD9AC: .4byte 0x00000427
.syntax divided
asm/object/bigBarrel.s
+2 -2
View File
@@ -586,7 +586,7 @@ _08088E94:
.align 2, 0
_08088EB0: .4byte gRoomVars
_08088EB4:
ldr r0, _08088F18 @ =gScreenTransition
ldr r0, _08088F18 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@@ -635,7 +635,7 @@ _08088EB4:
_08088F14:
pop {r4, pc}
.align 2, 0
_08088F18: .4byte gScreenTransition
_08088F18: .4byte gRoomTransition
_08088F1C: .4byte gUnk_08120C52
thumb_func_start sub_08088F20
asm/object/bossDoor.s
+2 -2
View File
@@ -196,7 +196,7 @@ sub_0808C348: @ 0x0808C348
ands r0, r1
cmp r0, #0
bne _0808C37C
ldr r0, _0808C374 @ =gScreenTransition
ldr r0, _0808C374 @ =gRoomTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@@ -209,7 +209,7 @@ _0808C36A:
bl GetNextFrame
b _0808C382
.align 2, 0
_0808C374: .4byte gScreenTransition
_0808C374: .4byte gRoomTransition
_0808C378: .4byte 0x00000185
_0808C37C:
adds r0, r4, #0
asm/object/gyorgBossObject.s
+6 -6
View File
@@ -135,7 +135,7 @@ _080A0F5A:
strh r1, [r0]
adds r0, #2
strh r1, [r0]
ldr r0, _080A1060 @ =gScreenTransition
ldr r0, _080A1060 @ =gRoomTransition
adds r0, #0x39
mov r2, sb
strb r2, [r0]
@@ -165,7 +165,7 @@ _080A1050: .4byte gEntCount
_080A1054: .4byte gRoomControls
_080A1058: .4byte gScreen
_080A105C: .4byte 0x00001E07
_080A1060: .4byte gScreenTransition
_080A1060: .4byte gRoomTransition
_080A1064: .4byte gPlayerState
.else
@@ -274,7 +274,7 @@ _080A171E:
strh r1, [r0]
adds r0, #2
strh r1, [r0]
ldr r0, _080A1838 @ =gScreenTransition
ldr r0, _080A1838 @ =gRoomTransition
adds r0, #0x39
mov r2, sb
strb r2, [r0]
@@ -314,7 +314,7 @@ _080A1828: .4byte gEntCount
_080A182C: .4byte gRoomControls
_080A1830: .4byte gScreen
_080A1834: .4byte 0x00001E07
_080A1838: .4byte gScreenTransition
_080A1838: .4byte gRoomTransition
_080A183C: .4byte gPlayerState
_080A1840: .4byte 0x80100000
_080A1844: .4byte gArea
@@ -740,7 +740,7 @@ sub_080A1B4C: @ 0x080A1B4C
_080A1B80:
movs r6, #0
strh r7, [r5]
ldr r0, _080A1BF0 @ =gScreenTransition
ldr r0, _080A1BF0 @ =gRoomTransition
adds r0, #0x39
strb r6, [r0]
bl sub_08079F8C
@@ -792,7 +792,7 @@ _080A1BD0:
strh r0, [r2, #0x18]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A1BF0: .4byte gScreenTransition
_080A1BF0: .4byte gRoomTransition
_080A1BF4: .4byte gPlayerEntity
_080A1BF8: .4byte gPlayerState
_080A1BFC: .4byte 0xFFFDFFFF
asm/object/lilypadLarge.s
+4 -4
View File
@@ -417,7 +417,7 @@ _080857F6:
_08085806:
str r1, [r7, #0x6c]
_08085808:
ldr r0, _080858B0 @ =gScreenTransition
ldr r0, _080858B0 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@@ -495,7 +495,7 @@ _08085884:
.align 2, 0
_080858A8: .4byte gSineTable
_080858AC: .4byte 0xFFFF0000
_080858B0: .4byte gScreenTransition
_080858B0: .4byte gRoomTransition
_080858B4: .4byte 0x00000FFF
_080858B8:
movs r0, #0
@@ -679,7 +679,7 @@ _080859E6:
bl sub_08085D60
b _08085A0A
_080859F4:
ldr r0, _08085A18 @ =gScreenTransition
ldr r0, _08085A18 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0x1f
ands r0, r1
@@ -696,7 +696,7 @@ _08085A0A:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08085A18: .4byte gScreenTransition
_08085A18: .4byte gRoomTransition
thumb_func_start sub_08085A1C
sub_08085A1C: @ 0x08085A1C
asm/object/mazaalBossObject.s
+4 -4
View File
@@ -44,7 +44,7 @@ _0809AB22:
adds r1, r4, #0
bl CopyPosition
str r4, [r5, #0x54]
ldr r2, _0809AB68 @ =gScreenTransition
ldr r2, _0809AB68 @ =gRoomTransition
adds r0, r2, #0
adds r0, #0x38
ldrb r1, [r0]
@@ -67,7 +67,7 @@ _0809AB52:
bl sub_080809D4
b _0809AB9C
.align 2, 0
_0809AB68: .4byte gScreenTransition
_0809AB68: .4byte gRoomTransition
_0809AB6C: .4byte gRoomControls
_0809AB70:
movs r0, #1
@@ -253,7 +253,7 @@ sub_0809ACA0: @ 0x0809ACA0
ldr r1, [r2, #0x54]
movs r0, #6
strb r0, [r1, #0xd]
ldr r0, _0809ACC8 @ =gScreenTransition
ldr r0, _0809ACC8 @ =gRoomTransition
adds r0, #0x38
movs r1, #0xf1
strb r1, [r0]
@@ -262,7 +262,7 @@ sub_0809ACA0: @ 0x0809ACA0
_0809ACC4:
pop {pc}
.align 2, 0
_0809ACC8: .4byte gScreenTransition
_0809ACC8: .4byte gRoomTransition
thumb_func_start sub_0809ACCC
sub_0809ACCC: @ 0x0809ACCC
asm/object/object17.s
+2 -2
View File
@@ -84,7 +84,7 @@ sub_08086234: @ 0x08086234
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _08086258
ldr r0, _08086254 @ =gScreenTransition
ldr r0, _08086254 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@@ -94,7 +94,7 @@ sub_08086234: @ 0x08086234
bl GetNextFrame
b _0808625E
.align 2, 0
_08086254: .4byte gScreenTransition
_08086254: .4byte gRoomTransition
_08086258:
adds r0, r4, #0
bl GetNextFrame
asm/object/object3D.s
+3 -3
View File
@@ -88,7 +88,7 @@ _0808CF82:
strh r1, [r0]
bl sub_0808D030
movs r0, #0
bl sub_0801CFA8
bl ResetPaletteTable
bl ResetPalettes
ldr r0, _0808D024 @ =gGFXSlots
movs r6, #1
@@ -180,14 +180,14 @@ _0808D046:
subs r5, #1
cmp r5, #0
bne _0808D046
ldr r1, _0808D060 @ =gUnk_03000000
ldr r1, _0808D060 @ =gOAMControls
movs r0, #1
strb r0, [r1]
pop {r4, r5, pc}
.align 2, 0
_0808D058: .4byte gUnk_03000020
_0808D05C: .4byte 0x00000B74
_0808D060: .4byte gUnk_03000000
_0808D060: .4byte gOAMControls
thumb_func_start sub_0808D064
sub_0808D064: @ 0x0808D064
asm/object/object3E.s
+6 -6
View File
@@ -171,7 +171,7 @@ _0808D1AE:
_0808D1F4: .4byte 0x00004069
_0808D1F8: .4byte gRoomControls
_0808D1FC:
ldr r0, _0808D274 @ =gScreenTransition
ldr r0, _0808D274 @ =gRoomTransition
ldr r3, [r0]
movs r0, #3
ands r3, r0
@@ -233,7 +233,7 @@ _0808D24E:
_0808D272:
pop {r4, r5, r6, pc}
.align 2, 0
_0808D274: .4byte gScreenTransition
_0808D274: .4byte gRoomTransition
_0808D278: .4byte gScreen
_0808D27C: .4byte gUnk_08121704
@@ -339,7 +339,7 @@ _0808D31C:
ldrsh r0, [r4, r1]
cmp r5, r0
beq _0808D350
ldr r0, _0808D358 @ =gScreenTransition
ldr r0, _0808D358 @ =gRoomTransition
ldr r0, [r0]
movs r1, #8
ands r0, r1
@@ -351,7 +351,7 @@ _0808D350:
pop {r4, r5, pc}
.align 2, 0
_0808D354: .4byte gRoomControls
_0808D358: .4byte gScreenTransition
_0808D358: .4byte gRoomTransition
_0808D35C: .4byte 0x0000010F
thumb_func_start sub_0808D360
@@ -585,7 +585,7 @@ _0808D514: .4byte 0x00004069
sub_0808D518: @ 0x0808D518
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r0, _0808D58C @ =gScreenTransition
ldr r0, _0808D58C @ =gRoomTransition
ldr r2, [r0]
movs r0, #3
ands r2, r0
@@ -642,7 +642,7 @@ sub_0808D518: @ 0x0808D518
_0808D58A:
pop {r4, r5, r6, pc}
.align 2, 0
_0808D58C: .4byte gScreenTransition
_0808D58C: .4byte gRoomTransition
_0808D590: .4byte gScreen
_0808D594: .4byte 0x00004069
_0808D598: .4byte gRoomControls
asm/object/object43.s
+4 -4
View File
@@ -240,7 +240,7 @@ _0808E084:
ldrh r0, [r5]
cmp r0, #0
beq _0808E0BC
ldr r0, _0808E0B8 @ =gScreenTransition
ldr r0, _0808E0B8 @ =gRoomTransition
ldr r1, [r0]
movs r0, #0x1f
ands r1, r0
@@ -260,7 +260,7 @@ _0808E084:
strb r1, [r0]
b _0808E0E4
.align 2, 0
_0808E0B8: .4byte gScreenTransition
_0808E0B8: .4byte gRoomTransition
_0808E0BC:
ldr r0, _0808E140 @ =0x00000115
bl EnqueueSFX
@@ -446,7 +446,7 @@ sub_0808E208: @ 0x0808E208
ldrb r0, [r0, #0x1b]
cmp r0, #0
beq _0808E248
ldr r0, _0808E244 @ =gScreenTransition
ldr r0, _0808E244 @ =gRoomTransition
ldr r0, [r0]
movs r1, #3
ands r0, r1
@@ -464,7 +464,7 @@ sub_0808E208: @ 0x0808E208
b _0808E24C
.align 2, 0
_0808E240: .4byte gPlayerState
_0808E244: .4byte gScreenTransition
_0808E244: .4byte gRoomTransition
_0808E248:
bl DeleteThisEntity
_0808E24C:
asm/object/object8E.s
+10 -10
View File
@@ -90,7 +90,7 @@ _0809B8D8:
ldrb r0, [r4, #0xf]
cmp r0, #0x1f
bhi _0809B914
ldr r5, _0809B90C @ =gScreenTransition
ldr r5, _0809B90C @ =gRoomTransition
ldr r0, [r5]
movs r1, #0x1f
ands r0, r1
@@ -113,7 +113,7 @@ _0809B8F0:
bl sub_0809B97C
b _0809B972
.align 2, 0
_0809B90C: .4byte gScreenTransition
_0809B90C: .4byte gRoomTransition
_0809B910: .4byte 0x00000133
_0809B914:
movs r0, #2
@@ -273,7 +273,7 @@ _0809BA40:
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _0809BA7C
ldr r5, _0809BA74 @ =gScreenTransition
ldr r5, _0809BA74 @ =gRoomTransition
ldr r0, [r5]
movs r1, #0x1f
ands r0, r1
@@ -296,7 +296,7 @@ _0809BA58:
bl sub_0809B97C
b _0809BAC2
.align 2, 0
_0809BA74: .4byte gScreenTransition
_0809BA74: .4byte gRoomTransition
_0809BA78: .4byte 0x00000133
_0809BA7C:
movs r0, #2
@@ -436,7 +436,7 @@ _0809BB88:
ldrh r0, [r5]
cmp r0, #0xdf
bhi _0809BBC4
ldr r4, _0809BBBC @ =gScreenTransition
ldr r4, _0809BBBC @ =gRoomTransition
ldr r0, [r4]
movs r1, #0x1f
ands r0, r1
@@ -456,7 +456,7 @@ _0809BBA6:
b _0809BC68
.align 2, 0
_0809BBB8: .4byte gScreen
_0809BBBC: .4byte gScreenTransition
_0809BBBC: .4byte gRoomTransition
_0809BBC0: .4byte 0x00000133
_0809BBC4:
movs r0, #2
@@ -631,7 +631,7 @@ _0809BD20:
ldrb r0, [r4, #0xd]
cmp r0, #0
beq _0809BD64
ldr r6, _0809BD58 @ =gScreenTransition
ldr r6, _0809BD58 @ =gRoomTransition
ldr r0, [r6]
movs r1, #0x1f
ands r0, r1
@@ -656,7 +656,7 @@ _0809BD38:
strh r0, [r1]
b _0809BDAE
.align 2, 0
_0809BD58: .4byte gScreenTransition
_0809BD58: .4byte gRoomTransition
_0809BD5C: .4byte 0x00000133
_0809BD60: .4byte gScreen
_0809BD64:
@@ -753,7 +753,7 @@ _0809BE0C:
lsls r0, r0, #0x18
cmp r0, #0
beq _0809BE34
ldr r0, _0809BE2C @ =gScreenTransition
ldr r0, _0809BE2C @ =gRoomTransition
ldr r0, [r0]
movs r1, #0x1f
ands r0, r1
@@ -763,7 +763,7 @@ _0809BE0C:
bl SoundReq
b _0809BE70
.align 2, 0
_0809BE2C: .4byte gScreenTransition
_0809BE2C: .4byte gRoomTransition
_0809BE30: .4byte 0x00000133
_0809BE34:
movs r0, #2
asm/object/object91.s
+8 -8
View File
@@ -463,7 +463,7 @@ _0809C74A:
ldrb r0, [r5, #0xf]
cmp r0, #0
beq _0809C7BC
ldr r0, _0809C7AC @ =gScreenTransition
ldr r0, _0809C7AC @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@@ -502,7 +502,7 @@ _0809C7A0:
b _0809C7BC
.align 2, 0
_0809C7A8: .4byte gUnk_08123DF8
_0809C7AC: .4byte gScreenTransition
_0809C7AC: .4byte gRoomTransition
_0809C7B0: .4byte 0xFFFFD000
_0809C7B4:
ldr r0, [r5, #0x50]
@@ -776,7 +776,7 @@ sub_0809C988: @ 0x0809C988
strb r0, [r2, #0xb]
b _0809C9DC
_0809C9AC:
ldr r0, _0809C9C8 @ =gScreenTransition
ldr r0, _0809C9C8 @ =gRoomTransition
ldr r0, [r0]
movs r1, #8
ands r0, r1
@@ -791,7 +791,7 @@ _0809C9AC:
subs r0, #4
b _0809C9DA
.align 2, 0
_0809C9C8: .4byte gScreenTransition
_0809C9C8: .4byte gRoomTransition
_0809C9CC:
adds r0, r2, #0
adds r0, #0x84
@@ -810,7 +810,7 @@ _0809C9DC:
sub_0809C9E0: @ 0x0809C9E0
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r0, _0809CA04 @ =gScreenTransition
ldr r0, _0809CA04 @ =gRoomTransition
ldr r1, [r0]
movs r2, #2
ands r1, r2
@@ -826,7 +826,7 @@ sub_0809C9E0: @ 0x0809C9E0
subs r0, #8
b _0809CA16
.align 2, 0
_0809CA04: .4byte gScreenTransition
_0809CA04: .4byte gRoomTransition
_0809CA08:
adds r2, r4, #0
adds r2, #0x84
@@ -971,7 +971,7 @@ sub_0809CAC8: @ 0x0809CAC8
movs r0, #7
strb r0, [r5, #0xd]
_0809CB26:
ldr r0, _0809CB44 @ =gScreenTransition
ldr r0, _0809CB44 @ =gRoomTransition
ldr r0, [r0]
movs r1, #0xf
ands r0, r1
@@ -984,7 +984,7 @@ _0809CB38:
.align 2, 0
_0809CB3C: .4byte gRoomControls
_0809CB40: .4byte gPlayerEntity
_0809CB44: .4byte gScreenTransition
_0809CB44: .4byte gRoomTransition
_0809CB48: .4byte 0x00000163
thumb_func_start sub_0809CB4C
asm/object/objectA8.s
+2 -2
View File
@@ -283,7 +283,7 @@ _0809FCAC:
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0809FCF8
ldr r0, _0809FCFC @ =gScreenTransition
ldr r0, _0809FCFC @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@@ -314,7 +314,7 @@ _0809FCE0:
_0809FCF8:
pop {r4, r5, pc}
.align 2, 0
_0809FCFC: .4byte gScreenTransition
_0809FCFC: .4byte gRoomTransition
thumb_func_start sub_0809FD00
sub_0809FD00: @ 0x0809FD00
asm/object/windTribeTeleporter.s
+26 -26
View File
@@ -163,12 +163,12 @@ _080A0B60:
bl SoundReq
b _080A0BF0
_080A0B7E:
ldr r0, _080A0B88 @ =gScreenTransition
ldr r0, _080A0B88 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
b _080A0BDE
.align 2, 0
_080A0B88: .4byte gScreenTransition
_080A0B88: .4byte gRoomTransition
_080A0B8C:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -184,11 +184,11 @@ _080A0B98:
strb r0, [r4, #0xe]
b _080A0BF0
_080A0BA4:
ldr r0, _080A0BAC @ =gScreenTransition
ldr r0, _080A0BAC @ =gRoomTransition
ldr r0, [r0]
b _080A0BDE
.align 2, 0
_080A0BAC: .4byte gScreenTransition
_080A0BAC: .4byte gRoomTransition
_080A0BB0:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -209,7 +209,7 @@ _080A0BB0:
.align 2, 0
_080A0BD4: .4byte 0x0813AA10
_080A0BD8:
ldr r0, _080A0BF4 @ =gScreenTransition
ldr r0, _080A0BF4 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
_080A0BDE:
@@ -225,7 +225,7 @@ _080A0BDE:
_080A0BF0:
pop {r4, pc}
.align 2, 0
_080A0BF4: .4byte gScreenTransition
_080A0BF4: .4byte gRoomTransition
_080A0BF8: .4byte gPlayerEntity
@@ -391,12 +391,12 @@ _080A0884:
bl SoundReq
b _080A0910
_080A08A2:
ldr r0, _080A08AC @ =gScreenTransition
ldr r0, _080A08AC @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
b _080A08FE
.align 2, 0
_080A08AC: .4byte gScreenTransition
_080A08AC: .4byte gRoomTransition
_080A08B0:
ldrb r0, [r1, #0xe]
subs r0, #1
@@ -412,12 +412,12 @@ _080A08BC:
strb r0, [r1, #0xe]
b _080A0910
_080A08C8:
ldr r0, _080A08D0 @ =gScreenTransition
ldr r0, _080A08D0 @ =gRoomTransition
ldr r0, [r0]
ands r0, r2
b _080A0900
.align 2, 0
_080A08D0: .4byte gScreenTransition
_080A08D0: .4byte gRoomTransition
_080A08D4:
ldrb r0, [r1, #0xe]
subs r0, #1
@@ -436,7 +436,7 @@ _080A08D4:
.align 2, 0
_080A08F4: .4byte gUnk_0813ADEC
_080A08F8:
ldr r0, _080A0914 @ =gScreenTransition
ldr r0, _080A0914 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
_080A08FE:
@@ -453,7 +453,7 @@ _080A0900:
_080A0910:
pop {pc}
.align 2, 0
_080A0914: .4byte gScreenTransition
_080A0914: .4byte gRoomTransition
_080A0918: .4byte gPlayerEntity
.else
@@ -504,12 +504,12 @@ _080A1038:
bl SoundReq
b _080A10D4
_080A1056:
ldr r0, _080A1060 @ =gScreenTransition
ldr r0, _080A1060 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
b _080A10C2
.align 2, 0
_080A1060: .4byte gScreenTransition
_080A1060: .4byte gRoomTransition
_080A1064:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -525,11 +525,11 @@ _080A1070:
strb r0, [r4, #0xe]
b _080A10D4
_080A107C:
ldr r0, _080A1084 @ =gScreenTransition
ldr r0, _080A1084 @ =gRoomTransition
ldr r0, [r0]
b _080A10C2
.align 2, 0
_080A1084: .4byte gScreenTransition
_080A1084: .4byte gRoomTransition
_080A1088:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -556,7 +556,7 @@ _080A10A2:
_080A10B4: .4byte gRoomControls
_080A10B8: .4byte gUnk_0813ADEC
_080A10BC:
ldr r0, _080A10D8 @ =gScreenTransition
ldr r0, _080A10D8 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
_080A10C2:
@@ -572,7 +572,7 @@ _080A10C2:
_080A10D4:
pop {r4, pc}
.align 2, 0
_080A10D8: .4byte gScreenTransition
_080A10D8: .4byte gRoomTransition
_080A10DC: .4byte gPlayerEntity
.endif
.endif
@@ -611,11 +611,11 @@ _080A110E:
lsls r0, r0, #0x18
cmp r0, #0
beq _080A1130
ldr r0, _080A1120 @ =gScreenTransition
ldr r0, _080A1120 @ =gRoomTransition
ldr r0, [r0]
b _080A1162
.align 2, 0
_080A1120: .4byte gScreenTransition
_080A1120: .4byte gRoomTransition
_080A1124:
ldrb r0, [r2, #0xe]
subs r0, #1
@@ -631,12 +631,12 @@ _080A1130:
strb r0, [r2, #0xe]
b _080A11BA
_080A113C:
ldr r0, _080A1144 @ =gScreenTransition
ldr r0, _080A1144 @ =gRoomTransition
ldr r0, [r0]
movs r1, #3
b _080A1162
.align 2, 0
_080A1144: .4byte gScreenTransition
_080A1144: .4byte gRoomTransition
_080A1148:
ldrb r0, [r2, #0xe]
subs r0, #1
@@ -649,7 +649,7 @@ _080A1148:
strb r0, [r2, #0xd]
b _080A11BA
_080A115C:
ldr r0, _080A1178 @ =gScreenTransition
ldr r0, _080A1178 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
_080A1162:
@@ -664,14 +664,14 @@ _080A1162:
strb r1, [r0, #0x14]
b _080A11BA
.align 2, 0
_080A1178: .4byte gScreenTransition
_080A1178: .4byte gRoomTransition
_080A117C: .4byte gPlayerEntity
_080A1180:
ldr r4, _080A11A0 @ =gPlayerEntity
ldrb r3, [r4, #0x14]
cmp r3, #4
beq _080A11A8
ldr r0, _080A11A4 @ =gScreenTransition
ldr r0, _080A11A4 @ =gRoomTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
@@ -684,7 +684,7 @@ _080A1180:
b _080A11BA
.align 2, 0
_080A11A0: .4byte gPlayerEntity
_080A11A4: .4byte gScreenTransition
_080A11A4: .4byte gRoomTransition
_080A11A8:
movs r0, #0
movs r1, #1
asm/scroll.s
+8 -8
View File
@@ -228,7 +228,7 @@ sub_0807FDC8: @ 0x0807FDC8
ldr r4, _0807FDE0 @ =gUpdateVisibleTiles
movs r0, #1
strb r0, [r4]
bl sub_08000108
bl UpdateScrollVram
movs r1, #0
movs r0, #1
strb r0, [r5, #3]
@@ -411,7 +411,7 @@ _0807FF18: .4byte gUpdateVisibleTiles
sub_0807FF1C: @ 0x0807FF1C
push {lr}
adds r2, r0, #0
ldr r0, _0807FF4C @ =gScreenTransition
ldr r0, _0807FF4C @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@@ -433,7 +433,7 @@ sub_0807FF1C: @ 0x0807FF1C
_0807FF48:
pop {pc}
.align 2, 0
_0807FF4C: .4byte gScreenTransition
_0807FF4C: .4byte gRoomTransition
_0807FF50: .4byte gUpdateVisibleTiles
thumb_func_start sub_0807FF54
@@ -716,7 +716,7 @@ sub_08080198: @ 0x08080198
movs r1, #0xff
strh r1, [r0, #0x1c]
bl LoadRoom
bl sub_0804AFF4
bl CallRoomProp5And7
ldr r0, _080801B8 @ =gUpdateVisibleTiles
strb r4, [r0]
bl sub_080805F8
@@ -1335,8 +1335,8 @@ _08080660:
.align 2, 0
_08080664: .4byte gUnk_03004030
thumb_func_start sub_08080668
sub_08080668: @ 0x08080668
thumb_func_start ClearTilemaps
ClearTilemaps: @ 0x08080668
push {r4, r5, lr}
ldr r5, _080806A4 @ =gRoomControls
adds r0, r5, #0
@@ -1587,7 +1587,7 @@ _0808083E:
DoExitTransition: @ 0x08080840
push {r4, lr}
adds r4, r0, #0
ldr r0, _0808085C @ =gScreenTransition
ldr r0, _0808085C @ =gRoomTransition
movs r1, #1
strb r1, [r0, #8]
adds r2, r0, #0
@@ -1599,7 +1599,7 @@ DoExitTransition: @ 0x08080840
strh r1, [r2, #4]
b _08080872
.align 2, 0
_0808085C: .4byte gScreenTransition
_0808085C: .4byte gRoomTransition
_08080860: .4byte 0x000003FF
_08080864:
ldr r0, _08080880 @ =gRoomControls
asm/staffroll.s
+8 -8
View File
@@ -6,10 +6,10 @@
.text
thumb_func_start HandleCreditsScreen
HandleCreditsScreen: @ 0x080A35E0
thumb_func_start StaffrollTask
StaffrollTask: @ 0x080A35E0
push {lr}
ldr r1, _080A35FC @ =gScreenTransition
ldr r1, _080A35FC @ =gRoomTransition
ldr r0, [r1]
adds r0, #1
str r0, [r1]
@@ -22,7 +22,7 @@ HandleCreditsScreen: @ 0x080A35E0
bl _call_via_r0
pop {pc}
.align 2, 0
_080A35FC: .4byte gScreenTransition
_080A35FC: .4byte gRoomTransition
_080A3600: .4byte gUnk_08127D00
_080A3604: .4byte gMain
@@ -242,7 +242,7 @@ _080A37C4:
ldrb r0, [r0]
cmp r0, #0
bne _080A385E
ldr r0, _080A37FC @ =gScreenTransition
ldr r0, _080A37FC @ =gRoomTransition
ldr r0, [r0]
ands r0, r1
cmp r0, #0
@@ -266,7 +266,7 @@ _080A37C4:
b _080A383C
.align 2, 0
_080A37F8: .4byte gFadeControl
_080A37FC: .4byte gScreenTransition
_080A37FC: .4byte gRoomTransition
_080A3800: .4byte gScreen
_080A3804:
ldrh r0, [r4, #8]
@@ -277,7 +277,7 @@ _080A3804:
bne _080A385E
b _080A383C
_080A3812:
ldr r0, _080A3844 @ =gScreenTransition
ldr r0, _080A3844 @ =gRoomTransition
ldr r0, [r0]
movs r1, #1
ands r0, r1
@@ -304,7 +304,7 @@ _080A383C:
strb r0, [r4, #6]
b _080A385E
.align 2, 0
_080A3844: .4byte gScreenTransition
_080A3844: .4byte gRoomTransition
_080A3848: .4byte gScreen
_080A384C:
ldr r1, _080A3860 @ =gFadeControl
asm/subtask.s
+16 -16
View File
@@ -203,13 +203,13 @@ _080A3DDC: .4byte gMenu
_080A3DE0: .4byte gFuseInfo
_080A3DE4: .4byte gUnk_080C9CBC
_080A3DE8:
bl sub_080A71DC
bl Subtask_Exit
b _080A3DF8
_080A3DEE:
ldr r1, _080A3DFC @ =gFuseInfo
movs r0, #5
strb r0, [r1]
bl sub_080A71DC
bl Subtask_Exit
_080A3DF8:
pop {pc}
.align 2, 0
@@ -1300,8 +1300,8 @@ _080A4576:
_080A45A2:
pop {r4, pc}
thumb_func_start sub_080A45A4
sub_080A45A4: @ 0x080A45A4
thumb_func_start Subtask_FigurineMenu
Subtask_FigurineMenu: @ 0x080A45A4
.ifdef DEMO_USA
bx lr
.align 2, 0
@@ -1339,10 +1339,10 @@ _080A45D0:
_080A45E0:
bl UpdateEntities
bl sub_0801C1D4
bl sub_0801C208
bl sub_080AD9B0
bl DrawOAMCmd
bl DrawEntities
bl sub_080A4978
bl sub_080AD918
bl CopyOAM
bl sub_080A4B44
pop {pc}
.align 2, 0
@@ -1445,7 +1445,7 @@ sub_080A46C0: @ 0x080A46C0
bl SoundReq
movs r0, #2
bl ClearRoomFlag
bl sub_080A71DC
bl Subtask_Exit
pop {pc}
thumb_func_start sub_080A46DC
@@ -2499,7 +2499,7 @@ _080A4D2E:
thumb_func_start sub_080A4D34
sub_080A4D34: @ 0x080A4D34
push {lr}
bl sub_08053320
bl LoadGfxGroups
movs r0, #0xb5
bl LoadPaletteGroup
ldr r1, _080A4D50 @ =gSave
@@ -2669,8 +2669,8 @@ sub_080A4E90: @ 0x080A4E90
.align 2, 0
_080A4E9C: .4byte gUnk_02034490
thumb_func_start sub_080A4EA0
sub_080A4EA0: @ 0x080A4EA0
thumb_func_start Subtask_PauseMenu
Subtask_PauseMenu: @ 0x080A4EA0
push {r4, lr}
ldr r4, _080A4EB8 @ =gUnk_02034490
ldrb r0, [r4, #0x11]
@@ -2679,7 +2679,7 @@ sub_080A4EA0: @ 0x080A4EA0
movs r0, #0x80
lsls r0, r0, #1
bl SetBgmVolume
bl sub_080A71DC
bl Subtask_Exit
b _080A4F14
.align 2, 0
_080A4EB8: .4byte gUnk_02034490
@@ -2693,7 +2693,7 @@ _080A4EBC:
bl _call_via_r0
bl sub_080A5128
bl sub_0801C1D4
bl sub_0801C208
bl DrawOAMCmd
ldrb r0, [r4, #0x11]
cmp r0, #4
beq _080A4EF0
@@ -2705,7 +2705,7 @@ _080A4EBC:
ldr r0, [r1]
bl _call_via_r0
_080A4EF0:
bl sub_080AD918
bl CopyOAM
movs r3, #0x16
ldrsb r3, [r4, r3]
movs r1, #0
@@ -2745,7 +2745,7 @@ _080A4F38:
adds r1, #1
cmp r1, #0xd
ble _080A4F38
ldr r1, _080A4F94 @ =gScreenTransition
ldr r1, _080A4F94 @ =gRoomTransition
ldrh r0, [r1, #0x20]
ldrh r1, [r1, #0x22]
bl sub_080A6A80
@@ -2779,7 +2779,7 @@ _080A4F66:
pop {r4, pc}
.align 2, 0
_080A4F90: .4byte gUnk_02034492
_080A4F94: .4byte gScreenTransition
_080A4F94: .4byte gRoomTransition
_080A4F98: .4byte gUnk_02034490
_080A4F9C: .4byte gUnk_08128A38
asm/subtask2.s
+50 -50
View File
@@ -2480,7 +2480,7 @@ _080A5B86:
ands r0, r1
cmp r0, #0
bne _080A5BE0
ldr r4, _080A5C20 @ =gScreenTransition
ldr r4, _080A5C20 @ =gRoomTransition
ldrh r1, [r4, #0x20]
lsls r0, r1, #2
adds r0, r0, r1
@@ -2538,7 +2538,7 @@ _080A5BE0:
.align 2, 0
_080A5C18: .4byte gChooseFileState
_080A5C1C: .4byte gOamCmd
_080A5C20: .4byte gScreenTransition
_080A5C20: .4byte gRoomTransition
_080A5C24: .4byte gPlayerState
_080A5C28: .4byte gUnk_08128DE8
@@ -2570,7 +2570,7 @@ _080A6392:
ands r0, r1
cmp r0, #0
bne _080A63EA
ldr r4, _080A6428 @ =gScreenTransition
ldr r4, _080A6428 @ =gRoomTransition
ldrh r1, [r4, #0x20]
lsls r0, r1, #2
adds r0, r0, r1
@@ -2626,7 +2626,7 @@ _080A63EA:
.align 2, 0
_080A6420: .4byte gMenu
_080A6424: .4byte gOamCmd
_080A6428: .4byte gScreenTransition
_080A6428: .4byte gRoomTransition
_080A642C: .4byte gPlayerState
_080A6430: .4byte 0x000001FB
_080A6434: .4byte gUnk_08128DE8
@@ -2830,8 +2830,8 @@ _080A64F4: .4byte gScreen
_080A64F8: .4byte 0x00003D3F
.endif
thumb_func_start sub_080A64FC
sub_080A64FC: @ 0x080A64FC
thumb_func_start Subtask_MapHint
Subtask_MapHint: @ 0x080A64FC
push {r4, lr}
bl FlushSprites
ldr r1, _080A652C @ =gUnk_08128E70
@@ -2850,7 +2850,7 @@ sub_080A64FC: @ 0x080A64FC
bl sub_080A6438
_080A6522:
bl sub_080A6498
bl sub_080AD918
bl CopyOAM
pop {r4, pc}
.align 2, 0
_080A652C: .4byte gUnk_08128E70
@@ -2949,7 +2949,7 @@ _080A65EC:
cmp r0, #8
bne _080A6600
_080A65FC:
bl sub_080A71DC
bl Subtask_Exit
_080A6600:
pop {r4, pc}
.align 2, 0
@@ -3448,7 +3448,7 @@ sub_080A68D4: @ 0x080A68D4
beq _080A60DA
movs r4, #0x65
_080A60DA:
ldr r1, _080A6104EU @ =gScreenTransition
ldr r1, _080A6104EU @ =gRoomTransition
ldrh r0, [r1, #0x20]
ldrh r1, [r1, #0x22]
movs r2, #0xfd
@@ -3467,7 +3467,7 @@ _080A60DA:
b _080A612C
.align 2, 0
_080A6100EU: .4byte gPlayerState
_080A6104EU: .4byte gScreenTransition
_080A6104EU: .4byte gRoomTransition
_080A6108: .4byte gSave
_080A610C: .4byte gUnk_08128F58
_080A6110:
@@ -3536,7 +3536,7 @@ _080A6178EU: .4byte gUnk_080FE320
beq _080A68E6
movs r4, #0x65
_080A68E6:
ldr r1, _080A6910 @ =gScreenTransition
ldr r1, _080A6910 @ =gRoomTransition
ldrh r0, [r1, #0x20]
ldrh r1, [r1, #0x22]
ldr r2, _080A6914 @ =0x000001FB
@@ -3554,7 +3554,7 @@ _080A68E6:
b _080A693A
.align 2, 0
_080A690C: .4byte gPlayerState
_080A6910: .4byte gScreenTransition
_080A6910: .4byte gRoomTransition
_080A6914: .4byte 0x000001FB
_080A6918: .4byte gSave
_080A691C: .4byte gUnk_08128F58
@@ -3776,8 +3776,8 @@ _080A6AAE:
_080A6AB6:
pop {pc}
thumb_func_start sub_080A6AB8
sub_080A6AB8: @ 0x080A6AB8
thumb_func_start Subtask_LocalMapHint
Subtask_LocalMapHint: @ 0x080A6AB8
push {r4, lr}
bl FlushSprites
ldr r1, _080A6AF4 @ =gUnk_08128F1C
@@ -3802,7 +3802,7 @@ sub_080A6AB8: @ 0x080A6AB8
ldrh r0, [r4, #0xa]
subs r0, r0, r1
strh r0, [r2, #0x24]
bl sub_080AD918
bl CopyOAM
pop {r4, pc}
.align 2, 0
_080A6AF4: .4byte gUnk_08128F1C
@@ -3869,7 +3869,7 @@ sub_080A6B04: @ 0x080A6B04
beq _080A6B84
movs r2, #0x65
_080A6B84:
ldr r1, _080A6C10 @ =gScreenTransition
ldr r1, _080A6C10 @ =gRoomTransition
ldrh r0, [r1, #0x20]
ldrh r1, [r1, #0x22]
.ifdef EU
@@ -3933,7 +3933,7 @@ _080A6C00: .4byte 0x0000475F
_080A6C04: .4byte 0x00005001
_080A6C08: .4byte gBG3Buffer
_080A6C0C: .4byte gPlayerState
_080A6C10: .4byte gScreenTransition
_080A6C10: .4byte gRoomTransition
.ifndef EU
_080A6C14: .4byte 0x000001FB
.endif
@@ -3967,7 +3967,7 @@ _080A6C3C:
cmp r0, #8
bne _080A6C6A
_080A6C50:
bl sub_080A71DC
bl Subtask_Exit
b _080A6C6A
.align 2, 0
_080A6C58: .4byte gInput
@@ -3985,8 +3985,8 @@ _080A6C6A:
_080A6C6C: .4byte 0x00000103
_080A6C70: .4byte gMenu
thumb_func_start sub_080A6C74
sub_080A6C74: @ 0x080A6C74
thumb_func_start Subtask_FastTravel
Subtask_FastTravel: @ 0x080A6C74
push {r4, lr}
bl FlushSprites
ldr r1, _080A6CA0 @ =gUnk_08128F24
@@ -4002,7 +4002,7 @@ sub_080A6C74: @ 0x080A6C74
bl sub_080A6E70
_080A6C94:
bl sub_080A6498
bl sub_080AD918
bl CopyOAM
pop {r4, pc}
.align 2, 0
_080A6CA0: .4byte gUnk_08128F24
@@ -4241,7 +4241,7 @@ _080A6E18:
ldrb r1, [r1]
ldrh r2, [r0, #0x12]
bl sub_080042D0
bl sub_080A71DC
bl Subtask_Exit
ldr r1, _080A6E40 @ =gUnk_02034490
movs r0, #0
strb r0, [r1]
@@ -4677,8 +4677,8 @@ sub_080A7114: @ 0x080A7114
.align 2, 0
_080A7120: .4byte gMenu
thumb_func_start sub_080A7124
sub_080A7124: @ 0x080A7124
thumb_func_start ResetUI
ResetUI: @ 0x080A7124
push {lr}
ldr r0, _080A7134 @ =gUnk_02032EC0
movs r1, #0xed
@@ -4773,8 +4773,8 @@ sub_080A71C4: @ 0x080A71C4
.align 2, 0
_080A71D8: .4byte gUnk_02032EC0
thumb_func_start sub_080A71DC
sub_080A71DC: @ 0x080A71DC
thumb_func_start Subtask_Exit
Subtask_Exit: @ 0x080A71DC
push {lr}
ldr r1, _080A71F0 @ =gUnk_02032EC0
movs r0, #3
@@ -4805,8 +4805,8 @@ _080A71FE:
.align 2, 0
_080A7218: .4byte gMain
thumb_func_start sub_080A721C
sub_080A721C: @ 0x080A721C
thumb_func_start GameMain_Subtask
GameMain_Subtask: @ 0x080A721C
push {lr}
ldr r0, _080A7248 @ =gUnk_02032EC0
ldrb r1, [r0]
@@ -4833,8 +4833,8 @@ _080A7238:
_080A7248: .4byte gUnk_02032EC0
_080A724C: .4byte gUnk_0812901C
thumb_func_start sub_080A7250
sub_080A7250: @ 0x080A7250
thumb_func_start Subtask_FadeIn
Subtask_FadeIn: @ 0x080A7250
push {r4, lr}
ldr r0, _080A72E8 @ =gFadeControl
ldrb r0, [r0]
@@ -4882,7 +4882,7 @@ sub_080A7250: @ 0x080A7250
bl sub_0805E958
adds r1, r4, #0
subs r1, #0x54
ldr r0, _080A7314 @ =gScreenTransition
ldr r0, _080A7314 @ =gRoomTransition
adds r0, #0x2f
ldrb r0, [r0]
strb r0, [r1, #0xd]
@@ -4915,14 +4915,14 @@ _080A7304: .4byte gPaletteList
_080A7308: .4byte gRoomControls
_080A730C: .4byte gUnk_03000420
_080A7310: .4byte gActiveScriptInfo
_080A7314: .4byte gScreenTransition
_080A7314: .4byte gRoomTransition
_080A7318: .4byte gPlayerState
_080A731C: .4byte gCurrentRoomProperties
_080A7320: .4byte gUnk_02025EB0
_080A7324: .4byte gUnk_0200B650
thumb_func_start sub_080A7328
sub_080A7328: @ 0x080A7328
thumb_func_start Subtask_Init
Subtask_Init: @ 0x080A7328
push {r4, lr}
ldr r0, _080A7388 @ =gFadeControl
ldrb r0, [r0]
@@ -4950,14 +4950,14 @@ sub_080A7328: @ 0x080A7328
bl MessageInitialize
bl ResetPalettes
movs r0, #0
bl sub_0801CFA8
bl ResetPaletteTable
ldr r0, _080A739C @ =gGFXSlots
movs r2, #1
strb r2, [r0]
ldr r1, _080A73A0 @ =gUnk_02032EC0
movs r0, #2
strb r0, [r1]
ldr r0, _080A73A4 @ =gScreenTransition
ldr r0, _080A73A4 @ =gRoomTransition
adds r0, #0x30
strb r2, [r0]
_080A7384:
@@ -4970,10 +4970,10 @@ _080A7394: .4byte gUnk_03000420
_080A7398: .4byte gActiveScriptInfo
_080A739C: .4byte gGFXSlots
_080A73A0: .4byte gUnk_02032EC0
_080A73A4: .4byte gScreenTransition
_080A73A4: .4byte gRoomTransition
thumb_func_start sub_080A73A8
sub_080A73A8: @ 0x080A73A8
thumb_func_start Subtask_FadeOut
Subtask_FadeOut: @ 0x080A73A8
push {r4, r5, lr}
ldr r0, _080A7468 @ =gFadeControl
ldrb r0, [r0]
@@ -5081,17 +5081,17 @@ _080A74AE:
movs r2, #0
movs r0, #4
strb r0, [r1]
ldr r0, _080A74C4 @ =gScreenTransition
ldr r0, _080A74C4 @ =gRoomTransition
adds r0, #0x30
strb r2, [r0]
_080A74BC:
pop {r4, r5, pc}
.align 2, 0
_080A74C0: .4byte gUnk_02032EC0
_080A74C4: .4byte gScreenTransition
_080A74C4: .4byte gRoomTransition
thumb_func_start sub_080A74C8
sub_080A74C8: @ 0x080A74C8
thumb_func_start Subtask_Die
Subtask_Die: @ 0x080A74C8
push {lr}
bl sub_080A74F4
ldr r0, _080A74E8 @ =gFadeControl
@@ -5122,17 +5122,17 @@ sub_080A74F4: @ 0x080A74F4
bl FlushSprites
bl UpdateEntities
bl UpdateManagers
bl sub_0801C344
bl sub_0801C208
bl sub_08078CB4
bl sub_080AD9B0
bl sub_080AD918
bl DrawUI
bl DrawOAMCmd
bl UpdateCarriedObject
bl DrawEntities
bl CopyOAM
pop {pc}
.align 2, 0
_080A7524: .4byte gMain
thumb_func_start sub_080A7528
sub_080A7528: @ 0x080A7528
thumb_func_start Subtask_Update
Subtask_Update: @ 0x080A7528
push {lr}
ldr r1, _080A753C @ =gUnk_08129030
ldr r0, _080A7540 @ =gUnk_02032EC0
asm/ui.s
+8 -8
View File
@@ -35,8 +35,8 @@ _0801C1F8:
_0801C200: .4byte gUnk_0200AF34
_0801C204: .4byte gUnk_080C8F8C
thumb_func_start sub_0801C208
sub_0801C208: @ 0x0801C208
thumb_func_start DrawOAMCmd
DrawOAMCmd: @ 0x0801C208
push {r4, r5, lr}
movs r5, #0
ldr r4, _0801C250 @ =gOamCmd
@@ -195,8 +195,8 @@ _0801C338: .4byte gUnk_085C4620
_0801C33C: .4byte 0x84000008
_0801C340: .4byte 0x06010020
thumb_func_start sub_0801C344
sub_0801C344: @ 0x0801C344
thumb_func_start DrawUI
DrawUI: @ 0x0801C344
push {r4, r5, lr}
ldr r4, _0801C36C @ =gUnk_0200AF00
ldrb r1, [r4, #1]
@@ -214,8 +214,8 @@ sub_0801C344: @ 0x0801C344
.align 2, 0
_0801C36C: .4byte gUnk_0200AF00
thumb_func_start sub_0801C370
sub_0801C370: @ 0x0801C370
thumb_func_start InitUI
InitUI: @ 0x0801C370
push {r4, r5, r6, lr}
cmp r0, #0
bne _0801C390
@@ -267,7 +267,7 @@ _0801C398:
adds r0, r3, #0
orrs r0, r2
strh r0, [r1]
ldr r1, _0801C484 @ =gUnk_03000000
ldr r1, _0801C484 @ =gOAMControls
ldr r2, _0801C488 @ =0x00000427
adds r0, r1, r2
movs r2, #1
@@ -333,7 +333,7 @@ _0801C474: .4byte gSave
_0801C478: .4byte gBG0Buffer
_0801C47C: .4byte gScreen
_0801C480: .4byte 0x00001F0C
_0801C484: .4byte gUnk_03000000
_0801C484: .4byte gOAMControls
_0801C488: .4byte 0x00000427
_0801C48C: .4byte 0x00000426
_0801C490: .4byte 0x0000042E
asm/veneer.s
+2 -2
View File
@@ -79,8 +79,8 @@ _08000144EU:
.endif
.endif
thumb_func_start sub_08000108
sub_08000108: @ 0x08000108
thumb_func_start UpdateScrollVram
UpdateScrollVram: @ 0x08000108
push {r4, lr}
ldr r0, _080001E8 @ =gUpdateVisibleTiles
ldrb r1, [r0]
asm/vram.s
+3 -3
View File
@@ -924,7 +924,7 @@ _080AE2B4:
movs r4, #0
ldr r0, _080AE318 @ =0xFFFFFC00
mov sl, r0
ldr r5, _080AE31C @ =gUnk_03000000
ldr r5, _080AE31C @ =gOAMControls
adds r5, #0x24
ldr r1, _080AE320 @ =0x000003FF
mov sb, r1
@@ -948,7 +948,7 @@ _080AE2D2:
orrs r0, r1
strh r0, [r5]
mov r2, r8
ldr r1, _080AE31C @ =gUnk_03000000
ldr r1, _080AE31C @ =gOAMControls
strb r2, [r1]
_080AE2F8:
adds r5, #8
@@ -965,7 +965,7 @@ _080AE30C: .4byte gGFXSlots
_080AE310: .4byte gUnk_020000C0
_080AE314: .4byte gPlayerEntity
_080AE318: .4byte 0xFFFFFC00
_080AE31C: .4byte gUnk_03000000
_080AE31C: .4byte gOAMControls
_080AE320: .4byte 0x000003FF
thumb_func_start sub_080AE324