mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-05 13:43:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #436 from octorock/rename-arm

Browse Source 
Use same names for arm functions and their trampolines
This commit is contained in:
notyourav
2022-03-08 17:22:42 -08:00
committed by GitHub
parent 5df0c09ac6 8f678d15ed
commit c330470f91
98 changed files with 476 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/beanstalkSubtask.s
+7 -7
View File
@@ -331,7 +331,7 @@ _0801989E:
mov r1, sb
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0xff
bne _0801997C
ldr r0, [r7, #0x30]
@@ -429,7 +429,7 @@ _0801997C:
cmp r6, r0
bhi _080199EC
adds r0, r6, #0
bl sub_080002E4
bl sub_080B1B54
adds r4, r0, #0
b _080199EE
.align 2, 0
@@ -724,7 +724,7 @@ _08019BE6:
adds r0, #0x38
ldrb r1, [r0]
adds r0, r7, #0
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0xf
beq _08019BF8
b _0801A2A4
@@ -1660,7 +1660,7 @@ sub_0801A2B0: @ 0x0801A2B0
ldrb r1, [r0]
adds r0, r4, #0
bl GetTileType
bl sub_080002E4
bl sub_080B1B54
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
adds r1, r0, #0
@@ -1780,7 +1780,7 @@ _0801A3D6:
ldrb r1, [r0]
adds r0, r4, #0
bl GetTileType
bl sub_080002E4
bl sub_080B1B54
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
cmp r0, #0x52
@@ -1864,7 +1864,7 @@ sub_0801A458: @ 0x0801A458
ldrb r1, [r0]
adds r0, r4, #0
bl GetTileType
bl sub_080002E4
bl sub_080B1B54
cmp r0, #0x52
beq _0801A4F0
cmp r0, #0x52
@@ -2576,7 +2576,7 @@ sub_0801A980: @ 0x0801A980
cmp r1, r0
bhi _0801A9DC
adds r0, r1, #0
bl sub_080002E4
bl sub_080B1B54
_0801A9DC:
movs r0, #0
pop {r4, r5, r6, r7, pc}
asm/code_08000F10.s
+2 -2
View File
@@ -7,7 +7,7 @@
thumb_func_start CheckBits
CheckBits: @ 0x08000F10
ldr r3, _08000F50 @ =gUnk_03005E60
ldr r3, _08000F50 @ =ram_CheckBits
bx r3
thumb_func_start sub_08000F14
@@ -48,4 +48,4 @@ _08000F40:
pop {r4, r5, r6, r7}
bx lr
.align 2, 0
_08000F50: .4byte gUnk_03005E60
_08000F50: .4byte ram_CheckBits
asm/code_08001A7C.s
+2 -2
View File
@@ -855,12 +855,12 @@ gUnk_080026A4::
.4byte gUnk_020000B0 @ enemy target? (player)
.4byte gEntityLists - 8 @ first linked list
.4byte gEntityLists + 64 @ last linked list
.4byte gUnk_03005FBC @ entity table
.4byte ram_sub_080B2248 @ entity table
@ managers
.4byte gUnk_020000B0
.4byte gEntityLists + 56
.4byte gCollidableCount
.4byte gUnk_03005FBC
.4byte ram_sub_080B2248
thumb_func_start sub_080026C4
sub_080026C4: @ 0x080026C4
asm/code_080043E8.s
+7 -7
View File
@@ -82,7 +82,7 @@ _08004482:
thumb_func_start sub_08004484
sub_08004484: @ 0x08004484
ldr r2, _080044DC @ =gUnk_03005FF0
ldr r2, _080044DC @ =ram_sub_080B227C
bx r2
thumb_func_start EnqueueSFX
@@ -133,7 +133,7 @@ _080044CC:
b _080044C8
.align 2, 0
_080044D8: .4byte gPlayerEntity
_080044DC: .4byte gUnk_03005FF0
_080044DC: .4byte ram_sub_080B227C
_080044E0: .4byte gUnk_02024048
_080044E4: .4byte gUnk_02021F20
_080044E8: .4byte gPlayerEntity
@@ -170,7 +170,7 @@ _08004516:
thumb_func_start sub_0800451C
sub_0800451C: @ 0x0800451C
push {r0, lr}
bl sub_080002B8
bl sub_080B1AA8
adds r1, r0, #0
pop {r0, r3}
mov lr, r3
@@ -266,7 +266,7 @@ sub_080045B4: @ 0x080045B4
ldrsh r1, [r0, r3]
movs r3, #0x2e
ldrsh r0, [r0, r3]
ldr r3, _08004690 @ =gUnk_030060F0
ldr r3, _08004690 @ =ram_CalcCollisionDirection
bx r3
thumb_func_start GetFacingDirection
@@ -283,7 +283,7 @@ GetFacingDirection: @ 0x080045C4
thumb_func_start CalculateDirectionTo
CalculateDirectionTo: @ 0x080045D4
mov ip, r3
ldr r3, _08004694 @ =gUnk_030060F0
ldr r3, _08004694 @ =ram_CalcCollisionDirection
bx r3
non_word_aligned_thumb_func_start sub_080045DA
@@ -362,8 +362,8 @@ gUnk_0800464E::
.byte 0x1E, 0x1D, 0x1C, 0x00, 0x00, 0x00, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x00, 0x00, 0x00, 0x10, 0x11
.byte 0x12, 0x13, 0x14, 0x00, 0x00, 0x00, 0x18, 0x17, 0x16, 0x15, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00
_08004690: .4byte gUnk_030060F0
_08004694: .4byte gUnk_030060F0
_08004690: .4byte ram_CalcCollisionDirection
_08004694: .4byte ram_CalcCollisionDirection
_08004698: .4byte gUnk_080C93E0
_0800469C: .4byte 0x00000106
_080046A0: .4byte 0x00000280
asm/crt0.s
+1 -1
View File
@@ -39,7 +39,7 @@ _080000F0:
sp_irq: .4byte gUnk_03007FA0
sp_usr: .4byte gUnk_03007F00
INTR_VECTOR_BUF: .4byte 0x03007FFC
intr_main: .4byte gIntrMain
intr_main: .4byte ram_IntrMain
.ifdef EU
unk_function: .4byte sub_08000118
.else
asm/intr.s
+96 -79
View File
@@ -54,53 +54,59 @@ _080B19C4: .4byte 0x80000020
_080B19C8: .4byte 0x040000D4
@ r0 = entity*
arm_func_start _GetTileAtEntityPos
_GetTileAtEntityPos: @ 0x080B19CC
arm_func_start arm_GetTileAtEntityPos
arm_GetTileAtEntityPos: @ 0x080B19CC
ldrb r2, [r0, #0x38] @ obj layer
ldrh r1, [r0, #0x32] @ obj y
ldrh r0, [r0, #0x2e] @ obj x
ldr ip, _080B1C10 @ =gRoomControls
arm_sub_080B19D8:
ldrh r3, [ip, #6]
sub r0, r0, r3 @ obj x - room x
ldrh r3, [ip, #8]
sub r1, r1, r3 @ obj y - room y
arm_sub_080B19EC:
lsl r0, r0, #0x16
lsr r0, r0, #0x1a
lsl r1, r1, #0x16
lsr r1, r1, #0x1a
arm_sub_080B19FC:
add r0, r0, r1, lsl #6
mov r1, r2
arm_sub_080B1A04:
ldr r2, _080B1C14 @ =gUnk_08000258
b _080B1A64
arm_func_start sub_080B1A0C
sub_080B1A0C: @ 0x080B1A0C
arm_func_start arm_sub_080B1A0C
arm_sub_080B1A0C: @ 0x080B1A0C
ldrh r3, [r0, #0x2e]
add r3, r3, r1
ldrh r1, [r0, #0x32]
add r1, r1, r2
ldrb r2, [r0, #0x38]
mov r0, r3
b _080B1A34
_080B1A28:
b arm_GetTileTypeByPos
arm_GetTileTypeByEntity:
ldrb r2, [r0, #0x38]
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
_080B1A34:
arm_GetTileTypeByPos:
ldr ip, _080B1C18 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
ldrh r3, [ip, #8]
sub r1, r1, r3
arm_sub_080B1A48:
lsl r0, r0, #0x16
lsr r0, r0, #0x1a
lsl r1, r1, #0x16
lsr r1, r1, #0x1a
arm_sub_080B1A58:
add r0, r0, r1, lsl #6
mov r1, r2
arm_func_start _GetTileType
_GetTileType: @ 0x080B1A60
arm_func_start arm_GetTileType
arm_GetTileType: @ 0x080B1A60
ldr r2, _080B1C1C @ =gUnk_08000228
_080B1A64:
add r2, r2, r1, lsl #3
@@ -114,76 +120,82 @@ _080B1A64:
ldrh r0, [r1, r0]
bx lr
arm_func_start sub_080B1A8C
sub_080B1A8C: @ 0x080B1A8C
arm_func_start arm_sub_080B1A8C
arm_sub_080B1A8C: @ 0x080B1A8C
ldrh r3, [r0, #0x2e]
add r3, r3, r1
ldrh r1, [r0, #0x32]
add r1, r1, r2
ldrb r2, [r0, #0x38]
mov r0, r3
b _080B1AB4
_080B1AA8:
b arm_sub_080B1AB4
arm_sub_080B1AA8:
ldrb r2, [r0, #0x38]
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
_080B1AB4:
arm_sub_080B1AB4:
ldr ip, _080B1C20 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
ldrh r3, [ip, #8]
sub r1, r1, r3
arm_sub_080B1AC8:
lsl r0, r0, #0x16
lsr r0, r0, #0x1a
lsl r1, r1, #0x16
lsr r1, r1, #0x1a
arm_sub_080B1AD8:
add r0, r0, r1, lsl #6
mov r1, r2
arm_sub_080B1AE0:
ldr r2, _080B1C24 @ =gUnk_08000278
ldr r2, [r2, r1, lsl #2]
ldrb r0, [r2, r0]
bx lr
arm_func_start sub_080B1AF0
sub_080B1AF0: @ 0x080B1AF0
arm_func_start arm_sub_080B1AF0
arm_sub_080B1AF0: @ 0x080B1AF0
ldrh r3, [r0, #0x2e]
add r3, r3, r1
ldrh r1, [r0, #0x32]
add r1, r1, r2
ldrb r2, [r0, #0x38]
mov r0, r3
b _080B1B18
_080B1B0C:
b arm_sub_080B1B18
arm_sub_080B1B0C:
ldrb r2, [r0, #0x38]
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
_080B1B18:
arm_sub_080B1B18:
ldr ip, _080B1C28 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
ldrh r3, [ip, #8]
sub r1, r1, r3
arm_sub_080B1B2C:
lsl r0, r0, #0x16
lsr r0, r0, #0x1a
lsl r1, r1, #0x16
lsr r1, r1, #0x1a
arm_sub_080B1B3C:
add r0, r0, r1, lsl #6
mov r1, r2
arm_sub_080B1B44:
ldr r2, _080B1C2C @ =gUnk_08000248
ldr r1, [r2, r1, lsl #2]
ldrb r0, [r1, r0]
bx lr
arm_func_start sub_080B1B54
sub_080B1B54: @ 0x080B1B54
arm_func_start arm_sub_080B1B54
arm_sub_080B1B54: @ 0x080B1B54
lsls r0, r0, #0x12
ldrlo r1, _080B1C30 @ =gUnk_080B37A0
ldrhs r1, _080B1C34 @ =gUnk_080B7910
ldrb r0, [r1, r0, lsr #18]
bx lr
arm_func_start sub_080B1B68
sub_080B1B68: @ 0x080B1B68
arm_func_start arm_sub_080B1B68
arm_sub_080B1B68: @ 0x080B1B68
lsrs r2, r0, #0xe
bxne lr
ldr r2, _080B1C38 @ =gUnk_0800022C
@@ -192,10 +204,10 @@ sub_080B1B68: @ 0x080B1B68
ldrh r0, [r1, r0]
bx lr
arm_func_start sub_080B1B84
sub_080B1B84: @ 0x080B1B84
arm_func_start arm_sub_080B1B84
arm_sub_080B1B84: @ 0x080B1B84
mov ip, lr
bl _GetTileType
bl arm_GetTileType
lsls r0, r0, #0x12
ldrlo r1, _080B1C3C @ =gUnk_08000360
ldrhs r1, _080B1C40 @ =gUnk_080B7A3E
@@ -203,11 +215,11 @@ sub_080B1B84: @ 0x080B1B84
ldrh r0, [r1, r0]
bx ip
arm_func_start sub_080B1BA4
sub_080B1BA4: @ 0x080B1BA4
arm_func_start arm_sub_080B1BA4
arm_sub_080B1BA4: @ 0x080B1BA4
mov ip, lr
mov r3, r2
bl _GetTileType
bl arm_GetTileType
lsls r0, r0, #0x12
ldrlo r1, _080B1C44 @ =gUnk_08000360
ldrhs r1, _080B1C48 @ =gUnk_080B7A3E
@@ -523,15 +535,16 @@ _080B1FB4:
arm_func_start sub_080B1FE4
sub_080B1FE4: @ 0x080B1FE4
ldrb r6, [r4, #0x15]
_080B1FE8:
bx lr
_080B1FEC: .4byte gUnk_03005D5C
_080B1FF0: .4byte gUnk_03005CA4
_080B1FF4: .4byte gUnk_03005CD0
_080B1FF8: .4byte gUnk_03005CFC
_080B1FFC: .4byte gUnk_03005D5C
_080B2000: .4byte gUnk_03005D24
_080B2004: .4byte gUnk_03005D18
_080B2008: .4byte gUnk_03005D58
_080B1FEC: .4byte ram_sub_080B1FE8
_080B1FF0: .4byte ram_sub_080B1F30
_080B1FF4: .4byte ram_sub_080B1F5C
_080B1FF8: .4byte ram_sub_080B1F88
_080B1FFC: .4byte ram_sub_080B1FE8
_080B2000: .4byte ram_sub_080B1FB0
_080B2004: .4byte ram_sub_080B1FA4
_080B2008: .4byte ram_sub_080B1FE4
_080B200C: .4byte gCollidableList
_080B2010: .4byte gCollidableCount
_080B2014: .4byte gCollisionMtx
@@ -571,7 +584,7 @@ _080B2074:
bic r3, r3, #0xdf
orr r3, r3, #0x1f
msr cpsr_fc, r3
ldr r1, _080B20E8 @ =gUnk_030067E4
ldr r1, _080B20E8 @ =ram_gUnk_080B2A70
ldr r0, [r1, ip]
stmdb sp!, {lr}
mov lr, pc
@@ -597,10 +610,10 @@ _080B20E0:
b _080B20E0
.align 2, 0
_080B20E4: .4byte 0x0000208C
_080B20E8: .4byte gUnk_030067E4
_080B20E8: .4byte ram_gUnk_080B2A70
arm_func_start sub_080B20EC
sub_080B20EC: @ 0x080B20EC
arm_func_start arm_CheckBits
arm_CheckBits: @ 0x080B20EC
add r3, r0, r1, lsr #3
and r1, r1, #7
ldr r0, _080B21A4 @ =0x01010101
@@ -657,6 +670,7 @@ _080B21A4: .4byte 0x01010101
_080B21A8: .4byte 0x02000000 + 6 @ brightness preference
_080B21AC: .4byte gUnk_08000F54
_ClearAndUpdateEntities:
ldr r11, _080B2270 @ =gUpdateContext
ldr r1, [r11]
ldm r1, {r7, r8, r9, r10}
@@ -672,8 +686,8 @@ _080B21AC: .4byte gUnk_08000F54
@ void* restore_sp;
@ }
arm_func_start UpdateEntities_arm
UpdateEntities_arm: @ 0x080B21B0
arm_func_start _UpdateEntities
_UpdateEntities: @ 0x080B21B0 @
@ UpdateEntities starts here
@ arg0 (r0) : 0 = entities, 1 = managers
ldr r1, _080B2274 @ =gUnk_080026A4
@@ -1100,13 +1114,13 @@ _080B1B64:
eor r2, r2, r3
and r2, r2, #6
_080B1B74:
ldr r3, _080B2A48 @ =gUnk_030068CC
ldr r3, _080B2A48 @ =ram_0x80b2b58
add r2, r1, r2, lsl #1
ldr sl, [r3, r2]
push {r4, r8, sb}
mov r8, #0
and sb, sb, #0xc00
bl _080B2874
bl sub_080B2874
pop {r4, r8, sb, lr}
b _080B2718
_080B1B98:
@@ -1169,7 +1183,7 @@ _080B1C5C:
ldrsh r0, [r4]
asr r6, r0, #6
and r1, r0, #7
ldr sl, _080B2A54 @ =gUnk_0300694C
ldr sl, _080B2A54 @ =ram_0x80b2bd8
ldr sl, [sl, r1, lsl #2]
ldrsh r0, [r4, #2]
asr r7, r0, #6
@@ -1177,7 +1191,7 @@ _080B1C5C:
lsl sb, r1, #0xa
mov r8, #0
push {r4, r5}
bl _080B2874
bl sub_080B2874
pop {r4, r5}
add r4, r4, #4
subs r5, r5, #1
@@ -1231,13 +1245,13 @@ _080B1B64:
eor r2, r2, r3
and r2, r2, #6
_080B1B74:
ldr r3, _080B2A48 @ =gUnk_030068CC
ldr r3, _080B2A48 @ =ram_0x80b2b58
add r2, r1, r2, lsl #1
ldr sl, [r3, r2]
push {r4, r8, sb}
mov r8, #0
and sb, sb, #0xc00
bl _080B2874
bl sub_080B2874
pop {r4, r8, sb, lr}
b _080B2718
_080B1B98:
@@ -1300,7 +1314,7 @@ _080B1C5C:
ldrsh r0, [r4]
asr r6, r0, #6
and r1, r0, #7
ldr sl, _080B2A54 @ =gUnk_0300694C
ldr sl, _080B2A54 @ =ram_0x80b2bd8
ldr sl, [sl, r1, lsl #2]
ldrsh r0, [r4, #2]
asr r7, r0, #6
@@ -1308,7 +1322,7 @@ _080B1C5C:
lsl sb, r1, #0xa
mov r8, #0
push {r4, r5}
bl _080B2874
bl sub_080B2874
pop {r4, r5}
add r4, r4, #4
subs r5, r5, #1
@@ -1354,13 +1368,13 @@ _080B25D8:
eor r2, r2, r3
and r2, r2, #6
_080B25E8:
ldr r3, _080B2A48 @ =gUnk_030068CC
ldr r3, _080B2A48 @ =ram_0x80b2b58
add r2, r1, r2, lsl #1
ldr sl, [r3, r2]
push {r4, r8, sb}
mov r8, #0
and sb, sb, #0xc00
bl _080B2874
bl sub_080B2874
pop {r4, r8, sb, lr}
b _080B2718
_080B260C:
@@ -1423,7 +1437,7 @@ _080B26D0:
ldrsh r0, [r4]
asr r6, r0, #6
and r1, r0, #7
ldr sl, _080B2A54 @ =gUnk_0300694C
ldr sl, _080B2A54 @ =ram_0x80b2bd8
ldr sl, [sl, r1, lsl #2]
ldrsh r0, [r4, #2]
asr r7, r0, #6
@@ -1431,7 +1445,7 @@ _080B26D0:
lsl sb, r1, #0xa
mov r8, #0
push {r4, r5}
bl _080B2874
bl sub_080B2874
pop {r4, r5}
add r4, r4, #4
subs r5, r5, #1
@@ -1449,7 +1463,7 @@ _080B2718:
beq _080B27E4
bpl _080B2730
ldr sl, [r4, #0x64]
b _080B2874
b sub_080B2874
_080B2730:
ldr r4, _080B2A58 @ =gUnk_020000C0
add r4, r4, r0, lsl #6
@@ -1512,7 +1526,7 @@ sub_080B27F4: @ 0x080B27F4
add r2, r2, sl
ldr r0, [r2, r0, lsl #2]
add sl, sl, r0
b _080B2874
b sub_080B2874
arm_func_start sub_080B280C
sub_080B280C: @ 0x080B280C
@@ -1523,6 +1537,7 @@ sub_080B280C: @ 0x080B280C
add r1, r1, r2, lsl #2
ldr r1, [r3, r1]
add r1, r1, r3
_080B2828:
ldrb r2, [r1]
cmp r2, #0
bxeq lr
@@ -1539,11 +1554,13 @@ sub_080B280C: @ 0x080B280C
add r3, pc, #0x8 @ =_080B286C
str r3, [fp, #0x18]
str sp, [fp, #0x14]
bl _080B2874
bl sub_080B2874
_080B286C:
pop {r4, r5, r6, r7, r8, sb, sl, fp, lr}
bx lr
_080B2874:
arm_func_start sub_080B2874
sub_080B2874: @ 0x080B2874
ldrb r0, [sl], #1
lsls r0, r0, #0x18
bxeq lr
@@ -1559,7 +1576,7 @@ _080B289C:
lsr r0, r0, #0x18
add r0, r0, r0, lsl #1
_080B28A8:
ldr r5, _080B2A68 @ =gUnk_0300695C
ldr r5, _080B2A68 @ =ram_0x80b2be8
add r5, r5, r0
ldrb r0, [fp, #3]
orr sb, sb, r0, lsl #16
@@ -1678,7 +1695,7 @@ _080B1FBC:
sub r1, r1, r3
mov r2, #0
mov r3, #0
bl sub_080B20ECEU
bl arm_CheckBitsEU
mov r5, #0
ldr r4, _080B2194 @ =0x03003DF8
_080B1FECEU:
@@ -1717,7 +1734,7 @@ _080B202C:
add r0, r0, r6
add r1, r1, r7
mov r2, #0
bl sub_080B20ECEU
bl arm_CheckBitsEU
_080B2074EU:
add r4, r4, #0xc
add r5, r5, #1
@@ -1746,15 +1763,15 @@ sub_080B2088: @ 0x080B2088
add r1, r7, r1
add r1, r1, r2
mov r2, sb
b sub_080B20ECEU
b arm_CheckBitsEU
_080B20DC:
mov r0, r6
mov r1, r7
mov r2, r9
mov r3, #0x0
arm_func_start sub_080B20ECEU
sub_080B20ECEU: @ 0x080B20EC
arm_func_start arm_CheckBitsEU
arm_CheckBitsEU: @ 0x080B20EC
add ip, r1, #7
cmp ip, #0xa8
bxhs lr
@@ -1778,9 +1795,9 @@ sub_080B20ECEU: @ 0x080B20EC
strb r3, [fp, #3]
bx lr
_080B2144:
.4byte gUnk_03006954
.4byte gUnk_030068F0
.4byte gUnk_0300689C
.4byte ram_sub_080B2140
.4byte ram_sub_080B20DC
.4byte ram_sub_080B2088
.endif
.ifdef DEMO_JP @ TODO deduplicate same as EU
_080B1FBC:
@@ -1793,7 +1810,7 @@ _080B1FBC:
sub r1, r1, r3
mov r2, #0
mov r3, #0
bl sub_080B20ECEU
bl arm_CheckBitsEU
mov r5, #0
ldr r4, _080B2194 @ =0x03003DF8
_080B1FECEU:
@@ -1832,7 +1849,7 @@ _080B202C:
add r0, r0, r6
add r1, r1, r7
mov r2, #0
bl sub_080B20ECEU
bl arm_CheckBitsEU
_080B2074EU:
add r4, r4, #0xc
add r5, r5, #1
@@ -1861,15 +1878,15 @@ sub_080B2088: @ 0x080B2088
add r1, r7, r1
add r1, r1, r2
mov r2, sb
b sub_080B20ECEU
b arm_CheckBitsEU
_080B20DC:
mov r0, r6
mov r1, r7
mov r2, r9
mov r3, #0x0
arm_func_start sub_080B20ECEU
sub_080B20ECEU: @ 0x080B20EC
arm_func_start arm_CheckBitsEU
arm_CheckBitsEU: @ 0x080B20EC
add ip, r1, #7
cmp ip, #0xa8
bxhs lr
@@ -1893,9 +1910,9 @@ sub_080B20ECEU: @ 0x080B20EC
strb r3, [fp, #3]
bx lr
_080B2144:
.4byte gUnk_03006954
.4byte gUnk_030068F0
.4byte gUnk_0300689C
.4byte ram_sub_080B2140
.4byte ram_sub_080B20DC
.4byte ram_sub_080B2088
.endif
_080B2A30: .4byte gOAMControls
@@ -1910,15 +1927,15 @@ _080B2A38: .4byte gUnk_081326EC
_080B2A3C: .4byte gUnk_081326EC
_080B2A40: .4byte gUnk_081326EC
_080B2A44: .4byte gUnk_081326EC
_080B2A48: .4byte gUnk_030068CC
_080B2A48: .4byte ram_0x80b2b58
_080B2A4C: .4byte gUnk_081326EC
_080B2A50: .4byte gUnk_081326EC
_080B2A54: .4byte gUnk_0300694C
_080B2A54: .4byte ram_0x80b2bd8
_080B2A58: .4byte gUnk_020000C0
_080B2A5C: .4byte gFrameObjLists
_080B2A60: .4byte gFrameObjLists
_080B2A64: .4byte gOAMControls
_080B2A68: .4byte gUnk_0300695C
_080B2A68: .4byte ram_0x80b2be8
_080B2A6C: .4byte 0x3E003F00
.ifdef EU
_080B2194: .4byte 0x03003DF8 @TODO pointer?
asm/non_matching/itemMoleMitts/sub_080774A0.inc
+2 -2
View File
@@ -36,7 +36,7 @@
adds r4, #0x38
ldrb r1, [r4]
adds r0, r6, #0
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0x16
bhi _080774F6
cmp r0, #0xe
@@ -51,7 +51,7 @@ _08077504: .4byte gRoomControls
_08077508:
adds r0, r6, #0
ldrb r1, [r4]
bl sub_080002C8
bl sub_080B1AE0
cmp r0, #0x56
bne _08077518
movs r0, #0x56
asm/non_matching/lilypadLarge/sub_08085D60.inc
+2 -2
View File
@@ -61,7 +61,7 @@ _08085DB8:
adds r0, r5, #0
adds r1, r7, #0
mov r2, r8
bl sub_080002CC
bl sub_080B1AF0
cmp r0, #0xff
bne _08085E20
movs r1, #0x2e
@@ -110,7 +110,7 @@ _08085E28:
movs r2, #0
ldrsb r2, [r0, r2]
adds r0, r5, #0
bl sub_080002CC
bl sub_080B1AF0
cmp r0, #0xff
bne _08085E6C
ldr r0, _08085E60 @ =gPlayerEntity
asm/non_matching/madderpillar/sub_08029E0C.inc
+1 -1
View File
@@ -65,7 +65,7 @@ _08029E72:
adds r1, r5, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002E0
bl sub_080B1B44
adds r6, r5, #0
adds r6, #0x74
cmp r0, #0
asm/non_matching/playerItem11/sub_08018E68.inc
+2 -2
View File
@@ -89,7 +89,7 @@ _08018F0C:
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl sub_0800029C
bl sub_080B1A0C
ldr r1, _08018F64 @ =gUnk_080B3DF4
bl sub_08007DD6
cmp r0, #0
@@ -97,7 +97,7 @@ _08018F0C:
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl sub_080002B4
bl sub_080B1A8C
cmp r0, #0x74
beq _08018F62
ldr r1, _08018F68 @ =gUnk_08003E44
asm/non_matching/playerItem13/sub_080AD040.inc
+3 -3
View File
@@ -50,7 +50,7 @@ _080AD088:
movs r2, #0
ldrsb r2, [r0, r2]
adds r0, r4, #0
bl sub_080002B4
bl sub_080B1A8C
cmp r0, #0x74
bne _080AD0B4
adds r0, r4, #0
@@ -60,7 +60,7 @@ _080AD088:
_080AD0B0: .4byte gUnk_081320C4
_080AD0B4:
adds r0, r4, #0
bl sub_080002D0
bl sub_080B1B0C
cmp r0, #0x24
beq _080AD0C8
cmp r0, #0x26
@@ -85,7 +85,7 @@ _080AD0D8:
ldr r0, [r4, #0x34]
str r0, [r5, #0x34]
adds r0, r4, #0
bl sub_080002B8
bl sub_080B1AA8
cmp r0, #0x11
bhi _080AD0FC
cmp r0, #0x10
asm/non_matching/playerItem15/sub_080A310C.inc
+1 -1
View File
@@ -56,7 +56,7 @@ _080A315C:
adds r1, #0x38
ldrb r1, [r1]
movs r2, #0x80
bl sub_080002F0
bl sub_080B1BA4
cmp r0, #0
bne _080A31AE
ldr r1, _080A31F8 @ =gUnk_08003E44
asm/non_matching/playerItemBow/sub_0801917C.inc
+1 -1
View File
@@ -99,7 +99,7 @@ _0801921A:
adds r1, #0x38
ldrb r1, [r1]
movs r2, #0x80
bl sub_080002F0
bl sub_080B1BA4
cmp r0, #0
bne _080192D0
cmp r7, #0
asm/non_matching/playerItemSword/sub_080A7A84.inc
+1 -1
View File
@@ -83,7 +83,7 @@ _080A7AEC:
adds r0, r4, #0
adds r1, r6, #0
adds r2, r5, #0
bl sub_080002B4
bl sub_080B1A8C
cmp r0, #0x2e
bne _080A7B4C
ldr r0, _080A7B44 @ =gPlayerEntity
asm/non_matching/playerUtils/GetSurfaceCalcType.inc
+1 -1
View File
@@ -73,7 +73,7 @@ _0807A26A:
adds r0, r5, #0
adds r1, r6, #0
mov r2, r8
bl sub_080002B4
bl sub_080B1A8C
adds r2, r0, #0
ldr r1, _0807A294 @ =gUnk_08007CAC
bl sub_08007DD6
asm/non_matching/playerUtils/RespawnPlayer.inc
+1 -1
View File
@@ -79,7 +79,7 @@ _080794F4:
ldr r1, [r4]
ldrh r0, [r4]
lsrs r1, r1, #0x1e
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0xf
bne _080794A0
adds r4, #4
asm/non_matching/playerUtils/sub_080789A8.inc
+2 -2
View File
@@ -18,7 +18,7 @@ _080789C0:
cmp r0, #0
bne _08078A56
ldr r0, _08078A60 @ =gPlayerEntity
bl sub_080002D0
bl sub_080B1B0C
adds r4, r0, #0
cmp r4, #0xf
bls _080789E6
@@ -79,7 +79,7 @@ _08078A2E:
ldrb r2, [r2, #1]
lsls r2, r2, #0x18
asrs r2, r2, #0x18
bl sub_0800029C
bl sub_080B1A0C
ldr r4, _08078A68 @ =gUnk_03003BE0
strh r0, [r4, #4]
movs r1, #6
asm/non_matching/playerUtils/sub_080793E4.inc
+1 -1
View File
@@ -40,7 +40,7 @@ _08079410:
adds r1, #0x38
ldrb r1, [r1]
adds r2, r5, #0
bl sub_080002F0
bl sub_080B1BA4
cmp r0, #0
beq _08079454
_08079442:
asm/non_matching/playerUtils/sub_08079550.inc
+2 -2
View File
@@ -140,7 +140,7 @@ _0807965E:
mov r5, r8
adds r5, #0x38
ldrb r1, [r5]
bl sub_080002C8
bl sub_080B1AE0
adds r3, r0, #0
ldr r6, _080796F0 @ =gUnk_0811C1E8
mov r1, r8
@@ -156,7 +156,7 @@ _0807965E:
beq _080796FC
adds r0, r4, #0
ldrb r1, [r5]
bl sub_080002C8
bl sub_080B1AE0
adds r3, r0, #0
mov r5, r8
ldrb r0, [r5, #0x14]
asm/non_matching/playerUtils/sub_080797EC.inc
+1 -1
View File
@@ -131,7 +131,7 @@ _080798CE:
ldr r1, _080798F8 @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0xff
beq _0807991E
ldrb r1, [r4, #0x1b]
asm/non_matching/playerUtils/sub_08079C30.inc
+3 -3
View File
@@ -70,7 +70,7 @@ _08079CE8:
rsbs r2, r2, #0
adds r0, r6, #0
movs r1, #0
bl sub_080002B4
bl sub_080B1A8C
ldr r5, _08079D3C @ =gUnk_08007CAC
adds r1, r5, #0
bl sub_08007DD6
@@ -81,7 +81,7 @@ _08079CE8:
adds r0, r6, #0
movs r1, #2
movs r2, #0
bl sub_080002B4
bl sub_080B1A8C
adds r1, r5, #0
bl sub_08007DD6
cmp r4, r0
@@ -91,7 +91,7 @@ _08079CE8:
rsbs r1, r1, #0
adds r0, r6, #0
movs r2, #0
bl sub_080002B4
bl sub_080B1A8C
adds r1, r5, #0
bl sub_08007DD6
cmp r4, r0
asm/non_matching/playerUtils/sub_08079E90.inc
+2 -2
View File
@@ -51,7 +51,7 @@ _08079EDE:
adds r0, r7, #0
mov r1, r8
adds r2, r6, #0
bl sub_080002CC
bl sub_080B1AF0
adds r1, r0, #0
mov r0, sb
bl sub_08079F48
@@ -77,7 +77,7 @@ _08079F18:
asrs r1, r1, #0x10
lsls r2, r4, #0x10
asrs r2, r2, #0x10
bl sub_080002CC
bl sub_080B1AF0
adds r1, r0, #0
mov r0, sb
bl sub_08079F48
asm/non_matching/playerUtils/sub_0807A2F8.inc
+7 -7
View File
@@ -100,7 +100,7 @@ _0807A3AA:
lsrs r4, r7, #1
adds r0, r4, #0
movs r1, #1
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0
beq _0807A3FC
lsls r0, r4, #0x10
@@ -108,7 +108,7 @@ _0807A3AA:
mov r1, sl
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002C8
bl sub_080B1AE0
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
mov r2, sl
@@ -138,7 +138,7 @@ _0807A400:
lsrs r4, r6, #1
adds r0, r4, #0
movs r1, #1
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0
beq _0807A44C
lsls r0, r4, #0x10
@@ -146,7 +146,7 @@ _0807A400:
adds r1, r5, #0
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002C8
bl sub_080B1AE0
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
ldrb r1, [r5, #0x14]
@@ -195,7 +195,7 @@ _0807A46E:
adds r7, r0, #0
lsrs r0, r7, #1
movs r1, #2
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0
bne _0807A4F2
adds r0, r4, #0
@@ -206,7 +206,7 @@ _0807A46E:
lsrs r0, r6, #1
movs r1, #2
_0807A4A0:
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0
beq _0807A4EC
b _0807A4F2
@@ -224,7 +224,7 @@ _0807A4B0:
_0807A4C2:
lsrs r0, r7, #1
movs r1, #1
bl sub_080002E0
bl sub_080B1B44
cmp r0, #0
bne _0807A4F2
mov r1, sb
asm/non_matching/playerUtils/sub_0807A750.inc
+1 -1
View File
@@ -35,7 +35,7 @@ _0807A77C:
ldr r1, _0807A7A8 @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002E0
bl sub_080B1B44
adds r1, r0, #0
cmp r1, #0xf
bls _0807A7AE
asm/non_matching/playerUtils/sub_0807A894.inc
+1 -1
View File
@@ -35,7 +35,7 @@ _0807A8C8:
_0807A8CA:
movs r1, #0
_0807A8CC:
bl sub_080002B4
bl sub_080B1A8C
pop {pc}
.align 2, 0
.syntax divided
asm/non_matching/playerUtils/sub_0807A8D8.inc
+4 -4
View File
@@ -33,7 +33,7 @@ _0807A8F0:
adds r1, #0x38
mov sb, r1
ldrb r1, [r1]
bl sub_080002EC
bl sub_080B1B84
adds r4, r0, #0
movs r0, #0x20
mov r8, r0
@@ -75,7 +75,7 @@ _0807A94E:
orrs r0, r1
mov r2, sb
ldrb r1, [r2]
bl sub_080002EC
bl sub_080B1B84
adds r4, r0, #0
mov r0, r8
ands r4, r0
@@ -116,7 +116,7 @@ _0807A9A2:
orrs r0, r1
mov r2, sb
ldrb r1, [r2]
bl sub_080002EC
bl sub_080B1B84
adds r4, r0, #0
mov r0, r8
ands r4, r0
@@ -159,7 +159,7 @@ _0807A9F6:
ldr r1, _0807AA64 @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002EC
bl sub_080B1B84
adds r4, r0, #0
movs r0, #0x20
ands r0, r4
asm/non_matching/playerUtils/sub_0807B600.inc
+3 -3
View File
@@ -6,7 +6,7 @@
lsls r0, r5, #0x10
lsrs r0, r0, #0x10
movs r1, #1
bl sub_080002C8
bl sub_080B1AE0
cmp r0, #0x56
beq _0807B61A
movs r0, #0
@@ -84,7 +84,7 @@ _0807B69C:
bl SetTileType
adds r0, r6, #0
movs r1, #1
bl sub_080002E0
bl sub_080B1B44
cmp r0, #3
bne _0807B6CA
movs r0, #0xbd
@@ -96,7 +96,7 @@ _0807B6CA:
adds r0, r5, #0
adds r0, #0x40
movs r1, #1
bl sub_080002E0
bl sub_080B1B44
cmp r0, #3
bne _0807B6F8
movs r0, #0xbd
asm/non_matching/playerUtils/sub_0807B778.inc
+1 -1
View File
@@ -6,7 +6,7 @@
lsrs r0, r0, #0x10
lsls r1, r6, #0x18
lsrs r1, r1, #0x18
bl sub_080002C8
bl sub_080B1AE0
cmp r0, #0xd
bne _0807B7D0
adds r0, r5, #0
asm/non_matching/pushableFurniture/sub_08090094.inc
+1 -1
View File
@@ -5,7 +5,7 @@
adds r7, r2, #0
adds r0, r7, #0
movs r1, #1
bl sub_080002E0
bl sub_080B1B44
adds r4, r0, #0
adds r0, r7, #0
movs r1, #1
asm/non_matching/pushableStatue/sub_080896B0.inc
+1 -1
View File
@@ -54,7 +54,7 @@
adds r5, r6, #0
adds r5, #0x38
ldrb r1, [r5]
bl sub_080002C8
bl sub_080B1AE0
adds r1, r0, #0
subs r0, #0x26
cmp r0, #1
asm/non_matching/scroll/UpdateDoorTransition.inc
+2 -2
View File
@@ -83,14 +83,14 @@ _08080AFA:
orrs r0, r1
adds r3, #0x38
ldrb r1, [r3]
bl sub_080002C8
bl sub_080B1AE0
adds r4, r0, #0
ldr r0, [r7, #0x30]
adds r0, #0x38
ldrb r2, [r0]
adds r0, r5, #0
adds r1, r6, #0
bl sub_080002A8
bl sub_080B1A48
ldr r1, _08080B48 @ =gRoomTransition
strh r0, [r1, #0xa]
cmp r4, #0x3f
asm/object/minecart.s
+2 -2
View File
@@ -15,7 +15,7 @@ sub_08091C0C: @ 0x08091C0C
adds r0, r4, #0
bl CopyPosition
adds r0, r4, #0
bl sub_080002B8
bl sub_080B1AA8
cmp r0, #0x68
beq _08091C46
cmp r0, #0x68
@@ -269,7 +269,7 @@ sub_08091DDC: @ 0x08091DDC
movs r2, #0
ldrsb r2, [r0, r2]
adds r0, r4, #0
bl sub_080002CC
bl sub_080B1AF0
cmp r0, #0xff
bne _08091E5C
ldr r0, _08091E34 @ =gPlayerEntity
asm/object/object10.s
+2 -2
View File
@@ -280,7 +280,7 @@ _08084A40: .4byte gPlayerClones
_08084A44: .4byte gPlayerEntity
_08084A48:
adds r0, r4, #0
bl sub_080002B8
bl sub_080B1AA8
adds r0, r4, #0
bl sub_08084B1C
adds r0, r4, #0
@@ -625,7 +625,7 @@ sub_08084CAC: @ 0x08084CAC
adds r1, #0x38
ldrb r1, [r1]
bl GetTileType
bl sub_080002E4
bl sub_080B1B54
cmp r0, #0x72
bne _08084D24
ldr r2, [r6]
asm/object/object1F.s
+1 -1
View File
@@ -153,7 +153,7 @@ _080877A0:
sub_080877A4: @ 0x080877A4
push {r4, lr}
adds r4, r0, #0
bl sub_080002D0
bl sub_080B1B0C
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
adds r1, r0, #0
asm/object/object20.s
+1 -1
View File
@@ -159,7 +159,7 @@ _0808790A:
adds r0, r4, #0
ldr r2, [sp, #8]
lsrs r1, r2, #0x18
bl sub_080002C8
bl sub_080B1AE0
cmp r0, #0x2e
bne _08087970
adds r0, r4, #0
asm/object/treeHidingPortal.s
+1 -1
View File
@@ -46,7 +46,7 @@ _0809E9B4:
lsls r1, r1, #6
orrs r0, r1
movs r1, #1
bl sub_080002C8
bl sub_080B1AE0
_0809E9F0:
pop {r4, r5, r6, pc}
.align 2, 0
asm/player.s
+1 -1
View File
@@ -743,7 +743,7 @@ sub_08008B02: @ 0x08008B02
push {r0, r1, lr}
movs r1, #0
movs r2, #0
bl sub_080002B4
bl sub_080B1A8C
ldr r1, _08008B50 @ =0x00004000
tst r0, r1
bne _08008B1E
asm/script.s
+2 -2
View File
@@ -84,7 +84,7 @@ ResolveCollisionLayer: @ 0x08016A30
movs r3, #1
cmp r0, #0
beq _08016A62
bl sub_080002E4
bl sub_080B1B54
movs r3, #2
add r1, pc, #0x40
_08016A54:
@@ -106,7 +106,7 @@ _08016A64:
sub_08016A6C: @ 0x08016A6C
push {r4, r5, lr}
adds r4, r0, #0
bl sub_080002B8
bl sub_080B1AA8
add r1, pc, #0x38
_08016A76:
adds r1, #4
asm/veneer.s
+101 -101
View File
@@ -106,7 +106,7 @@ _08000126:
_08000136:
pop {r4, pc}
_08000138:
_08000138: .4byte gUnk_030056F1
_08000138: .4byte ram_sub_080B197C + 1
_0800013C: .4byte sub_0807D280 @ layer 1, 2, 3?
_08000140: .4byte sub_0807D46C
_08000144: .4byte sub_0807D6D8
@@ -246,48 +246,48 @@ gUnk_08000278::
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start GetTileAtEntityPos
GetTileAtEntityPos: @ 0x08000288
ldr r3, _080002F4 @ =gUnk_03005740
ldr r3, _080002F4 @ =ram_GetTileAtEntityPos
bx r3
@ call 0x80B19D8
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_0800028C
sub_0800028C: @ 0x0800028C
ldr r3, _080002F8 @ =gUnk_0300574C
thumb_func_start sub_080B19D8
sub_080B19D8: @ 0x0800028C
ldr r3, _080002F8 @ =ram_sub_080B19D8
bx r3
@ call 0x80B19EC
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_08000290
sub_08000290: @ 0x08000290
ldr r3, _080002FC @ =gUnk_03005760
thumb_func_start sub_080B19EC
sub_080B19EC: @ 0x08000290
ldr r3, _080002FC @ =ram_sub_080B19EC
bx r3
@ call 0x80B19FC
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_08000294
sub_08000294: @ 0x08000294
ldr r3, _08000300 @ =gUnk_03005770
thumb_func_start sub_080B19FC
sub_080B19FC: @ 0x08000294
ldr r3, _08000300 @ =ram_sub_080B19FC
bx r3
@ call 0x80B1A04
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_08000298
sub_08000298: @ 0x08000298
ldr r3, _08000304 @ =gUnk_03005778
thumb_func_start sub_080B1A04
sub_080B1A04: @ 0x08000298
ldr r3, _08000304 @ =ram_sub_080B1A04
bx r3
@ call 0x80B1A0C
@ r0: entity*
@ r1: s32
@ r2: s32
thumb_func_start sub_0800029C
sub_0800029C: @ 0x0800029C
ldr r3, _08000308 @ =gUnk_03005780
thumb_func_start sub_080B1A0C
sub_080B1A0C: @ 0x0800029C
ldr r3, _08000308 @ =ram_sub_080B1A0C
bx r3
@ call 0x080B1A28
@@ -295,7 +295,7 @@ sub_0800029C: @ 0x0800029C
@ return: u32 (tileType)
thumb_func_start GetTileTypeByEntity
GetTileTypeByEntity: @ 0x080002A0
ldr r3, _0800030C @ =gUnk_0300579C
ldr r3, _0800030C @ =ram_GetTileTypeByEntity
bx r3
@ call 0x080B1A34
@@ -305,25 +305,25 @@ GetTileTypeByEntity: @ 0x080002A0
@ return: u32 (tileType)
thumb_func_start GetTileTypeByPos
GetTileTypeByPos: @ 0x080002A4
ldr r3, _08000310 @ =gUnk_030057A8
ldr r3, _08000310 @ =ram_GetTileTypeByPos
bx r3
@ call 0x080B1A48
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
thumb_func_start sub_080002A8
sub_080002A8: @ 0x080002A8
ldr r3, _08000314 @ =gUnk_030057BC
thumb_func_start sub_080B1A48
sub_080B1A48: @ 0x080002A8
ldr r3, _08000314 @ =ram_sub_080B1A48
bx r3
@ call 0x080B1A58
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
thumb_func_start sub_080002AC
sub_080002AC: @ 0x080002AC
ldr r3, _08000318 @ =gUnk_030057CC
thumb_func_start sub_080B1A58
sub_080B1A58: @ 0x080002AC
ldr r3, _08000318 @ =ram_sub_080B1A58
bx r3
@ call 0x080B1A60
@@ -332,16 +332,16 @@ sub_080002AC: @ 0x080002AC
@ return: u32 (tileType)
thumb_func_start GetTileType
GetTileType: @ 0x080002B0
ldr r3, _0800031C @ =gUnk_030057D4
ldr r3, _0800031C @ =ram_GetTileType
bx r3
@ call 0x080B1A8C
@ r0: Entity*
@ r1: u32
@ r2: u32
thumb_func_start sub_080002B4
sub_080002B4: @ 0x080002B4
ldr r3, _08000320 @ =gUnk_03005800
thumb_func_start sub_080B1A8C
sub_080B1A8C: @ 0x080002B4
ldr r3, _08000320 @ =ram_sub_080B1A8C
bx r3
@ call 0x080B1AA8
@@ -351,18 +351,18 @@ sub_080002B4: @ 0x080002B4
@ return:
@ ========
@ Called every frame a pot is thrown, every frame the screen is sliding in a transition, and once when entering stairs.
thumb_func_start sub_080002B8
sub_080002B8: @ 0x080002B8
ldr r3, _08000324 @ =gUnk_0300581C
thumb_func_start sub_080B1AA8
sub_080B1AA8: @ 0x080002B8
ldr r3, _08000324 @ =ram_sub_080B1AA8
bx r3
@ call 0x080B1AB4
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
thumb_func_start sub_080002BC
sub_080002BC: @ 0x080002BC
ldr r3, _08000328 @ =gUnk_03005828
thumb_func_start sub_080B1AB4
sub_080B1AB4: @ 0x080002BC
ldr r3, _08000328 @ =ram_sub_080B1AB4
bx r3
@ call 0x080B1AC8
@@ -370,9 +370,9 @@ sub_080002BC: @ 0x080002BC
@ r1: u32
@ r2: u32
@ return: ???
thumb_func_start sub_080002C0
sub_080002C0: @ 0x080002C0
ldr r3, _0800032C @ =gUnk_0300583C
thumb_func_start sub_080B1AC8
sub_080B1AC8: @ 0x080002C0
ldr r3, _0800032C @ =ram_sub_080B1AC8
bx r3
@ call 0x080B1AD8
@@ -381,124 +381,124 @@ sub_080002C0: @ 0x080002C0
@ r2: s32 (yOffset)
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002C4
sub_080002C4: @ 0x080002C4
ldr r3, _08000330 @ =gUnk_0300584C
thumb_func_start sub_080B1AD8
sub_080B1AD8: @ 0x080002C4
ldr r3, _08000330 @ =ram_sub_080B1AD8
bx r3
@ call 0x080B1AE0
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
thumb_func_start sub_080002C8
sub_080002C8: @ 0x080002C8
ldr r3, _08000334 @ =gUnk_03005854
thumb_func_start sub_080B1AE0
sub_080B1AE0: @ 0x080002C8
ldr r3, _08000334 @ =ram_sub_080B1AE0
bx r3
@ call 0x080B1AF0
@ r0: Entity*
@ r1: ???
@ r2: ???
thumb_func_start sub_080002CC
sub_080002CC: @ 0x080002CC
ldr r3, _08000338 @ =gUnk_03005864
thumb_func_start sub_080B1AF0
sub_080B1AF0: @ 0x080002CC
ldr r3, _08000338 @ =ram_sub_080B1AF0
bx r3
@ call 0x080B1B0C
@ r0: Entity*
thumb_func_start sub_080002D0
sub_080002D0: @ 0x080002D0
ldr r3, _0800033C @ =gUnk_03005880
thumb_func_start sub_080B1B0C
sub_080B1B0C: @ 0x080002D0
ldr r3, _0800033C @ =ram_sub_080B1B0C
bx r3
@ call 0x080B1B18
@ r0: s32 (xPos)
@ r1: s32 (yPos)
@ r2: u32 (layer)
thumb_func_start sub_080002D4
sub_080002D4: @ 0x080002D4
ldr r3, _08000340 @ =gUnk_0300588C
thumb_func_start sub_080B1B18
sub_080B1B18: @ 0x080002D4
ldr r3, _08000340 @ =ram_sub_080B1B18
bx r3
@ call 0x080B1B2C
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002D8
sub_080002D8: @ 0x080002D8
ldr r3, _08000344 @ =gUnk_030058A0
thumb_func_start sub_080B1B2C
sub_080B1B2C: @ 0x080002D8
ldr r3, _08000344 @ =ram_sub_080B1B2C
bx r3
@ call 0x080B1B3C
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002DC
sub_080002DC: @ 0x080002DC
ldr r3, _08000348 @ =gUnk_030058B0
thumb_func_start sub_080B1B3C
sub_080B1B3C: @ 0x080002DC
ldr r3, _08000348 @ =ram_sub_080B1B3C
bx r3
@ call 0x080B1B44
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002E0
sub_080002E0: @ 0x080002E0
ldr r3, _0800034C @ =gUnk_030058B8
thumb_func_start sub_080B1B44
sub_080B1B44: @ 0x080002E0
ldr r3, _0800034C @ =ram_sub_080B1B44
bx r3
@ call 0x080B1B54
@ r0: u32 (tileIndex)
thumb_func_start sub_080002E4
sub_080002E4: @ 0x080002E4
ldr r3, _08000350 @ =gUnk_030058C8
thumb_func_start sub_080B1B54
sub_080B1B54: @ 0x080002E4
ldr r3, _08000350 @ =ram_sub_080B1B54
bx r3
@ call 0x080B1B68
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_080002E8
sub_080002E8: @ 0x080002E8
ldr r3, _08000354 @ =gUnk_030058DC
thumb_func_start sub_080B1B68
sub_080B1B68: @ 0x080002E8
ldr r3, _08000354 @ =ram_sub_080B1B68
bx r3
@ call 0x080B1B84
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
thumb_func_start sub_080002EC
sub_080002EC: @ 0x080002EC
ldr r3, _08000358 @ =gUnk_030058F8
thumb_func_start sub_080B1B84
sub_080B1B84: @ 0x080002EC
ldr r3, _08000358 @ =ram_sub_080B1B84
bx r3
@ call 0x080B1BA4
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
@ r2: ???
thumb_func_start sub_080002F0
sub_080002F0: @ 0x080002F0
ldr r3, _0800035C @ =gUnk_03005918
thumb_func_start sub_080B1BA4
sub_080B1BA4: @ 0x080002F0
ldr r3, _0800035C @ =ram_sub_080B1BA4
bx r3
_080002F4: .4byte gUnk_03005740
_080002F8: .4byte gUnk_0300574C
_080002FC: .4byte gUnk_03005760
_08000300: .4byte gUnk_03005770
_08000304: .4byte gUnk_03005778
_08000308: .4byte gUnk_03005780
_0800030C: .4byte gUnk_0300579C
_08000310: .4byte gUnk_030057A8
_08000314: .4byte gUnk_030057BC
_08000318: .4byte gUnk_030057CC
_0800031C: .4byte gUnk_030057D4
_08000320: .4byte gUnk_03005800
_08000324: .4byte gUnk_0300581C
_08000328: .4byte gUnk_03005828
_0800032C: .4byte gUnk_0300583C
_08000330: .4byte gUnk_0300584C
_08000334: .4byte gUnk_03005854
_08000338: .4byte gUnk_03005864
_0800033C: .4byte gUnk_03005880
_08000340: .4byte gUnk_0300588C
_08000344: .4byte gUnk_030058A0
_08000348: .4byte gUnk_030058B0
_0800034C: .4byte gUnk_030058B8
_08000350: .4byte gUnk_030058C8
_08000354: .4byte gUnk_030058DC
_08000358: .4byte gUnk_030058F8
_0800035C: .4byte gUnk_03005918
_080002F4: .4byte ram_GetTileAtEntityPos
_080002F8: .4byte ram_sub_080B19D8
_080002FC: .4byte ram_sub_080B19EC
_08000300: .4byte ram_sub_080B19FC
_08000304: .4byte ram_sub_080B1A04
_08000308: .4byte ram_sub_080B1A0C
_0800030C: .4byte ram_GetTileTypeByEntity
_08000310: .4byte ram_GetTileTypeByPos
_08000314: .4byte ram_sub_080B1A48
_08000318: .4byte ram_sub_080B1A58
_0800031C: .4byte ram_GetTileType
_08000320: .4byte ram_sub_080B1A8C
_08000324: .4byte ram_sub_080B1AA8
_08000328: .4byte ram_sub_080B1AB4
_0800032C: .4byte ram_sub_080B1AC8
_08000330: .4byte ram_sub_080B1AD8
_08000334: .4byte ram_sub_080B1AE0
_08000338: .4byte ram_sub_080B1AF0
_0800033C: .4byte ram_sub_080B1B0C
_08000340: .4byte ram_sub_080B1B18
_08000344: .4byte ram_sub_080B1B2C
_08000348: .4byte ram_sub_080B1B3C
_0800034C: .4byte ram_sub_080B1B44
_08000350: .4byte ram_sub_080B1B54
_08000354: .4byte ram_sub_080B1B68
_08000358: .4byte ram_sub_080B1B84
_0800035C: .4byte ram_sub_080B1BA4
data/data_080B2A70.s
+1 -1
View File
@@ -20,7 +20,7 @@ gUnk_080B2A70:: @ 080B2A70
.4byte DummyIntr
.4byte DummyIntr
unusedLabel_0B21D0::
unusedLabel_080B2AA8::
@ TODO contains some pointers to iwram
.ifdef EU
.incbin "data_080B2A70/unusedLabel_0B21D0_EU.bin"
include/asm.h
+2 -2
View File
@@ -10,8 +10,8 @@ extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer);
extern u32 GetTileType(u32 position, u32 layer);
extern void SetTile(u32 index, u32 position, u32 layer);
extern void UpdateScrollVram(void);
extern u32 sub_080002D0(struct Entity_*);
extern u32 sub_080002F0(u32, u32, u32);
extern u32 sub_080B1B0C(struct Entity_*);
extern u32 sub_080B1BA4(u32, u32, u32);
extern void LoadResourceAsync(const void*, u32, u32);
extern void GenericConfused(struct Entity_*);
extern void sub_08001290(struct Entity_*, u32);
include/functions.h
+8 -8
View File
@@ -73,14 +73,14 @@ extern void UpdatePlayerMovement(void);
// Unidentified
extern void sub_08000148(u32, u32, u32);
extern u32 sub_0800029C(Entity*, s32, s32);
extern u32 sub_080002A8(u32, u32, u32);
extern u32 sub_080002B4(Entity*, u32, u32);
extern u32 sub_080002B8(Entity*);
extern u32 sub_080002C8(u16, u8);
extern u32 sub_080002CC(Entity*, s32, s32);
extern u32 sub_080002D4(s32, s32, u32);
extern u32 sub_080002E0(u32, u32);
extern u32 sub_080B1A0C(Entity*, s32, s32);
extern u32 sub_080B1A48(u32, u32, u32);
extern u32 sub_080B1A8C(Entity*, u32, u32);
extern u32 sub_080B1AA8(Entity*);
extern u32 sub_080B1AE0(u16, u8);
extern u32 sub_080B1AF0(Entity*, s32, s32);
extern u32 sub_080B1B18(s32, s32, u32);
extern u32 sub_080B1B44(u32, u32);
extern s32 sub_080012DC(Entity*);
extern void sub_08001318(Entity*);
extern u32 sub_0800132C(Entity*, Entity*);
linker.ld
+61 -61
View File
@@ -199,70 +199,70 @@ SECTIONS {
. = 0x00004EE0; gMPlayInfos = .;
. = 0x000055E0; gMPlayMemAccArea = .;
. = 0x000055F0; gMPlayInfos2 = .;
. = 0x000056F0; gUnk_030056F0 = .;
. = 0x000056F1; gUnk_030056F1 = .;
. = 0x00005740; gUnk_03005740 = .;
. = 0x0000574C; gUnk_0300574C = .;
. = 0x00005760; gUnk_03005760 = .;
. = 0x00005770; gUnk_03005770 = .;
. = 0x00005778; gUnk_03005778 = .;
. = 0x00005780; gUnk_03005780 = .;
. = 0x0000579C; gUnk_0300579C = .;
. = 0x000057A8; gUnk_030057A8 = .;
. = 0x000057BC; gUnk_030057BC = .;
. = 0x000057CC; gUnk_030057CC = .;
. = 0x000057D4; gUnk_030057D4 = .;
. = 0x00005800; gUnk_03005800 = .;
. = 0x0000581C; gUnk_0300581C = .;
. = 0x00005828; gUnk_03005828 = .;
. = 0x0000583C; gUnk_0300583C = .;
. = 0x0000584C; gUnk_0300584C = .;
. = 0x00005854; gUnk_03005854 = .;
. = 0x00005864; gUnk_03005864 = .;
. = 0x00005880; gUnk_03005880 = .;
. = 0x0000588C; gUnk_0300588C = .;
. = 0x000058A0; gUnk_030058A0 = .;
. = 0x000058B0; gUnk_030058B0 = .;
. = 0x000058B8; gUnk_030058B8 = .;
. = 0x000058C8; gUnk_030058C8 = .;
. = 0x000058DC; gUnk_030058DC = .;
. = 0x000058F8; gUnk_030058F8 = .;
. = 0x00005918; gUnk_03005918 = .;
. = 0x000059F0; gDoCollision = .;
. = 0x00005CA4; gUnk_03005CA4 = .;
. = 0x00005CD0; gUnk_03005CD0 = .;
. = 0x00005CFC; gUnk_03005CFC = .;
. = 0x00005D18; gUnk_03005D18 = .;
. = 0x00005D24; gUnk_03005D24 = .;
. = 0x00005D58; gUnk_03005D58 = .;
. = 0x00005D5C; gUnk_03005D5C = .;
. = 0x00005D90; gIntrMain = .;
. = 0x00005E60; gUnk_03005E60 = .;
. = 0x00005E98; gMakeFadeBuff256 = .;
. = 0x00005F24; _ClearAndUpdateEntities = .;
. = 0x00005F40; UpdateEntities_arm = .;
. = 0x00005FBC; gUnk_03005FBC = .;
. = 0x00005FF0; gUnk_03005FF0 = .;
. = 0x000060F0; gUnk_030060F0 = .;
. = 0x00006164; gUnk_03006164 = .;
/* ARM functions copied to IWRAM */
. = 0x000056F0; ram_sub_080B197C = .;
. = 0x00005740; ram_GetTileAtEntityPos = .;
. = 0x0000574C; ram_sub_080B19D8 = .;
. = 0x00005760; ram_sub_080B19EC = .;
. = 0x00005770; ram_sub_080B19FC = .;
. = 0x00005778; ram_sub_080B1A04 = .;
. = 0x00005780; ram_sub_080B1A0C = .;
. = 0x0000579C; ram_GetTileTypeByEntity = .;
. = 0x000057A8; ram_GetTileTypeByPos = .;
. = 0x000057BC; ram_sub_080B1A48 = .;
. = 0x000057CC; ram_sub_080B1A58 = .;
. = 0x000057D4; ram_GetTileType = .;
. = 0x00005800; ram_sub_080B1A8C = .;
. = 0x0000581C; ram_sub_080B1AA8 = .;
. = 0x00005828; ram_sub_080B1AB4 = .;
. = 0x0000583C; ram_sub_080B1AC8 = .;
. = 0x0000584C; ram_sub_080B1AD8 = .;
. = 0x00005854; ram_sub_080B1AE0 = .;
. = 0x00005864; ram_sub_080B1AF0 = .;
. = 0x00005880; ram_sub_080B1B0C = .;
. = 0x0000588C; ram_sub_080B1B18 = .;
. = 0x000058A0; ram_sub_080B1B2C = .;
. = 0x000058B0; ram_sub_080B1B3C = .;
. = 0x000058B8; ram_sub_080B1B44 = .;
. = 0x000058C8; ram_sub_080B1B54 = .;
. = 0x000058DC; ram_sub_080B1B68 = .;
. = 0x000058F8; ram_sub_080B1B84 = .;
. = 0x00005918; ram_sub_080B1BA4 = .;
. = 0x000059F0; ram_CollideAll = .;
. = 0x00005CA4; ram_sub_080B1F30 = .;
. = 0x00005CD0; ram_sub_080B1F5C = .;
. = 0x00005CFC; ram_sub_080B1F88 = .;
. = 0x00005D18; ram_sub_080B1FA4 = .;
. = 0x00005D24; ram_sub_080B1FB0 = .;
. = 0x00005D58; ram_sub_080B1FE4 = .;
. = 0x00005D5C; ram_sub_080B1FE8 = .;
. = 0x00005D90; ram_IntrMain = .;
. = 0x00005E60; ram_CheckBits = .;
. = 0x00005E98; ram_MakeFadeBuff256 = .;
. = 0x00005F24; ram_ClearAndUpdateEntities = .;
. = 0x00005F40; ram_UpdateEntities = .;
. = 0x00005FBC; ram_sub_080B2248 = .;
. = 0x00005FF0; ram_sub_080B227C = .;
. = 0x000060F0; ram_CalcCollisionDirection = .;
. = 0x00006164; ram_sub_080B23F0 = .;
#if defined(EU) || defined(DEMO_JP)
. = 0x000065AC; gUnk_03006580 = .;
. = 0x000065C8; gUnk_0300659C = .;
. = 0x0000689C; gUnk_0300689C = .;
. = 0x000068F0; gUnk_030068F0 = .;
. = 0x00006954; gUnk_03006954 = .;
. = 0x000069AC; gUnk_030067E4 = .;
. = 0x00006A94; gUnk_030068CC = .;
. = 0x00006B14; gUnk_0300694C = .;
. = 0x00006B24; gUnk_0300695C = .;
. = 0x000065AC; ram_sub_080B280C = .;
. = 0x000065C8; ram_sub_080B2828 = .;
. = 0x0000689C; ram_sub_080B2088 = .;
. = 0x000068F0; ram_sub_080B20DC = .;
. = 0x00006954; ram_sub_080B2140 = .;
. = 0x000069AC; ram_gUnk_080B2A70 = .;
. = 0x00006A94; ram_0x80b2b58 = .; /* TODO 0x80b2b58 in unusedLabel_080B2AA8*/
. = 0x00006B14; ram_0x80b2bd8 = .; /* 0x80b2bd8 */
. = 0x00006B24; ram_0x80b2be8 = .; /* 0x80b2be8 */
. = 0x00006C14; gUnk_03006C14 = .;
#else
. = 0x00006580; gUnk_03006580 = .;
. = 0x0000659C; gUnk_0300659C = .;
. = 0x000067E4; gUnk_030067E4 = .;
. = 0x000068CC; gUnk_030068CC = .;
. = 0x0000694C; gUnk_0300694C = .;
. = 0x0000695C; gUnk_0300695C = .;
. = 0x00006580; ram_sub_080B280C = .;
. = 0x0000659C; ram_sub_080B2828 = .;
. = 0x000067E4; ram_gUnk_080B2A70 = .;
. = 0x000068CC; ram_0x80b2b58 = .; /* TODO 0x80b2b58 in unusedLabel_080B2AA8*/
. = 0x0000694C; ram_0x80b2bd8 = .; /* 0x80b2bd8 */
. = 0x0000695C; ram_0x80b2be8 = .; /* 0x80b2be8 */
#endif
. = 0x00007F00; gUnk_03007F00 = .;
. = 0x00007FA0; gUnk_03007FA0 = .;
src/affine.c
+6 -6
View File
@@ -6,9 +6,9 @@
extern u32 gFrameObjLists[];
extern void gUnk_03006164(void);
extern void gUnk_0300659C(OAMCommand*, void*);
extern void gUnk_03006580(OAMCommand*, u32, u32);
extern void ram_sub_080B23F0(void);
extern void ram_sub_080B2828(OAMCommand*, void*);
extern void ram_sub_080B280C(OAMCommand*, u32, u32);
// regalloc
NONMATCH("asm/non_matching/vram/sub_080AD8F0.inc", void* sub_080AD8F0(u32 sprite, u32 frame)) {
@@ -59,16 +59,16 @@ void DrawEntities(void) {
gOAMControls._4 = gRoomControls.aff_x + gRoomControls.scroll_x;
gOAMControls._6 = gRoomControls.aff_y + gRoomControls.scroll_y;
gOAMControls.field_0x1++;
fn = &gUnk_03006164;
fn = &ram_sub_080B23F0;
fn();
}
void sub_080ADA04(OAMCommand* cmd, void* dst) {
void (*fn)(OAMCommand*, void*) = gUnk_0300659C;
void (*fn)(OAMCommand*, void*) = ram_sub_080B2828;
fn(cmd, dst);
}
void DrawDirect(u32 a1, u32 a2) {
void (*fn)(OAMCommand*, u32, u32) = gUnk_03006580;
void (*fn)(OAMCommand*, u32, u32) = ram_sub_080B280C;
fn(&gOamCmd, a1, a2);
}
src/collision.c
+2 -2
View File
@@ -29,7 +29,7 @@ typedef struct {
extern ColSettings gCollisionMtx[173 * 34];
extern void gDoCollision(void);
extern void ram_CollideAll(void);
u32 sub_08081420(Entity*);
extern void SoundReqClipped(Entity*, u32);
s32 sub_08018308(Entity*, Entity*, u32, ColSettings*);
@@ -64,7 +64,7 @@ void CollisionMain(void) {
if (prio)
return;
doCollision = &gDoCollision;
doCollision = &ram_CollideAll;
// Check to see if we should disable collision this frame
if (gPlayerState.controlMode != CONTROL_ENABLED) {
u32 flags = gPlayerEntity.flags;
src/coord.c
+1 -1
View File
@@ -223,7 +223,7 @@ u32 sub_0806F824(Entity* a, Entity* b, s32 x, s32 y) {
u32 sub_0806F854(Entity* ent, s32 x, s32 y) {
if (ent->z.WORD == 0 || (ent->collisionLayer & 2))
return 0;
if (!sub_080002F0(TILE(ent->x.HALF.HI + x, ent->y.HALF.HI + y), 2, 8)) {
if (!sub_080B1BA4(TILE(ent->x.HALF.HI + x, ent->y.HALF.HI + y), 2, 8)) {
ent->spriteRendering.b3 = 1;
ent->spriteOrientation.flipY = 1;
return 0;
src/enemy/acroBandits.c
+1 -1
View File
@@ -138,7 +138,7 @@ void sub_08031AC8(Entity* this)
rand = Random();
x = this->field_0x74.HWORD + ((s32)rand % 5) * 0x10 - 0x20;
y = this->field_0x76.HWORD + ((s32)(rand >> 4) % 5) * 0x10 - 0x20;
if (sub_080002D4(x, y, this->collisionLayer) == 0) {
if (sub_080B1B18(x, y, this->collisionLayer) == 0) {
this->action = 2;
this->spriteSettings.draw = 1;
this->x.HALF.HI = x;
src/enemy/bombPeahat.c
+1 -1
View File
@@ -203,7 +203,7 @@ void sub_0802AAC0(Entity* this) {
this->child = NULL;
#ifdef EU
} else if (ent->actionDelay == 0) {
if (sub_080002E0(COORD_TO_TILE(this), 1) == 0) {
if (sub_080B1B44(COORD_TO_TILE(this), 1) == 0) {
if (EntityInRectRadius(this, &gPlayerEntity, 0x10, 0x10) && ent->field_0xf <= 0x50) {
this->field_0x80.HALF.HI = 0;
}
src/enemy/chuchu.c
+1 -1
View File
@@ -705,7 +705,7 @@ void sub_0801FB68(Entity* this) {
}
u32 sub_0801FBD0(Entity* this) {
if (sub_080002B8(this) == 0x10) {
if (sub_080B1AA8(this) == 0x10) {
return 1;
} else {
return 0;
src/enemy/cloudPiranha.c
+2 -2
View File
@@ -249,13 +249,13 @@ void sub_080387F0(CloudPiranhaEntity* this) {
const s8* ptr;
if ((super->action != 4) && (this->unk_82 == 0)) {
iVar4 = sub_080002E0(COORD_TO_TILE(super), super->collisionLayer);
iVar4 = sub_080B1B44(COORD_TO_TILE(super), super->collisionLayer);
if ((iVar4 == 0xf) || (iVar4 == 0x2a)) {
this->unk_82 = 0x20;
}
ptr = &gUnk_080CF520[super->direction >> 1];
bVar1 = super->direction;
iVar4 = sub_080002CC(super, ptr[0], ptr[1]);
iVar4 = sub_080B1AF0(super, ptr[0], ptr[1]);
if ((iVar4 == 0xf) || (iVar4 == 0x2a)) {
super->direction = (super->direction + 0x10) & 0x1f;
} else {
src/enemy/leever.c
+4 -4
View File
@@ -8,8 +8,8 @@
#include "enemy.h"
#include "functions.h"
extern u32 sub_080002D4(s32, s32, u32);
extern u32 sub_080002BC(s32, s32, u32);
extern u32 sub_080B1B18(s32, s32, u32);
extern u32 sub_080B1AB4(s32, s32, u32);
extern Entity* gUnk_020000B0;
@@ -124,10 +124,10 @@ u32 sub_0801FDE4(Entity* ent, s32 x, s32 y) {
u32 uVar3;
const u16* puVar4;
if (sub_080002D4(x, y, gUnk_020000B0->collisionLayer) != 0) {
if (sub_080B1B18(x, y, gUnk_020000B0->collisionLayer) != 0) {
return 0;
} else {
uVar3 = sub_080002BC(x, y, gUnk_020000B0->collisionLayer);
uVar3 = sub_080B1AB4(x, y, gUnk_020000B0->collisionLayer);
for (puVar4 = gUnk_080CA4CA; *puVar4 != (u16)-1;) {
if (*puVar4++ == uVar3) {
ent->x.HALF.HI = (x & 0xfff0) + 8;
src/enemy/pesto.c
+1 -1
View File
@@ -336,7 +336,7 @@ void sub_080244E8(Entity* this) {
switch (this->field_0x80.HALF.LO) {
case 0:
if (--this->actionDelay == 0) {
if (sub_080002E0(COORD_TO_TILE(this), 1) == 0) {
if (sub_080B1B44(COORD_TO_TILE(this), 1) == 0) {
this->field_0x80.HALF.LO += 1;
this->field_0x82.HALF.LO += 1;
this->field_0xf = 0;
src/enemy/puffstool.c
+10 -10
View File
@@ -416,22 +416,22 @@ bool32 sub_0802571C(Entity* this) {
bool32 sub_080257EC(Entity* this, u32 x, u32 y) {
u16 tmp;
tmp = sub_080002A8(x - 0x00, y - 0x00, this->collisionLayer);
tmp = sub_080B1A48(x - 0x00, y - 0x00, this->collisionLayer);
if (tmp != 0x312 && gUnk_080B37A0[tmp] != 0x16 && gUnk_080B3E80[tmp] == 0) {
return TRUE;
}
tmp = sub_080002A8(x - 0x10, y - 0x00, this->collisionLayer);
tmp = sub_080B1A48(x - 0x10, y - 0x00, this->collisionLayer);
if (tmp != 0x312 && gUnk_080B37A0[tmp] != 0x16 && gUnk_080B3E80[tmp] == 0) {
return TRUE;
}
tmp = sub_080002A8(x - 0x00, y - 0x10, this->collisionLayer);
tmp = sub_080B1A48(x - 0x00, y - 0x10, this->collisionLayer);
if (tmp != 0x312 && gUnk_080B37A0[tmp] != 0x16 && gUnk_080B3E80[tmp] == 0) {
return TRUE;
}
tmp = sub_080002A8(x - 0x10, y - 0x10, this->collisionLayer);
tmp = sub_080B1A48(x - 0x10, y - 0x10, this->collisionLayer);
if (tmp != 0x312 && gUnk_080B37A0[tmp] != 0x16 && gUnk_080B3E80[tmp] == 0) {
return TRUE;
}
@@ -484,10 +484,10 @@ bool32 sub_0802594C(Entity* this, u32 param_2) {
u8 bVar6;
iVar9 = xDiff + unk[0];
iVar11 = yDiff + unk[1];
bVar4 = sub_080002D4(iVar9 - 0x00, iVar11 - 0x00, uVar1);
bVar5 = sub_080002D4(iVar9 - 0x10, iVar11 - 0x00, uVar1);
bVar6 = sub_080002D4(iVar9 - 0x00, iVar11 - 0x10, uVar1);
bVar7 = sub_080002D4(iVar9 - 0x10, iVar11 - 0x10, uVar1);
bVar4 = sub_080B1B18(iVar9 - 0x00, iVar11 - 0x00, uVar1);
bVar5 = sub_080B1B18(iVar9 - 0x10, iVar11 - 0x00, uVar1);
bVar6 = sub_080B1B18(iVar9 - 0x00, iVar11 - 0x10, uVar1);
bVar7 = sub_080B1B18(iVar9 - 0x10, iVar11 - 0x10, uVar1);
if ((bVar4 | bVar5 | bVar6 | bVar7) == 0) {
this->field_0x7c.HALF.LO = gRoomControls.origin_x + iVar9;
this->field_0x7c.HALF.HI = gRoomControls.origin_y + iVar11;
@@ -513,10 +513,10 @@ void sub_08025A54(Entity* this) {
}
bool32 sub_08025AB8(u32 tile, u32 layer) {
if (sub_080002E0(tile, layer))
if (sub_080B1B44(tile, layer))
return FALSE;
if (sub_080002C8(tile, layer) == 10) {
if (sub_080B1AE0(tile, layer) == 10) {
sub_0807B7D8(0x61, tile, layer);
return TRUE;
}
src/enemy/rope.c
+1 -1
View File
@@ -174,7 +174,7 @@ void sub_08031600(Entity* this) {
u32 sub_0803163C(Entity* this) {
u32 h;
if (sub_080002B8(this) == 0x13) {
if (sub_080B1AA8(this) == 0x13) {
h = this->field_0x7a.HWORD / 2;
} else {
h = this->field_0x7a.HWORD;
src/enemy/slime.c
+1 -1
View File
@@ -129,7 +129,7 @@ void sub_08045178(Entity* this, Entity* child, int h, int v) {
return;
sub_0804A4E4(this, child);
if (sub_080002CC(child, h, v))
if (sub_080B1AF0(child, h, v))
return;
x = child->x.HALF.HI + h;
src/enemy/spinyBeetle.c
+1 -1
View File
@@ -323,7 +323,7 @@ void sub_08033D78(SpinyBeetleEntity* this) {
case 0x1c5:
break;
default:
if (sub_080002E0(tile, super->collisionLayer) - 1 > 0x3e)
if (sub_080B1B44(tile, super->collisionLayer) - 1 > 0x3e)
ProcessMovement0(super);
break;
}
src/enemy/tektite.c
+1 -1
View File
@@ -137,7 +137,7 @@ void sub_0802F300(Entity* this) {
return;
} else if (this->collisions != 0) {
sub_0800417E(this, this->collisions);
} else if ((sub_080002B8(this) & 0xf0) == 0x50) {
} else if ((sub_080B1AA8(this) & 0xf0) == 0x50) {
this->direction = (this->direction + 0x10) & 0x1f;
}
src/enemy/tektiteGolden.c
+1 -1
View File
@@ -116,7 +116,7 @@ void sub_08038048(Entity* this) {
return;
} else if (this->collisions != 0) {
sub_0800417E(this, this->collisions);
} else if ((sub_080002B8(this) & 0xf0) == 0x50) {
} else if ((sub_080B1AA8(this) & 0xf0) == 0x50) {
this->direction = (this->direction + 0x10) & 0x1f;
}
src/enemy/vaatiEyesMacro.c
+1 -1
View File
@@ -230,7 +230,7 @@ void sub_0802EFB8(Entity* this) {
uVar3 = GetFacingDirection(&gPlayerEntity, this);
uVar1 = (uVar3 + 4) & 0x18;
}
iVar4 = sub_080002E0(TILE(this->x.HALF.HI, this->y.HALF.HI) + gUnk_080B4488[((uVar1) >> 3)], 1);
iVar4 = sub_080B1B44(TILE(this->x.HALF.HI, this->y.HALF.HI) + gUnk_080B4488[((uVar1) >> 3)], 1);
if (iVar4 != 0) {
this->direction = 0xff;
} else {
src/enemy/vaatiProjectile.c
+1 -1
View File
@@ -275,7 +275,7 @@ void sub_0803E4D8(Entity* this) {
u32 tile;
tile = TILE(this->x.HALF.HI, this->y.HALF.HI + 8);
if (sub_080002E0(tile, gPlayerEntity.collisionLayer) != 0xff) {
if (sub_080B1B44(tile, gPlayerEntity.collisionLayer) != 0xff) {
SetTile(0x4074, tile, gPlayerEntity.collisionLayer);
}
}
src/enemy/wizzrobeWind.c
+1 -1
View File
@@ -235,7 +235,7 @@ void sub_0802F8E4(WizzrobeEntity* this) {
iVar4 = ((s32)(rand)&0x7ff0) % (this->unk_6f << 3);
uVar7 = (uVar1 + iVar4) | 8;
uVar6 = TILE(uVar8, uVar7);
if ((sub_080002E0(uVar6, super->collisionLayer) == 0) &&
if ((sub_080B1B44(uVar6, super->collisionLayer) == 0) &&
(GetTileIndex(uVar6, super->collisionLayer) != 0x4071)) {
super->x.HALF.HI = (s16)uVar8;
super->y.HALF.HI = (s16)uVar7;
src/entity.c
+5 -5
View File
@@ -21,8 +21,8 @@ extern void UnloadHitbox(Entity*);
extern void sub_0804AA1C(Entity*);
void ClearDeletedEntity(Entity*);
extern void _ClearAndUpdateEntities(void);
extern void UpdateEntities_arm(u32);
extern void ram_ClearAndUpdateEntities(void);
extern void ram_UpdateEntities(u32);
static void UpdatePriorityTimer(void);
static void ReleaseTransitionManager(void*);
@@ -205,7 +205,7 @@ void UpdateEntities(void) {
UpdatePriority();
ClearHitboxList();
sub_0806F0A4();
f = UpdateEntities_arm;
f = ram_UpdateEntities;
f(0);
ClearAllDeletedEntities();
sub_0805EE88();
@@ -213,7 +213,7 @@ void UpdateEntities(void) {
void UpdateManagers(void) {
void (*f)(u32);
f = UpdateEntities_arm;
f = ram_UpdateEntities;
f(1);
ClearAllDeletedEntities();
}
@@ -323,7 +323,7 @@ void* GetEmptyEntityByKind(u32 kind) {
void DeleteThisEntity(void) {
void (*f)(void);
DeleteEntityAny(gUpdateContext.current_entity);
f = _ClearAndUpdateEntities;
f = ram_ClearAndUpdateEntities;
f();
}
src/fade.c
+2 -2
View File
@@ -13,7 +13,7 @@ extern u16 gPaletteBuffer[];
extern u16 gUnk_080FC3C4[];
// function pointer to overlay (0x03005e98) in ram calls rom function MakeFadeBuff256
extern u32 gMakeFadeBuff256;
extern u32 ram_MakeFadeBuff256;
typedef void (*fptrMakeFadeBuff256)(u8*, u8*, u16, u8);
void SetBrightness(u32 brightness) {
@@ -32,7 +32,7 @@ void FadeVBlank(void) {
while (usedPalettesTmp != 0) {
if ((usedPalettesTmp & 1) == 1) {
func = (fptrMakeFadeBuff256)&gMakeFadeBuff256;
func = (fptrMakeFadeBuff256)&ram_MakeFadeBuff256;
func(&((u8*)gPaletteBuffer)[palIdx], &PAL_RAM[palIdx], ptrUnk->unk2, ptrUnk->unk1);
}
palIdx += 0x20;
src/interrupts.c
+2 -2
View File
@@ -18,7 +18,7 @@ extern Entity gUnk_03003BE0;
extern Entity* gPlayerClones[3];
extern u16 gUnk_080B2CD8[];
void gIntrMain(void);
void ram_IntrMain(void);
struct {
u8 ready;
@@ -36,7 +36,7 @@ void DummyIntr(void) {
}
void EnableVBlankIntr(void) {
INTR_VECTOR = gIntrMain;
INTR_VECTOR = ram_IntrMain;
REG_DISPSTAT = DISPSTAT_VCOUNT_INTR | DISPSTAT_VBLANK_INTR | (80 << 8);
REG_IE = INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_GAMEPAK;
REG_IME = 1;
src/item/itemLantern.c
+1 -1
View File
@@ -87,7 +87,7 @@ void sub_08075B54(ItemBehavior* this, u32 arg1) {
tmp = &gUnk_08126EEC[gPlayerEntity.animationState & 6];
if ((gPlayerState.jump_status == 0) &&
(sub_080002F0(TILE(gPlayerEntity.x.HALF.HI + tmp[0], gPlayerEntity.y.HALF.HI + tmp[1]),
(sub_080B1BA4(TILE(gPlayerEntity.x.HALF.HI + tmp[0], gPlayerEntity.y.HALF.HI + tmp[1]),
gPlayerEntity.collisionLayer, 0x40) != 0)) {
this->field_0xf = 0xf;
this->stateID += 1;
src/main.c
+2 -2
View File
@@ -84,7 +84,7 @@ void AgbMain(void) {
// Interrupt handlers that are loaded into RAM.
extern u8 sub_080B197C[];
extern u8 gUnk_030056F0[];
extern u8 ram_sub_080B197C[];
extern u8 gUnk_02038560[];
extern u8 gUnk_080B2CD8[];
extern u8 gUnk_080B2CD8_2[];
@@ -102,7 +102,7 @@ static void InitOverlays(void) {
MemClear(gUnk_02000030, size);
size = (u32)gUnk_080B2CD8 - (u32)sub_080B197C;
if (size != 0) {
MemCopy(sub_080B197C, gUnk_030056F0, size);
MemCopy(sub_080B197C, ram_sub_080B197C, size);
}
size = (u32)gUnk_080B2CD8_2 - (u32)gUnk_080B2CD8_3;
src/manager/manager24.c
+2 -2
View File
@@ -10,7 +10,7 @@ extern void (*const gUnk_08108CDC[])(Manager24*);
u32 sub_0805BFC4(u32, u32);
void sub_0805C02C(Manager24*);
extern u32 sub_080002C8(u16, u8);
extern u32 sub_080B1AE0(u16, u8);
extern void (*const gUnk_08108CE8[])(u32, u32);
@@ -33,7 +33,7 @@ void sub_0805BF30(Manager24* manager) {
}
void sub_0805BF78(Manager24* this) {
if (sub_080002C8(this->tile, this->field_0x35) != 0x2e) {
if (sub_080B1AE0(this->tile, this->field_0x35) != 0x2e) {
this->manager.action = 2;
this->manager.unk_0e = 0x5a;
sub_0805C02C(this);
src/manager/manager3.c
+2 -2
View File
@@ -27,7 +27,7 @@ typedef struct {
extern s8 gUnk_08107C6C[];
extern u32 sub_08057810(void);
extern u32 sub_080002C0(u16, u16, u8);
extern u32 sub_080B1AC8(u16, u16, u8);
void Manager3_Main(Manager3* this) {
s8 tmp;
@@ -53,7 +53,7 @@ void Manager3_Main(Manager3* this) {
gArea.field_0x18 = 3;
}
}
if (sub_080002C0(this->unk_38, this->unk_3a, this->manager.unk_0e) == 0x3d) {
if (sub_080B1AC8(this->unk_38, this->unk_3a, this->manager.unk_0e) == 0x3d) {
CreateMagicSparkles(this->unk_38 + gRoomControls.origin_x, this->unk_3a + gRoomControls.origin_y,
this->manager.unk_0e);
if (!this->manager.unk_0f) {
src/manager/managerF.c
+1 -1
View File
@@ -116,7 +116,7 @@ void sub_08058EE4(ManagerF* this) {
void sub_08058F44(u32 unk0, u32 unk1, u32 unk2) {
if (CheckRoomFlag(unk2))
return;
if (sub_080002A8(unk0, unk1, 1) != 0x61)
if (sub_080B1A48(unk0, unk1, 1) != 0x61)
return;
SetTileType(0x26, ((unk0 >> 4) & 0x3F) | (((unk1 >> 4) & 0x3F) << 6), 1);
sub_08058F84(unk0, unk1);
src/npc/npc5.c
+1 -1
View File
@@ -484,7 +484,7 @@ u32 sub_080611D4(Entity* this) {
ptr = (s8*)gUnk_0810AC4C;
a = ptr[x];
b = ptr[x + 1];
uVar2 = sub_080002B4(this, a, b);
uVar2 = sub_080B1A8C(this, a, b);
ptr2 = gUnk_0810AC54;
do {
src/npc/townMinish.c
+3 -3
View File
@@ -4,7 +4,7 @@
#include "functions.h"
#include "item.h"
extern u32 sub_080002C0(u32, u32, u32);
extern u32 sub_080B1AC8(u32, u32, u32);
extern void sub_0806ACC4(Entity*);
extern void sub_0806AEA8(Entity*);
extern void sub_0806AEE4(Entity*);
@@ -298,8 +298,8 @@ void sub_0806B098(Entity* this) {
void sub_0806B0E0(Entity* this) {
int idx = 0;
if (sub_080002C0(0x38, 0xb8, 1) == 0x57 && sub_080002C0(0x48, 0xb8, 1) == 0x57 &&
sub_080002C0(0x38, 200, 1) == 0x57 && sub_080002C0(0x48, 200, 1) == 0x57) {
if (sub_080B1AC8(0x38, 0xb8, 1) == 0x57 && sub_080B1AC8(0x48, 0xb8, 1) == 0x57 &&
sub_080B1AC8(0x38, 200, 1) == 0x57 && sub_080B1AC8(0x48, 200, 1) == 0x57) {
idx = 1;
}
src/object/beanstalk.c
+3 -3
View File
@@ -335,18 +335,18 @@ void Beanstalk_Action1Type9(BeanstalkEntity* this) {
if (super->subAction == 0) {
super->subAction = 1;
super->y.HALF.HI += 0x28;
this->unk_72 = sub_0800029C(super, 0, -0x18);
this->unk_72 = sub_080B1A0C(super, 0, -0x18);
}
super->spriteOrientation.flipY = gPlayerEntity.spriteOrientation.flipY;
super->spriteRendering.b3 = gPlayerEntity.spriteRendering.b3;
if (gPlayerState.floor_type == 0x1e) {
super->spritePriority.b0 = 0;
if (sub_0800029C(super, 0, -0x18) != 0x4014) {
if (sub_080B1A0C(super, 0, -0x18) != 0x4014) {
SetTile(0x4014, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1);
}
} else {
super->spritePriority.b0 = 5;
if (this->unk_72 != sub_0800029C(super, 0, -0x18)) {
if (this->unk_72 != sub_080B1A0C(super, 0, -0x18)) {
SetTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1);
}
}
src/object/bigIceBlock.c
+16 -16
View File
@@ -145,27 +145,27 @@ void sub_08099910(BigIceBlockEntity* this) {
SetTile(0x4022, position, super->collisionLayer);
break;
case 1:
iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
uVar3 = 0x4024;
if (iVar1 == 0x12) {
uVar3 = 0x4079;
}
SetTile(uVar3, position - 0x41, super->collisionLayer);
SetTile(0x4022, position - 0x40, super->collisionLayer);
iVar1 = sub_080002C8(position - 0x3f, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x3f, super->collisionLayer);
uVar3 = 0x4025;
if (iVar1 == 0x12) {
uVar3 = 0x407b;
}
SetTile(uVar3, position - 0x3f, super->collisionLayer);
iVar1 = sub_080002C8(position - 1, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 1, super->collisionLayer);
uVar3 = 0x4024;
if (iVar1 == 0x12) {
uVar3 = 0x4079;
}
SetTile(uVar3, position - 1, super->collisionLayer);
SetTile(0x4022, position, super->collisionLayer);
iVar1 = sub_080002C8(position + 1, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 1, super->collisionLayer);
uVar3 = 0x4025;
if (iVar1 == 0x12) {
uVar3 = 0x407b;
@@ -174,13 +174,13 @@ void sub_08099910(BigIceBlockEntity* this) {
return;
break;
case 2:
iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
uVar3 = 0x4023;
if (iVar1 == 0x12) {
uVar3 = 0x4077;
}
SetTile(uVar3, position - 0x41, super->collisionLayer);
iVar1 = sub_080002C8(position - 0x40, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x40, super->collisionLayer);
uVar3 = 0x4023;
if (iVar1 == 0x12) {
uVar3 = 0x4077;
@@ -188,13 +188,13 @@ void sub_08099910(BigIceBlockEntity* this) {
SetTile(uVar3, position - 0x40, super->collisionLayer);
SetTile(0x4022, position - 1, super->collisionLayer);
SetTile(0x4022, position, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x3f, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x3f, super->collisionLayer);
uVar3 = 0x4026;
if (iVar1 == 0x12) {
uVar3 = 0x407c;
}
SetTile(uVar3, position + 0x3f, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x40, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x40, super->collisionLayer);
uVar3 = 0x4026;
if (iVar1 == 0x12) {
uVar3 = 0x407c;
@@ -202,50 +202,50 @@ void sub_08099910(BigIceBlockEntity* this) {
SetTile(uVar3, position + 0x40, super->collisionLayer);
break;
case 3:
iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
uVar3 = 0x4027;
if (iVar1 == 0x12) {
uVar3 = 0x4075;
}
SetTile(uVar3, position - 0x41, super->collisionLayer);
iVar1 = sub_080002C8(position - 0x40, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x40, super->collisionLayer);
uVar3 = 0x4023;
if (iVar1 == 0x12) {
uVar3 = 0x4077;
}
SetTile(uVar3, position - 0x40, super->collisionLayer);
iVar1 = sub_080002C8(position - 0x3f, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x3f, super->collisionLayer);
uVar3 = 0x4028;
if (iVar1 == 0x12) {
uVar3 = 0x4076;
}
SetTile(uVar3, position - 0x3f, super->collisionLayer);
iVar1 = sub_080002C8(position - 1, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 1, super->collisionLayer);
uVar3 = 0x4024;
if (iVar1 == 0x12) {
uVar3 = 0x4079;
}
SetTile(uVar3, position - 1, super->collisionLayer);
SetTile(0x4022, position, super->collisionLayer);
iVar1 = sub_080002C8(position + 1, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 1, super->collisionLayer);
uVar3 = 0x4025;
if (iVar1 == 0x12) {
uVar3 = 0x407b;
}
SetTile(uVar3, position + 1, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x3f, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x3f, super->collisionLayer);
uVar3 = 0x4029;
if (iVar1 == 0x12) {
uVar3 = 0x4078;
}
SetTile(uVar3, position + 0x3f, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x40, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x40, super->collisionLayer);
uVar3 = 0x4026;
if (iVar1 == 0x12) {
uVar3 = 0x407c;
}
SetTile(uVar3, position + 0x40, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x41, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x41, super->collisionLayer);
uVar3 = 0x402a;
if (iVar1 == 0x12) {
uVar3 = 0x407a;
src/object/bollard.c
+1 -1
View File
@@ -89,7 +89,7 @@ void sub_0808B3AC(BollardEntity* this) {
super->spritePriority.b0 = 4;
this->tile = COORD_TO_TILE(super);
this->tileIndex = GetTileIndex(this->tile, super->collisionLayer);
this->unk74 = sub_080002E0(this->tile, super->collisionLayer);
this->unk74 = sub_080B1B44(this->tile, super->collisionLayer);
SetTile(0x400b, this->tile, super->collisionLayer);
}
src/object/button.c
+1 -1
View File
@@ -140,7 +140,7 @@ u32 sub_08081E0C(Entity*);
Entity* sub_08081D74(Entity* this) {
Entity* ent;
if (sub_080002E0(this->field_0x74.HWORD, this->collisionLayer) == 0xF) {
if (sub_080B1B44(this->field_0x74.HWORD, this->collisionLayer) == 0xF) {
return 0;
}
ent = 0;
src/object/crenelBeanSprout.c
+3 -3
View File
@@ -18,7 +18,7 @@ typedef struct {
/*0x72*/ u16 unk_72;
} CrenelBeanSproutEntity;
extern u32 sub_080002BC(s32, s32, u32);
extern u32 sub_080B1AB4(s32, s32, u32);
void sub_080969A4(CrenelBeanSproutEntity*);
void sub_08096A78(CrenelBeanSproutEntity*);
@@ -171,13 +171,13 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) {
tmp = gPlayerEntity.animationState & 6;
this->unk_70 = ((super->x.HALF.HI + (s8)gUnk_08123184[tmp]) & -0x10) | 8;
this->unk_72 = ((super->y.HALF.HI + (s8)gUnk_08123184[(tmp) + 1]) & -0x10) | 8;
if (sub_080002BC(this->unk_70, this->unk_72, super->collisionLayer) == 0x19) {
if (sub_080B1AB4(this->unk_70, this->unk_72, super->collisionLayer) == 0x19) {
gUnk_0200AF00.filler25[10] = 3;
} else {
gUnk_0200AF00.filler25[10] = 0;
}
PositionRelative(&gPlayerEntity, super, 0, 0x10000);
if (sub_080002B8(super) == 0x19) {
if (sub_080B1AA8(super) == 0x19) {
sub_0807BA8C(0xdc, super->collisionLayer);
sub_08096A78(this);
}
src/object/itemOnGround.c
+1 -1
View File
@@ -247,7 +247,7 @@ void sub_080812A0(Entity* this) {
}
void sub_080812A8(Entity* this) {
if (sub_080002D0(this) != 0xF && this->field_0x6e.HWORD != GetTileTypeByEntity(this)) {
if (sub_080B1B0C(this) != 0xF && this->field_0x6e.HWORD != GetTileTypeByEntity(this)) {
this->direction = 0;
this->speed = 0;
this->spriteSettings.draw = 1;
src/object/lilypadLarge.c
+8 -8
View File
@@ -102,10 +102,10 @@ void sub_08085A1C(LilypadLargeEntity* this) {
void sub_08085A44(LilypadLargeEntity* this) {
super->speed = 0x200;
if (sub_080002B4(super, 0x10, 0x18) != 0x11) {
if (sub_080B1A8C(super, 0x10, 0x18) != 0x11) {
super->direction = 0x18;
} else {
if (sub_080002B4(super, 0xfffffff0, 0x18) != 0x11) {
if (sub_080B1A8C(super, 0xfffffff0, 0x18) != 0x11) {
super->direction = 8;
} else {
super->direction = 0x10;
@@ -126,7 +126,7 @@ void sub_08085A98(LilypadLargeEntity* this) {
this->unk_78.WORD -= 0x20000;
sub_0805EC9C(super, this->unk_78.HALF_U.HI, this->unk_78.HALF_U.HI, this->unk_7c.HALF_U.HI);
}
if (sub_080002B4(super, 0, 0x18) != 0x11) {
if (sub_080B1A8C(super, 0, 0x18) != 0x11) {
super->subAction = 2;
if (gArea.locationIndex == 0x1b) {
super->y.HALF.HI += 0xd0;
@@ -159,7 +159,7 @@ void sub_08085B40(LilypadLargeEntity* this) {
}
} else {
ResetCollisionLayer(super);
if (sub_080002B8(super) == 0xd) {
if (sub_080B1AA8(super) == 0xd) {
ResetCollisionLayer(&gPlayerEntity);
sub_08085CDC(this);
super->direction = GetFacingDirection(&gPlayerEntity, super);
@@ -181,7 +181,7 @@ void sub_08085B40(LilypadLargeEntity* this) {
super->actionDelay |= 0x80;
this->unk_70 = 0;
this->unk_6c = 0;
if (sub_080002B8(super) == 0xd) {
if (sub_080B1AA8(super) == 0xd) {
super->action = 4;
}
}
@@ -229,7 +229,7 @@ void sub_08085D10(LilypadLargeEntity* this) {
void sub_08085D28(LilypadLargeEntity* this) {
if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & PL_FLAGS2) != 0)) &&
(sub_080002B4(super, 0, 0x18) == 0x11)) {
(sub_080B1A8C(super, 0, 0x18) == 0x11)) {
super->action = 2;
super->subAction = 0;
sub_08078B48();
@@ -261,7 +261,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil
u32 tmp = r4 >> 2;
s32 tmpX = gUnk_08120638[tmp];
s32 tmpY = gUnk_08120638[tmp + 1];
if (sub_080002CC(super, tmpX, tmpY) == 0xff) {
if (sub_080B1AF0(super, tmpX, tmpY) == 0xff) {
if (sub_080806BC((super->x.HALF.HI - gRoomControls.origin_x) + tmpX,
(super->y.HALF.HI - gRoomControls.origin_y) + tmpY, r4, 5) == 0) {
@@ -280,7 +280,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil
u32 tmp = r6 >> 2;
s32 tmpX = (u8)gUnk_08120638[tmp];
s32 tmpY = gUnk_08120638[tmp + 1];
if (sub_080002CC(super, tmpX, tmpY) == 0xff) {
if (sub_080B1AF0(super, tmpX, tmpY) == 0xff) {
if (sub_0807BD14(&gPlayerEntity, r6 >> 3) != 0) {
super->direction = (u8)r6;
sub_08085E74(this);
src/object/mask.c
+1 -1
View File
@@ -46,7 +46,7 @@ void sub_080929A4(Entity* this) {
this->field_0x7c.HALF_U.HI = COORD_TO_TILE(this);
this->field_0x7c.HALF_U.LO = GetTileIndex(this->field_0x7c.HALF_U.HI, 1);
this->field_0x7a.HWORD = sub_080002E0((u16)this->field_0x7c.HALF.HI, 1);
this->field_0x7a.HWORD = sub_080B1B44((u16)this->field_0x7c.HALF.HI, 1);
SetTile(0x4022, this->field_0x7c.HALF_U.HI, 1);
}
src/object/minecart.c
+2 -2
View File
@@ -141,7 +141,7 @@ void sub_080919AC(Entity* this) {
this->field_0xf = 0x3c;
}
uVar3 = sub_080002B4(this, gUnk_081223C8[this->animationState * 2],
uVar3 = sub_080B1A8C(this, gUnk_081223C8[this->animationState * 2],
gUnk_081223C8[this->animationState * 2 + 1]);
iVar2 = sub_08007DD6(uVar3, gUnk_081223D8[this->animationState]);
if (iVar2 == 0) {
@@ -177,7 +177,7 @@ void sub_080919AC(Entity* this) {
case 0x6d:
case 0x6e:
case 0x6f:
if (uVar3 == sub_080002B8(this)) {
if (uVar3 == sub_080B1AA8(this)) {
sub_08091C0C(this);
gPlayerEntity.animationState = this->animationState << 1;
return;
src/object/object68.c
+2 -2
View File
@@ -16,7 +16,7 @@ typedef struct {
/*0x68*/ u8 unk_68;
} Object68Entity;
extern u32 sub_0800029C(Entity*, s32, s32);
extern u32 sub_080B1A0C(Entity*, s32, s32);
void sub_08094774(Object68Entity*);
void sub_080948D0(Object68Entity*);
@@ -117,7 +117,7 @@ void sub_08094980(Object68Entity* this, u32 searchTileIndex, u32 replaceTileInde
while (index < 10) {
xOffset = gUnk_08122A28[index];
yOffset = gUnk_08122A28[index + 1];
if (searchTileIndex == sub_0800029C(super, xOffset, yOffset)) {
if (searchTileIndex == sub_080B1A0C(super, xOffset, yOffset)) {
SetTile(replaceTileIndex, TILE(super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset),
super->collisionLayer);
}
src/object/object6A.c
+1 -1
View File
@@ -327,7 +327,7 @@ void sub_08094E30(Object6AEntity* this) {
super->zVelocity = 0;
SetDefaultPriority(super, PRIO_PLAYER_EVENT);
InitializeAnimation(super, 0);
if (sub_080002B8(super) == 13) {
if (sub_080B1AA8(super) == 13) {
super->action = 3;
}
break;
src/object/objectOnPillar.c
+1 -1
View File
@@ -211,7 +211,7 @@ void sub_080970F4(ObjectOnPillarEntity* this) {
bool32 sub_08097144(ObjectOnPillarEntity* this) {
LinearMoveUpdate(super);
sub_0800445C(super);
if (sub_080002B8(super) == 0x19) {
if (sub_080B1AA8(super) == 0x19) {
super->spriteOffsetY = 2;
}
if ((--this->unk_76 == 0) && sub_08097194(this) == FALSE) {
src/object/pot.c
+1 -1
View File
@@ -94,7 +94,7 @@ void sub_08082310(Entity* this) {
DeleteThisEntity();
break;
default:
if (sub_080002B8(this) == 13) {
if (sub_080B1AA8(this) == 13) {
CreateFx(this, FX_FALL_DOWN, 0);
} else if (tileType == 0x4005) {
gPlayerState.field_0xab = 4;
src/object/pullableLever.c
+1 -1
View File
@@ -114,7 +114,7 @@ void PullableLever_HandleSubAction0(PullableLeverEntity* this) {
if (-player->animationState + super->type2 * 2 == 0) {
x = gUnk_081222B8[super->type2 * 2] + super->x.HALF_U.HI;
y = gUnk_081222B8[super->type2 * 2 + 1] + super->y.HALF_U.HI;
if (0x10 < sub_080002D4(x, y, player->collisionLayer) - 0xf) {
if (0x10 < sub_080B1B18(x, y, player->collisionLayer) - 0xf) {
player->x.HALF.HI = x;
player->y.HALF.HI = y;
}
src/object/pushableFurniture.c
+5 -5
View File
@@ -152,7 +152,7 @@ bool32 sub_0808FC5C(PushableFurnitureEntity* this) {
} else {
super->spriteOffsetY = 0;
}
if (sub_080002D0(super)) {
if (sub_080B1B0C(super)) {
return 0;
}
if (super->field_0xf == 0) {
@@ -239,27 +239,27 @@ void sub_0808FDE8(PushableFurnitureEntity* this) {
u32 uVar3;
uVar3 = (u32)this->unk_70;
uVar1 = sub_080002E0(uVar3 - 1, 1);
uVar1 = sub_080B1B44(uVar3 - 1, 1);
iVar2 = GetTileIndex(uVar3, 1);
if (iVar2 == 0x402e) {
if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 5) == 0)) {
SetTile(0x402c, uVar3, 1);
}
} else {
iVar2 = sub_080002E0(uVar3, 1);
iVar2 = sub_080B1B44(uVar3, 1);
if ((iVar2 == 5) && ((((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)) && ((uVar1 & 5) != 0)))) {
SetTile(0x402e, uVar3, 1);
}
}
uVar3 = (u32)this->unk_72;
uVar1 = sub_080002E0(uVar3 + 1, 1);
uVar1 = sub_080B1B44(uVar3 + 1, 1);
iVar2 = GetTileIndex(uVar3, 1);
if (iVar2 == 0x402f) {
if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 10) == 0)) {
SetTile(0x402d, uVar3, 1);
}
} else {
iVar2 = sub_080002E0(uVar3, 1);
iVar2 = sub_080B1B44(uVar3, 1);
if (((iVar2 == 10) && (((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)))) && ((uVar1 & 10) != 0)) {
SetTile(0x402f, uVar3, 1);
}
src/object/pushableRock.c
+2 -2
View File
@@ -92,8 +92,8 @@ void sub_0808A644(PushableRockEntity* this) {
u32 tmp;
this->tilePosition = COORD_TO_TILE(super);
this->tileIndex = GetTileIndex(this->tilePosition, super->collisionLayer);
this->unk_72 = sub_080002E0(this->tilePosition, super->collisionLayer);
tmp = sub_080002C8(this->tilePosition, super->collisionLayer);
this->unk_72 = sub_080B1B44(this->tilePosition, super->collisionLayer);
tmp = sub_080B1AE0(this->tilePosition, super->collisionLayer);
if ((tmp == 0x19) || (tmp == 0xf0)) {
SetTile(0x4015, this->tilePosition, super->collisionLayer);
super->action = 3;
src/object/pushableStatue.c
+1 -1
View File
@@ -213,7 +213,7 @@ bool32 sub_080895C0(PushableStatueEntity* this) {
LinearMoveUpdate(super);
if ((--this->unk_86 == 0) && (sub_0800442E(super) == 0)) {
super->spriteOffsetY = 0;
if (!sub_080002D0(super)) {
if (!sub_080B1B0C(super)) {
sub_08089454(this);
return TRUE;
}
src/player.c
+4 -4
View File
@@ -2006,7 +2006,7 @@ static void PlayerRoomTransition(Entity* this) {
static void sub_080724DC(Entity* this) {
this->knockbackDuration = 0;
DeleteClones();
if (sub_080002B8(this) != 0x29) {
if (sub_080B1AA8(this) != 0x29) {
if ((gPlayerState.field_0x82[7] == 0) && (gPlayerState.swim_state != 0)) {
sub_0807AE20(this);
}
@@ -2648,7 +2648,7 @@ static void sub_080731D8(Entity* this) {
static void sub_080732D0(Entity* this) {
UpdateAnimationSingleFrame(this);
if (sub_080002B8(this) != 40) {
if (sub_080B1AA8(this) != 40) {
this->direction = DirectionNorth;
LinearMoveUpdate(this);
} else {
@@ -2910,7 +2910,7 @@ static void sub_080737BC(Entity* this) {
pos = this->y.HALF.HI;
tmp = 0xf;
tmp &= pos;
if (tmp == 8 && !sub_080002D0(this)) {
if (tmp == 8 && !sub_080B1B0C(this)) {
gPlayerState.jump_status |= 0x40;
sub_0807921C();
}
@@ -4130,7 +4130,7 @@ void sub_0807529C(Entity* this) {
void sub_080752AC(Entity* this, ScriptExecutionContext* ctx) {
LinearMoveUpdate(this);
if (!ctx->unk_18) {
if (sub_080002B8(this) != 41) {
if (sub_080B1AA8(this) != 41) {
ctx->unk_18 = 1;
ctx->unk_19 = 6;
}
src/playerItem/playerItem12.c
+2 -2
View File
@@ -107,9 +107,9 @@ void sub_080701F8(Entity* this) {
if (this->type == 0) {
sub_0800451C(this);
}
if (sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
if (sub_080B1BA4(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
if (sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI) == 0) {
if (sub_080002B8(this) == 0x19) {
if (sub_080B1AA8(this) == 0x19) {
this->action = 4;
COLLISION_OFF(this);
this->x.HALF.HI = (this->x.HALF.HI & 0xfff0) | 8;
src/playerItem/playerItem14.c
+1 -1
View File
@@ -44,7 +44,7 @@ void sub_0805FC74(Entity* this) {
if (this->type2 == 0) {
sub_0800451C(this);
}
if (!sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) &&
if (!sub_080B1BA4(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) &&
sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI)) {
CreateFx(this, FX_SWORD_MAGIC, 0);
DeleteThisEntity();
src/playerItem/playerItem3.c
+1 -1
View File
@@ -152,7 +152,7 @@ void sub_0801B680(Entity* this) {
uVar6 = ((u32)(-uvar1 | uvar1)) >> 0x1f;
}
if (sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
if (sub_080B1BA4(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
if (uVar6 == 0) {
uVar6 = sub_080040E2(this, &gUnk_08003E44);
}
src/playerItem/playerItemBottle.c
+1 -1
View File
@@ -273,7 +273,7 @@ void PlayerItemBottle_UseEmptyBottle(Entity* this) {
if (this->spriteSettings.flipX != 0) {
iVar2 = -iVar2;
}
if (sub_080002B4(this, iVar2, (s8)ptr2[1]) == 0x10) {
if (sub_080B1A8C(this, iVar2, (s8)ptr2[1]) == 0x10) {
this->type2 = ITEM_BOTTLE_WATER;
}
}
src/playerItem/playerItemSwordBeam.c
+1 -1
View File
@@ -71,7 +71,7 @@ void sub_08019580(Entity* this) {
if (this->type2 == 0) {
sub_0800451C(this);
}
if ((sub_080002F0(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer, 0x80) == 0) &&
if ((sub_080B1BA4(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer, 0x80) == 0) &&
(sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI) != 0)) {
CreateFx(this, FX_SWORD_MAGIC, 0);
DeleteThisEntity();
src/playerUtils.c
+8 -8
View File
@@ -23,7 +23,7 @@ extern Entity* sub_0805E744();
extern void sub_0809D738(Entity*);
extern s32 Mod(s32, s32);
extern void sub_08003FDE(Entity*, u32, u32, u32);
extern u32 sub_080002EC(u32, u32);
extern u32 sub_080B1B84(u32, u32);
extern u32 sub_08007DD6(u32, const u16*);
typedef struct {
@@ -1187,7 +1187,7 @@ bool32 sub_08079D48(void) {
return TRUE;
} else {
if (!sub_08008B22()) {
if (!sub_08007DD6((u16)sub_080002B8(&gPlayerEntity), gUnk_0811C268)) {
if (!sub_08007DD6((u16)sub_080B1AA8(&gPlayerEntity), gUnk_0811C268)) {
return TRUE;
}
}
@@ -1349,20 +1349,20 @@ NONMATCH("asm/non_matching/playerUtils/sub_0807A8D8.inc", void sub_0807A8D8(Enti
u32 tmp;
if ((gPlayerState.flags & PL_MINISH) == 0) {
tmp = sub_080002EC(COORD_TO_TILE_OFFSET(this, 0, 1), gPlayerEntity.collisionLayer) & 0x20;
tmp = sub_080B1B84(COORD_TO_TILE_OFFSET(this, 0, 1), gPlayerEntity.collisionLayer) & 0x20;
if (tmp != 0) {
sub_0807AAF8(this, COORD_TO_TILE_OFFSET(this, 0, 1));
}
tmp = sub_080002EC(COORD_TO_TILE_OFFSET(this, -2, 0), gPlayerEntity.collisionLayer) & 0x20;
tmp = sub_080B1B84(COORD_TO_TILE_OFFSET(this, -2, 0), gPlayerEntity.collisionLayer) & 0x20;
if (tmp != 0) {
sub_0807AAF8(this, COORD_TO_TILE_OFFSET(this, -2, 0));
}
tmp = sub_080002EC(COORD_TO_TILE_OFFSET(this, 2, 0), gPlayerEntity.collisionLayer) & 0x20;
tmp = sub_080B1B84(COORD_TO_TILE_OFFSET(this, 2, 0), gPlayerEntity.collisionLayer) & 0x20;
if (tmp != 0) {
sub_0807AAF8(this, COORD_TO_TILE_OFFSET(this, 2, 0));
}
}
tmp = sub_080002EC(COORD_TO_TILE(this), gPlayerEntity.collisionLayer);
tmp = sub_080B1B84(COORD_TO_TILE(this), gPlayerEntity.collisionLayer);
if ((tmp & 0x20) != 0) {
sub_0807AAF8(this, COORD_TO_TILE(this));
}
@@ -1643,12 +1643,12 @@ bool32 sub_0807B434(u32 position, u32 layer) {
case 0x37:
return FALSE;
default:
return sub_080002C8(position, layer) != 0xd;
return sub_080B1AE0(position, layer) != 0xd;
}
}
bool32 sub_0807B464(u32 param_1, u32 param_2) {
return sub_080002C8(param_1, param_2) == 0x56;
return sub_080B1AE0(param_1, param_2) == 0x56;
}
ASM_FUNC("asm/non_matching/playerUtils/sub_0807B480.inc", void sub_0807B480())
src/projectile/projectile5.c
+2 -2
View File
@@ -4,7 +4,7 @@
#include "room.h"
#include "coord.h"
extern u32 sub_080002E0(u32, u32);
extern u32 sub_080B1B44(u32, u32);
extern void (*const Projectile5_Functions[])(Entity*);
extern void (*const Projectile5_Actions[])(Entity*);
@@ -28,7 +28,7 @@ void sub_080A86F0(Entity* this) {
pbVar2 = &this->parent->field_0x82.HALF.HI;
if ((this->parent->field_0x82.HALF.HI & 0x3f) == 3) {
if (gPlayerState.hurtBlinkSpeed != 0) {
if (sub_080002E0(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer) == 0) {
if (sub_080B1B44(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer) == 0) {
if (this->bitfield == 0x80) {
*pbVar2 = *pbVar2 & 0x7f;
DeleteThisEntity();
src/projectile/removableDust.c
+2 -2
View File
@@ -4,7 +4,7 @@
#include "functions.h"
#include "object.h"
extern u32 sub_080002C8(u16, u8);
extern u32 sub_080B1AE0(u16, u8);
extern Entity* LoadRoomEntity(EntityData*);
extern void (*const RemovableDust_Functions[])(Entity*);
@@ -101,7 +101,7 @@ void sub_080AA544(Entity* this) {
uVar3 = 0;
iVar4 = 0;
do {
iVar2 = sub_080002C8((param - tmp[uVar3]) & 0xffff, this->collisionLayer);
iVar2 = sub_080B1AE0((param - tmp[uVar3]) & 0xffff, this->collisionLayer);
if (iVar2 == 0x3e) {
iVar4 += 1;
}
src/projectile/spiderWeb.c
+1 -1
View File
@@ -135,7 +135,7 @@ void SpiderWeb_SubAction0(Entity* this) {
if (tmp * 2 - entity->animationState == 0) {
x = gUnk_0812A064[tmp * 2] + this->x.HALF.HI;
y = gUnk_0812A064[tmp * 2 + 1] + this->y.HALF.HI;
if (sub_080002D4(x, y, entity->collisionLayer) == 0) {
if (sub_080B1B18(x, y, entity->collisionLayer) == 0) {
entity->x.HALF.HI = x;
entity->y.HALF.HI = y;
}