mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-31 09:22:08 -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
data/data_080FC8A4.s
+10 -10
View File
@@ -59,20 +59,20 @@ gUnk_080FC9C8:: @ 080FC9C8
.4byte sub_080518E4
gUnk_080FC9D8:: @ 080FC9D8
.4byte sub_080519B0
.4byte sub_08051A14
.4byte sub_08051A90
.4byte GameTask_Transition
.4byte GameTask_Init
.4byte GameTask_Main
.4byte sub_08051D2C
gUnk_080FC9E8:: @ 080FC9E8
.4byte InitializeNewRoom
.4byte sub_08051AF0
.4byte sub_08051BD0
.4byte sub_08051CF0
.4byte sub_0804AAB8
.4byte sub_08051CA8
.4byte GameMain_InitRoom
.4byte GameMain_ChangeRoom
.4byte GameMain_Update
.4byte GameMain_ChangeArea
.4byte GameMain_MinishPortal
.4byte GameMain_BarrelUpdate
.4byte 00000000
.4byte sub_080A721C
.4byte GameMain_Subtask
gUnk_080FCA08:: @ 080FCA08
.4byte sub_08051E84
data/data_08128BF4.s
+16 -16
View File
@@ -136,21 +136,21 @@ gUnk_08129004:: @ 08129004
.incbin "data_08127280/gUnk_08129004.bin"
gUnk_0812901C:: @ 0812901C
.4byte sub_080A7250
.4byte sub_080A7328
.4byte sub_080A7528
.4byte sub_080A73A8
.4byte sub_080A74C8
.4byte Subtask_FadeIn
.4byte Subtask_Init
.4byte Subtask_Update
.4byte Subtask_FadeOut
.4byte Subtask_Die
gUnk_08129030:: @ 08129030
.4byte sub_080A71DC
.4byte sub_080A4EA0
.4byte sub_080A71DC
.4byte sub_080A64FC
.4byte DrawKinstoneMenu
.4byte sub_08051E68
.4byte sub_0804AB54
.4byte sub_080A45A4
.4byte sub_08054870
.4byte sub_080A6C74
.4byte sub_080A6AB8
.4byte Subtask_Exit
.4byte Subtask_PauseMenu
.4byte Subtask_Exit
.4byte Subtask_MapHint
.4byte Subtask_KinstoneMenu
.4byte Subtask_ChuchuCutscene
.4byte Subtask_PortalCutscene
.4byte Subtask_FigurineMenu
.4byte Subtask_WorldEvent
.4byte Subtask_FastTravel
.4byte Subtask_LocalMapHint
include/asm.h
+1 -1
View File
@@ -9,7 +9,7 @@ extern u32 GetTileTypeByEntity(struct Entity_*);
extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer);
extern u32 GetTileType(u32 pos, u32 layer);
extern void SetTile(u32 index, u32 position, u32 layer);
extern void sub_08000108(void);
extern void UpdateScrollVram(void);
extern u32 sub_080002D0(struct Entity_*);
extern void LoadResourceAsync(const void*, u32, u32);
extern void sub_08001242(struct Entity_*);
include/color.h
+1 -1
View File
@@ -10,7 +10,7 @@ typedef struct {
} Palette;
extern Palette gPaletteList[];
void sub_0801CFA8(u32 a1);
void ResetPaletteTable(u32 a1);
void sub_0801D000(u32 a1);
void LoadObjPalette(struct Entity_*, u32);
void UnloadOBJPalette(struct Entity_* entity);
include/entity.h
+4 -4
View File
@@ -164,8 +164,8 @@ extern LinkedList gEntityLists[9];
enum {
ENT_DID_INIT = 0x1,
ENT_SCRIPTED = 0x2,
ENT_ASLEEP = 0x10,
ENT_20 = 0x20,
ENT_DELETED = 0x10,
ENT_PERSIST = 0x20,
ENT_COLLIDE = 0x80,
};
@@ -173,8 +173,8 @@ enum {
#define COLLISION_ON(entity) ((entity)->flags |= ENT_COLLIDE)
#define TILE(x, y) \
(((((x) - gRoomControls.roomOriginX) >> 4) & 0x3F) | \
((((y) - gRoomControls.roomOriginY) >> 4) & 0x3F) << 6)
(((((x) - gRoomControls.origin_x) >> 4) & 0x3F) | \
((((y) - gRoomControls.origin_y) >> 4) & 0x3F) << 6)
#define COORD_TO_TILE(entity) \
TILE((entity)->x.HALF.HI, (entity)->y.HALF.HI)
include/fileScreen.h → include/fileselect.h
+1 -1
View File
@@ -63,7 +63,7 @@ extern struct_02019EE0 gUnk_02019EE0;
extern void sub_08056FEC(u32, struct_020227E8*);
extern void sub_0805F46C(u32, void*);
extern void RecoverUI(u32 bottomPt, u32 topPt);
extern void sub_08080668(void);
extern void ClearTilemaps(void);
extern void sub_0805194C(u32);
extern struct_02036540* sub_0805F2C8(void);
extern void sub_0805F7DC(u32, struct_02036540*);
include/functions.h
+4 -4
View File
@@ -61,8 +61,8 @@ extern void sub_08077F50(ItemBehavior* beh, u32 arg1);
extern void sub_0807AA80(Entity*);
extern s32 sub_0807887C(Entity*, u32, u32);
extern s32 sub_08078904();
extern void sub_080AD9B0(void);
extern void sub_080AD918(void);
extern void DrawEntities(void);
extern void CopyOAM(void);
extern void sub_0801E104(void);
extern void sub_080A57F4(void);
extern void sub_08030118(u32);
@@ -105,7 +105,7 @@ extern void sub_0801E1B8(u32, u32);
extern void sub_080A3B74(void);
extern void sub_080A4054(void);
extern void sub_0801C1D4(void);
extern void sub_0801C208(void);
extern void DrawOAMCmd(void);
extern void sub_080A4D34(void);
extern u32 sub_080A4494(void);
extern void sub_080A4528(void);
@@ -152,7 +152,7 @@ extern void sub_0807B7D8(u32, u32, u32);
extern void sub_0800451C(Entity*);
extern u32 sub_080002F0(u32, u32, u32);
extern u32 sub_080040D8(Entity*, u8*, s32, s32);
extern void sub_08053320();
extern void LoadGfxGroups();
extern void SetColor(u32, u32);
extern u32 sub_0805F8F8(u32);
extern void sub_08002724(void*, u8*);
include/game.h
+20 -2
View File
@@ -4,6 +4,24 @@
#include "global.h"
#include "area.h"
enum {
GAMETASK_TRANSITION,
GAMETASK_INIT,
GAMETASK_MAIN,
GAMETASK_EXIT,
};
enum {
GAMEMAIN_INITROOM,
GAMEMAIN_CHANGEROOM,
GAMEMAIN_UPDATE,
GAMEMAIN_CHANGEAREA,
GAMEMAIN_MINISHPORTAL,
GAMEMAIN_BARRELUPDATE,
GAMEMAIN_RESERVED,
GAMEMAIN_SUBTASK,
};
void ChangeLightLevel(s32);
void SetPopupState(u32 type, u32 choice_idx);
@@ -39,7 +57,7 @@ void DisplayEzloMessage(void);
void sub_08052CA4(u32 area, u32 room, u32 x, u32 y);
void sub_08052CD0(u32 area, u32 room, u32 x, u32 y);
void sub_08052CFC(void);
void InitRoom(void);
/**
* @brief Get bank offset for area
@@ -50,7 +68,7 @@ RoomResInfo* GetCurrentRoomInfo(void);
void sub_08052EA0(void);
void sub_08052FD8(u32 room, u32 area);
void sub_08053250(void);
void sub_08053320(void);
void LoadGfxGroups(void);
void sub_080533CC(void);
void sub_08053494(void);
void sub_080534AC(void);
include/main.h
+10 -10
View File
@@ -25,12 +25,12 @@ typedef enum {
#endif
enum {
SCREEN_INTRO,
SCREEN_CHOOSE_FILE,
SCREEN_GAMEPLAY,
SCREEN_GAME_OVER,
SCREEN_CREDITS,
SCREEN_DEBUG_TEXT,
TASK_TITLE,
TASK_FILE_SELECT,
TASK_GAME,
TASK_GAMEOVER,
TASK_STAFFROLL,
TASK_DEBUG,
};
enum {
@@ -41,9 +41,9 @@ enum {
typedef struct {
vu8 interruptFlag;
u8 sleepStatus;
u8 screen;
u8 funcIndex;
u8 transition;
u8 task;
u8 state;
u8 substate;
u8 field_0x5;
u8 muteAudio;
u8 field_0x7;
@@ -75,7 +75,7 @@ extern UI gUnk_02032EC0;
/**
* @brief Begin a subroutine.
*/
void InitScreen(u32 screen);
void SetTask(u32 screen);
void InitDMA(void);
include/manager.h
+3 -3
View File
@@ -130,10 +130,10 @@ typedef struct Manager11 {
typedef struct {
u16 unk_00;
u8 source_roomID;
u8 source_room;
u8 unk_03;
u8 target_areaID;
u8 target_roomID;
u8 target_area;
u8 target_room;
u16 unk_06;
} DiggingCaveEntrance;
include/message.h
+1 -1
View File
@@ -39,7 +39,7 @@ typedef struct {
Message message;
Token curToken;
WStruct _50;
char playerName[10];
char player_name[10];
u8 _66[0x10];
u8 _76;
u8 _77[0x11];
include/player.h
+1 -1
View File
@@ -280,7 +280,7 @@ extern u16 gWalletSizes[];
extern PlayerState gPlayerState;
extern Entity gPlayerEntity;
u32 sub_080705AC(void);
u32 CheckPlayerActivity(void);
void SetPlayerControl(PlayerControlMode mode);
void ResetPlayer(void);
void ResetPlayerVelocity(void);
include/room.h
+87 -88
View File
@@ -4,13 +4,6 @@
#include "global.h"
#include "entity.h"
/*
typedef struct {
u8 areaID;
u8 roomID;
} RoomID;
*/
enum RoomTransition {
TRANSITION_DEFAULT,
TRANSITION_CUT,
@@ -24,25 +17,30 @@ enum RoomTransition {
TRANSITION_CUT_FAST,
};
enum RoomReloadType {
RELOAD_ALL = 1,
RELOAD_ENTITIES = 2,
};
typedef struct {
/*0x00*/ u16 unk2;
/*0x00*/ u16 reload_flags;
/*0x02*/ u8 unk3;
/*0x03*/ u8 unk4;
/*0x04*/ u8 areaID;
/*0x05*/ u8 roomID;
/*0x06*/ u16 roomOriginX;
/*0x08*/ u16 roomOriginY;
/*0x0A*/ s16 roomScrollX;
/*0x0C*/ s16 roomScrollY;
/*0x04*/ u8 area;
/*0x05*/ u8 room;
/*0x06*/ u16 origin_x;
/*0x08*/ u16 origin_y;
/*0x0A*/ s16 scroll_x;
/*0x0C*/ s16 scroll_y;
/*0x0E*/ u8 unk5;
/*0x0F*/ u8 scroll_flags; // 0x2 = ??, 0x4 = camera scrolling
/*0x10*/ u8 unk_10;
/*0x10*/ u8 scroll_direction;
/*0x11*/ s8 oam_offset_x;
/*0x12*/ s8 oam_offset_y;
/*0x13*/ u8 unk13;
/*0x14*/ u8 screenShakeMagnitude;
/*0x14*/ u8 shake_magnitude;
/*0x15*/ u8 unk7;
/*0x16*/ u16 screenShakeTime;
/*0x16*/ u16 shake_duration;
/*0x18*/ u16 filler2[3];
/*0x1E*/ u16 width;
/*0x20*/ u16 height;
@@ -52,33 +50,33 @@ typedef struct {
/*0x26*/ u8 filler26[2];
/*0x28*/ union SplitWord bg3OffsetX;
/*0x2C*/ union SplitWord bg3OffsetY;
/*0x30*/ Entity* cameraTarget;
/*0x30*/ Entity* camera_target;
} RoomControls;
extern RoomControls gRoomControls;
typedef struct {
u8 field_0x0;
u8 filler_0x1;
u8 field_0x2;
u8 field_0x3;
u8 field_0x4;
u8 filler1[1];
u8 shopItemType;
u8 shopItemType2;
u8 field_0x8;
u8 field_0x9;
u8 unk2;
u8 filler2;
s16 lightLevel;
u8 filler3[2];
u8 unk_10[4];
u32 flags;
u32 unk3;
u8 filler4[48];
u8 filler5[28];
u32 animFlags;
void* field_0x6c[8];
void* field_0x8c[16];
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 filler_0x1;
/* 0x02 */ u8 field_0x2;
/* 0x03 */ u8 field_0x3;
/* 0x04 */ u8 field_0x4;
/* 0x05 */ u8 filler1[1];
/* 0x06 */ u8 shopItemType;
/* 0x07 */ u8 shopItemType2;
/* 0x08 */ u8 field_0x8;
/* 0x09 */ u8 field_0x9;
/* 0x0a */ u8 unk2;
/* 0x0b */ u8 filler2;
/* 0x0c */ s16 lightLevel;
/* 0x0e */ u8 filler3[2];
/* 0x10 */ u8 unk_10[4];
/* 0x14 */ u32 flags;
/* 0x18 */ u32 unk3;
/* 0x1c */ u8 filler4[48];
/* 0x4c */ u8 filler5[28];
/* 0x68 */ u32 animFlags;
/* 0x6c */ void* field_0x6c[8];
/* 0x8c */ void* field_0x8c[16];
} RoomVars;
static_assert(sizeof(RoomVars) == 0xCC);
extern RoomVars gRoomVars;
@@ -112,54 +110,55 @@ typedef struct {
// Status of the player's positioning within the scene.
typedef struct {
u8 area_next;
u8 room_next;
u8 start_anim;
u8 spawn_type;
s16 start_pos_x;
s16 start_pos_y;
u8 layer;
u8 field_0x15;
u8 dungeon_area;
u8 dungeon_room;
s16 dungeon_x;
s16 dungeon_y;
u16 dungeon_map_x;
u16 dungeon_map_y;
s16 overworld_map_x;
s16 overworld_map_y;
u8 field_0x24[0x8];
} PlayerWorldStatus;
static_assert(sizeof(PlayerWorldStatus) == 0x20);
/* 0x00 */ u8 area_next;
/* 0x01 */ u8 room_next;
/* 0x02 */ u8 start_anim;
/* 0x03 */ u8 spawn_type;
/* 0x04 */ s16 start_pos_x;
/* 0x06 */ s16 start_pos_y;
/* 0x08 */ u8 layer;
/* 0x09 */ u8 field_0x15;
/* 0x0a */ u8 dungeon_area;
/* 0x0b */ u8 dungeon_room;
/* 0x0c */ s16 dungeon_x;
/* 0x0e */ s16 dungeon_y;
/* 0x10 */ u16 dungeon_map_x;
/* 0x12 */ u16 dungeon_map_y;
/* 0x14 */ s16 overworld_map_x;
/* 0x16 */ s16 overworld_map_y;
/* 0x18 */ u8 field_0x24[0x8];
} PlayerRoomStatus;
static_assert(sizeof(PlayerRoomStatus) == 0x20);
typedef struct {
s32 frameCount; // regular frame count? does anything reset it?
u8 field_0x4[0x2];
u16 field_0x6;
bool8 transitioningOut;
u8 transitionType; // transition when changing areas
u16 stairs_idx; // seems to be a tile type
PlayerWorldStatus player_status;
u8 field_0x2c[0x9];
u8 hint_height;
u16 hint_idx;
u8 field_0x38;
u8 field_0x39;
u8 field_0x3a;
u8 field_0x3b;
u8 field_0x3c;
u8 field_0x3d;
u16 field_0x3e;
u16 hurtType;
u16 field_0x42;
u16 field_0x44;
u16 field_0x46;
u16 field_0x48;
u16 field_0x4a;
struct_030010EC minecart_data[4];
struct_0300110C armos_data;
} ScreenTransition;
extern ScreenTransition gScreenTransition;
/* 0x00 */ s32 frameCount; // regular frame count? does anything reset it?
/* 0x04 */ u8 field_0x4[0x2];
/* 0x06 */ u16 field_0x6;
/* 0x08 */ bool8 transitioningOut;
/* 0x09 */ u8 type; // transition when changing areas
/* 0x0a */ u16 stairs_idx; // seems to be a tile type
/* 0x0c */ PlayerRoomStatus player_status;
/* 0x2c */ u8 field_0x2c[0x9];
/* 0x35 */ u8 hint_height;
/* 0x36 */ u16 hint_idx;
/* 0x38 */ u8 field_0x38;
/* 0x39 */ u8 field_0x39;
/* 0x3a */ u8 field_0x3a;
/* 0x3b */ u8 field_0x3b;
/* 0x3c */ u8 field_0x3c;
/* 0x3d */ u8 field_0x3d;
/* 0x3e */ u16 field_0x3e;
/* 0x40 */ u16 hurtType;
/* 0x42 */ u16 field_0x42;
/* 0x44 */ u16 field_0x44;
/* 0x46 */ u16 field_0x46;
/* 0x48 */ u16 field_0x48;
/* 0x4a */ u16 field_0x4a;
/* 0x4c */ struct_030010EC minecart_data[4];
/* 0x6c */ struct_0300110C armos_data;
} RoomTransition;
static_assert(sizeof(RoomTransition) == 0xB0);
extern RoomTransition gRoomTransition;
typedef struct {
u8 type;
@@ -186,13 +185,13 @@ typedef enum {
DESTRUCTIBLE_TILE,
GRASS_DROP_CHANGER,
LOCATION_CHANGER,
TILE_ENTITY_D
TILE_ENTITY_D,
} TileEntityType;
extern void SetTileType(u32, u32, u32);
extern void InitScreenShake(u32 time, u32 magnitude);
void sub_0804AFF4(void);
void CallRoomProp5And7(void);
void LoadRoom(void);
void SetCurrentRoomPropertyList(u32 area, u32 room);
extern void* GetCurrentRoomProperty(u32);
include/save.h
+10 -9
View File
@@ -23,10 +23,10 @@ typedef enum {
extern SaveResult HandleSave(u32 arg0);
typedef struct {
/*0x000*/ u8 unk_00;
/*0x000*/ u8 unk_01;
/*0x002*/ u8 messageSpeed;
/*0x003*/ u8 brightnessPref;
/*0x000*/ u8 invalid;
/*0x000*/ u8 initialized;
/*0x002*/ u8 msg_speed;
/*0x003*/ u8 brightness;
/*0x004*/ u8 filler4[0x2];
/*0x006*/ u8 unk6;
/*0x007*/ u8 unk7;
@@ -37,9 +37,9 @@ typedef struct {
/*0x050*/ u32 unk50;
/*0x054*/ u8 filler54[0xC];
/*0x060*/ u32 areaVisitFlags[8];
/*0x080*/ u8 playerName[FILENAME_LENGTH];
/*0x080*/ char name[FILENAME_LENGTH];
/*0x086*/ u8 filler86[0x2];
/*0x088*/ PlayerWorldStatus saved_status;
/*0x088*/ PlayerRoomStatus saved_status;
/*0x0A8*/ Stats stats;
/*0x0D0*/ u8 fillerD0[0x48];
/*0x118*/ u8 unk118[0x13];
@@ -51,7 +51,8 @@ typedef struct {
/*0x25C*/ u8 flags[0x200];
/*0x45C*/ u8 unk45C[0x10];
/*0x46C*/ u8 unk46C[0x20];
/*0x48C*/ u32 unk48C[8];
/*0x48C*/ u32 unk48C[7];
/*0x4A8*/ u32 demo_timer;
/*0x4AC*/ u8 filler4ac[0x8];
} SaveFile;
@@ -59,9 +60,9 @@ extern SaveFile gSave;
u32 InitSaveData(void);
u32 Write_02000000(struct_02000000*);
u32 Write_02000000(SaveHeader*);
s32 ReadSaveFile(u32, SaveFile*);
u32 Read_02000000(struct_02000000*);
u32 Read_02000000(SaveHeader*);
void SetFileStatusDeleted(u32 index);
extern const char gUnk_0811E470[];
include/structures.h
+13 -18
View File
@@ -8,15 +8,15 @@
typedef struct {
int signature;
u8 saveFileId;
u8 messageSpeed;
u8 brightnessPref;
u8 gameLanguage;
u8 msg_speed;
u8 brightness;
u8 language;
u8 name[6];
u8 _e;
u8 invalid;
u8 _f;
} struct_02000000;
#define gSaveHeader ((struct_02000000*)(0x2000000))
// extern struct_02000000 gSaveHeader;
} SaveHeader;
#define gSaveHeader ((SaveHeader*)(0x2000000))
// extern SaveHeader gSaveHeader;
typedef struct {
u8 unk_00;
@@ -39,13 +39,13 @@ static_assert(sizeof(struct_02000010) == 0x20);
extern struct_02000010 gUnk_02000010;
typedef struct {
u16 transitionType;
u16 type;
u8 field_0x2[4];
s16 playerXPos;
s16 playerYPos;
u8 field_0xa;
u8 areaID;
u8 roomID;
u8 area;
u8 room;
u8 playerLayer;
u8 field_0xe;
u8 playerState;
@@ -164,13 +164,8 @@ typedef struct {
u16 _6;
u8 _0[0x18];
struct OamData oam[0x80];
OAMObj unk[0x100];
u8 fill[10];
u8 _426;
u8 _427;
u8 _428[6];
u8 _42e;
} OAMSettings;
extern OAMSettings gUnk_03000000;
OAMObj unk[0xA0]; /* todo: affine */
} OAMControls;
extern OAMControls gOAMControls;
#endif
linker.ld
+5 -5
View File
@@ -90,7 +90,7 @@ SECTIONS {
. = 0x00022830; gUnk_02022830 = .;
. = 0x00024030; gMessageChoices = .;
. = 0x00024048; gUnk_02024048 = .;
. = 0x00024050; gUnk_02024050 = .;
. = 0x00024050; gRoomMemory = .;
. = 0x00024090; gUnk_02024090 = .;
. = 0x00024490; gGFXSlots = .;
. = 0x00024494; gUnk_02024494 = .;
@@ -158,7 +158,7 @@ SECTIONS {
} >ewram
iwram (NOLOAD) : ALIGN(4) {
. = 0x00000000; gUnk_03000000 = .;
. = 0x00000000; gOAMControls = .;
. = 0x00000020; gUnk_03000020 = .;
. = 0x00000420; gUnk_03000420 = .;
. = 0x00000B80; gUnk_03000B80 = .;
@@ -173,7 +173,7 @@ SECTIONS {
. = 0x00001000; gMain = .;
. = 0x00001010; gOamCmd = .;
. = 0x00001020; gUnk_03001020 = .;
. = 0x000010A0; gScreenTransition = .;
. = 0x000010A0; gRoomTransition = .;
. = 0x00001150; gRand = .;
. = 0x00001160; gPlayerEntity = .;
. = 0x000011E8; gUnk_030011E8 = .;
@@ -436,7 +436,7 @@ SECTIONS {
src/room.o(.text);
src/roomInit.o(.text);
src/fade.o(.text);
src/fileScreen.o(.text);
src/fileselect.o(.text);
src/game.o(.text);
asm/code_080526F8.o(.text);
asm/modBombs.o(.text);
@@ -1120,7 +1120,7 @@ SECTIONS {
data/data_080D3D94.o(.rodata);
data/map/entity_headers.o(.rodata);
data/data_080FC3C4.o(.rodata);
src/fileScreen.o(.rodata);
src/fileselect.o(.rodata);
data/data_080FC8A4.o(.rodata);
src/game.o(.rodata);
data/data_080FCAC8.o(.rodata);
src/affine.c
+17 -17
View File
@@ -21,42 +21,42 @@ NONMATCH("asm/non_matching/vram/sub_080AD8F0.inc", void* sub_080AD8F0(u32 sprite
END_NONMATCH
void FlushSprites(void) {
gUnk_03000000.updated = 0;
gOAMControls.updated = 0;
}
NONMATCH("asm/non_matching/vram/sub_080AD918.inc", void sub_080AD918(void)) {
NONMATCH("asm/non_matching/vram/sub_080AD918.inc", void CopyOAM(void)) {
s32 rem;
u16* d;
if (gMain.ticks.HALF.LO == 0) {
gUnk_03000000.unk[0x20].unk0 = gMain.ticks.HALF.LO;
gUnk_03000000.unk[0x48].unk4 = gMain.ticks.HALF.LO;
gUnk_03000000.unk[0x71].unk0 = gMain.ticks.HALF.LO;
gUnk_03000000.unk[0x99].unk4 = gMain.ticks.HALF.LO;
gOAMControls.unk[0x20].unk0 = gMain.ticks.HALF.LO;
gOAMControls.unk[0x48].unk4 = gMain.ticks.HALF.LO;
gOAMControls.unk[0x71].unk0 = gMain.ticks.HALF.LO;
gOAMControls.unk[0x99].unk4 = gMain.ticks.HALF.LO;
} else {
gMain.ticks.HALF.LO--;
}
rem = 0x80 - gUnk_03000000.updated;
for (d = (u16*)&gUnk_03000000.oam[0x80 + gUnk_03000000.updated]; rem > 0; rem--) {
rem = 0x80 - gOAMControls.updated;
for (d = (u16*)&gOAMControls.oam[0x80 + gOAMControls.updated]; rem > 0; rem--) {
*d = 0x2A0;
(u8*)d += 6;
}
if (gUnk_03000000.unk[0].unk7) {
gUnk_03000000.unk[0].unk7 = 0;
ObjAffineSet((struct ObjAffineSrcData*)gUnk_03000000.unk, &gUnk_03000000.oam[0].affineParam, 32, 8);
if (gOAMControls.unk[0].unk7) {
gOAMControls.unk[0].unk7 = 0;
ObjAffineSet((struct ObjAffineSrcData*)gOAMControls.unk, &gOAMControls.oam[0].affineParam, 32, 8);
}
gUnk_03000000.field_0x0 = 1;
gOAMControls.field_0x0 = 1;
}
END_NONMATCH
void sub_080AD9B0(void) {
void DrawEntities(void) {
void (*fn)(void);
gUnk_03000000._0[6] = gScreenTransition.field_0x2c[3] ? 15 : 0;
gUnk_03000000._4 = gRoomControls.aff_x + gRoomControls.roomScrollX;
gUnk_03000000._6 = gRoomControls.aff_y + gRoomControls.roomScrollY;
gUnk_03000000.field_0x1++;
gOAMControls._0[6] = gRoomTransition.field_0x2c[3] ? 15 : 0;
gOAMControls._4 = gRoomControls.aff_x + gRoomControls.scroll_x;
gOAMControls._6 = gRoomControls.aff_y + gRoomControls.scroll_y;
gOAMControls.field_0x1++;
fn = &gUnk_03006164;
fn();
}
src/code_08049CD4.c
+4 -4
View File
@@ -1,13 +1,13 @@
#include "global.h"
extern u32* gUnk_020354B0;
extern u32 gUnk_02024050;
extern u32 gRoomMemory;
extern void MemFill32(u32, void*, u32);
void sub_08049CD4() {
MemFill32(0xFFFFFFFF, &gUnk_02024050, 0x40);
gUnk_020354B0 = &gUnk_02024050;
void ClearRoomMemory() {
MemFill32(0xFFFFFFFF, &gRoomMemory, 0x40);
gUnk_020354B0 = &gRoomMemory;
}
void sub_08049CF4(u8* arg0) {
src/code_0805436C.c
+2 -2
View File
@@ -149,7 +149,7 @@ NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) {
bVar1 = gArea.locationIndex;
if (gArea.locationIndex == 0) {
bVar1 = gScreenTransition.player_status.field_0x24[0xa];
bVar1 = gRoomTransition.player_status.field_0x24[0xa];
}
if (bVar1 > 0x16) {
bVar1 = 0;
@@ -263,7 +263,7 @@ u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) {
}
*/
void sub_08054870(void) {
void Subtask_WorldEvent(void) {
#if !(defined(DEMO_USA) || defined(DEMO_JP))
gUnk_080FE2A0[gMenu.menuType]();
#endif
src/code_0805EC04.c
+5 -5
View File
@@ -4,7 +4,7 @@
bool32 sub_0805EC04(Entity* this) {
u32 i = 1;
OAMSettings* temp = &gUnk_03000000;
OAMControls* temp = &gOAMControls;
u32 j = 1;
for (; i < 0x20; i++) {
if (temp->unk[i].unk6 == 0) {
@@ -19,13 +19,13 @@ bool32 sub_0805EC04(Entity* this) {
void sub_0805EC60(Entity* this) {
u8 temp;
OAMSettings* temp2;
OAMControls* temp2;
if (this->spriteRendering.b0 != 0) {
this->spriteRendering.b0 = 0;
temp = this->spriteOrientation.b1;
this->spriteOrientation.b1 = 0;
temp2 = &gUnk_03000000;
temp2 = &gOAMControls;
temp2->unk[temp].unk6 = 0;
}
}
@@ -35,9 +35,9 @@ ASM_FUNC("asm/non_matching/sub_0805EC9C.inc", bool32 sub_0805EC9C(Entity* ent, u
void sub_0805ECEC(int param_1, u32 param_2, u32 param_3, u32 param_4) {
u16* temp;
gUnk_03000000.unk[0].unk7 = 1;
gOAMControls.unk[0].unk7 = 1;
temp = &gUnk_03000000.unk[param_1].unk0;
temp = &gOAMControls.unk[param_1].unk0;
temp[0] = param_2;
temp[1] = param_3;
temp[2] = param_4;
src/color.c
+1 -1
View File
@@ -7,7 +7,7 @@ void LoadObjPaletteAtIndex(u32 a1, u32 a2);
static void sub_0801CFD0(u32 a1);
void sub_0801CFA8(u32 a1) {
void ResetPaletteTable(u32 a1) {
u32 i;
MemClear(gPaletteList, 0x40);
src/common.c
+6 -6
View File
@@ -6,7 +6,7 @@
#include "main.h"
#include "area.h"
#include "room.h"
#include "fileScreen.h"
#include "fileselect.h"
#include "game.h"
#include "flags.h"
#include "kinstone.h"
@@ -266,17 +266,17 @@ void LoadGfxGroup(u32 group) {
case 0xD:
return;
case 0xE:
if (gSaveHeader->gameLanguage != 0 && gSaveHeader->gameLanguage != 1) {
if (gSaveHeader->language != 0 && gSaveHeader->language != 1) {
loadGfx = TRUE;
}
break;
case 0xF:
if (gSaveHeader->gameLanguage != 0) {
if (gSaveHeader->language != 0) {
loadGfx = TRUE;
}
break;
default:
if (ctrl == gSaveHeader->gameLanguage) {
if (ctrl == gSaveHeader->language) {
loadGfx = TRUE;
}
break;
@@ -350,7 +350,7 @@ void DispReset(bool32 refresh) {
}
void ClearOAM(void) {
u8* d = (u8*)gUnk_03000000.oam;
u8* d = (u8*)gOAMControls.oam;
u8* mem = (u8*)0x07000000;
u32 i;
for (i = 128; i != 0; --i) {
@@ -376,7 +376,7 @@ void ResetScreenRegs(void) {
}
u32 sub_0801DB94(void) {
return gScreenTransition.player_status.dungeon_map_y >> 11;
return gRoomTransition.player_status.dungeon_map_y >> 11;
}
ASM_FUNC("asm/non_matching/common/DrawDungeonMap.inc", void DrawDungeonMap(u32 floor, struct_02019EE0* data, u32 size));
src/coord.c
+6 -6
View File
@@ -169,14 +169,14 @@ void LinearMoveUpdate(Entity* ent) {
}
void sub_0806F704(Entity* ent, u32 a2) {
ent->x.HALF.HI = (((16 * a2) & 0x3F0) | 8) + gRoomControls.roomOriginX;
ent->y.HALF.HI = (((a2 >> 2) & 0x3F0) | 8) + gRoomControls.roomOriginY;
ent->x.HALF.HI = (((16 * a2) & 0x3F0) | 8) + gRoomControls.origin_x;
ent->y.HALF.HI = (((a2 >> 2) & 0x3F0) | 8) + gRoomControls.origin_y;
}
u32 sub_0806F730(Entity* ent) {
u32 tmp = 0x3F;
u32 x = ent->x.HALF.HI + ent->hitbox->offset_x - gRoomControls.roomOriginX;
u32 y = ent->y.HALF.HI + ent->hitbox->offset_y - gRoomControls.roomOriginY;
u32 x = ent->x.HALF.HI + ent->hitbox->offset_x - gRoomControls.origin_x;
u32 y = ent->y.HALF.HI + ent->hitbox->offset_y - gRoomControls.origin_y;
switch (ent->animationState) {
case 0:
y -= ent->hitbox->unk2[3];
@@ -195,8 +195,8 @@ u32 sub_0806F730(Entity* ent) {
}
u32 sub_0806F798(Entity* ent) {
u32 hitboxX = ent->x.HALF.HI + ent->hitbox->offset_x - gRoomControls.roomOriginX;
u32 hitboxY = ent->y.HALF.HI + ent->hitbox->offset_y - gRoomControls.roomOriginY;
u32 hitboxX = ent->x.HALF.HI + ent->hitbox->offset_x - gRoomControls.origin_x;
u32 hitboxY = ent->y.HALF.HI + ent->hitbox->offset_y - gRoomControls.origin_y;
u32 mask = 0x3f;
return (mask & (hitboxX >> 4)) + ((mask & (hitboxY >> 4)) << 6);
}
src/debugScreen.c
+7 -7
View File
@@ -9,8 +9,8 @@
extern void (*const gUnk_08109A30[])();
void HandleDebugTextScreen() {
gUnk_08109A30[gMain.funcIndex]();
void DebugTask() {
gUnk_08109A30[gMain.state]();
}
void sub_0805FA04(void) {
@@ -27,10 +27,10 @@ void sub_0805FA04(void) {
MessageInitialize();
MemClear((void*)&gUnk_02032EC0, sizeof(UI));
MemClear((void*)&gMenu, sizeof(Menu));
gMenu.unk16 = gSaveHeader->gameLanguage;
sub_08053320();
gMenu.unk16 = gSaveHeader->language;
LoadGfxGroups();
SetColor(0, 0x1144);
gMain.funcIndex = 1;
gMain.state = 1;
InitSoundPlayingInfo();
sub_08050008();
}
@@ -56,7 +56,7 @@ void sub_0805FA98(void) {
}
break;
case R_BUTTON:
gSaveHeader->gameLanguage = gMenu.unk16;
gSaveHeader->language = gMenu.unk16;
MessageFromTarget(gMenu.unk14 * 0x100 + gMenu.unk15);
break;
case B_BUTTON:
@@ -91,5 +91,5 @@ void sub_0805FA98(void) {
}
void sub_0805FBC4() {
InitScreen(0);
SetTask(TASK_TITLE);
}
src/demoScreen.c
+13 -13
View File
@@ -3,7 +3,7 @@
#include "main.h"
#include "common.h"
#include "message.h"
#include "fileScreen.h"
#include "fileselect.h"
#include "screen.h"
extern void (*const demoFunctions[])(void);
@@ -23,11 +23,11 @@ extern u16 gUnk_08127CC8[4];
extern void* gUnk_08127C98;
extern u8 gUnk_08A068BF[129];
void HandleChooseDemoScreen(void) {
void DemoTask(void) {
FlushSprites();
demoFunctions[gMain.funcIndex]();
demoFunctions[gMain.state]();
sub_080A30AC();
sub_080AD918();
CopyOAM();
}
void sub_080A2E40(void) {
@@ -37,11 +37,11 @@ void sub_080A2E40(void) {
MessageInitialize();
EraseAllEntities();
ResetPalettes();
sub_0801CFA8(0);
ResetPaletteTable(0);
MemClear(&gUnk_02032EC0, sizeof gUnk_02032EC0);
MemClear(&gChooseFileState, sizeof gChooseFileState);
MemClear(&gBG0Buffer, sizeof gBG0Buffer);
sub_08053320();
LoadGfxGroups();
LoadPaletteGroup(0xb5);
LoadGfxGroup(0x56);
MemCopy(&gUnk_089FD1B4, &gUnk_02017760[0], 0x100);
@@ -65,27 +65,27 @@ void sub_080A2E40(void) {
*(u8*)(addr + 4) = 0;
}
sub_080A3198(0, 0);
gMain.funcIndex = 1;
gMain.state = 1;
SoundReq(BGM_FILE_SELECT);
DoFade(4, 8);
}
void sub_080A2F8C(void) {
if (gFadeControl.active == 0) {
switch (gMain.transition) {
switch (gMain.substate) {
case 0:
gMain.transition = 1;
gMain.substate = 1;
{
// TODO write to 0x2000005
u32 addr = (0x80 << 0x12);
*(u8*)(addr + 5) = 1;
*(u8*)(addr + 6) = 1;
}
gMain.funcIndex = 2;
gMain.state = 2;
DoFade(5, 8);
break;
case 1:
InitScreen(2);
SetTask(TASK_GAME);
break;
}
}
@@ -125,8 +125,8 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
case START_BUTTON:
case A_BUTTON: {
if (gChooseFileState.unk_0x0 == 0) {
gMain.screen = 2;
gMain.funcIndex = gChooseFileState.unk_0x0;
gMain.task = 2;
gMain.state = gChooseFileState.unk_0x0;
SoundReq(SFX_TEXTBOX_SELECT);
}
}
src/enemy/bombPeahat.c
+11 -11
View File
@@ -136,19 +136,19 @@ void sub_0802A9A8(Entity* this) {
sub_0802ACDC(this, 8);
}
} else {
if (gRoomControls.unk2 != 0) {
if (gRoomControls.reload_flags != 0) {
return;
}
this->spriteSettings.draw = 1;
this->field_0x82.HWORD = 1;
if (this->field_0x80.HALF.LO) {
this->x.HALF.HI = gRoomControls.roomScrollX - 0x10;
this->x.HALF.HI = gRoomControls.scroll_x - 0x10;
this->direction = 8;
} else {
this->x.HALF.HI = gRoomControls.roomScrollX + 0x100;
this->x.HALF.HI = gRoomControls.scroll_x + 0x100;
this->direction = 0x18;
}
this->y.HALF.HI = gRoomControls.roomScrollY + 0x40;
this->y.HALF.HI = gRoomControls.scroll_y + 0x40;
this->actionDelay = 0x80;
sub_0802ADDC(this);
}
@@ -311,9 +311,9 @@ void sub_0802AC40(Entity* this) {
void sub_0802ACDC(Entity* this, u32 param_2) {
u32 x;
if (this->field_0x80.HALF.LO) {
x = sub_080045B4(this, gRoomControls.roomScrollX + 0x20, gRoomControls.roomScrollY + 0x60);
x = sub_080045B4(this, gRoomControls.scroll_x + 0x20, gRoomControls.scroll_y + 0x60);
} else {
x = sub_080045B4(this, gRoomControls.roomScrollX + 0xd0, gRoomControls.roomScrollY + 0x60);
x = sub_080045B4(this, gRoomControls.scroll_x + 0xd0, gRoomControls.scroll_y + 0x60);
}
sub_08004596(this, x);
this->field_0xf = param_2;
@@ -333,13 +333,13 @@ void sub_0802AD1C(Entity* this, u32 param_2) {
void sub_0802AD54(Entity* this) {
if (this->field_0x82.HWORD != 0) {
if (gRoomControls.unk2 != 0) {
if (gRoomControls.reload_flags != 0) {
this->spriteSettings.draw = 0;
DeleteEntity(this);
return;
}
if (gRoomControls.roomOriginY > this->y.HALF.HI ||
(gRoomControls.roomOriginY + gRoomControls.height + 0x20) < this->y.HALF.HI) {
if (gRoomControls.origin_y > this->y.HALF.HI ||
(gRoomControls.origin_y + gRoomControls.height + 0x20) < this->y.HALF.HI) {
this->spriteSettings.draw = 0;
} else {
this->spriteSettings.draw = 1;
@@ -504,8 +504,8 @@ void sub_0802B048(Entity* this) {
u32 action;
if (this->field_0x7a.HALF.HI) {
if (gRoomControls.roomOriginY > this->y.HALF.HI ||
(gRoomControls.roomOriginY + gRoomControls.height + 0x20) < this->y.HALF.HI) {
if (gRoomControls.origin_y > this->y.HALF.HI ||
(gRoomControls.origin_y + gRoomControls.height + 0x20) < this->y.HALF.HI) {
COLLISION_OFF(this);
} else {
COLLISION_ON(this);
src/enemy/code_080300AC.c
+6 -6
View File
@@ -2,14 +2,14 @@
#include "common.h"
#include "functions.h"
void sub_080300AC(void) {
MemClear(&gScreenTransition.armos_data, sizeof(gScreenTransition.armos_data));
gScreenTransition.armos_data.field_0xae = 0xff;
void ClearArmosData(void) {
MemClear(&gRoomTransition.armos_data, sizeof(gRoomTransition.armos_data));
gRoomTransition.armos_data.field_0xae = 0xff;
}
void sub_080300C4(void) {
if (gScreenTransition.armos_data.field_0xae == 0xff) {
gScreenTransition.armos_data.field_0xac = 0;
MemClear(&gScreenTransition.armos_data.data, sizeof(gScreenTransition.armos_data.data));
if (gRoomTransition.armos_data.field_0xae == 0xff) {
gRoomTransition.armos_data.field_0xac = 0;
MemClear(&gRoomTransition.armos_data.data, sizeof(gRoomTransition.armos_data.data));
}
}
src/enemy/fallingBoulder.c
+2 -2
View File
@@ -61,7 +61,7 @@ void sub_0802C318(Entity* this) {
NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(Entity* this)) {
if ((u16)this->field_0x7c.HALF.LO == 0) {
u32 tmp = gRoomControls.roomOriginY;
u32 tmp = gRoomControls.origin_y;
if (&gPlayerEntity == NULL)
return;
if (tmp - gPlayerEntity.y.HALF.HI <= 0x38) {
@@ -106,7 +106,7 @@ NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(E
}
}
y = gRoomControls.roomOriginY + gRoomControls.height - this->y.HALF.HI;
y = gRoomControls.origin_y + gRoomControls.height - this->y.HALF.HI;
if (y >= 5) {
sub_080AEFB4(this);
} else {
src/enemy/gyorgMale.c
+44 -44
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "enemy.h"
#include "player.h"
#include "fileScreen.h"
#include "fileselect.h"
#include "functions.h"
void (*const gUnk_080D1AFC[8])(Entity*);
@@ -98,7 +98,7 @@ void GyorgMale(Entity* this) {
this->animationState = -(this->field_0x78.HWORD >> 8);
sub_08048004(this);
this->field_0x7c.BYTES.byte1 = this->spriteSettings.draw;
if (this->spriteSettings.draw == 1 && (this->y.HALF.HI - gRoomControls.roomScrollY + 0x30) > 0x100u) {
if (this->spriteSettings.draw == 1 && (this->y.HALF.HI - gRoomControls.scroll_y + 0x30) > 0x100u) {
this->spriteSettings.draw = 0;
}
this->cutsceneBeh.HWORD = gPlayerEntity.x.HALF.HI;
@@ -162,7 +162,7 @@ void sub_08046930(Entity* this) {
void sub_0804696C(Entity* this) {
sub_08047E48(this);
if (gRoomControls.roomOriginY + 0x130 > this->y.HALF.HI) {
if (gRoomControls.origin_y + 0x130 > this->y.HALF.HI) {
this->subAction = 2;
this->direction = 0x80;
this->speed = 0x100;
@@ -174,9 +174,9 @@ void sub_0804696C(Entity* this) {
}
if (this->actionDelay) {
#ifdef EU
if (gRoomControls.roomOriginY + 0x210 > this->y.HALF.HI) {
if (gRoomControls.origin_y + 0x210 > this->y.HALF.HI) {
#else
if (gRoomControls.roomOriginY + 0x258 > this->y.HALF.HI) {
if (gRoomControls.origin_y + 0x258 > this->y.HALF.HI) {
#endif
this->actionDelay = 0;
SoundReq(SFX_APPARATE);
@@ -186,7 +186,7 @@ void sub_0804696C(Entity* this) {
void sub_080469CC(Entity* this) {
sub_08047E48(this);
if (gRoomControls.roomOriginY + 0x210 < this->y.HALF.HI) {
if (gRoomControls.origin_y + 0x210 < this->y.HALF.HI) {
this->subAction = 3;
this->direction = 0x90;
}
@@ -194,7 +194,7 @@ void sub_080469CC(Entity* this) {
void sub_080469F4(Entity* this) {
sub_08047E48(this);
if (gRoomControls.roomOriginY + 0x290 < this->y.HALF.HI) {
if (gRoomControls.origin_y + 0x290 < this->y.HALF.HI) {
this->subAction = 4;
this->spriteOrientation.flipY = 2;
this->spriteRendering.b3 = 2;
@@ -211,7 +211,7 @@ void sub_08046A30(Entity* this) {
void sub_08046A54(Entity* this) {
sub_08047E48(this);
if (gRoomControls.roomOriginX + 0x380 < this->x.HALF.HI) {
if (gRoomControls.origin_x + 0x380 < this->x.HALF.HI) {
this->subAction = 6;
}
}
@@ -268,8 +268,8 @@ void sub_08046B8C(Entity* this) {
if (sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, 4)) {
this->subAction = 3;
this->field_0x76.HWORD = this->direction << 8;
this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x200;
this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x210;
this->field_0x80.HWORD = gRoomControls.origin_x + 0x200;
this->field_0x82.HWORD = gRoomControls.origin_y + 0x210;
sub_08047D88(this);
} else {
this->direction =
@@ -331,8 +331,8 @@ void sub_08046D44(Entity* this) {
this->subAction = 1;
this->speed = 0x200;
tmp = gUnk_080D1B60 + (((Entity*)this->myHeap)->next->animationState >> 5);
this->field_0x80.HWORD = tmp[0] + gRoomControls.roomOriginX;
this->field_0x82.HWORD = tmp[1] + gRoomControls.roomOriginY;
this->field_0x80.HWORD = tmp[0] + gRoomControls.origin_x;
this->field_0x82.HWORD = tmp[1] + gRoomControls.origin_y;
this->field_0x76.HWORD = this->direction << 8;
sub_08047D88(this);
}
@@ -440,8 +440,8 @@ void sub_08046FE8(Entity* this) {
this->subAction = 1;
this->speed = 0x1c0;
this->field_0x7c.HALF.HI = 0x1e;
this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x290;
this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x190;
this->field_0x80.HWORD = gRoomControls.origin_x + 0x290;
this->field_0x82.HWORD = gRoomControls.origin_y + 0x190;
sub_08047D88(this);
}
@@ -499,7 +499,7 @@ void sub_0804717C(Entity* this) {
this->speed += 8;
}
sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8);
if (gRoomControls.roomOriginX + 0x200 > this->x.HALF.HI) {
if (gRoomControls.origin_x + 0x200 > this->x.HALF.HI) {
this->subAction = 5;
}
}
@@ -512,7 +512,7 @@ void sub_080471C8(Entity* this) {
this->direction++;
}
sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8);
if (gRoomControls.roomOriginY + 0x190 <= this->y.HALF.HI)
if (gRoomControls.origin_y + 0x190 <= this->y.HALF.HI)
return;
if (this->field_0x74.HWORD > 0x100) {
if (Random() & 1) {
@@ -552,7 +552,7 @@ void sub_080472BC(Entity* this) {
this->speed += 8;
}
sub_08047DF0(this, ((0x100 - this->direction) & 0xFF) << 8);
if (gRoomControls.roomOriginX + 0x2B0 >= this->x.HALF.HI)
if (gRoomControls.origin_x + 0x2B0 >= this->x.HALF.HI)
return;
this->subAction = 9;
this->field_0x76.HWORD = this->direction << 8;
@@ -591,8 +591,8 @@ void sub_0804736C(Entity* this) {
void sub_080473B8(Entity* this) {
this->subAction = 1;
this->speed = 0x120;
this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x200;
this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x1D0;
this->field_0x80.HWORD = gRoomControls.origin_x + 0x200;
this->field_0x82.HWORD = gRoomControls.origin_y + 0x1D0;
sub_08047D88(this);
}
@@ -645,9 +645,9 @@ void sub_08047484(Entity* this) {
}
void sub_08047508(Entity* this) {
if (gRoomControls.roomOriginX + 0x1A0 < this->x.HALF.HI) {
if (gRoomControls.origin_x + 0x1A0 < this->x.HALF.HI) {
if (this->direction == 0) {
if (gRoomControls.roomOriginY + 0x208 >= this->y.HALF.HI) {
if (gRoomControls.origin_y + 0x208 >= this->y.HALF.HI) {
this->field_0x74.HWORD = -this->field_0x74.HWORD;
this->field_0x76.HWORD += this->field_0x74.HWORD;
this->direction = this->field_0x76.HWORD >> 8;
@@ -673,7 +673,7 @@ void sub_08047508(Entity* this) {
}
}
sub_08047E48(this);
if (gRoomControls.roomOriginX + 0x280 < this->x.HALF.HI) {
if (gRoomControls.origin_x + 0x280 < this->x.HALF.HI) {
this->subAction = 4;
this->speed = 0x200;
this->animationState = this->direction;
@@ -700,9 +700,9 @@ void sub_080475F4(Entity* this) {
}
void sub_0804763C(Entity* this) {
if (gRoomControls.roomOriginX + 0x1F0 > this->x.HALF.HI) {
if (gRoomControls.origin_x + 0x1F0 > this->x.HALF.HI) {
if (this->direction == 0) {
if (gRoomControls.roomOriginY + 0x208 >= this->y.HALF.HI) {
if (gRoomControls.origin_y + 0x208 >= this->y.HALF.HI) {
this->field_0x74.HWORD = -this->field_0x74.HWORD;
this->field_0x76.HWORD += this->field_0x74.HWORD;
this->direction = this->field_0x76.HWORD >> 8;
@@ -728,7 +728,7 @@ void sub_0804763C(Entity* this) {
}
}
sub_08047E48(this);
if (gRoomControls.roomOriginX + 0x180 > this->x.HALF.HI) {
if (gRoomControls.origin_x + 0x180 > this->x.HALF.HI) {
this->subAction = 6;
this->speed = 0x200;
this->animationState = this->direction;
@@ -764,13 +764,13 @@ void sub_08047778(Entity* this) {
void sub_08047798(Entity* this) {
this->subAction = 1;
this->speed = 0x80;
if (this->x.HALF.HI - gRoomControls.roomOriginX < 0x1F8) {
if (this->x.HALF.HI - gRoomControls.origin_x < 0x1F8) {
this->field_0x80.HWORD = 0xa8;
} else {
this->field_0x80.HWORD = 0x348;
}
this->field_0x80.HWORD += gRoomControls.roomOriginX;
this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x348;
this->field_0x80.HWORD += gRoomControls.origin_x;
this->field_0x82.HWORD = gRoomControls.origin_y + 0x348;
sub_08047D88(this);
}
@@ -790,7 +790,7 @@ void sub_080477F0(Entity* this) {
this->direction = this->animationState;
return;
}
if (!sub_0806FCB8(this, gRoomControls.roomOriginX + 0x200, gRoomControls.roomOriginY + 0x210, 0x100)) {
if (!sub_0806FCB8(this, gRoomControls.origin_x + 0x200, gRoomControls.origin_y + 0x210, 0x100)) {
this->spriteOrientation.flipY = 3;
this->spriteRendering.b3 = 3;
}
@@ -800,7 +800,7 @@ void sub_080477F0(Entity* this) {
this->field_0x74.HWORD = gUnk_080D1BF0[Random() & 1];
if (((Entity*)this->myHeap)->prev->field_0x6c.HWORD & 1) {
((Entity*)this->myHeap)->next->field_0x78.HALF.HI =
gRoomControls.roomOriginX + 0x200 > this->x.HALF.HI ? 0x81 : 0x83;
gRoomControls.origin_x + 0x200 > this->x.HALF.HI ? 0x81 : 0x83;
} else {
((Entity*)this->myHeap)->next->field_0x78.HALF.HI = 0x80;
}
@@ -861,25 +861,25 @@ void sub_08047978(Entity* this) {
this->subAction = 4;
if (this->type == 0) {
if ((((Entity*)this->myHeap)->next->animationState >> 6) == 1) {
this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x1C0;
this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x250;
this->field_0x80.HWORD = gRoomControls.origin_x + 0x1C0;
this->field_0x82.HWORD = gRoomControls.origin_y + 0x250;
} else {
this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x240;
this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x250;
this->field_0x80.HWORD = gRoomControls.origin_x + 0x240;
this->field_0x82.HWORD = gRoomControls.origin_y + 0x250;
}
} else {
if (gRoomControls.roomOriginX + 0x200 < this->x.HALF.HI) {
if (gRoomControls.origin_x + 0x200 < this->x.HALF.HI) {
this->field_0x80.HWORD = 0x190;
} else {
this->field_0x80.HWORD = 0x270;
}
this->field_0x80.HWORD += gRoomControls.roomOriginX;
if (gRoomControls.roomOriginY + 0x210 < this->y.HALF.HI) {
this->field_0x80.HWORD += gRoomControls.origin_x;
if (gRoomControls.origin_y + 0x210 < this->y.HALF.HI) {
this->field_0x82.HWORD = 0x1A0;
} else {
this->field_0x82.HWORD = 0x280;
}
this->field_0x82.HWORD += gRoomControls.roomOriginY;
this->field_0x82.HWORD += gRoomControls.origin_y;
}
}
@@ -914,7 +914,7 @@ void sub_08047BA4(Entity* this) {
this->subAction = 1;
this->actionDelay = 0x78;
this->field_0xf = 0;
if (gRoomControls.roomOriginX + 0x200 < this->x.HALF.HI) {
if (gRoomControls.origin_x + 0x200 < this->x.HALF.HI) {
this->field_0x76.HWORD = 0x78;
} else {
this->field_0x76.HWORD = 0x88;
@@ -946,7 +946,7 @@ void sub_08047BF0(Entity* this) {
this->direction = this->field_0x76.HWORD;
this->speed = 0x140;
sub_08047E48(this);
if (this->y.HALF.HI > gRoomControls.roomOriginY + 0x270) {
if (this->y.HALF.HI > gRoomControls.origin_y + 0x270) {
this->subAction = 2;
this->field_0x7c.HALF.HI = 0xAA;
SoundReq(SFX_12D);
@@ -1117,8 +1117,8 @@ void sub_08048004(Entity* this) {
if (this->field_0x7c.BYTES.byte0 & 1) {
u32 b = this->spriteRendering.b3;
if (b == 3) {
s32 posX = ((gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX) >> 3);
s32 posY = ((gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY) >> 3);
s32 posX = ((gPlayerEntity.x.HALF.HI - gRoomControls.origin_x) >> 3);
s32 posY = ((gPlayerEntity.y.HALF.HI - gRoomControls.origin_y) >> 3);
u16* tmp = (u16*)&gUnk_02019EE0;
if (tmp[(posY << 7) + posX]) {
if (!(this->field_0x7c.BYTES.byte0 & 2)) {
@@ -1169,6 +1169,6 @@ const u16 gUnk_080D1C60[8] = { 0x200, 0x150, 0x290, 0x210, 0x200, 0x2D0, 0x170,
void sub_08048178(Entity* this, u32 unk1) {
const u16* tmp =
((((Entity*)this->myHeap)->next->animationState >> 6 & 1) ? gUnk_080D1C60 + unk1 : gUnk_080D1C50 + unk1);
this->field_0x80.HWORD = *tmp + gRoomControls.roomOriginX;
this->field_0x82.HWORD = *(tmp + 1) + gRoomControls.roomOriginY;
this->field_0x80.HWORD = *tmp + gRoomControls.origin_x;
this->field_0x82.HWORD = *(tmp + 1) + gRoomControls.origin_y;
}
src/enemy/mazaalBracelet.c
+4 -4
View File
@@ -196,7 +196,7 @@ void sub_0803A274(Entity* this) {
this->spriteSettings.flipX = 1;
PositionRelative(this->parent, this, -0x100000, 0x200000);
}
if (gScreenTransition.field_0x38 != 0) {
if (gRoomTransition.field_0x38 != 0) {
this->action = 3;
COLLISION_ON(this);
this->spriteSettings.draw = 1;
@@ -1210,8 +1210,8 @@ void sub_0803B724(Entity* param_1) {
pEVar1->type2 = 1;
random_value = Random();
temp = gUnk_080CFD1B[param_1->type];
pEVar1->x.HALF.HI = (random_value & 0x70) + temp + gRoomControls.roomOriginX;
pEVar1->y.HALF.HI = ((random_value >> 0x10) & 7) * 10 + 0x5c + gRoomControls.roomOriginY;
pEVar1->x.HALF.HI = (random_value & 0x70) + temp + gRoomControls.origin_x;
pEVar1->y.HALF.HI = ((random_value >> 0x10) & 7) * 10 + 0x5c + gRoomControls.origin_y;
pEVar1->parent = param_1;
ResolveCollisionLayer(pEVar1);
param_1->field_0xf++;
@@ -1282,7 +1282,7 @@ void sub_0803B8F8(Entity* this) {
}
void sub_0803B910(Entity* this) {
if (gScreenTransition.field_0x38 != 0) {
if (gRoomTransition.field_0x38 != 0) {
this->action = 2;
this->spriteSettings.draw = 1;
*(u8*)&this->field_0x74 = 0;
src/enemy/mazaalHead.c
+12 -12
View File
@@ -119,7 +119,7 @@ void sub_08033F3C(Entity* this) {
Entity* pEVar2;
if (gEntCount < 0x43) {
if (gScreenTransition.field_0x38 != 0) {
if (gRoomTransition.field_0x38 != 0) {
sub_08034420(this);
this->field_0x80.HALF.HI = 1;
} else {
@@ -133,7 +133,7 @@ void sub_08033F3C(Entity* this) {
pEVar1->parent = this;
pEVar2 = CreateObject(OBJECT_7E, 0, 0);
pEVar2->parent = this;
if (gScreenTransition.field_0x39 == 0) {
if (gRoomTransition.field_0x39 == 0) {
this->action = 0xd;
this->subAction = 0;
this->actionDelay = 0xfc;
@@ -215,7 +215,7 @@ void sub_08033FFC(Entity* this) {
break;
default:
if (((*(Entity**)&this->field_0x74)->flags & 0x80) != 0) {
gRoomControls.cameraTarget = &gPlayerEntity;
gRoomControls.camera_target = &gPlayerEntity;
sub_08034420(this);
gPlayerState.controlMode = 1;
ResetPlayerAnimationAndAction();
@@ -227,8 +227,8 @@ void sub_08033FFC(Entity* this) {
void sub_0803414C(Entity* this) {
u32 x, y;
x = gRoomControls.roomOriginX + 0xb8;
y = gRoomControls.roomOriginY + 0x48;
x = gRoomControls.origin_x + 0xb8;
y = gRoomControls.origin_y + 0x48;
if (this->x.HALF.HI - x + 1 < 3 && this->y.HALF.HI - y + 1 < 3) {
if (sub_080349D8(this)) {
@@ -377,10 +377,10 @@ void sub_0803442C(Entity* this, u32 unk) {
void sub_0803443C(Entity* this) {
this->field_0x7c.BYTES.byte1 = 0;
if (gScreenTransition.field_0x39 < 0x1f) {
if (gRoomTransition.field_0x39 < 0x1f) {
sub_080344BC(this);
} else {
if (gScreenTransition.field_0x39 < 0x3d) {
if (gRoomTransition.field_0x39 < 0x3d) {
sub_08034498(this);
} else {
sub_08034474(this);
@@ -544,7 +544,7 @@ NONMATCH("asm/non_matching/mazaal/sub_0803473C.inc", void sub_0803473C(Entity* t
}
playerX = gPlayerEntity.x.HALF.HI + 0x60;
}
roomX = gRoomControls.roomOriginX;
roomX = gRoomControls.origin_x;
if (playerX - 4 > this->x.HALF.HI) {
if (roomX + 0xe0 < this->x.HALF.HI) {
return;
@@ -567,7 +567,7 @@ END_NONMATCH
NONMATCH("asm/non_matching/mazaal/sub_080347B4.inc", void sub_080347B4(Entity* this)) {
u32 direction;
u32 playerX = gPlayerEntity.x.HALF.HI;
u32 roomX = gRoomControls.roomOriginX;
u32 roomX = gRoomControls.origin_x;
if (playerX - 4 > this->x.HALF.HI) {
if (roomX + 0xe0 < this->x.HALF.HI) {
return;
@@ -810,9 +810,9 @@ void sub_08034BC8(Entity* this) {
void sub_08034C00(Entity* this) {
if (((gPlayerState.flags & PL_MINISH) != 0) &&
CheckPlayerInRegion(this->x.HALF.HI - gRoomControls.roomOriginX,
this->y.HALF.HI - gRoomControls.roomOriginY + 0xd, 3, 3) != 0) {
if (gScreenTransition.field_0x39 >= 0x3d) {
CheckPlayerInRegion(this->x.HALF.HI - gRoomControls.origin_x,
this->y.HALF.HI - gRoomControls.origin_y + 0xd, 3, 3) != 0) {
if (gRoomTransition.field_0x39 >= 0x3d) {
DoExitTransition((ScreenTransitionData*)&gUnk_080CED88);
} else {
DoExitTransition((ScreenTransitionData*)&gUnk_080CED9C);
src/enemy/mazaalMacro.c
+16 -16
View File
@@ -94,8 +94,8 @@ void sub_08034D4C(Entity* this) {
if (--this->field_0x78.HWORD == 0) {
if ((this->field_0xf < 8) && (entity = CreateEnemy(VAATI_PROJECTILE, 0), entity != (Entity*)0x0)) {
entity->direction = (s32)Random() % 5 + 0xc;
entity->x.HALF.HI = (gRoomControls.width / 2) + gRoomControls.roomOriginX;
entity->y.HALF.HI = gRoomControls.roomOriginY + 8;
entity->x.HALF.HI = (gRoomControls.width / 2) + gRoomControls.origin_x;
entity->y.HALF.HI = gRoomControls.origin_y + 8;
entity->collisionLayer = 3;
entity->parent = this;
UpdateSpriteForCollisionLayer(entity);
@@ -108,7 +108,7 @@ void sub_08034D4C(Entity* this) {
}
void sub_08034DC8(Entity* this) {
if (gScreenTransition.field_0x39 == 0) {
if (gRoomTransition.field_0x39 == 0) {
CreateFx(this, FX_GIANT_EXPLOSION4, 0);
sub_0807BA8C(COORD_TO_TILE(this), this->collisionLayer);
DeleteThisEntity();
@@ -136,7 +136,7 @@ void sub_08034E68(Entity* this) {
this->spriteSettings.draw = 0;
sub_08035120(this);
}
if (gScreenTransition.field_0x39 == 0) {
if (gRoomTransition.field_0x39 == 0) {
if (sub_08079F8C() != 0) {
this->action = 3;
scriptExecutionContext = StartCutscene(this, (u16*)script_MazaalMacroDefeated);
@@ -167,8 +167,8 @@ void sub_08034EE4(Entity* this) {
randomValue = Random();
entity = CreateFx(this, gUnk_080CEEC8[randomValue & 3], 0);
if (entity != NULL) {
entity->x.HALF.HI = (((randomValue >> 2) & 0x77) << 1) + 1 + gRoomControls.roomScrollX;
entity->y.HALF.HI = ((randomValue >> 9) & 0x7e) + 1 + gRoomControls.roomScrollY;
entity->x.HALF.HI = (((randomValue >> 2) & 0x77) << 1) + 1 + gRoomControls.scroll_x;
entity->y.HALF.HI = ((randomValue >> 9) & 0x7e) + 1 + gRoomControls.scroll_y;
entity->collisionLayer = 2;
UpdateSpriteForCollisionLayer(entity);
}
@@ -182,10 +182,10 @@ void sub_08034F58(Entity* this) {
}
void sub_08034F70(Entity* this) {
this->health = gScreenTransition.field_0x39;
if (gScreenTransition.field_0x39 >= 0x3d) {
this->health = gRoomTransition.field_0x39;
if (gRoomTransition.field_0x39 >= 0x3d) {
this->type2 = 0;
} else if (gScreenTransition.field_0x39 >= 0x1f) {
} else if (gRoomTransition.field_0x39 >= 0x1f) {
this->type2 = 1;
} else {
this->type2 = 2;
@@ -200,14 +200,14 @@ void sub_08034FA0(Entity* this) {
switch (this->type2) {
case 0:
if (this->health < 0x3c) {
gScreenTransition.field_0x39 = 0x3c;
gRoomTransition.field_0x39 = 0x3c;
sub_08035050(this);
return;
}
break;
case 1:
if (this->health < 0x1e) {
gScreenTransition.field_0x39 = 0x1e;
gRoomTransition.field_0x39 = 0x1e;
sub_08035050(this);
return;
}
@@ -218,7 +218,7 @@ void sub_08034FA0(Entity* this) {
}
break;
}
gScreenTransition.field_0x39 = this->health;
gRoomTransition.field_0x39 = this->health;
}
void sub_08035050(Entity* this) {
@@ -247,16 +247,16 @@ u32 sub_08035084(Entity* this) {
}
do {
vulnPillar = (s32)Random() % 6;
} while (vulnPillar == gScreenTransition.field_0x38 >> 4);
gScreenTransition.field_0x38 = (gScreenTransition.field_0x38 & 0xf) | (vulnPillar << 4);
} while (vulnPillar == gRoomTransition.field_0x38 >> 4);
gRoomTransition.field_0x38 = (gRoomTransition.field_0x38 & 0xf) | (vulnPillar << 4);
for (i = 0, coords = gUnk_080CEECC; i < 6; i++, coords += 2) {
if (i == vulnPillar) {
entity = this;
} else {
entity = CreateEnemy(MAZAAL_MACRO, 1);
}
entity->x.HALF.HI = gRoomControls.roomOriginX + *coords;
entity->y.HALF.HI = gRoomControls.roomOriginY + *(coords + 1);
entity->x.HALF.HI = gRoomControls.origin_x + *coords;
entity->y.HALF.HI = gRoomControls.origin_y + *(coords + 1);
entity->collisionLayer = 1;
UpdateSpriteForCollisionLayer(entity);
}
src/enemy/moldworm.c
+1 -1
View File
@@ -217,7 +217,7 @@ void sub_08023398(Entity* this) {
this->field_0x7c.BYTES.byte0--;
}
if ((gScreenTransition.frameCount & 7) == 0) {
if ((gRoomTransition.frameCount & 7) == 0) {
u32 uVar4;
sub_08004596(this, sub_08049F84(this, 1));
src/enemy/octorokBoss.c
+24 -24
View File
@@ -167,7 +167,7 @@ Hit SubActions
void OctorokBoss_Hit(Entity* this) {
if (GET_BOSS_PHASE(this) == 0) {
if (this->subAction != 3) {
gRoomControls.cameraTarget = GET_HELPER(this)->tailObjects[0];
gRoomControls.camera_target = GET_HELPER(this)->tailObjects[0];
GET_HELPER(this)->field_0x7 = 0x5a;
sub_08078B48();
}
@@ -219,17 +219,17 @@ void OctorokBoss_Hit_SubAction1(Entity* this) {
GET_HELPER(this)->tailObjects[0]->field_0x7c.BYTES.byte1--;
}
// Move to the center of the screen before freezing
diffX = 0x108 + gRoomControls.roomOriginX - this->x.HALF.HI + 0x4;
diffY = gRoomControls.roomOriginY - this->y.HALF.HI + 0x8c;
diffX = 0x108 + gRoomControls.origin_x - this->x.HALF.HI + 0x4;
diffY = gRoomControls.origin_y - this->y.HALF.HI + 0x8c;
if (diffX > 8 || diffY > 8) {
GET_HELPER(this)->field_0x2 = 1;
#if defined(JP) || defined(DEMO_JP) || defined(EU)
this->direction = ((s32)sub_080045DA((((gRoomControls.roomOriginX + 0x108) << 0x10) - this->x.WORD),
(((gRoomControls.roomOriginY + 0x88) << 0x10) - this->y.WORD))) >>
this->direction = ((s32)sub_080045DA((((gRoomControls.origin_x + 0x108) << 0x10) - this->x.WORD),
(((gRoomControls.origin_y + 0x88) << 0x10) - this->y.WORD))) >>
3;
#else
this->direction = ((s32)sub_080045DA(gRoomControls.roomOriginX + 0x108 - this->x.HALF.HI,
gRoomControls.roomOriginY + 0x88 - this->y.HALF.HI)) >>
this->direction = ((s32)sub_080045DA(gRoomControls.origin_x + 0x108 - this->x.HALF.HI,
gRoomControls.origin_y + 0x88 - this->y.HALF.HI)) >>
3;
#endif
this->speed = 0x100;
@@ -253,7 +253,7 @@ void OctorokBoss_Hit_SubAction1(Entity* this) {
Entity* tail = GET_HELPER(this)->tailObjects[i - 1];
tail->spriteSettings.draw |= 1;
}
if ((gScreenTransition.frameCount & 2) != 0) {
if ((gRoomTransition.frameCount & 2) != 0) {
CreateObjectWithParent(this, OCTOROK_BOSS_OBJECT, 6, 0);
}
GET_TIMER(this)--;
@@ -285,7 +285,7 @@ void OctorokBoss_Hit_SubAction2(Entity* this) {
} else {
this->subAction = 3;
GET_TIMER(this) = 0x96;
gRoomControls.cameraTarget = &gPlayerEntity;
gRoomControls.camera_target = &gPlayerEntity;
}
}
@@ -305,7 +305,7 @@ void OctorokBoss_Hit_SubAction4(Entity* this) {
this->subAction = 5;
object = CreateObjectWithParent(this, OCTOROK_BOSS_OBJECT, 9, 0);
if (object != NULL) {
gRoomControls.cameraTarget = object;
gRoomControls.camera_target = object;
}
}
@@ -340,7 +340,7 @@ void OctorokBoss_Hit_SubAction6(Entity* this) {
tmp = FixedDiv(tmp, 0x100);
this->spriteOffsetY = -((tmp << 0x10) >> 8) >> 0x10;
if (GET_TIMER(this) == 0) {
if ((gScreenTransition.frameCount & 0xfU) == 0) {
if ((gRoomTransition.frameCount & 0xfU) == 0) {
// Explosion in the center
CreateFx(this, FX_GIANT_EXPLOSION3, 0);
// Explosion at the front right leg
@@ -448,7 +448,7 @@ ASM_FUNC("asm/non_matching/octorokBoss/OctorokBoss_Init.inc", void OctorokBoss_I
gPlayerEntity.spriteSettings.draw = 0;
gPlayerEntity.x.HALF.HI = this->x.HALF.HI;
gPlayerEntity.y.HALF.HI = this->y.HALF.HI - 0xa0;
gRoomControls.cameraTarget = this;
gRoomControls.camera_target = this;
break;
case LEG_BR:
@@ -533,7 +533,7 @@ void OctorokBoss_Intro_SubAction2(Entity* this) {
this->subAction = 3;
GET_TIMER(this) = 0x3c;
gPlayerEntity.spriteSettings.draw |= 1;
gRoomControls.cameraTarget = &gPlayerEntity;
gRoomControls.camera_target = &gPlayerEntity;
gRoomControls.unk5 = 1;
}
}
@@ -714,7 +714,7 @@ void OctorokBoss_Action1(Entity* this) {
sub_08036F60(this);
if (GET_HELPER(this)->fallingStonesTimer != 0) {
GET_HELPER(this)->fallingStonesTimer--;
if ((gScreenTransition.frameCount & 3) == 0) {
if ((gRoomTransition.frameCount & 3) == 0) {
// Falling stones
CreateProjectileWithParent(this, OCTOROK_BOSS_PROJECTILE, 3);
}
@@ -892,7 +892,7 @@ void OctorokBoss_Action1_Attack_Type2_2(Entity* this) {
}
void OctorokBoss_Action1_Attack_Type2_3(Entity* this) {
if ((gScreenTransition.frameCount & 2) != 0) {
if ((gRoomTransition.frameCount & 2) != 0) {
GET_HELPER(this)->mouthObject->field_0x76.HWORD -= 8;
} else {
GET_HELPER(this)->mouthObject->field_0x76.HWORD += 8;
@@ -938,8 +938,8 @@ void OctorokBoss_ExecuteAttackVacuum(Entity* this) {
this->field_0x80.HALF.LO = 1;
GET_TIMER(this) = 2;
GET_HELPER(this)->targetAngle =
sub_080045DA((gRoomControls.roomOriginX + 0x108) * 0x10000 - this->x.WORD,
(gRoomControls.roomOriginY + 0x88) * 0x10000 - this->y.WORD);
sub_080045DA((gRoomControls.origin_x + 0x108) * 0x10000 - this->x.WORD,
(gRoomControls.origin_y + 0x88) * 0x10000 - this->y.WORD);
GET_HELPER(this)->targetAngle = (u8) - (GET_HELPER(this)->targetAngle + 0x80);
SoundReq(SFX_ED);
}
@@ -949,7 +949,7 @@ void OctorokBoss_ExecuteAttackVacuum(Entity* this) {
}
}
}
if ((gScreenTransition.frameCount & 3) == 0) {
if ((gRoomTransition.frameCount & 3) == 0) {
CreateObjectWithParent(this, OCTOROK_BOSS_OBJECT, 2, 0);
}
} else {
@@ -1012,8 +1012,8 @@ void OctorokBoss_ExecuteAttackSmoke(Entity* this) {
} else {
GET_TIMER(this)++;
ChangeLightLevel(-1);
if ((gScreenTransition.frameCount & 3) == 0) {
if ((gScreenTransition.frameCount & 7) == 0) {
if ((gRoomTransition.frameCount & 3) == 0) {
if ((gRoomTransition.frameCount & 7) == 0) {
SoundReq(SFX_124);
}
CreateObjectWithParent(this, OCTOROK_BOSS_OBJECT, 3, 0);
@@ -1027,7 +1027,7 @@ void OctorokBoss_ExecuteAttackFreeze(Entity* this) {
OctorokBoss_SetAttackTimer(this);
} else {
GET_TIMER(this)--;
if ((gScreenTransition.frameCount & 3) == 0) {
if ((gRoomTransition.frameCount & 3) == 0) {
this->child = CreateProjectileWithParent(this, OCTOROK_BOSS_PROJECTILE, 2);
if (this->child != NULL) {
this->child->parent = this;
@@ -1041,7 +1041,7 @@ void OctorokBoss_Burning(Entity* this) {
OctorokBoss_Burning_SubActions[this->subAction](this);
if (GET_HELPER(this)->fallingStonesTimer != 0) {
GET_HELPER(this)->fallingStonesTimer--;
if ((gScreenTransition.frameCount & 7) == 0) {
if ((gRoomTransition.frameCount & 7) == 0) {
// Falling stones
CreateProjectileWithParent(this, OCTOROK_BOSS_PROJECTILE, 3);
}
@@ -1083,7 +1083,7 @@ void OctorokBoss_Burning_SubAction1(Entity* this) {
if (GET_TIMER(this)-- == 0) {
this->health = 0;
}
if ((gScreenTransition.frameCount & 0x1f) == 0) {
if ((gRoomTransition.frameCount & 0x1f) == 0) {
SoundReq(SFX_159);
}
}
@@ -1410,7 +1410,7 @@ void sub_08036F60(Entity* this) {
}
void OctorokBoss_StepSound(Entity* this, u32 frameMask) {
if ((gScreenTransition.frameCount & frameMask) == 0) {
if ((gRoomTransition.frameCount & frameMask) == 0) {
if (IS_FROZEN(this) == FALSE) {
SoundReq(SFX_163);
} else {
src/enemy/peahat.c
+1 -1
View File
@@ -195,7 +195,7 @@ void Peahat_ChargeTarget(Entity* this) {
if (this->actionDelay & 1)
this->speed += 4;
if ((gScreenTransition.frameCount & 3) == 0)
if ((gRoomTransition.frameCount & 3) == 0)
sub_08004596(this, GetFacingDirection(this, gUnk_020000B0));
}
sub_080AEFE0(this);
src/enemy/puffstool.c
+12 -12
View File
@@ -386,8 +386,8 @@ void sub_080256B4(Entity* this) {
bool32 sub_0802571C(Entity* this) {
RoomControls* ctrl = &gRoomControls;
u16 xDiff = (this->x.HALF.HI - ctrl->roomOriginX + 8) & -0x10;
u16 yDiff = (this->y.HALF.HI - ctrl->roomOriginY + 8) & -0x10;
u16 xDiff = (this->x.HALF.HI - ctrl->origin_x + 8) & -0x10;
u16 yDiff = (this->y.HALF.HI - ctrl->origin_y + 8) & -0x10;
u16 unk = this->field_0x7a.HALF.LO;
u16 i;
@@ -396,8 +396,8 @@ bool32 sub_0802571C(Entity* this) {
u16 sVar4 = yDiff + gUnk_080CC020[unk + 1];
if (sub_080257EC(this, sVar3, sVar4)) {
this->field_0x7c.HALF.LO = sVar3 + ctrl->roomOriginX;
this->field_0x7c.HALF.HI = sVar4 + ctrl->roomOriginY;
this->field_0x7c.HALF.LO = sVar3 + ctrl->origin_x;
this->field_0x7c.HALF.HI = sVar4 + ctrl->origin_y;
return TRUE;
}
@@ -472,8 +472,8 @@ NONMATCH("asm/non_matching/puffstool/sub_0802594C.inc", bool32 sub_0802594C(Enti
const s8* unk = gUnk_080CC090[param_2];
u32 uVar1 = this->collisionLayer;
RoomControls* ctrl = &gRoomControls;
xDiff = (this->x.HALF.HI - ctrl->roomOriginX + 8) & -0x10;
yDiff = (this->y.HALF.HI - ctrl->roomOriginY + 8) & -0x10;
xDiff = (this->x.HALF.HI - ctrl->origin_x + 8) & -0x10;
yDiff = (this->y.HALF.HI - ctrl->origin_y + 8) & -0x10;
do {
s16 iVar9 = xDiff + unk[0];
s16 iVar11 = yDiff + unk[1];
@@ -482,8 +482,8 @@ NONMATCH("asm/non_matching/puffstool/sub_0802594C.inc", bool32 sub_0802594C(Enti
u8 bVar6 = sub_080002D4(iVar9 - 0x00, iVar11 - 0x10, uVar1);
u8 bVar7 = sub_080002D4(iVar9 - 0x10, iVar11 - 0x10, uVar1);
if ((bVar6 | bVar4 | bVar5 | bVar7) == 0) {
this->field_0x7c.HALF.LO = ctrl->roomOriginX + iVar9;
this->field_0x7c.HALF.HI = ctrl->roomOriginY + iVar11;
this->field_0x7c.HALF.LO = ctrl->origin_x + iVar9;
this->field_0x7c.HALF.HI = ctrl->origin_y + iVar11;
return TRUE;
}
unk += 2;
@@ -495,8 +495,8 @@ END_NONMATCH
void sub_08025A54(Entity* this) {
u32 layer = this->collisionLayer;
s16 x = this->x.HALF.HI - gRoomControls.roomOriginX;
s16 y = this->y.HALF.HI - gRoomControls.roomOriginY;
s16 x = this->x.HALF.HI - gRoomControls.origin_x;
s16 y = this->y.HALF.HI - gRoomControls.origin_y;
const s8* offset = gUnk_080CC0A0;
u32 i = 0;
@@ -535,8 +535,8 @@ void sub_08025AE8(Entity* this) {
void sub_08025B18(Entity* this) {
Entity* ent;
s32 x = this->x.HALF.HI - gRoomControls.roomOriginX;
s32 y = this->y.HALF.HI - gRoomControls.roomOriginY;
s32 x = this->x.HALF.HI - gRoomControls.origin_x;
s32 y = this->y.HALF.HI - gRoomControls.origin_y;
u32 layer = this->collisionLayer;
const s8* offset = gUnk_080CC0A8;
src/enemy/slime.c
+2 -2
View File
@@ -127,10 +127,10 @@ void sub_08045178(Entity* this, Entity* child, int h, int v) {
return;
x = child->x.HALF.HI + h;
if (0 <= x && x < (gRoomControls.roomOriginX + gRoomControls.width))
if (0 <= x && x < (gRoomControls.origin_x + gRoomControls.width))
child->x.HALF.HI = x;
y = child->y.HALF.HI + v;
if (0 <= y && y < (gRoomControls.roomOriginY + gRoomControls.height))
if (0 <= y && y < (gRoomControls.origin_y + gRoomControls.height))
child->y.HALF.HI = y;
}
src/enemy/vaatiArm.c
+46 -46
View File
@@ -189,11 +189,11 @@ void sub_080425B4(Entity* this) {
if (sub_080437DC(this)) {
this->field_0x7c.BYTES.byte0 = 0;
this->field_0x7c.BYTES.byte1 = 0;
if ((gScreenTransition.field_0x38 & 1) != 0) {
if (gScreenTransition.field_0x3c == this->type2) {
if ((gRoomTransition.field_0x38 & 1) != 0) {
if (gRoomTransition.field_0x3c == this->type2) {
sub_08043EB8(this);
sub_08043ABC(this);
if ((gScreenTransition.field_0x39 >> (this->type2 + 2) & 1U) != 0) {
if ((gRoomTransition.field_0x39 >> (this->type2 + 2) & 1U) != 0) {
this->action = 7;
this->subAction = 4;
} else {
@@ -207,7 +207,7 @@ void sub_080425B4(Entity* this) {
}
} else {
this->action = 1;
this->subAction = gScreenTransition.field_0x38 & 1;
this->subAction = gRoomTransition.field_0x38 & 1;
((VaatiArm_HeapStruct*)this->myHeap)->s1[0].unk08 = gUnk_080D1280[this->type2];
sub_08042654(this);
}
@@ -528,28 +528,28 @@ void sub_08042C34(Entity* this) {
temp = &gUnk_080D12F8[random];
x = gPlayerEntity.x.HALF.HI + *temp;
y = gPlayerEntity.y.HALF.HI + *(temp + 1);
if ((gRoomControls.roomOriginX + 0x20) > x) {
x = gRoomControls.roomOriginX + 0x20;
if ((gRoomControls.origin_x + 0x20) > x) {
x = gRoomControls.origin_x + 0x20;
}
if (gRoomControls.roomOriginX + gRoomControls.width + -0x20 < x) {
x = gRoomControls.roomOriginX + gRoomControls.width + -0x20;
if (gRoomControls.origin_x + gRoomControls.width + -0x20 < x) {
x = gRoomControls.origin_x + gRoomControls.width + -0x20;
}
if ((gRoomControls.roomOriginY + 0x20) > y) {
y = gRoomControls.roomOriginY + 0x20;
if ((gRoomControls.origin_y + 0x20) > y) {
y = gRoomControls.origin_y + 0x20;
}
#if defined EU || defined JP || defined DEMO_JP
if (gRoomControls.roomOriginY + gRoomControls.height + -0x20 < y) {
y = gRoomControls.roomOriginY + gRoomControls.height + -0x20;
if (gRoomControls.origin_y + gRoomControls.height + -0x20 < y) {
y = gRoomControls.origin_y + gRoomControls.height + -0x20;
}
#else
if (gRoomControls.roomOriginY + gRoomControls.height + -0x40 < y) {
y = gRoomControls.roomOriginY + gRoomControls.height + -0x40;
if (gRoomControls.origin_y + gRoomControls.height + -0x40 < y) {
y = gRoomControls.origin_y + gRoomControls.height + -0x40;
}
#endif
if (((u32)((x - gRoomControls.roomOriginX) - 0x90) < 0x41) &&
((u32)((y - gRoomControls.roomOriginY) - 8) < 0x41)) {
x = gRoomControls.roomOriginX + 0xb0;
y = gRoomControls.roomOriginY + 0x40;
if (((u32)((x - gRoomControls.origin_x) - 0x90) < 0x41) &&
((u32)((y - gRoomControls.origin_y) - 8) < 0x41)) {
x = gRoomControls.origin_x + 0xb0;
y = gRoomControls.origin_y + 0x40;
}
for (i = 0; i < 4; i++) {
entity = ((VaatiArm_HeapStruct*)this->myHeap)->entities[i];
@@ -636,8 +636,8 @@ void sub_08042E30(Entity* this) {
this->actionDelay = (Random() & 0x38) + 0x28;
this->speed = 0x200;
this->direction = pVVar9->unk00.HALF.HI >> 3;
uVar6 = sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, gRoomControls.roomOriginX + 0x110,
gRoomControls.roomOriginY + 0x60);
uVar6 = sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, gRoomControls.origin_x + 0x110,
gRoomControls.origin_y + 0x60);
this->field_0x78.HALF.HI = (gUnk_080D1304[Random() & 7] + uVar6) & 0x1f;
}
pVVar9->unk00.HWORD += pVVar9->unk08;
@@ -1079,15 +1079,15 @@ NONMATCH("asm/non_matching/vaati/sub_08043770.inc", void sub_08043770(Entity* th
if (--this->actionDelay == 0) {
entity = ((VaatiArm_HeapStruct*)this->myHeap)->parent;
if ((gScreenTransition.field_0x39 & 0xc) == 0) {
if ((gRoomTransition.field_0x39 & 0xc) == 0) {
entity->subAction = 2;
}
if (this->type2 == 0) {
((VaatiArm_HeapStruct*)this->myHeap)->parent = NULL;
gScreenTransition.field_0x39 &= 0xfe;
gRoomTransition.field_0x39 &= 0xfe;
} else {
*(u32*)((VaatiArm_HeapStruct*)this->myHeap)->s1 = 0;
gScreenTransition.field_0x39 &= 0xfd;
gRoomTransition.field_0x39 &= 0xfd;
}
((VaatiArm_HeapStruct*)this->myHeap)->entities[4]->myHeap = NULL;
((VaatiArm_HeapStruct*)this->myHeap)->entities[4]->health = 0;
@@ -1291,7 +1291,7 @@ u32 sub_08043C98(Entity* this) {
Entity* e2 = ((VaatiArm_HeapStruct*)this->myHeap)->entities[3];
if ((e1->bitfield == 0x9d) || (e2->bitfield == 0x9d)) {
sub_08043D08(this);
gScreenTransition.field_0x38 |= 2;
gRoomTransition.field_0x38 |= 2;
return 1;
} else {
return 0;
@@ -1345,33 +1345,33 @@ void sub_08043DB0(Entity* this) {
if (((gPlayerState.flags & PL_MINISH) != 0)) {
pEVar3 = ((VaatiArm_HeapStruct*)this->myHeap)->entities[3];
if (CheckPlayerInRegion(pEVar3->x.HALF.HI - gRoomControls.roomOriginX,
pEVar3->y.HALF.HI - gRoomControls.roomOriginY + 2, 3, 3)) {
if (CheckPlayerInRegion(pEVar3->x.HALF.HI - gRoomControls.origin_x,
pEVar3->y.HALF.HI - gRoomControls.origin_y + 2, 3, 3)) {
DoExitTransition((ScreenTransitionData*)&gUnk_080D13EC);
if ((gScreenTransition.field_0x39 & 3) != 3) {
gScreenTransition.player_status.room_next = 1;
if ((gRoomTransition.field_0x39 & 3) != 3) {
gRoomTransition.player_status.room_next = 1;
}
cVar1 = this->field_0x7a.HWORD;
gScreenTransition.field_0x3d = 0x1e - (cVar1 / 0x3c);
gScreenTransition.field_0x3c = this->type2;
gRoomTransition.field_0x3d = 0x1e - (cVar1 / 0x3c);
gRoomTransition.field_0x3c = this->type2;
pEVar2 = ((VaatiArm_HeapStruct*)this->myHeap)->parent;
gScreenTransition.hurtType = pEVar2->x.HALF.HI;
gScreenTransition.field_0x42 = pEVar2->y.HALF.HI;
gRoomTransition.hurtType = pEVar2->x.HALF.HI;
gRoomTransition.field_0x42 = pEVar2->y.HALF.HI;
pEVar4 = ((VaatiArm_HeapStruct*)pEVar2->myHeap)->parent;
if (pEVar4 != NULL) {
gScreenTransition.field_0x44 = pEVar4->x.HALF.HI;
gScreenTransition.field_0x46 = pEVar4->y.HALF.HI;
gRoomTransition.field_0x44 = pEVar4->x.HALF.HI;
gRoomTransition.field_0x46 = pEVar4->y.HALF.HI;
} else {
gScreenTransition.field_0x44 = gRoomControls.roomOriginX + 0x110;
gScreenTransition.field_0x46 = gRoomControls.roomOriginY + 0x60;
gRoomTransition.field_0x44 = gRoomControls.origin_x + 0x110;
gRoomTransition.field_0x46 = gRoomControls.origin_y + 0x60;
}
pEVar4 = (Entity*)(*(int*)((VaatiArm_HeapStruct*)pEVar2->myHeap)->s1);
if (pEVar4 != NULL) {
gScreenTransition.field_0x48 = pEVar4->x.HALF.HI;
gScreenTransition.field_0x4a = pEVar4->y.HALF.HI;
gRoomTransition.field_0x48 = pEVar4->x.HALF.HI;
gRoomTransition.field_0x4a = pEVar4->y.HALF.HI;
} else {
gScreenTransition.field_0x48 = gRoomControls.roomOriginX + 0x110;
gScreenTransition.field_0x4a = gRoomControls.roomOriginY + 0x60;
gRoomTransition.field_0x48 = gRoomControls.origin_x + 0x110;
gRoomTransition.field_0x4a = gRoomControls.origin_y + 0x60;
}
}
}
@@ -1399,8 +1399,8 @@ void sub_08043EB8(Entity* this) {
pEVar4->flags = pEVar4->flags | 0x80;
pEVar4->spriteSettings.draw = 1;
pEVar4->spritePriority.b0 = 4;
pEVar4->x.HALF.HI = (this->type2 == 0) ? gScreenTransition.field_0x44 : gScreenTransition.field_0x48;
pEVar4->y.HALF.HI = (this->type2 == 0) ? gScreenTransition.field_0x46 : gScreenTransition.field_0x4a;
pEVar4->x.HALF.HI = (this->type2 == 0) ? gRoomTransition.field_0x44 : gRoomTransition.field_0x48;
pEVar4->y.HALF.HI = (this->type2 == 0) ? gRoomTransition.field_0x46 : gRoomTransition.field_0x4a;
pEVar4->z.HALF.HI = 0;
pEVar4->field_0x3c = pEVar4->field_0x3c & 0xef;
pEVar4->hitType = 0x3a;
@@ -1442,8 +1442,8 @@ void sub_08044078(Entity* this) {
if (this->action == 0) {
this->action = 1;
if (this->type != 3 ||
!(((gScreenTransition.field_0x38 & 1) == 0 ||
(((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->type2 != gScreenTransition.field_0x3c)))) {
!(((gRoomTransition.field_0x38 & 1) == 0 ||
(((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->type2 != gRoomTransition.field_0x3c)))) {
InitializeAnimation(this, 0x12);
} else {
InitializeAnimation(this, 0x11);
@@ -1455,8 +1455,8 @@ void sub_08044078(Entity* this) {
void sub_080440CC(Entity* this) {
if (this->action == 0) {
this->action = 1;
if ((gScreenTransition.field_0x38 & 1) != 0 &&
((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->type2 == gScreenTransition.field_0x3c) {
if ((gRoomTransition.field_0x38 & 1) != 0 &&
((VaatiArm_HeapStruct*)this->myHeap)->entities[0]->type2 == gRoomTransition.field_0x3c) {
InitializeAnimation(this, 0x13);
} else {
InitializeAnimation(this, 0x11);
src/enemy/vaatiEyesMacro.c
+7 -7
View File
@@ -58,12 +58,12 @@ void VaatiEyesMacroFunction0(Entity* this) {
void VaatiEyesMacroFunction1(Entity* this) {
if (this->type == 0) {
if (this->health == 0) {
gScreenTransition.field_0x39 &= ~(1 << (gScreenTransition.field_0x3c + 2));
gRoomTransition.field_0x39 &= ~(1 << (gRoomTransition.field_0x3c + 2));
}
if (gRoomControls.roomID == 0) {
gScreenTransition.field_0x3a = this->health;
if (gRoomControls.room == 0) {
gRoomTransition.field_0x3a = this->health;
} else {
gScreenTransition.field_0x3b = this->health;
gRoomTransition.field_0x3b = this->health;
}
if (this->field_0x78.HALF.HI != this->health) {
EnqueueSFX(SFX_17A);
@@ -102,10 +102,10 @@ void VaatiEyesMacroFunction0Type0Action0(Entity* this) {
enemy = CreateEnemy(VAATI_EYES_MACRO, 2);
enemy->parent = this;
this->action = 1;
if (gRoomControls.roomID == 0) {
this->field_0x78.HALF.HI = this->health = gScreenTransition.field_0x3a;
if (gRoomControls.room == 0) {
this->field_0x78.HALF.HI = this->health = gRoomTransition.field_0x3a;
} else {
this->field_0x78.HALF.HI = this->health = gScreenTransition.field_0x3b;
this->field_0x78.HALF.HI = this->health = gRoomTransition.field_0x3b;
}
this->field_0x78.HALF.LO = Random();
sub_0802EFB8(this);
src/enemy/vaatiProjectile.c
+3 -3
View File
@@ -192,7 +192,7 @@ void VaatiProjectileFunction0Action7(Entity* this) {
sub_0803E444(this);
LinearMoveUpdate(this);
sub_0803E4D8(this);
if ((gRoomControls.roomOriginY + gRoomControls.height + -0x10) <= this->y.HALF.HI) {
if ((gRoomControls.origin_y + gRoomControls.height + -0x10) <= this->y.HALF.HI) {
SetInitializationPriority();
DoExitTransition((ScreenTransitionData*)&gUnk_0813AB94);
}
@@ -239,7 +239,7 @@ void sub_0803E480(Entity* this) {
bool32 sub_0803E4A0(Entity* this) {
#ifdef EU
bool32 ret;
if (gScreenTransition.field_0x39 == 0) {
if (gRoomTransition.field_0x39 == 0) {
return TRUE;
} else {
if (this->parent == NULL) {
@@ -250,7 +250,7 @@ bool32 sub_0803E4A0(Entity* this) {
return ret;
#else
bool32 ret;
if (gScreenTransition.field_0x39 != 0) {
if (gRoomTransition.field_0x39 != 0) {
if (this->parent == NULL) {
return FALSE;
}

Some files were not shown because too many files have changed in this diff Show More