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

more symbols

Browse Source
This commit is contained in:
theo3
2021-02-28 15:07:06 -08:00
parent 83720ece06
commit 0aa3c18d08
107 changed files with 479 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/chuchuBoss.s
+3 -3
View File
@@ -221,7 +221,7 @@ _08025E68:
_08025E6E:
ldr r4, [r5, #0x48]
adds r0, r5, #0
bl AllocMutableBBox
bl AllocMutableHitbox
adds r1, r0, #0
cmp r1, #0
beq _08025E7E
@@ -234,14 +234,14 @@ _08025E7E:
_08025E86:
strb r0, [r5, #0xb]
movs r0, #0x10
bl sub_0801D8E0
bl zMalloc
adds r4, r5, #0
adds r4, #0x84
str r0, [r4]
cmp r0, #0
beq _08025EA2
adds r0, r5, #0
bl AllocMutableBBox
bl AllocMutableHitbox
cmp r0, #0
bne _08025EAA
_08025EA2:
asm/code_080011C4.s
+2 -2
View File
@@ -41,7 +41,7 @@ _080011EA:
strb r2, [r4, r1]
_0800120A:
adds r0, r4, #0
bl sub_0800404C
bl DrawEntity
pop {r3, r4}
bx r3
@@ -1052,7 +1052,7 @@ gUnk_080026A4::
.4byte gUnk_03005FBC
.4byte gUnk_020000B0
.4byte gUnk_03003DA8
.4byte gUnk_03003DB8
.4byte gHitboxCount
.4byte gUnk_03005FBC
thumb_func_start sub_080026C4
asm/code_08003FC4.s
+2 -2
View File
@@ -86,8 +86,8 @@ _08004048:
movs r0, #0
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0800404C
sub_0800404C: @ 0x0800404C
thumb_func_start DrawEntity
DrawEntity: @ 0x0800404C
push {r4, r5, lr}
adds r4, r0, #0
ldrb r1, [r0, #0x18]
asm/code_08016B30.s
+4 -4
View File
@@ -49,7 +49,7 @@ sub_08016B6C: @ 0x08016B6C
strh r0, [r4, #0xa]
ldrh r0, [r4, #0xa]
bl m4aSoundVSync
ldr r5, _08016BC8 @ =gUnk_03001000
ldr r5, _08016BC8 @ =gMain
ldrb r0, [r5]
cmp r0, #0
bne _08016BA6
@@ -78,7 +78,7 @@ _08016BA6:
_08016BBC: .4byte 0x040000B0
_08016BC0: .4byte 0x0000C5FF
_08016BC4: .4byte 0x00007FFF
_08016BC8: .4byte gUnk_03001000
_08016BC8: .4byte gMain
_08016BCC: .4byte gUnk_03000FBC
_08016BD0: .4byte gUnk_02022730
_08016BD4: .4byte 0x84000004
@@ -135,8 +135,8 @@ _08016C30: .4byte gUnk_02022730
_08016C34: .4byte 0x040000B0
_08016C38: .4byte 0x00003FFF
thumb_func_start sub_08016C3C
sub_08016C3C: @ 0x08016C3C
thumb_func_start UpdateDisplayControls
UpdateDisplayControls: @ 0x08016C3C
push {r4, lr}
ldr r2, _08016C94 @ =gUnk_03000000
ldrb r0, [r2]
asm/code_08018500.s
+1 -1
View File
@@ -884,7 +884,7 @@ sub_08018BB4: @ 0x08018BB4
mov r5, sp
mov r1, sp
movs r2, #8
bl _DmaCopy
bl MemCopy
lsls r0, r4, #2
adds r0, r0, r4
lsls r0, r0, #2
asm/code_08019444.s
+4 -4
View File
@@ -495,7 +495,7 @@ _08019810:
_0801981A:
adds r0, r1, #0
adds r1, r3, #0
bl _DmaCopy
bl MemCopy
b _0801982E
_08019824:
ldrh r0, [r4]
@@ -3466,7 +3466,7 @@ _0801AE70:
movs r2, #0x80
lsls r2, r2, #4
movs r0, #0xf
bl _DmaFill16
bl MemFill16
movs r0, #1
rsbs r0, r0, #0
bl sub_0805BB74
@@ -3815,7 +3815,7 @@ _0801B114:
adds r1, r3, r0
lsls r2, r2, #5
adds r0, r5, #0
bl _DmaCopy
bl MemCopy
_0801B122:
ldr r0, [r4]
cmp r0, #0
@@ -5093,7 +5093,7 @@ _0801BA54: @ jump table
.4byte _0801BB02 @ case 17
_0801BA9C:
adds r0, r4, #0
bl AllocMutableBBox
bl AllocMutableHitbox
cmp r0, #0
beq _0801BB26
ldrb r1, [r4, #0x10]
asm/code_0801CEC0.s
+2 -2
View File
@@ -467,7 +467,7 @@ sub_0801D2C8: @ 0x0801D2C8
lsls r1, r4, #5
adds r1, r1, r2
movs r2, #0x20
bl _DmaFill16
bl MemFill16
b _0801D33C
.align 2, 0
_0801D2F8: .4byte gUsedPalettes
@@ -730,7 +730,7 @@ _0801D4C8:
adds r1, r7, #0
movs r2, #0x20
str r3, [sp]
bl _DmaCopy
bl MemCopy
adds r6, #0x20
adds r4, #4
adds r7, #0x20
asm/code_0801D79C.s
+7 -7
View File
@@ -45,8 +45,8 @@ _0801D8C4:
_0801D8D8: .4byte 0x00007FFF
_0801D8DC: .4byte 0x040000D4
thumb_func_start sub_0801D8E0
sub_0801D8E0: @ 0x0801D8E0
thumb_func_start zMalloc
zMalloc: @ 0x0801D8E0
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
@@ -291,7 +291,7 @@ _0801DA8C: .4byte gzHeap
sub_0801DA90: @ 0x0801DA90
push {r4, r5, lr}
adds r4, r0, #0
ldr r1, _0801DAEC @ =gUnk_03001000
ldr r1, _0801DAEC @ =gMain
ldrb r0, [r1]
movs r3, #0
movs r0, #1
@@ -331,7 +331,7 @@ sub_0801DA90: @ 0x0801DA90
strh r4, [r5, #0xe]
pop {r4, r5, pc}
.align 2, 0
_0801DAEC: .4byte gUnk_03001000
_0801DAEC: .4byte gMain
_0801DAF0: .4byte gUnk_03003DE0
_0801DAF4: .4byte gFadeControl
_0801DAF8: .4byte gScreen
@@ -1628,7 +1628,7 @@ sub_0801E49C: @ 0x0801E49C
movs r2, #0xf0
lsls r2, r2, #3
ldr r1, _0801E5E8 @ =gUnk_02018EE0
bl _DmaFill16
bl MemFill16
adds r3, r5, #0
subs r3, #0x40
movs r2, #0xff
@@ -2142,11 +2142,11 @@ _0801E86C:
adds r0, r6, #0
adds r1, r7, #0
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
mov r1, sb
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
_0801E890:
movs r3, #1
add sb, r3
asm/code_0804AA84.s
+1 -1
View File
@@ -45,7 +45,7 @@ _0804ABA4:
lsls r2, r2, #2
adds r1, r0, r2
movs r2, #0x20
bl _DmaCopy
bl MemCopy
ldr r2, _0804AC14 @ =gUsedPalettes
ldr r0, [r2]
movs r1, #0x80
asm/code_0804AEB0.s
+1 -1
View File
@@ -50,7 +50,7 @@ _0804AEF6:
_0804AF00:
adds r0, r6, #0
movs r2, #0x10
bl _DmaCopy
bl MemCopy
pop {r4, r5, r6, pc}
.align 2, 0
asm/code_0804B058.s
+2 -2
View File
@@ -173,7 +173,7 @@ sub_0804B260: @ 0x0804B260
adds r0, r0, r1
ldr r1, _0804B278 @ =gUnk_02034398
movs r2, #0x20
bl _DmaCopy
bl MemCopy
pop {pc}
.align 2, 0
_0804B274: .4byte gUnk_080015BC
@@ -211,7 +211,7 @@ _0804B2A4:
adds r0, r2, #0
adds r1, r4, #0
movs r2, #8
bl _DmaCopy
bl MemCopy
ldrb r1, [r4, #6]
movs r0, #1
ands r0, r1
asm/code_0804B9F8.s
+2 -2
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_0804FF98
sub_0804FF98: @ 0x0804FF98
thumb_func_start FadeMain
FadeMain: @ 0x0804FF98
push {r4, r5, r6, r7, lr}
ldr r6, _0804FFD4 @ =gUnk_020354C0
ldr r1, _0804FFD8 @ =gUsedPalettes
asm/code_080526F8.s
+10 -10
View File
@@ -161,7 +161,7 @@ sub_080527FC: @ 0x080527FC
ldr r1, _08052834 @ =gPaletteBuffer
movs r2, #0x80
lsls r2, r2, #3
bl _DmaCopy
bl MemCopy
ldr r1, _08052838 @ =gUsedPalettes
movs r0, #1
rsbs r0, r0, #0
@@ -246,7 +246,7 @@ sub_080528B4: @ 0x080528B4
_080528C4: .4byte gScreenTransition
_080528C8:
bl sub_0804FFE4
ldr r1, _080528E8 @ =gUnk_03001000
ldr r1, _080528E8 @ =gMain
movs r2, #0
movs r0, #3
strb r0, [r1, #3]
@@ -260,7 +260,7 @@ _080528C8:
_080528E6:
pop {pc}
.align 2, 0
_080528E8: .4byte gUnk_03001000
_080528E8: .4byte gMain
_080528EC: .4byte 0x80100000
thumb_func_start sub_080528F0
@@ -377,7 +377,7 @@ _080529D4:
bl DoFade
_080529DC:
bl sub_080528F0
ldr r0, _080529F0 @ =gUnk_03001000
ldr r0, _080529F0 @ =gMain
movs r1, #3
strb r1, [r0, #4]
movs r1, #1
@@ -385,7 +385,7 @@ _080529DC:
movs r0, #1
b _080529F6
.align 2, 0
_080529F0: .4byte gUnk_03001000
_080529F0: .4byte gMain
_080529F4:
movs r0, #0
_080529F6:
@@ -846,7 +846,7 @@ sub_08052D74: @ 0x08052D74
push {r4, r5, lr}
adds r3, r0, #0
adds r4, r1, #0
ldr r0, _08052D98 @ =gUnk_03001000
ldr r0, _08052D98 @ =gMain
ldrb r0, [r0, #4]
cmp r0, #7
beq _08052D96
@@ -863,7 +863,7 @@ sub_08052D74: @ 0x08052D74
_08052D96:
pop {r4, r5, pc}
.align 2, 0
_08052D98: .4byte gUnk_03001000
_08052D98: .4byte gMain
_08052D9C: .4byte gArea
_08052DA0: .4byte 0x00000888
_08052DA4: .4byte 0x0000088C
@@ -1258,7 +1258,7 @@ sub_080530B0: @ 0x080530B0
ldr r0, _080530C0 @ =gUnk_080FCAF8
ldr r1, _080530C4 @ =gUnk_030010EC
movs r2, #0x20
bl _DmaCopy
bl MemCopy
pop {pc}
.align 2, 0
_080530C0: .4byte gUnk_080FCAF8
@@ -1431,7 +1431,7 @@ sub_080531F8: @ 0x080531F8
ldr r1, _08053248 @ =gUnk_02002AC8
adds r0, r5, #0
movs r2, #0x20
bl _DmaCopy
bl MemCopy
bl CheckIsDungeon
cmp r0, #0
beq _08053238
@@ -1483,7 +1483,7 @@ sub_08053250: @ 0x08053250
adds r0, #0xc
ldr r1, _08053298 @ =gUnk_02002AC8
movs r2, #0x20
bl _DmaCopy
bl MemCopy
pop {r4, pc}
.align 2, 0
_0805328C: .4byte gScreenTransition
asm/code_0805436C.s
+1 -1
View File
@@ -258,7 +258,7 @@ sub_08054A60: @ 0x08054A60
ands r0, r1
strb r0, [r4, #0x14]
adds r0, r4, #0
bl AllocMutableBBox
bl AllocMutableHitbox
cmp r0, #0
bne _08054AAC
bl DeleteThisEntity
asm/code_08056418.s
+1 -1
View File
@@ -696,7 +696,7 @@ sub_08056BDC: @ 0x08056BDC
ldr r1, _08056C28 @ =gUnk_02000D00
movs r2, #0xd0
lsls r2, r2, #4
bl _DmaFill32
bl MemFill32
bl sub_08056F70
adds r1, r4, #0
adds r1, #0x9e
asm/code_0805E3B0.s
+1 -1
View File
@@ -331,7 +331,7 @@ sub_0805E5C0: @ 0x0805E5C0
strb r2, [r0, #4]
bl sub_0805ED30
bl sub_0805E428
bl sub_080175E8
bl ClearHitboxList
bl sub_0806F0A4
ldr r1, _0805E5F4 @ =gUnk_03005F40
movs r0, #0
asm/code_0805EC04.s
+4 -4
View File
@@ -805,7 +805,7 @@ sub_GetFontStrWidth: @ 0xGetFontStrWidth
adds r7, r1, #0
mov r1, sp
movs r2, #0x30
bl _DmaCopy
bl MemCopy
movs r0, #0
str r0, [sp, #0x34]
movs r1, #0
@@ -981,7 +981,7 @@ _0805F486:
adds r0, r5, #0
adds r1, r4, #0
movs r2, #0x18
bl _DmaCopy
bl MemCopy
mov r0, sp
adds r1, r6, #0
bl sub_0805F440
@@ -1158,7 +1158,7 @@ sub_0805F5CC: @ 0x0805F5CC
lsls r3, r3, #1
ands r2, r3
lsls r2, r2, #3
bl _DmaFill32
bl MemFill32
adds r0, r6, #0
movs r1, #0
bl sub_GetFontStrWidth
@@ -1211,7 +1211,7 @@ _0805F63A:
ldr r0, [r4, #8]
ldr r1, [r4, #4]
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
ldr r0, [r4, #4]
adds r0, r0, r5
str r0, [r4, #4]
asm/code_0806FA6C.s
+6 -6
View File
@@ -123,19 +123,19 @@ _0806FBCC:
_0806FBD0: .4byte gScreenTransition
_0806FBD4: .4byte gPlayerState
thumb_func_start AllocMutableBBox
AllocMutableBBox: @ 0x0806FBD8
thumb_func_start AllocMutableHitbox
AllocMutableHitbox: @ 0x0806FBD8
push {r4, lr}
adds r4, r0, #0
bl UnloadBoundingBox
bl UnloadHitbox
movs r0, #0xc
bl sub_0801D8E0
bl zMalloc
str r0, [r4, #0x48]
pop {r4, pc}
.align 2, 0
thumb_func_start UnloadBoundingBox
UnloadBoundingBox: @ 0x0806FBEC
thumb_func_start UnloadHitbox
UnloadHitbox: @ 0x0806FBEC
push {r4, lr}
adds r4, r0, #0
ldr r0, [r4, #0x48]
asm/code_080732D0.s
+2 -2
View File
@@ -113,7 +113,7 @@ _08073386:
_0807339C: .4byte gPlayerState
_080733A0: .4byte gRoomControls
_080733A4:
ldr r0, _080733B8 @ =gUnk_03001000
ldr r0, _080733B8 @ =gMain
movs r1, #3
strb r1, [r0, #4]
movs r1, #1
@@ -124,7 +124,7 @@ _080733A4:
_080733B6:
pop {r4, pc}
.align 2, 0
_080733B8: .4byte gUnk_03001000
_080733B8: .4byte gMain
thumb_func_start sub_080733BC
sub_080733BC: @ 0x080733BC
asm/code_08078778.s
+1 -1
View File
@@ -538,7 +538,7 @@ sub_08078C24: @ 0x08078C24
rsbs r0, r0, #0
adds r1, #4
movs r2, #0x40
bl _DmaFill32
bl MemFill32
ldr r0, _08078CB0 @ =gUnk_03003DF0
movs r1, #0xc4
lsls r1, r1, #1
asm/code_0807B9B8.s
+25 -25
View File
@@ -822,14 +822,14 @@ sub_0807BFD0: @ 0x0807BFD0
adds r0, r7, #0
adds r1, r6, #0
mov r2, r8
bl _DmaFill16
bl MemFill16
movs r5, #0
strh r5, [r6]
ldr r4, _0807C0C0 @ =gMetatileTypesTop
adds r0, r7, #0
adds r1, r4, #0
mov r2, r8
bl _DmaFill16
bl MemFill16
strh r5, [r4]
ldr r2, _0807C0C4 @ =gRoomControls
ldr r0, _0807C0C8 @ =gArea
@@ -853,7 +853,7 @@ _0807C01C:
lsls r2, r2, #2
adds r1, r1, r2
movs r2, #0x20
bl _DmaCopy
bl MemCopy
ldr r2, _0807C0D4 @ =gUsedPalettes
ldr r0, [r2]
movs r1, #0x80
@@ -873,7 +873,7 @@ _0807C04E:
adds r0, r7, #0
adds r1, r6, #0
mov r2, r8
bl _DmaFill16
bl MemFill16
movs r2, #0
ldr r3, _0807C0D8 @ =0x000007FF
adds r4, r7, #0
@@ -899,7 +899,7 @@ _0807C078:
ldr r4, _0807C0B8 @ =0x0000FFFF
adds r0, r4, #0
adds r1, r6, #0
bl _DmaFill16
bl MemFill16
movs r2, #0
ldr r3, _0807C0D8 @ =0x000007FF
_0807C096:
@@ -1015,13 +1015,13 @@ _0807C184:
movs r4, #0x80
lsls r4, r4, #6
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
ldr r0, _0807C1B8 @ =gMapDataTop
movs r3, #0xc0
lsls r3, r3, #6
adds r1, r0, r3
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
b _0807C26C
.align 2, 0
_0807C1B0: .4byte gScreenTransition
@@ -1040,34 +1040,34 @@ _0807C1BC:
adds r0, r4, #0
mov r1, r8
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
movs r1, #0xc0
lsls r1, r1, #6
adds r6, r4, r1
adds r0, r6, #0
adds r1, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
adds r1, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
adds r6, r4, r5
adds r0, r6, #0
mov r1, r8
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
movs r2, #0x80
lsls r2, r2, #7
adds r4, r4, r2
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
adds r1, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
ldr r4, _0807C27C @ =gMapDataTop
movs r3, #0xb0
lsls r3, r3, #8
@@ -1076,34 +1076,34 @@ _0807C1BC:
adds r0, r4, #0
mov r1, r8
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
movs r0, #0xc0
lsls r0, r0, #6
adds r6, r4, r0
adds r0, r6, #0
adds r1, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
adds r1, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
adds r6, r4, r5
adds r0, r6, #0
mov r1, r8
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
movs r1, #0x80
lsls r1, r1, #7
adds r4, r4, r1
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
mov r0, r8
adds r1, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
_0807C26C:
mov r2, sb
cmp r2, #0
@@ -1161,7 +1161,7 @@ _0807C2E4:
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807C5F4
@@ -1173,7 +1173,7 @@ _0807C2E4:
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807C5F4
@@ -1449,7 +1449,7 @@ _0807C54A:
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807C5F4
@@ -1461,7 +1461,7 @@ _0807C54A:
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807C5F4
@@ -1870,13 +1870,13 @@ sub_0807C860: @ 0x0807C860
movs r4, #0x80
lsls r4, r4, #6
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
ldr r0, _0807C894 @ =gMapDataTop
movs r2, #0xc0
lsls r2, r2, #6
adds r1, r0, r2
adds r2, r4, #0
bl _DmaCopy
bl MemCopy
pop {r4, pc}
.align 2, 0
_0807C88C: .4byte gScreenTransition
asm/code_0807F0D8.s
+4 -4
View File
@@ -1963,7 +1963,7 @@ sub_0807FEC8: @ 0x0807FEC8
ldr r4, _0807FEEC @ =gUnk_03003FC0
adds r1, r4, #0
movs r2, #0x40
bl _DmaFill32
bl MemFill32
subs r4, #0x40
ldr r1, [r5, #0x30]
ldrh r0, [r1, #0x2e]
@@ -2256,14 +2256,14 @@ sub_08080108: @ 0x08080108
lsls r6, r6, #6
adds r0, r5, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
ldr r4, _0808017C @ =gMapDataTop
movs r0, #0xc0
lsls r0, r0, #6
adds r1, r4, r0
adds r0, r4, #0
adds r2, r6, #0
bl _DmaCopy
bl MemCopy
bl sub_08080368
ldr r1, _08080180 @ =gUnk_02034480
ldr r0, _08080184 @ =gUnk_0200B640
@@ -2273,7 +2273,7 @@ sub_08080108: @ 0x08080108
ldr r1, _0808018C @ =gUnk_020246B0
movs r2, #0xc0
lsls r2, r2, #5
bl _DmaCopy
bl MemCopy
subs r5, #4
adds r0, r5, #0
bl sub_08080B60
asm/code_080A3480.s
+8 -8
View File
@@ -209,7 +209,7 @@ HandleCreditsScreen: @ 0x080A35E0
adds r0, #1
str r0, [r1]
ldr r1, _080A3600 @ =gUnk_08127D00
ldr r0, _080A3604 @ =gUnk_03001000
ldr r0, _080A3604 @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@@ -219,7 +219,7 @@ HandleCreditsScreen: @ 0x080A35E0
.align 2, 0
_080A35FC: .4byte gScreenTransition
_080A3600: .4byte gUnk_08127D00
_080A3604: .4byte gUnk_03001000
_080A3604: .4byte gMain
thumb_func_start sub_080A3608
sub_080A3608: @ 0x080A3608
@@ -230,7 +230,7 @@ sub_080A3608: @ 0x080A3608
strb r4, [r0, #6]
movs r0, #0x55
bl SetGlobalFlag
ldr r0, _080A3644 @ =gUnk_03001000
ldr r0, _080A3644 @ =gMain
strb r4, [r0, #3]
ldr r2, _080A3648 @ =gMenu
strb r5, [r2, #5]
@@ -251,7 +251,7 @@ sub_080A3608: @ 0x080A3608
b _080A365E
.align 2, 0
_080A3640: .4byte gSave
_080A3644: .4byte gUnk_03001000
_080A3644: .4byte gMain
_080A3648: .4byte gMenu
_080A364C: .4byte gUnk_08127998
_080A3650:
@@ -621,14 +621,14 @@ sub_080A3930: @ 0x080A3930
movs r0, #7
movs r1, #8
bl DoFade
ldr r1, _080A3950 @ =gUnk_03001000
ldr r1, _080A3950 @ =gMain
movs r0, #2
strb r0, [r1, #3]
_080A3948:
pop {pc}
.align 2, 0
_080A394C: .4byte gFadeControl
_080A3950: .4byte gUnk_03001000
_080A3950: .4byte gMain
thumb_func_start sub_080A3954
sub_080A3954: @ 0x080A3954
@@ -862,7 +862,7 @@ _080A3B14:
movs r0, #7
movs r1, #8
bl DoFade
ldr r1, _080A3B40 @ =gUnk_03001000
ldr r1, _080A3B40 @ =gMain
movs r0, #3
strb r0, [r1, #3]
ldr r0, _080A3B44 @ =gMenu
@@ -872,7 +872,7 @@ _080A3B36:
.align 2, 0
_080A3B38: .4byte gScreen
_080A3B3C: .4byte 0x0000FDFF
_080A3B40: .4byte gUnk_03001000
_080A3B40: .4byte gMain
_080A3B44: .4byte gMenu
thumb_func_start sub_080A3B48
asm/code_080A3BD0.s
+12 -12
View File
@@ -585,7 +585,7 @@ sub_080A4080: @ 0x080A4080
adds r0, r7, #0
movs r1, #1
bl sub_080ADA14
ldr r0, _080A4140 @ =gUnk_03001000
ldr r0, _080A4140 @ =gMain
ldrh r0, [r0, #0xc]
lsrs r0, r0, #2
movs r1, #0xe
@@ -634,7 +634,7 @@ _080A4130:
_080A4134: .4byte gOamCmd
_080A4138: .4byte gMenu
_080A413C: .4byte 0x000001FB
_080A4140: .4byte gUnk_03001000
_080A4140: .4byte gMain
_080A4144: .4byte gUnk_08128110
_080A4148: .4byte 0x0000FFFF
@@ -1130,7 +1130,7 @@ sub_080A44E0: @ 0x080A44E0
adds r5, r5, r1
adds r1, r5, #0
mov r2, r8
bl _DmaCopy
bl MemCopy
adds r0, r6, #0
pop {r3}
mov r8, r3
@@ -1755,7 +1755,7 @@ _080A49D6:
adds r0, r7, #0
movs r1, #1
bl sub_080ADA14
ldr r0, _080A4B28 @ =gUnk_03001000
ldr r0, _080A4B28 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x10
ands r0, r1
@@ -1777,7 +1777,7 @@ _080A49F4:
adds r0, r7, #0
bl sub_080ADA14
_080A4A10:
ldr r0, _080A4B28 @ =gUnk_03001000
ldr r0, _080A4B28 @ =gMain
ldrh r1, [r0, #0xc]
movs r2, #0x10
adds r0, r2, #0
@@ -1910,7 +1910,7 @@ _080A4ABE:
_080A4B1C: .4byte gOamCmd
_080A4B20: .4byte gSave
_080A4B24: .4byte gMenu
_080A4B28: .4byte gUnk_03001000
_080A4B28: .4byte gMain
_080A4B2C: .4byte gUnk_081281A8
_080A4B30: .4byte 0x06014000
_080A4B34:
@@ -1980,12 +1980,12 @@ sub_080A4BA0: @ 0x080A4BA0
ldr r0, _080A4C08 @ =gUnk_0812816C
mov r1, sp
movs r2, #0x18
bl _DmaCopy
bl MemCopy
ldr r0, _080A4C0C @ =gUnk_08128184
add r4, sp, #0x48
adds r1, r4, #0
movs r2, #0xc
bl _DmaCopy
bl MemCopy
lsls r1, r6, #1
adds r1, r1, r6
lsls r2, r1, #9
@@ -2062,7 +2062,7 @@ _080A4C3E:
_080A4C56:
ldr r1, [sp]
movs r2, #0x80
bl _DmaFill16
bl MemFill16
cmp r5, #0
ble _080A4CAC
ldr r0, _080A4C9C @ =0x00007FFF
@@ -2127,7 +2127,7 @@ sub_080A4CBC: @ 0x080A4CBC
ldr r1, _080A4D14 @ =0x0600E000
adds r0, r4, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
adds r0, r6, #0
bl sub_080A4948
cmp r0, #0
@@ -3116,7 +3116,7 @@ _080A547C:
ldrb r0, [r1, #7]
strh r0, [r4, #2]
ldrb r2, [r1, #4]
ldr r0, _080A5540 @ =gUnk_03001000
ldr r0, _080A5540 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x10
ands r0, r1
@@ -3198,6 +3198,6 @@ _080A5530: .4byte gOamCmd
_080A5534: .4byte gUnk_080FDFD8
_080A5538: .4byte gMenu
_080A553C: .4byte gUnk_08128B64
_080A5540: .4byte gUnk_03001000
_080A5540: .4byte gMain
_080A5544: .4byte 0x000001FB
_080A5548: .4byte gSave
asm/code_080A5574.s
+40 -40
View File
@@ -354,7 +354,7 @@ _080A581A:
ldrb r0, [r3, #7]
strh r0, [r2, #2]
ldrb r2, [r3, #4]
ldr r0, _080A58A0 @ =gUnk_03001000
ldr r0, _080A58A0 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x10
ands r0, r1
@@ -405,7 +405,7 @@ _080A5890: .4byte gOamCmd
_080A5894: .4byte gUnk_08128C94
_080A5898: .4byte gUnk_08128C14
_080A589C: .4byte gMenu
_080A58A0: .4byte gUnk_03001000
_080A58A0: .4byte gMain
_080A58A4: .4byte 0x000001FB
_080A58A8:
ldrb r0, [r6]
@@ -826,7 +826,7 @@ sub_080A5BB8: @ 0x080A5BB8
cmp r0, #0
bne _080A5BE2
bl sub_08050384
ldr r1, _080A5BE8 @ =gUnk_03001000
ldr r1, _080A5BE8 @ =gMain
ldrb r0, [r1, #1]
movs r0, #1
strb r0, [r1, #1]
@@ -842,7 +842,7 @@ _080A5BE2:
pop {pc}
.align 2, 0
_080A5BE4: .4byte gFadeControl
_080A5BE8: .4byte gUnk_03001000
_080A5BE8: .4byte gMain
_080A5BEC: .4byte gUnk_02034490
thumb_func_start sub_080A5BF0
@@ -856,7 +856,7 @@ sub_080A5BF0: @ 0x080A5BF0
ldr r0, [r0]
bl _call_via_r0
bl sub_080A5D1C
ldr r0, _080A5C38 @ =gUnk_03001000
ldr r0, _080A5C38 @ =gMain
ldrh r0, [r0, #0xc]
movs r1, #7
ands r0, r1
@@ -867,7 +867,7 @@ sub_080A5BF0: @ 0x080A5BF0
adds r0, r4, #2
adds r1, r4, #0
movs r2, #0xe
bl _DmaCopy
bl MemCopy
strh r5, [r4, #0xe]
ldr r2, _080A5C40 @ =gUsedPalettes
ldr r0, [r2]
@@ -880,7 +880,7 @@ _080A5C2E:
.align 2, 0
_080A5C30: .4byte gUnk_08128D30
_080A5C34: .4byte gMenu
_080A5C38: .4byte gUnk_03001000
_080A5C38: .4byte gMain
_080A5C3C: .4byte gUnk_02017830
_080A5C40: .4byte gUsedPalettes
@@ -1020,7 +1020,7 @@ sub_080A5D1C: @ 0x080A5D1C
lsls r0, r0, #2
adds r0, r6, r0
strh r0, [r5, #2]
ldr r1, _080A5EAC @ =gUnk_03001000
ldr r1, _080A5EAC @ =gMain
mov sl, r1
ldrh r1, [r1, #0xc]
movs r0, #0x10
@@ -1181,7 +1181,7 @@ _080A5E9C: .4byte gUnk_080C9C6C
_080A5EA0: .4byte gUnk_08128D3C
_080A5EA4: .4byte gOamCmd
_080A5EA8: .4byte gMenu
_080A5EAC: .4byte gUnk_03001000
_080A5EAC: .4byte gMain
_080A5EB0: .4byte 0x000001FB
_080A5EB4: .4byte gUnk_080FDFD8
_080A5EB8: .4byte gUnk_02019EE0
@@ -1564,7 +1564,7 @@ sub_080A617C: @ 0x080A617C
subs r0, r0, r1
adds r0, #0x1a
strh r0, [r6]
ldr r0, _080A6268 @ =gUnk_03001000
ldr r0, _080A6268 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x20
ands r0, r1
@@ -1655,7 +1655,7 @@ _080A6250:
.align 2, 0
_080A6260: .4byte gOamCmd
_080A6264: .4byte gMenu
_080A6268: .4byte gUnk_03001000
_080A6268: .4byte gMain
_080A626C: .4byte gUnk_08128D70
thumb_func_start sub_080A6270
@@ -2790,7 +2790,7 @@ sub_080A6B04: @ 0x080A6B04
ldr r1, _080A6C08 @ =gBG3Buffer
movs r2, #0x80
lsls r2, r2, #5
bl _DmaFill16
bl MemFill16
ldr r0, _080A6C0C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #8
@@ -3420,7 +3420,7 @@ sub_080A7040: @ 0x080A7040
movs r2, #0x80
lsls r2, r2, #4
adds r0, r4, #0
bl _DmaCopy
bl MemCopy
ldr r1, _080A70A0 @ =gUnk_08128D70
lsls r0, r5, #3
adds r4, r0, r1
@@ -3539,13 +3539,13 @@ MenuFadeIn: @ 0x080A7138
bl MemClear32
strb r5, [r4, #2]
strb r6, [r4, #3]
ldr r0, _080A7160 @ =gUnk_03001000
ldr r0, _080A7160 @ =gMain
ldrb r0, [r0, #4]
strb r0, [r4, #7]
b _080A716C
.align 2, 0
_080A715C: .4byte gUnk_02032EC0
_080A7160: .4byte gUnk_03001000
_080A7160: .4byte gMain
_080A7164:
strb r5, [r4, #4]
strb r6, [r4, #5]
@@ -3560,7 +3560,7 @@ _080A716C:
movs r4, #0
movs r0, #0x20
strh r0, [r1, #0xa]
ldr r1, _080A719C @ =gUnk_03001000
ldr r1, _080A719C @ =gMain
movs r0, #7
strb r0, [r1, #4]
movs r0, #5
@@ -3573,7 +3573,7 @@ _080A716C:
.align 2, 0
_080A7194: .4byte gUnk_02032EC0
_080A7198: .4byte 0x0000FFFF
_080A719C: .4byte gUnk_03001000
_080A719C: .4byte gMain
_080A71A0: .4byte gUnk_02018EB0
thumb_func_start sub_080A71A4
@@ -3632,14 +3632,14 @@ _080A71FE:
bl DeleteAllEntities
bl sub_0805E974
bl DeleteAllEntities
ldr r0, _080A7218 @ =gUnk_03001000
ldr r0, _080A7218 @ =gMain
movs r2, #0
movs r1, #1
strb r1, [r0, #3]
strb r2, [r0, #4]
pop {pc}
.align 2, 0
_080A7218: .4byte gUnk_03001000
_080A7218: .4byte gMain
thumb_func_start sub_080A721C
sub_080A721C: @ 0x080A721C
@@ -3679,42 +3679,42 @@ sub_080A7250: @ 0x080A7250
ldr r0, _080A72EC @ =gScreen
ldr r1, _080A72F0 @ =gUnk_03001020
movs r2, #0x7c
bl _DmaCopy
bl MemCopy
ldr r0, _080A72F4 @ =gPaletteBuffer
ldr r1, _080A72F8 @ =gUnk_02024090
movs r2, #0x80
lsls r2, r2, #3
bl _DmaCopy
bl MemCopy
ldr r0, _080A72FC @ =gUnk_02024490
ldr r4, _080A7300 @ =gUnk_02032F14
movs r2, #0x85
lsls r2, r2, #2
adds r1, r4, #0
bl _DmaCopy
bl MemCopy
ldr r0, _080A7304 @ =gUnk_02001A00
movs r2, #0x85
lsls r2, r2, #2
adds r1, r4, r2
movs r2, #0x40
bl _DmaCopy
bl MemCopy
ldr r0, _080A7308 @ =gRoomControls
adds r1, r4, #0
subs r1, #0x38
movs r2, #0x38
bl _DmaCopy
bl MemCopy
ldr r0, _080A730C @ =gUnk_03000420
movs r2, #0x95
lsls r2, r2, #2
adds r1, r4, r2
movs r2, #0x80
lsls r2, r2, #1
bl _DmaCopy
bl MemCopy
ldr r0, _080A7310 @ =gUnk_02033280
movs r2, #0xd5
lsls r2, r2, #2
adds r1, r4, r2
movs r2, #0xc
bl _DmaCopy
bl MemCopy
bl sub_0805E958
adds r1, r4, #0
subs r1, #0x54
@@ -3838,36 +3838,36 @@ _080A73B4:
adds r0, r5, r1
ldr r1, _080A7480 @ =gUnk_02033280
movs r2, #0xc
bl _DmaCopy
bl MemCopy
movs r1, #0xaa
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7484 @ =gUnk_03000420
movs r2, #0x80
lsls r2, r2, #1
bl _DmaCopy
bl MemCopy
movs r1, #0x9a
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7488 @ =gUnk_02001A00
movs r2, #0x40
bl _DmaCopy
bl MemCopy
adds r0, r5, #0
adds r0, #0x54
ldr r1, _080A748C @ =gUnk_02024490
movs r2, #0x85
lsls r2, r2, #2
bl _DmaCopy
bl MemCopy
adds r0, r5, #0
adds r0, #0x1c
ldr r4, _080A7490 @ =gRoomControls
adds r1, r4, #0
movs r2, #0x38
bl _DmaCopy
bl MemCopy
ldr r0, _080A7494 @ =gUnk_03001020
ldr r1, _080A7498 @ =gScreen
movs r2, #0x7c
bl _DmaCopy
bl MemCopy
ldrb r0, [r4, #4]
bl sub_08052D58
ldr r4, _080A749C @ =gArea
@@ -3934,7 +3934,7 @@ sub_080A74C8: @ 0x080A74C8
ldrb r3, [r0]
cmp r3, #0
bne _080A74E6
ldr r0, _080A74EC @ =gUnk_03001000
ldr r0, _080A74EC @ =gMain
ldr r1, _080A74F0 @ =gUnk_02032EC0
ldrb r2, [r1, #7]
strb r2, [r0, #4]
@@ -3945,14 +3945,14 @@ _080A74E6:
pop {pc}
.align 2, 0
_080A74E8: .4byte gFadeControl
_080A74EC: .4byte gUnk_03001000
_080A74EC: .4byte gMain
_080A74F0: .4byte gUnk_02032EC0
thumb_func_start sub_080A74F4
sub_080A74F4: @ 0x080A74F4
push {lr}
bl sub_0805E5A8
ldr r1, _080A7524 @ =gUnk_03001000
ldr r1, _080A7524 @ =gMain
movs r0, #0
strb r0, [r1, #0xb]
bl FlushSprites
@@ -3965,7 +3965,7 @@ sub_080A74F4: @ 0x080A74F4
bl sub_080AD918
pop {pc}
.align 2, 0
_080A7524: .4byte gUnk_03001000
_080A7524: .4byte gMain
thumb_func_start sub_080A7528
sub_080A7528: @ 0x080A7528
@@ -4038,7 +4038,7 @@ sub_080A758C: @ 0x080A758C
bl DeleteThisEntity
_080A75AC:
adds r0, r5, #0
bl AllocMutableBBox
bl AllocMutableHitbox
cmp r0, #0
bne _080A75BA
bl DeleteThisEntity
@@ -5935,7 +5935,7 @@ _080A836E:
sub_080A83A0: @ 0x080A83A0
push {r4, lr}
adds r4, r0, #0
bl AllocMutableBBox
bl AllocMutableHitbox
cmp r0, #0
beq _080A83B0
movs r0, #1
@@ -10572,7 +10572,7 @@ sub_080AA654: @ 0x080AA654
ldr r0, _080AA688 @ =gUnk_0812A004
adds r1, r4, #0
movs r2, #0x10
bl _DmaCopy
bl MemCopy
movs r1, #0x3f
adds r0, r5, #0
ands r0, r1
@@ -13189,7 +13189,7 @@ sub_080AB9DC: @ 0x080AB9DC
adds r1, r4, #0
adds r1, #0x68
movs r2, #0x1c
bl _DmaCopy
bl MemCopy
ldrh r1, [r4, #0x2e]
adds r0, r4, #0
adds r0, #0x84
asm/code_080AD90C.s
+2 -2
View File
@@ -17,7 +17,7 @@ _080AD914: .4byte gUnk_03000000
thumb_func_start sub_080AD918
sub_080AD918: @ 0x080AD918
push {r4, lr}
ldr r1, _080AD948 @ =gUnk_03001000
ldr r1, _080AD948 @ =gMain
ldrb r0, [r1, #0xb]
adds r2, r0, #0
cmp r2, #0
@@ -40,7 +40,7 @@ sub_080AD918: @ 0x080AD918
adds r4, r1, #0
b _080AD95E
.align 2, 0
_080AD948: .4byte gUnk_03001000
_080AD948: .4byte gMain
_080AD94C: .4byte gUnk_03000000
_080AD950: .4byte 0x00000664
_080AD954: .4byte 0x000008EC
asm/dust.s
+3 -3
View File
@@ -139,14 +139,14 @@ _080441F2:
adds r0, r0, r1
adds r5, r0, #1
adds r0, r5, #0
bl sub_0801D8E0
bl zMalloc
adds r1, r0, #0
str r1, [r4, #0x64]
cmp r1, #0
beq _0804429A
adds r0, r6, #0
adds r2, r5, #0
bl _DmaCopy
bl MemCopy
adds r1, r4, #0
adds r1, #0x28
movs r0, #0xff
@@ -155,7 +155,7 @@ _080441F2:
ldrb r0, [r0]
lsls r0, r0, #3
adds r0, #0xc
bl sub_0801D8E0
bl zMalloc
adds r2, r0, #0
cmp r2, #0
bne _08044248
asm/fileScreen.s
+29 -29
View File
@@ -13,7 +13,7 @@ HandleGameplayScreen: @ 0x08051988
adds r0, #1
str r0, [r1]
ldr r1, _080519A8 @ =gUnk_080FC9D8
ldr r0, _080519AC @ =gUnk_03001000
ldr r0, _080519AC @ =gMain
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@@ -23,7 +23,7 @@ HandleGameplayScreen: @ 0x08051988
.align 2, 0
_080519A4: .4byte gScreenTransition
_080519A8: .4byte gUnk_080FC9D8
_080519AC: .4byte gUnk_03001000
_080519AC: .4byte gMain
thumb_func_start sub_080519B0
sub_080519B0: @ 0x080519B0
@@ -49,11 +49,11 @@ sub_080519B0: @ 0x080519B0
adds r1, r4, #0
adds r1, #0xc
movs r2, #0x20
bl _DmaCopy
bl MemCopy
movs r0, #4
strb r0, [r4, #9]
bl sub_08053518
ldr r1, _08051A10 @ =gUnk_03001000
ldr r1, _08051A10 @ =gMain
movs r0, #1
strb r0, [r1, #3]
strb r5, [r1, #4]
@@ -63,7 +63,7 @@ _08051A02:
_08051A04: .4byte gFadeControl
_08051A08: .4byte gScreenTransition
_08051A0C: .4byte gUnk_02002AC8
_08051A10: .4byte gUnk_03001000
_08051A10: .4byte gMain
thumb_func_start sub_08051A14
sub_08051A14: @ 0x08051A14
@@ -98,7 +98,7 @@ sub_08051A14: @ 0x08051A14
ldr r1, _08051A88 @ =gUnk_02024490
movs r0, #1
strb r0, [r1]
ldr r1, _08051A8C @ =gUnk_03001000
ldr r1, _08051A8C @ =gMain
movs r0, #2
strb r0, [r1, #3]
pop {pc}
@@ -110,13 +110,13 @@ _08051A7C: .4byte gUnk_02032EC0
_08051A80: .4byte gRoomControls
_08051A84: .4byte gScreenTransition
_08051A88: .4byte gUnk_02024490
_08051A8C: .4byte gUnk_03001000
_08051A8C: .4byte gMain
thumb_func_start sub_08051A90
sub_08051A90: @ 0x08051A90
push {lr}
ldr r1, _08051AA4 @ =gUnk_080FC9E8
ldr r0, _08051AA8 @ =gUnk_03001000
ldr r0, _08051AA8 @ =gMain
ldrb r0, [r0, #4]
lsls r0, r0, #2
adds r0, r0, r1
@@ -125,7 +125,7 @@ sub_08051A90: @ 0x08051A90
pop {pc}
.align 2, 0
_08051AA4: .4byte gUnk_080FC9E8
_08051AA8: .4byte gUnk_03001000
_08051AA8: .4byte gMain
thumb_func_start InitializeNewRoom
InitializeNewRoom: @ 0x08051AAC
@@ -136,7 +136,7 @@ InitializeNewRoom: @ 0x08051AAC
movs r0, #0xba
lsls r0, r0, #5
strh r0, [r1]
ldr r1, _08051AE8 @ =gUnk_03001000
ldr r1, _08051AE8 @ =gMain
movs r0, #1
strb r0, [r1, #4]
ldr r0, _08051AEC @ =gScreenTransition
@@ -152,7 +152,7 @@ InitializeNewRoom: @ 0x08051AAC
pop {pc}
.align 2, 0
_08051AE4: .4byte gScreen
_08051AE8: .4byte gUnk_03001000
_08051AE8: .4byte gMain
_08051AEC: .4byte gScreenTransition
thumb_func_start sub_08051AF0
@@ -207,7 +207,7 @@ _08051B5A:
bl sub_0805E5B4
bl sub_08051E04
bl sub_080300C4
ldr r1, _08051BC4 @ =gUnk_03001000
ldr r1, _08051BC4 @ =gMain
movs r0, #2
strb r0, [r1, #4]
movs r0, #0
@@ -238,7 +238,7 @@ _08051BB4: .4byte gRoomControls
_08051BB8: .4byte gArea
_08051BBC: .4byte 0x00000864
_08051BC0: .4byte 0x800B0000
_08051BC4: .4byte gUnk_03001000
_08051BC4: .4byte gMain
_08051BC8: .4byte gUnk_02034490
_08051BCC: .4byte gRoomVars
@@ -252,7 +252,7 @@ sub_08051BD0: @ 0x08051BD0
cmp r0, #0
bne _08051C9C
bl sub_0805340C
ldr r0, _08051C5C @ =gUnk_03001000
ldr r0, _08051C5C @ =gMain
ldrb r0, [r0, #4]
cmp r0, #2
bne _08051C9C
@@ -272,7 +272,7 @@ _08051C06:
bl FlushSprites
bl sub_0805E5C0
bl sub_08080A40
bl sub_080175F4
bl CollisionMain
bl UpdateScroll
bl UpdateBgAnim
bl sub_08000108
@@ -295,7 +295,7 @@ _08051C06:
beq _08051C88
b _08051C9C
.align 2, 0
_08051C5C: .4byte gUnk_03001000
_08051C5C: .4byte gMain
_08051C60: .4byte gTextBox
_08051C64: .4byte gUnk_03003DC0
_08051C68: .4byte gRoomControls
@@ -303,19 +303,19 @@ _08051C6C:
ldr r0, _08051C80 @ =gPlayerState
movs r1, #0x17
strb r1, [r0, #0xc]
ldr r0, _08051C84 @ =gUnk_03001000
ldr r0, _08051C84 @ =gMain
strb r2, [r0, #4]
bl sub_0805E59C
bl sub_08051D98
b _08051C9C
.align 2, 0
_08051C80: .4byte gPlayerState
_08051C84: .4byte gUnk_03001000
_08051C84: .4byte gMain
_08051C88:
ldr r1, _08051CA0 @ =gPlayerState
movs r0, #0x17
strb r0, [r1, #0xc]
ldr r1, _08051CA4 @ =gUnk_03001000
ldr r1, _08051CA4 @ =gMain
movs r0, #1
strb r0, [r1, #4]
bl sub_0805E59C
@@ -324,7 +324,7 @@ _08051C9C:
pop {pc}
.align 2, 0
_08051CA0: .4byte gPlayerState
_08051CA4: .4byte gUnk_03001000
_08051CA4: .4byte gMain
thumb_func_start sub_08051CA8
sub_08051CA8: @ 0x08051CA8
@@ -333,7 +333,7 @@ sub_08051CA8: @ 0x08051CA8
cmp r0, #0
bne _08051CEA
bl sub_0805E5C0
bl sub_080175F4
bl CollisionMain
bl sub_0801C344
bl sub_0805E5F8
bl FlushSprites
@@ -359,7 +359,7 @@ sub_08051CF0: @ 0x08051CF0
bl FlushSprites
bl sub_0801C208
bl sub_080AD9B0
ldr r5, _08051D20 @ =gUnk_03001000
ldr r5, _08051D20 @ =gMain
movs r6, #1
strb r6, [r5, #0xb]
bl sub_080AD918
@@ -376,7 +376,7 @@ sub_08051CF0: @ 0x08051CF0
_08051D1E:
pop {r4, r5, r6, pc}
.align 2, 0
_08051D20: .4byte gUnk_03001000
_08051D20: .4byte gMain
_08051D24: .4byte gFadeControl
_08051D28: .4byte gScreenTransition
@@ -780,7 +780,7 @@ _08052090: .4byte 0x00001D05
HandleGameOverScreen: @ 0x08052094
push {r4, lr}
ldr r1, _080520BC @ =gUnk_080FCA70
ldr r4, _080520C0 @ =gUnk_03001000
ldr r4, _080520C0 @ =gMain
ldrb r0, [r4, #3]
lsls r0, r0, #2
adds r0, r0, r1
@@ -796,18 +796,18 @@ _080520B8:
pop {r4, pc}
.align 2, 0
_080520BC: .4byte gUnk_080FCA70
_080520C0: .4byte gUnk_03001000
_080520C0: .4byte gMain
thumb_func_start sub_080520C4
sub_080520C4: @ 0x080520C4
push {lr}
ldr r1, _080520D4 @ =gUnk_03001000
ldr r1, _080520D4 @ =gMain
strb r0, [r1, #3]
movs r0, #0
bl sub_080A7114
pop {pc}
.align 2, 0
_080520D4: .4byte gUnk_03001000
_080520D4: .4byte gMain
thumb_func_start sub_080520D8
sub_080520D8: @ 0x080520D8
@@ -827,7 +827,7 @@ sub_080520D8: @ 0x080520D8
adds r0, #0xaa
movs r1, #0x18
strb r1, [r0]
ldr r0, _08052124 @ =gUnk_03001000
ldr r0, _08052124 @ =gMain
strb r2, [r0, #5]
movs r0, #0xa
bl SoundReq
@@ -843,6 +843,6 @@ _08052114:
_08052118: .4byte gFadeControl
_0805211C: .4byte gMenu
_08052120: .4byte gSave
_08052124: .4byte gUnk_03001000
_08052124: .4byte gMain
_08052128: .4byte 0xFFFF0001
asm/gleerok.s
+1 -1
View File
@@ -542,7 +542,7 @@ _0802D420:
adds r0, r4, #0
bl sub_0802EB9C
movs r0, #0x54
bl sub_0801D8E0
bl zMalloc
adds r1, r4, #0
adds r1, #0x84
str r0, [r1]
asm/gyorgFemale.s
+1 -1
View File
@@ -475,7 +475,7 @@ _080464DE:
adds r0, r4, #0
adds r1, r5, #0
movs r2, #0x40
bl _DmaCopy
bl MemCopy
movs r0, #0x80
lsls r0, r0, #1
adds r5, r5, r0
asm/intr.s
+4 -4
View File
@@ -255,7 +255,7 @@ sub_080B1C54: @ 0x080B1C54
ands r1, r1, #0x80
bxeq lr
ldr r2, _080B200C @ =gUnk_03000E10
ldr r3, _080B2010 @ =gUnk_03003DB8
ldr r3, _080B2010 @ =gHitboxCount
ldrb r1, [r3]
str r0, [r2, r1, lsl #2]
add r1, r1, #1
@@ -340,7 +340,7 @@ _080B1D84:
bx lr
_080B1D8C: .4byte gUnk_02018EA0
_080B1D90: .4byte gUnk_03000E10
_080B1D94: .4byte gUnk_03003DB8
_080B1D94: .4byte gHitboxCount
arm_func_start sub_080B1D98
sub_080B1D98: @ 0x080B1D98
@@ -525,7 +525,7 @@ _080B2000: .4byte gUnk_03005D24
_080B2004: .4byte gUnk_03005D18
_080B2008: .4byte gUnk_03005D58
_080B200C: .4byte gUnk_03000E10
_080B2010: .4byte gUnk_03003DB8
_080B2010: .4byte gHitboxCount
_080B2014: .4byte gUnk_080B7B74
_080B2018: .4byte gUnk_080B3744
@@ -701,7 +701,7 @@ _080B2254: .4byte EnemyUpdate
_080B2258: .4byte ProjectileUpdate
_080B225C: .4byte DeleteThisEntity
_080B2260: .4byte ObjectUpdate
_080B2264: .4byte sub_08017530
_080B2264: .4byte NPCUpdate
_080B2268: .4byte ItemUpdate
_080B226C: .4byte sub_08017508
_080B2270: .4byte gUnk_03003DD0
asm/kid.s
+1 -1
View File
@@ -577,7 +577,7 @@ sub_08062500: @ 0x08062500
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0xa0
bl sub_0801D8E0
bl zMalloc
str r0, [r5, #0x64]
cmp r0, #0
beq _08062528
asm/manager10.s
+1 -1
View File
@@ -440,7 +440,7 @@ _080598AA:
lsls r2, r2, #2
adds r1, r0, r2
movs r2, #0x20
bl _DmaCopy
bl MemCopy
ldr r2, _080598F0 @ =gUsedPalettes
ldr r0, [r2]
ldr r1, _080598F4 @ =0x00207FFC
asm/manager14.s
+2 -2
View File
@@ -465,7 +465,7 @@ sub_0805A1D8: @ 0x0805A1D8
ldrb r0, [r0]
cmp r0, #0
bne _0805A240
ldr r0, _0805A250 @ =gUnk_03001000
ldr r0, _0805A250 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x1f
ands r0, r1
@@ -492,7 +492,7 @@ _0805A240:
_0805A244: .4byte gRoomControls
_0805A248: .4byte 0xFFFFF000
_0805A24C: .4byte gScreen
_0805A250: .4byte gUnk_03001000
_0805A250: .4byte gMain
_0805A254: .4byte gUnk_0810859A
thumb_func_start nullsub_495
asm/manager22.s
+3 -3
View File
@@ -41,7 +41,7 @@ _0805B90A:
ldrb r0, [r5, #0xe]
bl sub_0801E154
_0805B934:
ldr r0, _0805B970 @ =gUnk_03001000
ldr r0, _0805B970 @ =gMain
ldrb r0, [r0, #4]
cmp r0, #2
bne _0805B952
@@ -68,7 +68,7 @@ _0805B952:
_0805B964: .4byte gArea
_0805B968: .4byte gScreen
_0805B96C: .4byte 0x0000D7FF
_0805B970: .4byte gUnk_03001000
_0805B970: .4byte gMain
_0805B974: .4byte 0x0000DFFF
_0805B978:
ldr r3, _0805B9A8 @ =gPlayerEntity
@@ -297,7 +297,7 @@ _0805BB28:
movs r2, #0x80
lsls r2, r2, #4
movs r0, #0xf
bl _DmaFill16
bl MemFill16
ldr r0, _0805BB58 @ =gScreen
ldr r1, _0805BB5C @ =0x00001E0C
strh r1, [r0, #0x2c]
asm/non_matching/arm_proxy/sub_08017530.inc
+1 -1
View File
@@ -77,7 +77,7 @@ _080175A4:
strh r0, [r2, #6]
_080175CC:
adds r0, r4, #0
bl sub_0800404C
bl DrawEntity
_080175D2:
pop {r4}
pop {r0}
asm/non_matching/game/sub_08052418.inc
+1 -1
View File
@@ -22,7 +22,7 @@
adds r0, r4, #0
mov r1, sp
movs r2, #0x18
bl _DmaCopy
bl MemCopy
lsls r2, r6, #1
adds r2, r2, r6
lsls r2, r2, #2
asm/non_matching/managerC/sub_08058D34.inc
+1 -1
View File
@@ -7,7 +7,7 @@ sub_08058D34: @ 0x08058D34
lsl r2, r2, #0x2
add r1, r0, r2
mov r2, #0x20
bl _DmaCopy
bl MemCopy
ldr r2, _08058DB0 @ =gUsedPalettes
ldr r0, [r2]
mov r1, #0x80
asm/non_matching/sub_08054524.inc
+1 -1
View File
@@ -20,7 +20,7 @@ _0805453A:
adds r0, r0, r1
ldr r1, _08054560 @ =gUnk_02034398
movs r2, #0x20
bl _DmaCopy
bl MemCopy
pop {pc}
.align 2, 0
_08054550: .4byte gArea
asm/non_matching/sub_080560B8.inc
+1 -1
View File
@@ -31,7 +31,7 @@ _080560E4:
lsls r4, r4, #0x12
adds r1, r4, #0
movs r2, #0x10
bl _DmaCopy
bl MemCopy
adds r0, r4, #0
bl sub_0807CF10
_080560F8:
asm/non_matching/textbox/sub_080564EC.inc
+1 -1
View File
@@ -13,7 +13,7 @@
ldr r0, _080565A4 @ =gTextBox
adds r1, r4, #0
movs r2, #0x20
bl _DmaCopy
bl MemCopy
ldrb r0, [r4, #2]
cmp r0, #0x63
bne _08056520
asm/npc5.s
+1 -1
View File
@@ -138,7 +138,7 @@ sub_08060AE0: @ 0x08060AE0
push {r4, lr}
adds r4, r0, #0
movs r0, #0x14
bl sub_0801D8E0
bl zMalloc
adds r1, r0, #0
cmp r1, #0
beq _08060B54
asm/object67.s
+1 -1
View File
@@ -257,7 +257,7 @@ _0809430A:
_08094312:
strh r0, [r1]
adds r0, r4, #0
bl AllocMutableBBox
bl AllocMutableHitbox
cmp r0, #0
beq _0809438A
ldr r2, [r4, #0x48]
asm/object6A.s
+1 -1
View File
@@ -1692,7 +1692,7 @@ _0809572C:
adds r0, #0x6c
adds r1, r4, #0
movs r2, #0x1c
bl _DmaCopy
bl MemCopy
ldrh r0, [r4, #0x14]
strh r0, [r5, #0x2e]
ldrh r0, [r4, #0x16]
asm/object91.s
+1 -1
View File
@@ -109,7 +109,7 @@ _0809C440:
movs r0, #0xe0
strb r0, [r1]
movs r0, #0x30
bl sub_0801D8E0
bl zMalloc
adds r2, r0, #0
adds r0, r4, #0
adds r0, #0x84
asm/objectB9.s
+1 -1
View File
@@ -470,7 +470,7 @@ sub_080A1550: @ 0x080A1550
cmp r4, #0
beq _080A15FE
movs r0, #0x28
bl sub_0801D8E0
bl zMalloc
str r0, [r4, #0x64]
cmp r0, #0
bne _080A1582
asm/objectBA.s
+1 -1
View File
@@ -45,7 +45,7 @@ _080A171E:
cmp r0, #0x45
bhi _080A181C
movs r0, #0x40
bl sub_0801D8E0
bl zMalloc
adds r7, r0, #0
cmp r7, #0
beq _080A181C
asm/octorokBoss.s
+1 -1
View File
@@ -756,7 +756,7 @@ _08035764:
movs r0, #1
strb r0, [r4, #0xe]
movs r0, #0x30
bl sub_0801D8E0
bl zMalloc
adds r2, r0, #0
adds r0, r4, #0
adds r0, #0x84
asm/soundReq.s
+2 -2
View File
@@ -10,7 +10,7 @@
SoundReq: @ 0x080A3268
push {r4, r5, lr}
adds r3, r0, #0
ldr r0, _080A32AC @ =gUnk_03001000
ldr r0, _080A32AC @ =gMain
ldrb r2, [r0, #7]
cmp r2, #0
beq _080A3276
@@ -47,7 +47,7 @@ _080A32A0:
beq _080A337C
b _080A3458
.align 2, 0
_080A32AC: .4byte gUnk_03001000
_080A32AC: .4byte gMain
_080A32B0: .4byte gUnk_02021EE0
_080A32B4: .4byte 0x0000FFFF
_080A32B8: .4byte 0xFFFF0000
asm/sub_08016AE4.s
+1 -1
View File
@@ -37,7 +37,7 @@ _08016B0A:
strb r2, [r4, r1]
_08016B22:
adds r0, r4, #0
bl sub_0800404C
bl DrawEntity
pop {r3, r4}
bx r3
.align 2, 0
asm/sub_0807CA18.s
+1 -1
View File
@@ -54,7 +54,7 @@ _0807CA66:
bne _0807CA78
ldr r0, _0807CA80 @ =gUnk_0811E470
movs r2, #5
bl _DmaCopy
bl MemCopy
_0807CA78:
movs r0, #1
pop {pc}
asm/vaatiArm.s
+1 -1
View File
@@ -2538,7 +2538,7 @@ sub_080437DC: @ 0x080437DC
b _08043934
_080437EE:
movs r0, #0x68
bl sub_0801D8E0
bl zMalloc
adds r7, r0, #0
cmp r7, #0
bne _080437FC
asm/vaatiWrath.s
+1 -1
View File
@@ -1490,7 +1490,7 @@ sub_08041ED4: @ 0x08041ED4
cmp r0, #0x45
bhi _08041F18
movs r0, #0x2c
bl sub_0801D8E0
bl zMalloc
adds r4, r0, #0
cmp r4, #0
beq _08041F18
asm/zeldaFollower.s
+1 -1
View File
@@ -299,7 +299,7 @@ sub_0806854C: @ 0x0806854C
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0xa0
bl sub_0801D8E0
bl zMalloc
str r0, [r5, #0x64]
cmp r0, #0
beq _08068574
include/entity.h
+4 -4
View File
@@ -24,7 +24,7 @@ typedef struct {
u8 unk2[4];
u8 width;
u8 height;
} BoundingBox;
} Hitbox;
typedef struct {
s8 offset_x;
@@ -34,7 +34,7 @@ typedef struct {
u8 height;
u8 depth;
u8 unknown2[3];
} BoundingBox3D;
} Hitbox3D;
typedef struct Entity {
/*0x00*/ struct Entity* prev;
@@ -112,7 +112,7 @@ typedef struct Entity {
/*0x44*/ u8 field_0x44;
/*0x45*/ u8 currentHealth;
/*0x46*/ u16 field_0x46;
/*0x48*/ BoundingBox* boundingBox;
/*0x48*/ Hitbox* hitbox;
/*0x4c*/ struct Entity* field_0x4c;
/*0x50*/ struct Entity* parent;
/*0x54*/ struct Entity* attachedEntity;
@@ -132,7 +132,7 @@ typedef struct Entity {
/*0x60*/ u16 spriteVramOffset;
/*0x62*/ u8 spriteOffsetX;
/*0x63*/ s8 spriteOffsetY;
/*0x64*/ u32* otherEntity;
/*0x64*/ u32* myHeap;
/*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a;
/*0x6c*/ union SplitHWord field_0x6c;
include/functions.h
+3 -3
View File
@@ -42,9 +42,9 @@ extern void UpdateAnimationVariableFrames(Entity*, u32);
extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
extern u32 LoadFixedGFX(Entity*, u32);
extern void _DmaFill32(u32, void*, u32);
extern void MemFill32(u32, void*, u32);
extern Entity* CreateItemEntity(u32, u32, u32);
void _DmaCopy(const void* src, void* dst, u32 size);
void MemCopy(const void* src, void* dst, u32 size);
extern u32 ProcessMovement(Entity*);
extern Entity* FindEntityInListBySubtype(u32, u32, u32);
extern Entity* FindEntityInListByForm(u32, u32, u32, u32, u32);
@@ -227,7 +227,7 @@ extern void sub_0804A7D4(Entity*);
extern void sub_08033744(Entity*);
extern void sub_0800417E(Entity*, u32);
extern void sub_080784C8();
extern void sub_08017640();
extern void RegisterPlayerHitbox();
extern u32 sub_0808288C(Entity*, u32, u32, u32);
extern void sub_0806FDA0(Entity*);
extern void sub_080AE008(Entity*, u32, u32);
include/main.h
+1 -1
View File
@@ -74,7 +74,7 @@ typedef struct {
} UI;
static_assert(sizeof(UI) == 0x3b4);
extern Main gUnk_03001000;
extern Main gMain;
extern UI gUnk_02032EC0;
void InitScreen();
include/player.h
+9 -6
View File
@@ -33,8 +33,9 @@ typedef struct {
/*0x30*/ union {
/* */ u32 all;
/* */ struct {
/* */ u32 filler9 : 2;
/* */ u32 unk1 : 1;
/* */ u32 unk2 : 1;
/* */ u32 unk4 : 1;
/* */ u32 noMinishCap : 1;
/* */ u32 pullingState : 1;
/* */ u32 windyState : 1;
@@ -87,17 +88,19 @@ typedef struct {
/*0x05*/ u8 arrowCount;
/*0x06*/ u8 bombBagType;
/*0x07*/ u8 quiverType;
/*0x08*/ u8 filler[4];
/*0x08*/ u8 filler[2];
/*0x0a*/ u8 charm;
/*0x0b*/ u8 unkB;
/*0x0c*/ u8 itemOnA;
/*0x0d*/ u8 itemOnB;
/*0x0e*/ u8 bottles[4];
/*0x12*/ u8 floorType;
/*0x12*/ u8 effect;
/*0x13*/ u8 filler3[5];
/*0x18*/ u16 rupees;
/*0x1a*/ u16 field_0x1a;
/*0x1c*/ u16 field_0x1c;
/*0x1e*/ u16 field_0x1e;
/*0x20*/ u16 field_0x20;
/*0x1c*/ u16 charmTimer;
/*0x1e*/ u16 unkTimer;
/*0x20*/ u16 effectTimer;
/*0x22*/ u8 filler4[4];
} Stats;
linker.ld
+3 -3
View File
@@ -176,7 +176,7 @@ SECTIONS {
. = 0x00000FBC; gUnk_03000FBC = .;
. = 0x00000FD0; gFadeControl = .;
. = 0x00000FF0; gInput = .;
. = 0x00001000; gUnk_03001000 = .;
. = 0x00001000; gMain = .;
. = 0x00001010; gOamCmd = .;
. = 0x00001020; gUnk_03001020 = .;
. = 0x000010A0; gScreenTransition = .;
@@ -198,7 +198,7 @@ SECTIONS {
. = 0x00003DA0; gUnk_03003DA0 = .;
. = 0x00003DA8; gUnk_03003DA8 = .;
. = 0x00003DB0; gUnk_03003DB0 = .;
. = 0x00003DB8; gUnk_03003DB8 = .;
. = 0x00003DB8; gHitboxCount = .;
. = 0x00003DBC; gEntCount = .;
. = 0x00003DC0; gUnk_03003DC0 = .;
. = 0x00003DD0; gUnk_03003DD0 = .;
@@ -250,7 +250,7 @@ SECTIONS {
. = 0x000058DC; gUnk_030058DC = .;
. = 0x000058F8; gUnk_030058F8 = .;
. = 0x00005918; gUnk_03005918 = .;
. = 0x000059F0; gUnk_030059F0 = .;
. = 0x000059F0; gDoCollision = .;
. = 0x00005CA4; gUnk_03005CA4 = .;
. = 0x00005CD0; gUnk_03005CD0 = .;
. = 0x00005CFC; gUnk_03005CFC = .;
src/arm_proxy.c
+50 -50
View File
@@ -20,20 +20,20 @@ extern u8 gUnk_03003DF0[];
extern u8 gUnk_03003BE0;
extern Entity* gUnk_03004040[3];
extern u8 gUnk_020342F8;
extern u8 gUnk_03003DB8;
extern void gUnk_030059F0(void);
extern u8 gHitboxCount;
extern void gDoCollision(void);
extern void sub_080ADD70();
extern void sub_0801C25C();
extern void sub_08016C3C();
extern void UpdateDisplayControls();
extern void LoadResources();
extern void sub_0804FF98();
extern void FadeMain();
extern u32 sub_0805E3B0();
extern void sub_08016FF4();
extern void HandlePlayerLife();
extern void sub_08070680();
extern void sub_080171F0();
extern void sub_08078FB0();
extern void sub_0800404C();
extern void DrawEntity();
extern void sub_0807A050();
extern u32 sub_08079B24();
extern void sub_08079708();
@@ -114,15 +114,15 @@ void LoadResources(void) {
}
void PrepNextFrame(void) {
gUnk_03001000.interruptFlag = 0;
gMain.interruptFlag = 0;
VBlankIntrWait();
do {
// Our VBlankIntr will set this flag
} while (gUnk_03001000.interruptFlag == 0);
} while (gMain.interruptFlag == 0);
sub_080ADD70();
sub_0801C25C();
sub_08016C3C();
UpdateDisplayControls();
LoadResources();
if (gUnk_02000070) {
@@ -133,11 +133,11 @@ void PrepNextFrame(void) {
if (gUnk_0200B650 != NULL)
DmaCopy32(3, &gBG2Buffer, VRAM + (*gUnk_0200B650 & 0x1f00) * 8, 0x5C0);
}
sub_0804FF98();
FadeMain();
}
void PlayerUpdate(Entity* this) {
if (gSave.stats.floorType != 0)
if (gSave.stats.effect != 0)
gPlayerState.flags.all |= 0x4000;
else
gPlayerState.flags.all &= ~0x4000;
@@ -155,18 +155,19 @@ void PlayerUpdate(Entity* this) {
gPlayerState.field_0xa8 = 0xf;
}
}
sub_08016FF4(this);
HandlePlayerLife(this);
sub_08070680(this);
if ((this->height.WORD == 0) && (this->action == 1 || this->action == 9))
sub_08008790(this, 8);
sub_080171F0();
}
sub_08078FB0(this);
sub_0800404C(this);
DrawEntity(this);
sub_0807A050();
}
void sub_08016FF4(Entity* this) {
// Responsible for some life things like low health beep and initiating the death sequence
void HandlePlayerLife(Entity* this) {
u32 temp;
gUnk_0200AF00.filler25[10] = 0;
@@ -212,29 +213,28 @@ void sub_08016FF4(Entity* this) {
}
}
if (gSave.stats.filler[2] == 0) {
gSave.stats.field_0x1c = 0;
} else if ((gSave.stats.field_0x1c == 0) || --gSave.stats.field_0x1c == 0) {
gSave.stats.filler[2] = 0;
if (gSave.stats.charm == 0) {
gSave.stats.charmTimer = 0;
} else if ((gSave.stats.charmTimer == 0) || --gSave.stats.charmTimer == 0) {
gSave.stats.charm = 0;
SoundReq(SFX_ICE_BLOCK_MELT);
}
if (gSave.stats.filler[3] == 0) {
gSave.stats.field_0x1e = 0;
} else if ((gSave.stats.field_0x1e == 0) || (--gSave.stats.field_0x1e == 0)) {
gSave.stats.filler[3] = 0;
if (gSave.stats.unkB == 0) {
gSave.stats.unkTimer = 0;
} else if ((gSave.stats.unkTimer == 0) || (--gSave.stats.unkTimer == 0)) {
gSave.stats.unkB = 0;
SoundReq(SFX_140);
} else if ((gSave.stats.field_0x1e & 0xf) == 0) {
} else if ((gSave.stats.unkTimer & 0xf) == 0) {
CreateSparkle(this);
}
if (gSave.stats.floorType == 0) {
gSave.stats.field_0x20 = 0;
} else if ((gSave.stats.field_0x20 == 0) || --gSave.stats.field_0x20 == 0) {
gSave.stats.floorType = 0;
} else if ((gSave.stats.field_0x20 & 0x3f) == 0) {
// lava or water splash FX
CreateFx(this, 0x55 + gSave.stats.floorType, 0);
if (gSave.stats.effect == 0) {
gSave.stats.effectTimer = 0;
} else if ((gSave.stats.effectTimer == 0) || --gSave.stats.effectTimer == 0) {
gSave.stats.effect = 0;
} else if ((gSave.stats.effectTimer & 0x3f) == 0) {
CreateFx(this, 0x55 + gSave.stats.effect, 0);
}
}
@@ -299,7 +299,7 @@ void ItemUpdate(Entity* this) {
this->hurtBlinkTime++;
}
}
sub_0800404C(this);
DrawEntity(this);
}
// tiny regalloc
@@ -346,7 +346,7 @@ void ObjectUpdate(Entity* this) {
gObjectFunctions[this->entityType.subtype](this);
this->bitfield &= ~0x80;
}
sub_0800404C(this);
DrawEntity(this);
}
void sub_08017508(Entity* this) {
@@ -355,7 +355,7 @@ void sub_08017508(Entity* this) {
}
// regalloc
NONMATCH("asm/non_matching/arm_proxy/sub_08017530.inc", void sub_08017530(Entity* this)) {
NONMATCH("asm/non_matching/arm_proxy/sub_08017530.inc", void NPCUpdate(Entity* this)) {
if ((this->currentHealth & 0x7f) && !ReadBit(&gUnk_020342F8, this->currentHealth - 1))
DeleteThisEntity();
if ((this->action == 0) && ((this->flags & 1) == 0))
@@ -370,40 +370,40 @@ NONMATCH("asm/non_matching/arm_proxy/sub_08017530.inc", void sub_08017530(Entity
gUnk_02031EC0[temp * 2 - 2].x = this->x.HALF.HI - gRoomControls.roomOriginX;
gUnk_02031EC0[temp * 2 - 2].y = this->y.HALF.HI - gRoomControls.roomOriginY;
}
sub_0800404C(this);
DrawEntity(this);
}
}
END_NONMATCH
void sub_080175E8(void) {
gUnk_03003DB8 = 0;
void ClearHitboxList(void) {
gHitboxCount = 0;
}
void sub_080175F4(void) {
void CollisionMain(void) {
void (*doCollision)(void);
u32 flags;
u32 temp;
void (*func)(void);
temp = gUnk_03003DC0.unk0;
if (gUnk_03003DC0.unk0 <= gUnk_03003DC0.unk1)
temp = gUnk_03003DC0.unk1;
if (temp != 0)
return;
func = &gUnk_030059F0;
doCollision = &gDoCollision;
// Check to see if we should disable collision this frame
if (gPlayerState.field_0x8b != 0) {
u32 temp = gPlayerEntity.flags;
gPlayerEntity.flags &= 0x7f;
func();
gPlayerEntity.flags = temp;
gPlayerEntity.flags &= ~0x80;
doCollision();
gPlayerEntity.flags = temp; // reset collision to before
} else {
func();
doCollision();
}
}
void sub_08017640(void) {
MemClear32(&gUnk_03003C70, 0x100);
void RegisterPlayerHitbox(void) {
MemClear32(&gUnk_03003C70, sizeof(gUnk_03003C70));
gUnk_02018EA0 = (LinkedList2*)&gUnk_03003C70[0].last;
gUnk_03003C70[0].last = &gUnk_03003C70[0].last;
gUnk_03003C70[0].first = &gUnk_03003C70[0].last;
@@ -507,8 +507,8 @@ NONMATCH("asm/non_matching/arm_proxy/sub_080177A0.inc", bool32 sub_080177A0(Enti
u32 depth;
if ((that->collisionLayer & this->collisionLayer) != 0) {
BoundingBox* bb_this = this->boundingBox;
BoundingBox* bb_that = that->boundingBox;
Hitbox* bb_this = this->hitbox;
Hitbox* bb_that = that->hitbox;
u32 this_w = bb_this->width;
u32 that_w = bb_that->width;
if ((((this->x.HALF.HI - that->x.HALF.HI) + bb_this->offset_x) - bb_that->offset_x) + this_w + that_w <=
@@ -518,11 +518,11 @@ NONMATCH("asm/non_matching/arm_proxy/sub_080177A0.inc", bool32 sub_080177A0(Enti
if ((((this->y.HALF.HI - that->y.HALF.HI) + bb_this->offset_y) - bb_that->offset_y) + this_h + that_h <=
(this_h + that_h) * 2) {
if ((this->field_0x3c & 0x10) != 0)
this_d = ((BoundingBox3D*)bb_this)->depth;
this_d = ((Hitbox3D*)bb_this)->depth;
else
this_d = 5;
if ((that->field_0x3c & 0x10) != 0)
depth = this_d + ((BoundingBox3D*)bb_that)->depth;
depth = this_d + ((Hitbox3D*)bb_that)->depth;
else
depth = this_d + 5;
if ((this->height.HALF.HI - that->height.HALF.HI) + depth <= depth * 2)
src/code_08049CD4.c
+2 -2
View File
@@ -3,10 +3,10 @@
extern u32* gUnk_020354B0;
extern u32 gUnk_02024050;
extern void _DmaFill32(u32, void*, u32);
extern void MemFill32(u32, void*, u32);
void sub_08049CD4() {
_DmaFill32(0xFFFFFFFF, &gUnk_02024050, 0x40);
MemFill32(0xFFFFFFFF, &gUnk_02024050, 0x40);
gUnk_020354B0 = &gUnk_02024050;
}
src/code_0804AA84.c
+1 -1
View File
@@ -19,7 +19,7 @@ extern struct_02018EB0 gUnk_02018EB0;
u32 sub_0804AA84(void) {
if (gArea.fadeOut != 0) {
gUnk_03001000.transition = 4;
gMain.transition = 4;
gArea.filler[8] = 0;
gArea.filler[9] = 0;
*(u16*)&gArea.filler[10] = 0;
src/code_0805436C.c
+1 -1
View File
@@ -159,7 +159,7 @@ void sub_08054524(void) {
bVar1 = 0;
}
_DmaCopy(&gUnk_080015BC + gUnk_080FE1C6[bVar1] * 0x8, &gUnk_02034398, 0x20);
MemCopy(&gUnk_080015BC + gUnk_080FE1C6[bVar1] * 0x8, &gUnk_02034398, 0x20);
}
#else
NAKED
src/code_0805F9A0.c
+1 -1
View File
@@ -129,7 +129,7 @@ void sub_0805F918(u32 idx, u32 idx2, void* dest) {
u8* temp;
u8* temp2;
_DmaFill32(sub_0805F8F8(idx2), &gUnk_02036AD8, 0xe0);
MemFill32(sub_0805F8F8(idx2), &gUnk_02036AD8, 0xe0);
puVar1 = gUnk_081092AC[idx];
temp = &gUnk_081094CE + idx2 * 0xc0;
src/dma.c
+7 -7
View File
@@ -1,14 +1,14 @@
#include "global.h"
#include "entity.h"
void _DmaFill32(u32, u8*, u32);
void _DmaFill16(u32, u8*, u32);
void MemFill32(u32, u8*, u32);
void MemFill16(u32, u8*, u32);
void _DmaFill16(u32 value, u8* dest, u32 size) {
void MemFill16(u32 value, u8* dest, u32 size) {
DmaFill16(3, value, dest, size);
}
void _DmaFill32(u32 value, u8* dest, u32 size) {
void MemFill32(u32 value, u8* dest, u32 size) {
DmaFill32(3, value, dest, size);
}
@@ -17,10 +17,10 @@ void MemClear32(u8* src, u32 size) {
switch (((u32)src | size) & 3) {
case 0:
_DmaFill32(0, src, size);
MemFill32(0, src, size);
break;
case 2:
_DmaFill16(0, src, size);
MemFill16(0, src, size);
break;
default:
do {
@@ -31,7 +31,7 @@ void MemClear32(u8* src, u32 size) {
}
}
void _DmaCopy(const u8* src, u8* dst, u32 size) {
void MemCopy(const u8* src, u8* dst, u32 size) {
switch (((u32)src | (u32)dst | size) & 3) {
case 0:
DmaCopy32(3, src, dst, size);
src/enemy/bombPeahat.c
+9 -9
View File
@@ -32,9 +32,9 @@ extern void (*const gUnk_080CD134[])(Entity*);
extern void (*const gUnk_080CD140[])(Entity*);
extern void (*const gUnk_080CD158[])(Entity*);
extern const BoundingBox gUnk_080CD16C;
extern const BoundingBox gUnk_080CD174;
extern const BoundingBox gUnk_080CD17C;
extern const Hitbox gUnk_080CD16C;
extern const Hitbox gUnk_080CD174;
extern const Hitbox gUnk_080CD17C;
void BombPeahat(Entity* this) {
s32 iVar1;
@@ -105,7 +105,7 @@ void sub_0802A924(Entity* this) {
this->previousActionFlag = 0;
this->actionDelay = 0;
this->field_0xf = 0;
this->boundingBox = (BoundingBox*)&gUnk_080CD16C;
this->hitbox = (Hitbox*)&gUnk_080CD16C;
this->height.HALF.HI = -0x30;
this->field_0x80.HALF.LO = Random() & 1;
this->field_0x82.HWORD = 0;
@@ -358,7 +358,7 @@ void sub_0802AE24(Entity* this) {
this->action = 1;
this->actionDelay = 0xf0;
this->field_0x20 = 0x8000;
this->boundingBox = (BoundingBox*)&gUnk_080CD174;
this->hitbox = (Hitbox*)&gUnk_080CD174;
this->field_0x3c = 3;
this->field_0x16 = 0;
this->field_0x1c = 2;
@@ -515,7 +515,7 @@ void sub_0802B048(Entity* this) {
}
sub_0805EC60(this);
this->action = 4;
this->boundingBox = (BoundingBox*)&gUnk_080CD17C;
this->hitbox = (Hitbox*)&gUnk_080CD17C;
this->actionDelay = 0xf;
this->spriteSettings.b.draw = 0;
this->flags |= 0x80;
@@ -654,15 +654,15 @@ void (*const gUnk_080CD158[])(Entity*) = {
sub_0802AF94,
};
const BoundingBox gUnk_080CD16C = {
const Hitbox gUnk_080CD16C = {
0x00, 0xFB, 0x05, 0x03, 0x03, 0x05, 0x06, 0x06,
};
const BoundingBox gUnk_080CD174 = {
const Hitbox gUnk_080CD174 = {
0x00, 0x00, 0x06, 0x00, 0x00, 0x06, 0x04, 0x04,
};
const BoundingBox gUnk_080CD17C = {
const Hitbox gUnk_080CD17C = {
0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0x16, 0x16,
};
// clang-format on
src/enemy/doorMimic.c
+25 -25
View File
@@ -18,13 +18,13 @@ extern void (*const gUnk_080CB74C[])(Entity*);
extern const s8 gUnk_080CB764[];
extern const PosOffset gUnk_080CB76C[4][6];
extern const u16 gUnk_080CB79C[];
extern const BoundingBox* const* const gUnk_080CB8A4[];
extern const Hitbox* const* const gUnk_080CB8A4[];
extern s16 gUnk_080B4488[];
void DoorMimic(Entity* this) {
gUnk_080CB734[GetNextFunction(this)](this);
this->boundingBox = (BoundingBox*)gUnk_080CB8A4[this->entityType.parameter][this->frameIndex];
this->hitbox = (Hitbox*)gUnk_080CB8A4[this->entityType.parameter][this->frameIndex];
}
void sub_08021FDC(Entity* this) {
@@ -185,18 +185,18 @@ const u16 gUnk_080CB79C[] = {
};
const BoundingBox gUnk_080CB7A4 = { 0x00, -9, 0x00, 0x00, 0x00, 0x00, 0x08, 0x06 };
const BoundingBox gUnk_080CB7AC = { 0x00, -5, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04 };
const BoundingBox gUnk_080CB7B4 = { 0x00, -1, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04 };
const BoundingBox gUnk_080CB7BC = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x06, 0x08 };
const BoundingBox gUnk_080CB7C4 = { 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0c };
const BoundingBox gUnk_080CB7CC = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const BoundingBox gUnk_080CB7D4 = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04 };
const BoundingBox gUnk_080CB7DC = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04 };
const BoundingBox gUnk_080CB7E4 = { 0x00, -8, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const BoundingBox gUnk_080CB7EC = { 0x00, -12, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0c };
const Hitbox gUnk_080CB7A4 = { 0x00, -9, 0x00, 0x00, 0x00, 0x00, 0x08, 0x06 };
const Hitbox gUnk_080CB7AC = { 0x00, -5, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04 };
const Hitbox gUnk_080CB7B4 = { 0x00, -1, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04 };
const Hitbox gUnk_080CB7BC = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x06, 0x08 };
const Hitbox gUnk_080CB7C4 = { 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0c };
const Hitbox gUnk_080CB7CC = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const Hitbox gUnk_080CB7D4 = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04 };
const Hitbox gUnk_080CB7DC = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04 };
const Hitbox gUnk_080CB7E4 = { 0x00, -8, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const Hitbox gUnk_080CB7EC = { 0x00, -12, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0c };
const BoundingBox *const gUnk_080CB7F4[] = {
const Hitbox *const gUnk_080CB7F4[] = {
&gUnk_080CB7A4,
&gUnk_080CB7AC,
&gUnk_080CB7B4,
@@ -211,18 +211,18 @@ const BoundingBox *const gUnk_080CB7F4[] = {
&gUnk_080CB7EC,
};
const BoundingBox gUnk_080CB824 = { 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const BoundingBox gUnk_080CB82C = { 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08 };
const BoundingBox gUnk_080CB834 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08 };
const BoundingBox gUnk_080CB83C = { -8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const BoundingBox gUnk_080CB844 = { -12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08 };
const BoundingBox gUnk_080CB84C = { -8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const BoundingBox gUnk_080CB854 = { -4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08 };
const BoundingBox gUnk_080CB85C = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08 };
const BoundingBox gUnk_080CB864 = { 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const BoundingBox gUnk_080CB86C = { 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08 };
const Hitbox gUnk_080CB824 = { 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const Hitbox gUnk_080CB82C = { 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08 };
const Hitbox gUnk_080CB834 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08 };
const Hitbox gUnk_080CB83C = { -8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const Hitbox gUnk_080CB844 = { -12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08 };
const Hitbox gUnk_080CB84C = { -8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const Hitbox gUnk_080CB854 = { -4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08 };
const Hitbox gUnk_080CB85C = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08 };
const Hitbox gUnk_080CB864 = { 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08 };
const Hitbox gUnk_080CB86C = { 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08 };
const BoundingBox *const gUnk_080CB874[] = {
const Hitbox *const gUnk_080CB874[] = {
&gUnk_080CB84C,
&gUnk_080CB854,
&gUnk_080CB85C,
@@ -237,7 +237,7 @@ const BoundingBox *const gUnk_080CB874[] = {
&gUnk_080CB844,
};
const BoundingBox *const *const gUnk_080CB8A4[] = {
const Hitbox *const *const gUnk_080CB8A4[] = {
gUnk_080CB7F4,
gUnk_080CB874,
gUnk_080CB7F4,
src/enemy/gyorgMale.c
+16 -16
View File
@@ -193,7 +193,7 @@ void sub_080469F4(Entity* this) {
void sub_08046A30(Entity* this) {
sub_08047D88(this);
if (((Entity*)this->otherEntity)->prev->field_0x6c.HWORD & 1) {
if (((Entity*)this->myHeap)->prev->field_0x6c.HWORD & 1) {
this->action = 2;
this->previousActionFlag = 0;
}
@@ -208,7 +208,7 @@ void sub_08046A54(Entity* this) {
void sub_08046A78(Entity* this) {
sub_08047D88(this);
if (((Entity*)this->otherEntity)->prev->field_0x6c.HWORD & 0x10) {
if (((Entity*)this->myHeap)->prev->field_0x6c.HWORD & 0x10) {
this->action = 3;
this->previousActionFlag = 0;
}
@@ -233,7 +233,7 @@ void sub_08046A9C(Entity* this) {
void sub_08046AE8(Entity* this) {
this->previousActionFlag = 1;
this->nonPlanarMovement = 0x180;
sub_08048178(this, ((Entity*)this->otherEntity)->next->animationState >> 5);
sub_08048178(this, ((Entity*)this->myHeap)->next->animationState >> 5);
this->field_0x76.HWORD = this->direction << 8;
sub_08047D88(this);
}
@@ -307,7 +307,7 @@ void sub_08046CEC(Entity* this) {
}
gUnk_080D1B4C[this->previousActionFlag](this);
UpdateAnimationSingleFrame(this);
if (((Entity*)this->otherEntity)->prev->field_0x6c.HWORD & 2) {
if (((Entity*)this->myHeap)->prev->field_0x6c.HWORD & 2) {
this->action = 2;
this->previousActionFlag = 0;
this->animationState = this->nonPlanarMovement;
@@ -320,7 +320,7 @@ void sub_08046D44(Entity* this) {
const u16* tmp;
this->previousActionFlag = 1;
this->nonPlanarMovement = 0x200;
tmp = gUnk_080D1B60 + (((Entity*)this->otherEntity)->next->animationState >> 5);
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_0x76.HWORD = this->direction << 8;
@@ -358,7 +358,7 @@ void sub_08046E0C(Entity* this) {
const s16 gUnk_080D1B70[2] = { 0x40, -0x40 };
void sub_08046E68(Entity* this) {
u32 tmp = ((Entity*)this->otherEntity)->next->animationState ^ 0x80;
u32 tmp = ((Entity*)this->myHeap)->next->animationState ^ 0x80;
if (tmp != this->direction) {
if (((tmp - this->direction) & 0xFF) > 0x80) {
this->field_0x76.HWORD -= 0x100;
@@ -420,7 +420,7 @@ void sub_08046F64(Entity* this) {
UpdateSpriteForCollisionLayer(tmp);
}
}
if (((Entity*)this->otherEntity)->prev->field_0x6c.HWORD & 4) {
if (((Entity*)this->myHeap)->prev->field_0x6c.HWORD & 4) {
this->action = 5;
this->previousActionFlag = 0;
}
@@ -788,11 +788,11 @@ void sub_080477F0(Entity* this) {
this->previousActionFlag = 2;
this->field_0x76.HWORD = this->animationState << 8;
this->field_0x74.HWORD = gUnk_080D1BF0[Random() & 1];
if (((Entity*)this->otherEntity)->prev->field_0x6c.HWORD & 1) {
((Entity*)this->otherEntity)->next->field_0x78.HALF.HI =
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;
} else {
((Entity*)this->otherEntity)->next->field_0x78.HALF.HI = 0x80;
((Entity*)this->myHeap)->next->field_0x78.HALF.HI = 0x80;
}
}
}
@@ -807,7 +807,7 @@ void sub_08047914(Entity* this) {
this->previousActionFlag = 3;
this->field_0x70.HALF.LO = 0x3C;
this->field_0x7c.HALF.HI = ((this->entityType.form * 0xF) << 2) + 0x78;
sub_080A1D70(((Entity*)this->otherEntity)->prev, this->animationState);
sub_080A1D70(((Entity*)this->myHeap)->prev, this->animationState);
}
}
@@ -850,7 +850,7 @@ void sub_08047978(Entity* this) {
return;
this->previousActionFlag = 4;
if (this->entityType.form == 0) {
if ((((Entity*)this->otherEntity)->next->animationState >> 6) == 1) {
if ((((Entity*)this->myHeap)->next->animationState >> 6) == 1) {
this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x1C0;
this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x250;
} else {
@@ -969,11 +969,11 @@ void sub_08047D24(Entity* this) {
this->field_0x7c.HALF_U.HI += 8;
if (this->field_0x7c.HALF_U.HI > 0x800) {
if (this->entityType.form == 0) {
((u32*)this->otherEntity)[2] = 0;
((u32*)this->myHeap)[2] = 0;
} else {
((u32*)this->otherEntity)[3] = 0;
((u32*)this->myHeap)[3] = 0;
}
this->otherEntity = 0;
this->myHeap = NULL;
DeleteThisEntity();
} else {
if (this->field_0x7c.HALF_U.HI < 0x200) {
@@ -1158,7 +1158,7 @@ const u16 gUnk_080D1C60[8] = { 0x200, 0x150, 0x290, 0x210, 0x200, 0x2D0, 0x170,
void sub_08048178(Entity* this, u32 unk1) {
const u16* tmp =
((((Entity*)this->otherEntity)->next->animationState >> 6 & 1) ? gUnk_080D1C60 + unk1 : gUnk_080D1C50 + unk1);
((((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;
}
src/enemy/helmasaur.c
+4 -4
View File
@@ -305,8 +305,8 @@ void sub_0802C058(Entity* this, u32 param_2) {
}
bool32 sub_0802C06C(Entity* this) {
u32 x = this->x.HALF.HI + this->boundingBox->offset_x;
u32 y = this->y.HALF.HI + this->boundingBox->offset_y;
u32 x = this->x.HALF.HI + this->hitbox->offset_x;
u32 y = this->y.HALF.HI + this->hitbox->offset_y;
u32 xdiff = gUnk_080CD45C[(this->direction >> 2) + 0];
u32 ydiff = gUnk_080CD45C[(this->direction >> 2) + 1];
@@ -330,8 +330,8 @@ bool32 sub_0802C0E8(Entity* this) {
return TRUE;
} else {
const s8* ptr = &gUnk_080CD45C[this->direction >> 2];
s32 x = this->x.HALF.HI + this->boundingBox->offset_x + ptr[0] * 6;
s32 y = this->y.HALF.HI + this->boundingBox->offset_y + ptr[1] * 6;
s32 x = this->x.HALF.HI + this->hitbox->offset_x + ptr[0] * 6;
s32 y = this->y.HALF.HI + this->hitbox->offset_y + ptr[1] * 6;
Entity* ent = this->collisionLayer == 2 ? &gUnk_0200D654 : &gUnk_02027EB4;
u32 ret = FALSE;
src/enemy/madderpillar.c
+4 -4
View File
@@ -3,8 +3,8 @@
#include "functions.h"
extern u8 gEntCount;
extern BoundingBox gUnk_080FD298;
extern BoundingBox gUnk_080FD2A0;
extern Hitbox gUnk_080FD298;
extern Hitbox gUnk_080FD2A0;
void sub_08029E0C(Entity*);
void sub_08029EEC(Entity*);
@@ -278,7 +278,7 @@ void sub_08029D14(Entity* this) {
this->action = 4;
this->actionDelay = 0x78;
this->damageType = 0x6c;
this->boundingBox = &gUnk_080FD298;
this->hitbox = &gUnk_080FD298;
EnqueueSFX(0x6b);
}
}
@@ -289,7 +289,7 @@ void sub_08029D78(Entity* this) {
if (--this->actionDelay == 0) {
this->action = 5;
this->damageType = 0x6a;
this->boundingBox = (BoundingBox*)&gUnk_080FD2A0;
this->hitbox = (Hitbox*)&gUnk_080FD2A0;
InitializeAnimation(this, this->animationState + 0x10);
}
}
src/enemy/rupeeLike.c
+2 -2
View File
@@ -21,7 +21,7 @@ extern void (*const gUnk_080CCC3C[])(Entity*);
extern const u8 gUnk_080CCC34[];
extern const s8 gUnk_080CCC44[];
extern const u8 gUnk_080CCC47[];
extern BoundingBox gUnk_080FD260;
extern Hitbox gUnk_080FD260;
void RupeeLike(Entity* this) {
u32 uVar1;
@@ -258,7 +258,7 @@ void sub_08029770(Entity* this) {
temp = this->field_0x82.HALF.LO;
this->palette.b.b0 = temp;
this->damageType = 0x8d;
this->boundingBox = &gUnk_080FD260;
this->hitbox = &gUnk_080FD260;
InitializeAnimation(this, 2);
this->attachedEntity->spriteSettings.b.draw = TRUE;
InitializeAnimation(this->attachedEntity, 6);
src/enemy/slime.c
+1 -1
View File
@@ -29,7 +29,7 @@ extern u8 gUnk_080D16D0[4]; // Entity count per form
extern PosOffset gUnk_080D16D4[4];
extern u8 gEntCount;
extern EntityHandler gUnk_03003DB8;
extern EntityHandler gHitboxCount;
void Slime(Entity* this) {
EnemyFunctionHandler(this, gUnk_080D16A4);
src/enemy/smallPesto.c
+2 -2
View File
@@ -22,7 +22,7 @@ void sub_080317E0(Entity*);
void sub_080317F8(Entity*);
void sub_08031840(Entity*);
extern BoundingBox gUnk_080CE560;
extern Hitbox gUnk_080CE560;
void SmallPesto(Entity* this) {
gUnk_080CE530[GetNextFunction(this)](this);
@@ -123,7 +123,7 @@ void sub_080317F8(Entity* this) {
this->field_0x3c |= 0x10;
this->field_0x1c = 1;
this->direction = newDirection;
this->boundingBox = &gUnk_080CE560;
this->hitbox = &gUnk_080CE560;
sub_080317E0(this);
this->actionDelay = 0;
this->field_0xf = 0x20;
src/enemy/spearMoblin.c
+11 -11
View File
@@ -25,7 +25,7 @@ extern const s8 gUnk_080CC7C0[];
extern const u8 gUnk_080CC7D0[];
extern const u16 gUnk_080CC7D8[];
extern const BoundingBox* const gUnk_080CC944[];
extern const Hitbox* const gUnk_080CC944[];
void SpearMoblin(Entity* this) {
EnemyFunctionHandler(this, gUnk_080CC790);
@@ -195,7 +195,7 @@ void sub_08028488(Entity* this) {
void sub_08028528(Entity* this) {
Entity* ent = sub_08049DF4(1);
const BoundingBox* box;
const Hitbox* box;
if (ent == NULL) {
this->field_0xf = 0;
@@ -203,10 +203,10 @@ void sub_08028528(Entity* this) {
} else {
sub_080288C0(this);
box = gUnk_080CC944[this->animationState >> 1];
this->boundingBox->offset_x = box->offset_x;
this->boundingBox->offset_y = box->offset_y;
this->boundingBox->width = box->width;
this->boundingBox->height = box->height;
this->hitbox->offset_x = box->offset_x;
this->hitbox->offset_y = box->offset_y;
this->hitbox->width = box->width;
this->hitbox->height = box->height;
if (this->field_0x7a.HALF.LO != 0) {
this->field_0x7a.HALF.LO = 0;
@@ -361,14 +361,14 @@ bool32 sub_08028828(u32 arg0, u32 arg1) {
}
void sub_08028858(Entity* this) {
const BoundingBox* box;
const Hitbox* box;
sub_080288C0(this);
box = gUnk_080CC944[this->animationState >> 1];
this->boundingBox->offset_x = box->offset_x;
this->boundingBox->offset_y = box->offset_y;
this->boundingBox->width = box->width;
this->boundingBox->height = box->height;
this->hitbox->offset_x = box->offset_x;
this->hitbox->offset_y = box->offset_y;
this->hitbox->width = box->width;
this->hitbox->height = box->height;
if (this->field_0x82.HALF.LO == 0) {
this->nonPlanarMovement = 0;
src/enemy/spinyChuchu.c
+5 -5
View File
@@ -15,8 +15,8 @@ extern void (*const gUnk_080CBA40[])(Entity*);
extern const u8 gUnk_080CBA60[];
extern BoundingBox gUnk_080FD468;
extern BoundingBox gUnk_080FD470;
extern Hitbox gUnk_080FD468;
extern Hitbox gUnk_080FD470;
extern Entity* gUnk_020000B0;
@@ -38,7 +38,7 @@ void sub_0802244C(Entity* this) {
this->action = 2;
this->field_0xf = 0x3c;
this->damageType = 0x5c;
this->boundingBox = &gUnk_080FD468;
this->hitbox = &gUnk_080FD468;
InitializeAnimation(this, 0);
break;
case 8:
@@ -187,9 +187,9 @@ void sub_08022780(Entity* this) {
void sub_080227AC(Entity* this) {
GetNextFrame(this);
if (this->frames.all & 1) {
this->boundingBox = &gUnk_080FD470;
this->hitbox = &gUnk_080FD470;
} else {
this->boundingBox = &gUnk_080FD468;
this->hitbox = &gUnk_080FD468;
}
if (this->frames.all & 2) {
src/enemy/wisp.c
+2 -2
View File
@@ -36,8 +36,8 @@ void sub_08033564(Entity* this) {
this->flags &= 0x7f;
this->field_0x7c.HALF.LO = 0x27c;
gPlayerState.flags.all |= 0x4000;
gSave.stats.floorType = this->entityType.form + 1;
gSave.stats.field_0x20 = 600;
gSave.stats.effect = this->entityType.form + 1;
gSave.stats.effectTimer = 600;
if (this->entityType.form == 0) {
break;
}
src/entity.c
+8 -8
View File
@@ -78,7 +78,7 @@ extern void sub_0805EC60();
extern void sub_08017744();
extern void sub_0805E92C();
extern void UnloadCutsceneData();
extern void UnloadBoundingBox();
extern void UnloadHitbox();
extern void sub_0801DA0C();
extern void sub_0804AA1C();
extern void UnlinkEntity(); // Unlink
@@ -94,9 +94,9 @@ void DeleteEntity(Entity* ent) {
sub_08017744(ent);
sub_0805E92C(ent);
UnloadCutsceneData(ent);
UnloadBoundingBox(ent);
sub_0801DA0C(ent->otherEntity);
ent->otherEntity = NULL;
UnloadHitbox(ent);
sub_0801DA0C(ent->myHeap);
ent->myHeap = NULL;
if ((ent->entityType).type == 3) {
sub_0804AA1C(ent);
}
@@ -132,7 +132,7 @@ void ClearDeletedEntity(Entity* ent) {
gEntCount--;
}
extern EntityType gUnk_03003DB8;
extern EntityType gHitboxCount;
void DeleteAllEntities(void) {
Entity* ent;
@@ -187,16 +187,16 @@ void sub_0805E92C(u32 param_1) {
}
extern Entity gUnk_020369F0;
extern void _DmaCopy(const void* src, void* dest, size_t size); // dma copy
extern void MemCopy(const void* src, void* dest, size_t size); // dma copy
extern void sub_0805E98C(void);
void sub_0805E958(void) {
_DmaCopy(&gEntityLists, &gUnk_020369F0, 0x48);
MemCopy(&gEntityLists, &gUnk_020369F0, 0x48);
sub_0805E98C();
}
void sub_0805E974(void) {
_DmaCopy(&gUnk_020369F0, &gEntityLists, 0x48);
MemCopy(&gUnk_020369F0, &gEntityLists, 0x48);
}
void sub_0805E98C(void) {
src/ezloCap.c
+5 -5
View File
@@ -5,14 +5,14 @@
#include "save.h"
#include "script.h"
extern BoundingBox gUnk_080FD170;
extern Hitbox gUnk_080FD170;
extern u16* gUnk_08114144;
extern u32 gUnk_081141A4[];
extern u8 gUnk_081141E4[];
extern BoundingBox gUnk_08114154;
extern Hitbox gUnk_08114154;
extern void gUnk_08016030; // Cutscene data type?
extern void gUnk_0801606C; // Cutscene data type?
@@ -68,7 +68,7 @@ void NPC4E(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->spriteSettings.b.draw = 4;
this->boundingBox = &gUnk_080FD170;
this->hitbox = &gUnk_080FD170;
sub_0807DD50(this);
} else {
sub_0807DD94(this, 0);
@@ -176,7 +176,7 @@ void sub_0806DB84(
Entity* this,
u8 unused) { // The unused param just had to be added, so that a mov r1, #0 in NPC4E_Fusion is matching correctly
Entity* ent;
this->boundingBox = &gUnk_08114154;
this->hitbox = &gUnk_08114154;
ent = CreateObject(0x3e, 4, 0);
if (ent != NULL) {
PositionRelative(this, ent, -0x80000, 0);
@@ -270,7 +270,7 @@ void NPC4E_Fusion(Entity* this) {
break;
case 11:
sub_0806DB84(this, 0);
this->boundingBox = NULL;
this->hitbox = NULL;
break;
}
}
src/fileScreen.c
+10 -10
View File
@@ -92,7 +92,7 @@ void CreateDialogBox(u32 arg0, u32 arg1) {
struct_080FC844 var0;
sub_08050384();
_DmaCopy(&gUnk_080FC844, &var0, sizeof(gUnk_080FC844));
MemCopy(&gUnk_080FC844, &var0, sizeof(gUnk_080FC844));
sub_08056FEC(arg1, &gUnk_020227E8);
var0.unk10 |= gUnk_080FC85C[arg0][0] << 0xC;
sub_0805F46C(gUnk_080FC85C[arg0][1], &var0);
@@ -143,14 +143,14 @@ void LoadOptionsFromSave(u32 idx) {
void SetActiveSave(u32 idx) {
if (idx < NUM_SAVE_SLOTS) {
gUnk_02000000->saveFileId = idx;
_DmaCopy(&gUnk_02019EE0.saves[idx], &gSave, sizeof(gUnk_02019EE0.saves[idx]));
MemCopy(&gUnk_02019EE0.saves[idx], &gSave, sizeof(gUnk_02019EE0.saves[idx]));
}
LoadOptionsFromSave(idx);
}
void HandleChooseFileScreen(void) {
FlushSprites();
sScreenHandlers[gUnk_03001000.funcIndex]();
sScreenHandlers[gMain.funcIndex]();
if (gUnk_02032EC0.lastState != gUnk_02032EC0.state) {
gUnk_02032EC0.lastState = gUnk_02032EC0.state;
gScreen.bg.bg1Control = 0;
@@ -215,7 +215,7 @@ static void HandleFileScreenEnter(void) {
gScreen.controls.layerFXControl = BLDCNT_TGT1_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_EFFECT_BLEND;
gScreen.controls.alphaBlend = BLDALPHA_BLEND(15, 10);
gUnk_02024490.unk0 = 1;
gUnk_03001000.funcIndex = 1;
gMain.funcIndex = 1;
SoundReq(0x7);
DoFade(4, 8);
}
@@ -290,7 +290,7 @@ void sub_0805070C(void) {
sub_0805F7DC(playerName[j], var0);
}
// i is a struct of size 0x200
_DmaCopy(var0->unk8, (void*)(OBJ_VRAM0 + 0x4000 + i * 0x200), 0x200);
MemCopy(var0->unk8, (void*)(OBJ_VRAM0 + 0x4000 + i * 0x200), 0x200);
}
sub_0805F300(var0);
}
@@ -315,7 +315,7 @@ void sub_08050790(void) {
sub_0805F7DC(var1, var0);
var1++;
}
_DmaCopy(gUnk_02000D00, (void*)(BG_VRAM + i * 0x400), 0x400);
MemCopy(gUnk_02000D00, (void*)(BG_VRAM + i * 0x400), 0x400);
}
sub_0805F300(var0);
}
@@ -891,7 +891,7 @@ void sub_0805144C(void) {
void sub_08051458(void) {
sub_080503A8(gMenu.column_idx + 9);
_DmaCopy(&gUnk_02001B40, &gUnk_02022030, 0x400);
MemCopy(&gUnk_02001B40, &gUnk_02022030, 0x400);
}
u32 sub_080514BC(u32);
@@ -995,7 +995,7 @@ u32 sub_080514BC(u32 a1) {
void sub_08051574(u32 sfx) {
SoundReq(sfx);
_DmaCopy(&gSave, &gUnk_02019EE0.saves[gUnk_02019EE0.unk6], sizeof(gUnk_02019EE0.saves[gUnk_02019EE0.unk6]));
MemCopy(&gSave, &gUnk_02019EE0.saves[gUnk_02019EE0.unk6], sizeof(gUnk_02019EE0.saves[gUnk_02019EE0.unk6]));
sub_0805070C();
}
@@ -1146,7 +1146,7 @@ void sub_08051874(void) {
gUnk_02019EE0.saveStatus[gUnk_02019EE0.unk7] = temp;
switch (temp) {
case 1:
_DmaCopy(&gSave, &gUnk_02019EE0.saves[gUnk_02019EE0.unk7], sizeof(gUnk_02019EE0.saves[gUnk_02019EE0.unk7]));
MemCopy(&gSave, &gUnk_02019EE0.saves[gUnk_02019EE0.unk7], sizeof(gUnk_02019EE0.saves[gUnk_02019EE0.unk7]));
SetFileSelectState(0);
break;
case -1:
@@ -1176,7 +1176,7 @@ void HandleFileStart(void) {
gMenu.menuType = 1;
gUnk_02000000->messageSpeed = gSave.messageSpeed;
gUnk_02000000->brightnessPref = gSave.brightnessPref;
gUnk_03001000.funcIndex = 2;
gMain.funcIndex = 2;
DoFade(5, 8);
}
}
src/game.c
+5 -5
View File
@@ -53,7 +53,7 @@ void sub_0805212C(void) {
if (gFadeControl.active)
return;
if (gUnk_03001000.field_0x5 == 0) {
if (gMain.field_0x5 == 0) {
if (gMenu.focusCoords[0] >= 0x26) {
gMenu.focusCoords[0]--;
} else {
@@ -67,7 +67,7 @@ void sub_0805212C(void) {
}
}
} else {
gUnk_03001000.field_0x5--;
gMain.field_0x5--;
}
}
@@ -225,7 +225,7 @@ NONMATCH("asm/non_matching/game/sub_08052418.inc", void sub_08052418(int param_1
gUnk_020227E8._0[4].WORD = 0xf;
gUnk_020227E8._0[6].WORD = 0xf;
gUnk_020227E8._0[param_2 * 2].BYTES.byte1 = 1;
_DmaCopy(&gUnk_080FCA8C, &temp, sizeof(temp));
MemCopy(&gUnk_080FCA8C, &temp, sizeof(temp));
i = param_1 * 0xc;
// temp._0 = gBG1Buffer[gUnk_080FCAA4._8[param_1]][gUnk_080FCAA4._0[gUnk_02000000->gameLanguage + i]] * 2;
temp._13 = ((temp._13 & 0xfe) | gUnk_080FCAA4._8[i + 1]) & 1;
@@ -241,7 +241,7 @@ void InitializePlayer(void) {
MemClear32((void*)&gUnk_03000B80, 0x70);
MemClear32((void*)&gPlayerState, 0xb0);
_DmaFill32(0xffffffff, &gPlayerState.field_0x40, 0x40);
MemFill32(0xffffffff, &gPlayerState.field_0x40, 0x40);
pl = &gPlayerEntity;
MemClear32((void*)pl, 0x88);
gRoomControls.cameraTarget = pl;
@@ -284,7 +284,7 @@ void InitializePlayer(void) {
pl->collisionLayer = gScreenTransition.playerLayer;
UpdateSpriteForCollisionLayer(pl);
AppendEntityToList(pl, 1);
sub_08017640();
RegisterPlayerHitbox();
}
bool32 sub_08052620(u32 r0) {
src/intro.c
+3 -3
View File
@@ -54,14 +54,14 @@ static const u16 sLightRaysAlphaBlends[] = {
static u32 AdvanceIntroSequence(u32 transition) {
gUnk_02032EC0.lastState = transition;
gUnk_03001000.funcIndex = 2;
gMain.funcIndex = 2;
MemClear32(&gIntroState, sizeof(gIntroState));
DoFade(7, 8);
}
void HandleIntroScreen(void) {
FlushSprites();
switch (gUnk_03001000.funcIndex) {
switch (gMain.funcIndex) {
case 0:
MessageInitialize();
MemClear32(&gUnk_02032EC0, sizeof(gUnk_02032EC0));
@@ -75,7 +75,7 @@ void HandleIntroScreen(void) {
return;
}
sub_0801DA90(1);
gUnk_03001000.funcIndex = 1;
gMain.funcIndex = 1;
break;
}
sub_080AD918();
src/item11.c
+4 -4
View File
@@ -10,9 +10,9 @@ extern void sub_08018F6C(Entity*);
extern void (*const gUnk_080B3DD0[])(Entity*);
extern BoundingBox gUnk_080B3E18;
extern Hitbox gUnk_080B3E18;
extern u8 gUnk_080B3DE0[];
extern BoundingBox* gUnk_080B3DE8[];
extern Hitbox* gUnk_080B3DE8[];
void Item11(Entity* this) {
if (this->currentHealth) {
@@ -43,7 +43,7 @@ void sub_08018CBC(Entity* this) {
this->actionDelay = 0x56;
this->field_0x40 = 0x1c;
this->field_0x44 = 6;
this->boundingBox = &gUnk_080B3E18;
this->hitbox = &gUnk_080B3E18;
this->attachedEntity->spriteOffsetX = 0;
this->attachedEntity->spriteSettings.b.draw = 0;
} else {
@@ -59,7 +59,7 @@ void sub_08018CBC(Entity* this) {
this->actionDelay = gUnk_080B3DE0[(this->entityType).form * 2];
this->field_0x44 = gUnk_080B3DE0[(this->entityType).form * 2 + 1];
this->field_0x40 = 0x1b;
this->boundingBox = gUnk_080B3DE8[(this->entityType).form];
this->hitbox = gUnk_080B3DE8[(this->entityType).form];
(u32*)gPlayerEntity.field_0x70.WORD = this;
sub_08078CD0(&gPlayerEntity);
(u32*)gPlayerEntity.field_0x70.WORD = pEVar3;
src/item14.c
+2 -2
View File
@@ -4,7 +4,7 @@
#include "room.h"
extern void (*const gUnk_08109AC8[])(Entity*);
extern BoundingBox gUnk_08109AD0;
extern Hitbox gUnk_08109AD0;
extern u8 gUnk_08003E44;
void sub_0805FC74(Entity*);
@@ -18,7 +18,7 @@ void sub_0805FBE8(Entity* this) {
this->action++;
this->spriteSettings.b.draw = TRUE;
this->field_0x3c = gPlayerEntity.field_0x3c + 1;
this->boundingBox = &gUnk_08109AD0;
this->hitbox = &gUnk_08109AD0;
this->nonPlanarMovement = 0x380;
this->animationState = this->animationState & 0x7f;
if (this->collisionLayer == 2) {
src/main.c
+16 -16
View File
@@ -36,7 +36,7 @@ void MainLoop(void) {
MessageInitialize();
sub_080ADD30();
gRand = 0x1234567;
MemClear32(&gUnk_03001000, sizeof(gUnk_03001000));
MemClear32(&gMain, sizeof(gMain));
InitScreen(SCREEN_INTRO);
while (1) {
ReadKeyInput();
@@ -44,28 +44,28 @@ void MainLoop(void) {
DoSoftReset();
}
switch (gUnk_03001000.field_0x1) {
switch (gMain.field_0x1) {
case 1:
sub_08056260();
break;
case 0:
default:
if (gUnk_03001000.countdown != 0) {
if (gMain.countdown != 0) {
do {
VBlankIntrWait();
} while (--gUnk_03001000.countdown);
} while (--gMain.countdown);
}
if (gUnk_03001000.field_0x9 != 0) {
gUnk_03001000.field_0x9--;
var0 = gUnk_03001000.field_0xa;
if (gMain.field_0x9 != 0) {
gMain.field_0x9--;
var0 = gMain.field_0xa;
while (var0-- > 0) {
VBlankIntrWait();
}
}
gUnk_03001000.ticks++;
sScreenHandlers[gUnk_03001000.screen]();
gMain.ticks++;
sScreenHandlers[gMain.screen]();
MessageUpdate();
sub_08050154();
sub_080A3480();
@@ -95,12 +95,12 @@ static void sub_08055F70(void) {
MemClear32(gUnk_02000030, size);
size = (u32)gUnk_080B2CD8 - (u32)sub_080B197C;
if (size != 0) {
_DmaCopy(sub_080B197C, gUnk_030056F0, size);
MemCopy(sub_080B197C, gUnk_030056F0, size);
}
size = (u32)gUnk_080B2CD8_2 - (u32)gUnk_080B2CD8_3;
if (size != 0) {
_DmaCopy(gUnk_080B2CD8_3, gUnk_02038560, size);
MemCopy(gUnk_080B2CD8_3, gUnk_02038560, size);
}
sub_0801DA90(0);
@@ -114,9 +114,9 @@ static bool32 SoftResetKeysPressed(void) {
}
void InitScreen(u32 screen) {
gUnk_03001000.screen = screen;
gUnk_03001000.funcIndex = 0;
gUnk_03001000.transition = 0;
gMain.screen = screen;
gMain.funcIndex = 0;
gMain.transition = 0;
}
void DisableInterruptsAndDMA(void) {
@@ -172,7 +172,7 @@ NONMATCH("asm/non_matching/sub_080560B8.inc", void sub_080560B8(void)) {
case 0:
case -1:
default:
_DmaCopy(&sDefaultSettings, (void*)0x2000000, 16);
MemCopy(&sDefaultSettings, (void*)0x2000000, 16);
sub_0807CF10((u8*)0x2000000);
break;
}
@@ -245,7 +245,7 @@ void sub_08056260(void) {
REG_IME = 0;
REG_IE = temp;
REG_IME = 1;
temp2 = &gUnk_03001000;
temp2 = &gMain;
asm("ldrb r1, [r0, #0x1]");
temp2->field_0x1 = 0;
}
src/manager/manager39.c
+2 -2
View File
@@ -25,7 +25,7 @@ extern const u8 gUnk_08108E30[0x18];
extern const u8 gUnk_08108E48[0x18];
extern const u8 gUnk_08108E60[];
extern void _DmaCopy(const void* src, void* dest, u32 size);
extern void MemCopy(const void* src, void* dest, u32 size);
extern void sub_0805F46C(void*, const void*);
extern u32 CheckIsDungeon(void);
extern void sub_0805E5B4(void);
@@ -82,7 +82,7 @@ void sub_0805E1F8(u32 unk0, u32 unk1) {
} PACKED tmp;
const u8* tmp2;
MemClear32(&gUnk_02034DF0, 0x80);
_DmaCopy(gUnk_08108E60, &tmp, sizeof(tmp));
MemCopy(gUnk_08108E60, &tmp, sizeof(tmp));
tmp.unk_04 = unk0 >> 8;
tmp.unk_05 = unk0;
tmp2 = gUnk_08108E48;
src/manager/managerC.c
+2 -2
View File
@@ -45,7 +45,7 @@ void sub_08058D34(void);
extern void sub_0805622C(struct BgAffineDstData*, u32, u32);
extern void sub_08052D74(void*, void*, void*);
extern void sub_080044AE(Entity*, u32, u32);
extern void _DmaCopy(const void* src, void* dest, u32 size);
extern void MemCopy(const void* src, void* dest, u32 size);
extern u8 gUnk_03003DE4[0xC];
@@ -281,7 +281,7 @@ void sub_08058CFC() {
#ifdef NON_MATCHING
void sub_08058D34() {
LoadPaletteGroup(0x28);
_DmaCopy(gUnk_02017700, gUnk_02017700 + 0x240, 0x20);
MemCopy(gUnk_02017700, gUnk_02017700 + 0x240, 0x20);
gUsedPalettes |= 0x200000;
LoadGfxGroup(0x16);
gScreen.lcd.displayControl |= 1;
src/npc/beedle.c
+2 -2
View File
@@ -14,7 +14,7 @@ typedef struct {
extern void sub_08078850(Entity*, u32, s8, gUnk_0810C89C_struct*);
extern u8 gUnk_0810C88C[];
extern BoundingBox gUnk_0810C894;
extern Hitbox gUnk_0810C894;
extern gUnk_0810C89C_struct gUnk_0810C89C[];
extern SpriteLoadData gUnk_0810C8D4;
extern void (*gUnk_0810C8E0[])(Entity*);
@@ -100,7 +100,7 @@ void sub_08063410(Entity* this) {
}
this->action++;
if (this->entityType.form != 0) {
this->boundingBox = &gUnk_0810C894;
this->hitbox = &gUnk_0810C894;
this->entityType.parameter = 0;
}
sub_0807DD64(this);
src/npc/townsperson.c
+1 -1
View File
@@ -256,7 +256,7 @@ void sub_08061F94(Entity* this) {
}
void sub_08061FB0(Entity* this) {
this->boundingBox = NULL;
this->hitbox = NULL;
}
void sub_08061FB8(Entity* this, struct_08061FB8* arg1) {
src/npc/wheaton.c
+2 -2
View File
@@ -3,7 +3,7 @@
extern void sub_0805E3A0(Entity*, u32);
extern void ResolveEntityOnTop(Entity*, Entity*);
extern BoundingBox gUnk_0810C3C0;
extern Hitbox gUnk_0810C3C0;
extern void sub_0807DD64(Entity*);
extern void sub_0807DD94(Entity*, u32);
@@ -15,7 +15,7 @@ void Wheaton(Entity* this) {
ResolveEntityOnTop(this, this);
this->boundingBox = &gUnk_0810C3C0;
this->hitbox = &gUnk_0810C3C0;
this->spriteOffsetY = 0xfe;
src/object/heartContainer.c
+2 -2
View File
@@ -18,7 +18,7 @@ static void (*const gHeartContainerActions[])(Entity*) = {
sub_0808E764,
};
extern BoundingBox gUnk_08121C58;
extern Hitbox gUnk_08121C58;
void HeartContainer(Entity* this) {
gHeartContainerActions[this->action](this);
@@ -31,7 +31,7 @@ static void sub_0808E6A0(Entity* this) {
this->action = 1;
this->entityType.form = 0x62;
this->spriteSettings.b.draw = 0;
this->boundingBox = &gUnk_08121C58;
this->hitbox = &gUnk_08121C58;
this->collisionLayer = 3;
this->scriptedScene = 3;
}
src/object/houseDoorExterior.c
+3 -3
View File
@@ -29,7 +29,7 @@ extern u32 sub_080562CC(u32, u32, u32, u32);
extern void sub_08078AC0(u32, u32, u32);
extern void (*const gUnk_081206B4[])(Entity*);
extern BoundingBox gUnk_081206AC; // TODO: should be const
extern Hitbox gUnk_081206AC; // TODO: should be const
void HouseDoorExterior(Entity* this) {
gUnk_081206B4[this->entityType.parameter](this);
@@ -97,7 +97,7 @@ static void sub_0808681C(Entity* this) {
this->actionDelay = 8;
this->spriteSettings.b.draw = 1;
this->frameIndex = 0;
this->boundingBox = &gUnk_081206AC;
this->hitbox = &gUnk_081206AC;
if (this->previousActionFlag == 1) {
this->action = 2;
this->frameIndex = 1;
@@ -126,7 +126,7 @@ void sub_080868B0(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->spriteSettings.b.draw = 1;
this->boundingBox = &gUnk_081206AC;
this->hitbox = &gUnk_081206AC;
this->actionDelay = 8;
}
ExecuteScriptCommandSet(this, *(ScriptExecutionContext**)&this->cutsceneBeh);
src/object/itemOnGround.c
+2 -2
View File
@@ -24,7 +24,7 @@ extern void (*const gUnk_0811E7D4[])(Entity*);
extern void (*const gUnk_0811E7E8[])(Entity*);
extern void (*const gUnk_0811E814[])(Entity*);
extern void (*const gUnk_0811E840[])(Entity*);
extern BoundingBox gUnk_080FD1A8;
extern Hitbox gUnk_080FD1A8;
typedef struct {
u8 unk0[3];
@@ -95,7 +95,7 @@ void sub_08080F20(Entity* this) {
this->field_0x3c = 0x47;
this->field_0x40 = 0x44;
this->currentHealth = 0xFF;
this->boundingBox = &gUnk_080FD1A8;
this->hitbox = &gUnk_080FD1A8;
switch (this->entityType.form - 0x3F) {
case 0:
case 21:
src/object/lightableSwitch.c
+3 -3
View File
@@ -16,7 +16,7 @@ extern void (*const gUnk_081243B4[])(Entity*);
extern void (*const gUnk_081243BC[])(Entity*);
extern void (*const gUnk_081243C4[])(Entity*);
extern BoundingBox gUnk_080FD150;
extern Hitbox gUnk_080FD150;
void LightableSwitch(Entity* this) {
gUnk_081243B4[this->entityType.form](this);
@@ -35,7 +35,7 @@ void sub_0809EA34(Entity* this) {
this->field_0x40 = 0x48;
this->damageType = 0x28;
this->flags2 = 10;
this->boundingBox = &gUnk_080FD150;
this->hitbox = &gUnk_080FD150;
sub_0809EAD8(this);
UpdateSpriteForCollisionLayer(this);
sub_0809EABC(this);
@@ -107,7 +107,7 @@ void sub_0809EB80(Entity* this) {
this->field_0x40 = 0x48;
this->damageType = 0x28;
this->flags2 = 10;
this->boundingBox = &gUnk_080FD150;
this->hitbox = &gUnk_080FD150;
sub_0809EAD8(this);
UpdateSpriteForCollisionLayer(this);
if (CheckFlags(this->cutsceneBeh.HWORD) != 0) {
src/object/metalDoor.c
+2 -2
View File
@@ -14,7 +14,7 @@ extern void SetTile(u32, u32, u32);
extern void (*const gUnk_0812493C[])(Entity*);
extern BoundingBox gUnk_080FD180;
extern Hitbox gUnk_080FD180;
void MetalDoor(Entity* this) {
gUnk_0812493C[this->action](this);
@@ -29,7 +29,7 @@ void sub_080A0684(Entity* this) {
this->spriteSettings.b.draw = 0;
this->frameIndex = 0;
this->spriteSettings.b.flipY = 1;
this->boundingBox = &gUnk_080FD180;
this->hitbox = &gUnk_080FD180;
this->spritePriority.b0 = 5;
this->field_0x70.HALF.LO = this->x.HALF.HI;
this->field_0x70.HALF.HI = this->y.HALF.HI;
src/object/minecart.c
+2 -2
View File
@@ -22,7 +22,7 @@ typedef struct {
extern void (*const gUnk_081223A8[])(Entity*);
extern struct_030010EC gUnk_030010EC[];
extern BoundingBox gUnk_080FD310;
extern Hitbox gUnk_080FD310;
extern const s8 gUnk_081223C8[];
extern const u32 gUnk_081223D8[];
@@ -44,7 +44,7 @@ void sub_080916EC(Entity* this) {
this->animationState = unk->field_0x5;
this->entityType.parameter = unk->field_0x6;
this->action = 1;
this->boundingBox = &gUnk_080FD310;
this->hitbox = &gUnk_080FD310;
this->flags |= 0x80;
this->damageType = 1;
this->field_0x3c = 0x47;
src/object/mineralWaterSource.c
+4 -4
View File
@@ -12,7 +12,7 @@ typedef struct {
extern UnkStruct_MineralWater MineralWaterSourceParameters[];
extern bool32 AllocMutableBBox(Entity*);
extern bool32 AllocMutableHitbox(Entity*);
void MineralWaterSource(Entity* this) {
MineralWaterSourceActionFuncs[this->action](this);
@@ -21,7 +21,7 @@ void MineralWaterSource(Entity* this) {
void MineralWaterSource_Init(Entity* this) {
UnkStruct_MineralWater* unknownParameters;
if (!AllocMutableBBox(this)) {
if (!AllocMutableHitbox(this)) {
return;
}
@@ -30,8 +30,8 @@ void MineralWaterSource_Init(Entity* this) {
this->entityType.parameter = unknownParameters->field_0x00;
this->field_0x40 = unknownParameters->field_0x03;
this->boundingBox->width = unknownParameters->field_0x01;
this->boundingBox->height = unknownParameters->field_0x02;
this->hitbox->width = unknownParameters->field_0x01;
this->hitbox->height = unknownParameters->field_0x02;
this->flags |= 0x80;
src/object/object1A.c
+2 -2
View File
@@ -6,7 +6,7 @@ extern void sub_08086A6C();
extern void (*gUnk_081206C4[99])(Entity*);
extern BoundingBox gUnk_080FD1A8;
extern Hitbox gUnk_080FD1A8;
// Main
void Object1A(Entity* ent) {
@@ -18,7 +18,7 @@ void sub_080869DC(Entity* ent) {
ent->action = 1;
ent->spriteSettings.b.draw = 0;
ent->boundingBox = &gUnk_080FD1A8;
ent->hitbox = &gUnk_080FD1A8;
ent->field_0x3c |= 16;
itemEntity = CreateObject(0, ent->entityType.form, 0);
if (itemEntity != NULL) {
src/object/object49.c
+4 -4
View File
@@ -234,10 +234,10 @@ void sub_0808F498(Entity* this) {
this->action = 1;
this->actionDelay = 64;
var0 = this->entityType.parameter != 0 ? 44 : 43;
this->x.HALF.HI -= this->parent->boundingBox->width;
this->x.HALF.HI += (s32)Random() % (this->parent->boundingBox->width * 2);
this->y.HALF.HI -= this->parent->boundingBox->height;
this->y.HALF.HI += (s32)Random() % (this->parent->boundingBox->height * 2);
this->x.HALF.HI -= this->parent->hitbox->width;
this->x.HALF.HI += (s32)Random() % (this->parent->hitbox->width * 2);
this->y.HALF.HI -= this->parent->hitbox->height;
this->y.HALF.HI += (s32)Random() % (this->parent->hitbox->height * 2);
sub_0801D2B4(this, var0);
InitializeAnimation(this, 4);
}
src/object/object9E.c
+2 -2
View File
@@ -2,7 +2,7 @@
#include "entity.h"
#include "room.h"
extern BoundingBox gUnk_080FD168;
extern Hitbox gUnk_080FD168;
extern void SetTile(u32, u32, u32);
@@ -23,7 +23,7 @@ void Object9E(Entity* this) {
this->field_0x40 = 0x48;
this->damageType = 0x7a;
this->flags2 = 1;
this->boundingBox = &gUnk_080FD168;
this->hitbox = &gUnk_080FD168;
tilePos = COORD_TO_TILE(this);
SetTile(0x4066, tilePos - 1, *layer);
SetTile(0x4065, tilePos, *layer);
src/object/objectA.c
+2 -2
View File
@@ -4,7 +4,7 @@
#include "flags.h"
#include "functions.h"
extern BoundingBox gUnk_080FD170;
extern Hitbox gUnk_080FD170;
extern u8 gUnk_02000070;
@@ -13,7 +13,7 @@ void ObjectA(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->boundingBox = &gUnk_080FD170;
this->hitbox = &gUnk_080FD170;
if (this->collisionLayer == 1) {
uVar2 = 0x26;
} else {

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