diff --git a/asm/beanstalk.s b/asm/beanstalk.s index d702554a..4406c78d 100644 --- a/asm/beanstalk.s +++ b/asm/beanstalk.s @@ -349,7 +349,7 @@ sub_08089F70: @ 0x08089F70 strb r0, [r4, #0xe] movs r0, #0xcc lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08089F8E: adds r0, r4, #0 bl UpdateAnimationSingleFrame @@ -416,7 +416,7 @@ sub_08089FF0: @ 0x08089FF0 strb r0, [r1, #0xe] movs r0, #0xcc lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0808A00E: pop {pc} diff --git a/asm/bigBarrel.s b/asm/bigBarrel.s index a4c5b78b..e7390c31 100644 --- a/asm/bigBarrel.s +++ b/asm/bigBarrel.s @@ -96,7 +96,7 @@ _08088AE4: ldr r0, _08088B74 @ =gUnk_08120C1C str r0, [r4, #0x68] movs r0, #0x8a - bl PlaySFX + bl SoundReq _08088B06: ldr r1, [r5, #0x68] movs r0, #2 @@ -111,7 +111,7 @@ _08088B06: ldr r0, _08088B78 @ =gUnk_08120C25 str r0, [r4, #0x68] movs r0, #0x89 - bl PlaySFX + bl SoundReq _08088B24: ldr r1, [r5, #0x68] movs r0, #4 @@ -126,7 +126,7 @@ _08088B24: ldr r0, _08088B7C @ =gUnk_08120C2E str r0, [r4, #0x68] movs r0, #0x8a - bl PlaySFX + bl SoundReq _08088B42: ldrb r0, [r4, #0xe] cmp r0, #0 @@ -817,7 +817,7 @@ _0808905C: movs r1, #0x3c bl sub_0805E4E0 movs r0, #0x72 - bl PlaySFX + bl SoundReq _08089088: adds r0, r4, #0 bl DeleteEntity diff --git a/asm/bigGoron.s b/asm/bigGoron.s index d7fb70e1..a83c056b 100644 --- a/asm/bigGoron.s +++ b/asm/bigGoron.s @@ -95,7 +95,7 @@ sub_0806D0B0: @ 0x0806D0B0 movs r1, #0x80 lsls r1, r1, #6 adds r0, r5, #0 - bl _DmaZero + bl MemClear32 cmp r4, #0 beq _0806D0DA adds r0, r4, #0 diff --git a/asm/bird.s b/asm/bird.s index 7cac5b3c..7d16e5f0 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -89,7 +89,7 @@ _0809D234: movs r1, #0 bl InitAnimationForceUpdate ldr r0, _0809D2AC @ =0x00000123 - bl PlaySFX + bl SoundReq movs r0, #0x68 adds r0, r0, r5 mov r8, r0 @@ -392,7 +392,7 @@ sub_0809D498: @ 0x0809D498 ldrh r0, [r0, #0x32] strh r0, [r5, #0x32] ldr r0, _0809D544 @ =0x00000123 - bl PlaySFX + bl SoundReq ldrb r1, [r6] movs r0, #0x39 rsbs r0, r0, #0 diff --git a/asm/bossDoor.s b/asm/bossDoor.s index d48324aa..408d22b4 100644 --- a/asm/bossDoor.s +++ b/asm/bossDoor.s @@ -203,7 +203,7 @@ sub_0808C348: @ 0x0808C348 cmp r0, #0 bne _0808C36A ldr r0, _0808C378 @ =0x00000185 - bl PlaySFX + bl SoundReq _0808C36A: adds r0, r4, #0 bl GetNextFrame @@ -408,7 +408,7 @@ sub_0808C4BC: @ 0x0808C4BC strh r1, [r0, #0x32] bl sub_0808C5D0 ldr r0, _0808C4FC @ =0x0000010B - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _0808C4F8: .4byte gUnk_0812150C diff --git a/asm/bowUse.s b/asm/bowUse.s index 1358eed0..709ff5be 100644 --- a/asm/bowUse.s +++ b/asm/bowUse.s @@ -173,7 +173,7 @@ _080192C6: str r0, [r4, #0x30] movs r0, #0xc5 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080192D0: adds r5, r4, #0 adds r5, #0x41 diff --git a/asm/cat.s b/asm/cat.s index 88c7bd1c..5dfe0f10 100644 --- a/asm/cat.s +++ b/asm/cat.s @@ -697,7 +697,7 @@ _08067D12: movs r0, #0 strb r0, [r5] movs r0, #0xd2 - bl PlaySFX + bl SoundReq _08067D1C: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/chestSpawner.s b/asm/chestSpawner.s index 9416152c..701e03dd 100644 --- a/asm/chestSpawner.s +++ b/asm/chestSpawner.s @@ -195,7 +195,7 @@ _08083FB2: strb r1, [r4, #0xf] movs r0, #0xa5 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _08083FE6 .align 2, 0 _08083FC8: .4byte gPlayerEntity @@ -210,7 +210,7 @@ _08083FCC: adds r0, r4, #0 bl sub_08083E20 movs r0, #0x73 - bl PlaySFX + bl SoundReq _08083FE6: pop {r4, r5, pc} .align 2, 0 @@ -238,7 +238,7 @@ sub_08083FEC: @ 0x08083FEC movs r1, #0x3c bl sub_0805E4E0 ldr r0, _08084020 @ =0x0000011B - bl PlaySFX + bl SoundReq _0808401E: pop {r4, pc} .align 2, 0 @@ -381,7 +381,7 @@ sub_080840A8: @ 0x080840A8 beq _08084138 movs r0, #0x92 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08084138: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -524,13 +524,13 @@ sub_08084224: @ 0x08084224 cmp r0, #6 blt _0808424C ldr r0, _08084248 @ =0x00000215 - bl PlaySFX + bl SoundReq b _08084258 .align 2, 0 _08084248: .4byte 0x00000215 _0808424C: movs r0, #0x72 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl CreateDust _08084258: diff --git a/asm/chuchuBoss.s b/asm/chuchuBoss.s index 9637aeb4..faec7634 100644 --- a/asm/chuchuBoss.s +++ b/asm/chuchuBoss.s @@ -88,7 +88,7 @@ _08025D28: strb r3, [r0] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl sub_0804A7D4 b _08025D9C @@ -221,7 +221,7 @@ _08025E68: _08025E6E: ldr r4, [r5, #0x48] adds r0, r5, #0 - bl sub_0806FBD8 + 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 sub_0806FBD8 + bl AllocMutableHitbox cmp r0, #0 bne _08025EAA _08025EA2: @@ -1016,7 +1016,7 @@ sub_08026414: @ 0x08026414 strb r0, [r1, #3] movs r0, #0xd1 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08026474: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -1035,7 +1035,7 @@ sub_0802647C: @ 0x0802647C movs r1, #0 bl sub_08080964 ldr r0, _080264A8 @ =0x000001A1 - bl PlaySFX + bl SoundReq adds r0, r4, #0 adds r0, #0x84 ldr r1, [r0] @@ -1090,7 +1090,7 @@ sub_080264D4: @ 0x080264D4 movs r2, #0 bl sub_080276F4 movs r0, #0x2e - bl PlaySFX + bl SoundReq _08026504: adds r0, r4, #0 bl sub_080277F8 @@ -1371,7 +1371,7 @@ _0802670A: bne _08026726 movs r0, #0xcf lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08026726: adds r0, r4, #0 bl ProcessMovement @@ -1536,7 +1536,7 @@ _08026830: bl sub_080276F4 movs r0, #0xd1 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08026860: adds r0, r4, #0 bl sub_080277F8 @@ -1580,7 +1580,7 @@ _08026888: movs r1, #3 bl InitAnimationForceUpdate ldr r0, _080268C4 @ =0x000001A1 - bl PlaySFX + bl SoundReq _080268BE: add sp, #4 pop {r4, r5, pc} @@ -1853,7 +1853,7 @@ _08026A98: movs r1, #0 bl sub_08080964 ldr r0, _08026B24 @ =0x0000010B - bl PlaySFX + bl SoundReq adds r0, r6, #0 movs r1, #0x15 movs r2, #0 @@ -2035,7 +2035,7 @@ sub_08026BE8: @ 0x08026BE8 orrs r0, r1 strb r0, [r3] ldr r0, _08026C30 @ =0x00000155 - bl PlaySFX + bl SoundReq b _08026C38 .align 2, 0 _08026C30: .4byte 0x00000155 @@ -2558,7 +2558,7 @@ _08026FFE: movs r0, #0x2d strb r0, [r1] ldr r0, _08027044 @ =0x00000155 - bl PlaySFX + bl SoundReq ldrb r1, [r4, #0x15] movs r0, #0x10 ands r0, r1 @@ -2617,7 +2617,7 @@ sub_08027064: @ 0x08027064 cmp r0, #0 bne _08027098 movs r0, #0x7c - bl PlaySFX + bl SoundReq _08027098: adds r0, r5, #0 adds r0, #0x84 @@ -3071,7 +3071,7 @@ _08027406: beq _08027428 _0802741C: ldr r0, _08027424 @ =0x00000127 - bl PlaySFX + bl SoundReq b _08027444 .align 2, 0 _08027424: .4byte 0x00000127 @@ -3087,7 +3087,7 @@ _08027428: strb r0, [r2, #0xd] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08027444: adds r0, r6, #0 bl sub_08027A60 @@ -3965,14 +3965,14 @@ sub_08027AA4: @ 0x08027AA4 b _08027B94 _08027AC2: movs r0, #0x84 - bl PlaySFX + bl SoundReq ldrb r3, [r5, #0xb] adds r0, r5, #0 movs r1, #0x49 movs r2, #9 bl CreateObjectWithParent ldr r0, _08027B3C @ =0x00000155 - bl PlaySFX + bl SoundReq adds r0, r5, #0 adds r0, #0x84 ldr r4, [r0] @@ -4016,7 +4016,7 @@ _08027B2A: adds r0, r5, #0 bl sub_08027D20 ldr r0, _08027B40 @ =0x00000127 - bl PlaySFX + bl SoundReq _08027B36: movs r0, #1 b _08027B96 diff --git a/asm/code_08000E44.s b/asm/code_08000E44.s index 2104990f..cfaf1f47 100644 --- a/asm/code_08000E44.s +++ b/asm/code_08000E44.s @@ -59,8 +59,8 @@ sub_08000E92: @ 0x08000E92 movs r3, #1 b _08000E98 - non_word_aligned_thumb_func_start LoadAssetAsync -LoadAssetAsync: @ 0x08000E96 + non_word_aligned_thumb_func_start LoadResourceAsync +LoadResourceAsync: @ 0x08000E96 movs r3, #0 _08000E98: push {r4, r5} diff --git a/asm/code_080011C4.s b/asm/code_080011C4.s index fa7ab489..94684d6e 100644 --- a/asm/code_080011C4.s +++ b/asm/code_080011C4.s @@ -5,15 +5,15 @@ .text - thumb_func_start sub_080011C4 -sub_080011C4: @ 0x080011C4 + thumb_func_start EnemyUpdate +EnemyUpdate: @ 0x080011C4 mov r3, lr push {r3, r4} adds r4, r0, #0 ldrb r2, [r0, #0xc] cmp r2, #0 bne _080011DC - bl sub_0804A57C + bl EnemyInit cmp r0, #0 bne _080011EA bl DeleteThisEntity @@ -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 diff --git a/asm/code_08003FC4.s b/asm/code_08003FC4.s index 025f50bd..2779befc 100644 --- a/asm/code_08003FC4.s +++ b/asm/code_08003FC4.s @@ -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] @@ -123,7 +123,7 @@ _0800407E: ldr r4, _08004360 @ =gUnk_02021F20 _0800408C: ldrh r0, [r4] - bl PlaySFX + bl SoundReq adds r4, #2 subs r5, #1 bne _0800408C diff --git a/asm/code_080043E8.s b/asm/code_080043E8.s index cab44841..da9ba967 100644 --- a/asm/code_080043E8.s +++ b/asm/code_080043E8.s @@ -106,7 +106,7 @@ sub_0800449C: @ 0x0800449C cmp r0, #0 pop {r0} beq _080044AC - bl PlaySFX + bl SoundReq _080044AC: pop {pc} diff --git a/asm/code_08016B30.s b/asm/code_08016B30.s index 147aa712..4b1079c9 100644 --- a/asm/code_08016B30.s +++ b/asm/code_08016B30.s @@ -49,11 +49,11 @@ 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 - bl UpdateBackgroundRegisters + bl DispCtrlSet ldr r0, _08016BCC @ =gUnk_03000FBC str r0, [r4] ldr r0, _08016BD0 @ =gUnk_02022730 @@ -78,14 +78,14 @@ _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 _08016BD8: .4byte 0x03007FF8 - thumb_func_start sub_08016BDC -sub_08016BDC: @ 0x08016BDC + thumb_func_start HBlankIntr +HBlankIntr: @ 0x08016BDC push {lr} ldr r1, _08016BF0 @ =0x04000004 ldr r2, _08016BF4 @ =0x00005028 @@ -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] diff --git a/asm/code_08018500.s b/asm/code_08018500.s index e4aa9e2d..182c60f8 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -58,7 +58,7 @@ sub_0801855C: @ 0x0801855C ldr r4, _08018570 @ =gUnk_02033AB8 adds r0, r4, #0 movs r1, #0x14 - bl _DmaZero + bl MemClear32 adds r5, r4, #0 ldr r4, _08018574 @ =gUnk_080B3D20 movs r6, #0 @@ -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 diff --git a/asm/code_08019444.s b/asm/code_08019444.s index d528d5b9..5655fa6c 100644 --- a/asm/code_08019444.s +++ b/asm/code_08019444.s @@ -163,7 +163,7 @@ _0801954E: adds r0, r5, #0 bl sub_08019580 ldr r0, _0801957C @ =0x0000013F - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _08019578: .4byte gUnk_080B43FC @@ -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 @@ -3708,8 +3708,8 @@ _0801B054: pop {r4, r5, r6, r7, pc} .align 2, 0 - thumb_func_start sub_0801B060 -sub_0801B060: @ 0x0801B060 + thumb_func_start UpdateBgAnim +UpdateBgAnim: @ 0x0801B060 push {r4, r5, lr} movs r3, #0 ldr r4, _0801B0B0 @ =gUnk_02000CC0 @@ -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 sub_0806FBD8 + bl AllocMutableHitbox cmp r0, #0 beq _0801BB26 ldrb r1, [r4, #0x10] @@ -5130,7 +5130,7 @@ _0801BA9C: bl sub_0801766C movs r0, #0xee lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0801BB0A .align 2, 0 _0801BAF4: .4byte gPlayerEntity @@ -5189,7 +5189,7 @@ sub_0801BB2C: @ 0x0801BB2C movs r2, #5 bl sub_080A7C18 ldr r0, _0801BB8C @ =0x00000109 - bl PlaySFX + bl SoundReq _0801BB64: bl DeleteThisEntity _0801BB68: @@ -5319,7 +5319,7 @@ _0801BC7A: strh r0, [r1] movs r0, #0x88 lsls r0, r0, #2 - bl PlaySFX + bl SoundReq _0801BC98: adds r0, r5, #0 bl ModHealth @@ -5413,7 +5413,7 @@ _0801BD54: lsls r0, r0, #4 strh r0, [r1] ldr r0, _0801BD8C @ =0x000001CF - bl PlaySFX + bl SoundReq _0801BD6C: ldr r0, _0801BD90 @ =gPlayerEntity adds r0, #0x5a diff --git a/asm/code_0801C370.s b/asm/code_0801C370.s index 81359341..8ca381af 100644 --- a/asm/code_0801C370.s +++ b/asm/code_0801C370.s @@ -32,7 +32,7 @@ _0801C398: movs r1, #0xcd lsls r1, r1, #2 adds r0, r5, #0 - bl _DmaZero + bl MemClear32 strb r6, [r5, #3] strh r4, [r5, #0xe] ldr r0, _0801C474 @ =gSave @@ -48,7 +48,7 @@ _0801C398: movs r1, #0x80 lsls r1, r1, #4 adds r0, r4, #0 - bl _DmaZero + bl MemClear32 ldr r1, _0801C47C @ =gScreen str r4, [r1, #0x10] ldr r0, _0801C480 @ =0x00001F0C @@ -93,7 +93,7 @@ _0801C398: adds r0, #0x34 movs r1, #0xc0 lsls r1, r1, #2 - bl _DmaZero + bl MemClear32 movs r0, #5 movs r1, #9 bl sub_0801CA6C diff --git a/asm/code_0801CEC0.s b/asm/code_0801CEC0.s index c045e5d5..95184820 100644 --- a/asm/code_0801CEC0.s +++ b/asm/code_0801CEC0.s @@ -12,7 +12,7 @@ sub_0801CFA8: @ 0x0801CFA8 adds r5, r0, #0 ldr r0, _0801CFCC @ =gUnk_02001A00 movs r1, #0x40 - bl _DmaZero + bl MemClear32 movs r4, #0 _0801CFB6: adds r0, r4, #0 @@ -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 diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index f9bb8b3d..6ac7a011 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -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 @@ -59,7 +59,7 @@ sub_0801D8E0: @ 0x0801D8E0 mov r1, ip ands r1, r0 mov ip, r1 - ldr r6, _0801D90C @ =gUnk_02035540 + ldr r6, _0801D90C @ =gzHeap mov sb, r6 ldrh r7, [r6] movs r5, #1 @@ -70,7 +70,7 @@ sub_0801D8E0: @ 0x0801D8E0 movs r2, #0 b _0801D926 .align 2, 0 -_0801D90C: .4byte gUnk_02035540 +_0801D90C: .4byte gzHeap _0801D910: cmp r1, r4 bhi _0801D918 @@ -91,7 +91,7 @@ _0801D926: lsls r0, r2, #2 add r0, sb ldrh r1, [r0, #2] - ldr r6, _0801D95C @ =gUnk_02035540 + ldr r6, _0801D95C @ =gzHeap adds r1, r1, r6 ldrh r0, [r0, #4] adds r0, r0, r6 @@ -117,7 +117,7 @@ _0801D952: mov sl, r6 b _0801D970 .align 2, 0 -_0801D95C: .4byte gUnk_02035540 +_0801D95C: .4byte gzHeap _0801D960: movs r5, #0 _0801D962: @@ -133,7 +133,7 @@ _0801D970: lsls r0, r1, #2 add r0, sb ldrh r0, [r0, #2] - ldr r6, _0801D994 @ =gUnk_02035540 + ldr r6, _0801D994 @ =gzHeap adds r3, r0, r6 mov r0, ip subs r4, r3, r0 @@ -148,7 +148,7 @@ _0801D970: movs r2, #0 b _0801D9AE .align 2, 0 -_0801D994: .4byte gUnk_02035540 +_0801D994: .4byte gzHeap _0801D998: cmp r1, r4 bhi _0801D9A0 @@ -203,7 +203,7 @@ _0801D9D8: strh r0, [r3] adds r0, r4, #0 mov r1, ip - bl _DmaZero + bl MemClear32 adds r0, r4, #0 b _0801DA02 .align 2, 0 @@ -220,7 +220,7 @@ _0801DA02: thumb_func_start sub_0801DA0C sub_0801DA0C: @ 0x0801DA0C push {r4, r5, lr} - ldr r3, _0801DA44 @ =gUnk_02035540 + ldr r3, _0801DA44 @ =gzHeap subs r1, r0, r3 ldr r0, _0801DA48 @ =0x00000FFF cmp r1, r0 @@ -248,7 +248,7 @@ sub_0801DA0C: @ 0x0801DA0C strh r0, [r3] b _0801DA74 .align 2, 0 -_0801DA44: .4byte gUnk_02035540 +_0801DA44: .4byte gzHeap _0801DA48: .4byte 0x00000FFF _0801DA4C: adds r4, #4 @@ -276,22 +276,22 @@ _0801DA74: .align 2, 0 _0801DA78: .4byte gUnk_0203553E - thumb_func_start sub_0801DA7C -sub_0801DA7C: @ 0x0801DA7C + thumb_func_start zMallocInit +zMallocInit: @ 0x0801DA7C push {lr} - ldr r0, _0801DA8C @ =gUnk_02035540 + ldr r0, _0801DA8C @ =gzHeap movs r1, #0x80 lsls r1, r1, #5 - bl _DmaZero + bl MemClear32 pop {pc} .align 2, 0 -_0801DA8C: .4byte gUnk_02035540 +_0801DA8C: .4byte gzHeap thumb_func_start sub_0801DA90 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 @@ -323,15 +323,15 @@ sub_0801DA90: @ 0x0801DA90 bl sub_0801DB34 ldr r0, _0801DB08 @ =0x0600C000 movs r1, #0x20 - bl _DmaZero + bl MemClear32 ldr r0, _0801DB0C @ =gBG0Buffer movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 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 @@ -369,7 +369,7 @@ sub_0801DB34: @ 0x0801DB34 ldr r4, _0801DB6C @ =gScreen adds r0, r4, #0 movs r1, #0x7c - bl _DmaZero + bl MemClear32 ldr r0, _0801DB70 @ =gBG0Buffer str r0, [r4, #0x10] ldr r0, _0801DB74 @ =0x00001F0C @@ -424,7 +424,7 @@ sub_0801DBA0: @ 0x0801DBA0 adds r5, r1, #0 adds r1, r2, #0 adds r0, r5, #0 - bl _DmaZero + bl MemClear32 movs r0, #1 strb r0, [r5] ldr r2, _0801DBE4 @ =gScreenTransition @@ -667,7 +667,7 @@ sub_0801DD88: @ 0x0801DD88 ldr r1, _0801DD9C @ =0x06006000 movs r2, #0x80 lsls r2, r2, #6 - bl LoadAssetAsync + bl LoadResourceAsync pop {pc} .align 2, 0 _0801DD98: .4byte gUnk_0201AEE0 @@ -699,7 +699,7 @@ _0801DDB8: ldr r0, _0801DDE0 @ =gUnk_02019EE0 movs r1, #0x80 lsls r1, r1, #8 - bl _DmaZero + bl MemClear32 b _0801DEE2 .align 2, 0 _0801DDD8: .4byte gUnk_080C9C50 @@ -968,7 +968,7 @@ sub_0801DFB4: @ 0x0801DFB4 ldr r7, _0801E004 @ =gUnk_02022740 adds r0, r7, #0 movs r1, #0x10 - bl _DmaZero + bl MemClear32 strh r4, [r7, #6] strh r5, [r7, #8] strh r6, [r7, #0xa] @@ -1049,7 +1049,7 @@ sub_0801E044: @ 0x0801E044 movs r1, #2 strb r1, [r0, #1] movs r0, #0x6b - bl PlaySFX + bl SoundReq _0801E06A: pop {pc} .align 2, 0 @@ -1209,7 +1209,7 @@ sub_0801E160: @ 0x0801E160 adds r0, r0, r4 movs r1, #0xa0 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 adds r0, r6, #0 mov r1, r8 mov r2, sb @@ -1279,7 +1279,7 @@ sub_0801E1EC: @ 0x0801E1EC adds r0, r0, r5 movs r1, #0xa0 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 adds r0, r4, #0 movs r1, #0 bl sub_0801E24C @@ -1443,7 +1443,7 @@ sub_0801E31C: @ 0x0801E31C adds r0, r0, r1 movs r1, #0xa0 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 cmp sl, sb bge _0801E3DC movs r6, #0 @@ -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 @@ -1738,7 +1738,7 @@ sub_0801E49C: @ 0x0801E49C adds r0, r0, r6 movs r1, #0xa0 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 ldr r2, _0801E5E8 @ =gUnk_02018EE0 ldrb r1, [r5] lsls r0, r1, #2 @@ -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 diff --git a/asm/code_08049D30.s b/asm/code_08049D30.s index 872580f6..930b85a7 100644 --- a/asm/code_08049D30.s +++ b/asm/code_08049D30.s @@ -1137,8 +1137,8 @@ _0804A570: _0804A574: .4byte gUnk_080D2C58 _0804A578: .4byte 0x0000FFFF - thumb_func_start sub_0804A57C -sub_0804A57C: @ 0x0804A57C + thumb_func_start EnemyInit +EnemyInit: @ 0x0804A57C push {r4, r5, r6, r7, lr} adds r4, r0, #0 ldrb r1, [r4, #0x10] @@ -1524,7 +1524,7 @@ _0804A81C: _0804A84A: bl sub_0807CD9C ldr r0, _0804A860 @ =0x80100000 - bl PlaySFX + bl SoundReq bl DeleteThisEntity b _0804A982 .align 2, 0 diff --git a/asm/code_0804AA84.s b/asm/code_0804AA84.s index 6170eea3..c6424780 100644 --- a/asm/code_0804AA84.s +++ b/asm/code_0804AA84.s @@ -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 @@ -197,7 +197,7 @@ sub_0804ACF8: @ 0x0804ACF8 bl sub_0804AD6C bl sub_0805E5A8 movs r0, #0xf8 - bl PlaySFX + bl SoundReq _0804AD12: pop {pc} .align 2, 0 diff --git a/asm/code_0804AEB0.s b/asm/code_0804AEB0.s index a83e3f1b..f81da7cb 100644 --- a/asm/code_0804AEB0.s +++ b/asm/code_0804AEB0.s @@ -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 diff --git a/asm/code_0804B058.s b/asm/code_0804B058.s index 93fc9bca..cd7d2ea9 100644 --- a/asm/code_0804B058.s +++ b/asm/code_0804B058.s @@ -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 diff --git a/asm/code_0804B9F8.s b/asm/code_0804B9F8.s index 20a8b123..6ee254e6 100644 --- a/asm/code_0804B9F8.s +++ b/asm/code_0804B9F8.s @@ -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 @@ -50,10 +50,10 @@ sub_0804FFE4: @ 0x0804FFE4 ldr r4, _08050000 @ =gFadeControl adds r0, r4, #0 movs r1, #0x1c - bl _DmaZero + bl MemClear32 ldr r0, _08050004 @ =gUnk_020354C0 movs r1, #0x80 - bl _DmaZero + bl MemClear32 movs r0, #1 rsbs r0, r0, #0 str r0, [r4, #4] diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 92ac7b50..9f1662ed 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -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 @@ -213,7 +213,7 @@ sub_08052878: @ 0x08052878 ldr r0, [r0] str r0, [r1] ldr r0, _08052898 @ =0x80010000 - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _08052894: .4byte gArea @@ -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] @@ -255,12 +255,12 @@ _080528C8: movs r1, #8 bl DoFade ldr r0, _080528EC @ =0x80100000 - bl PlaySFX + bl SoundReq movs r0, #1 _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: @@ -791,7 +791,7 @@ sub_08052CFC: @ 0x08052CFC ldr r4, _08052D44 @ =gArea ldr r1, _08052D48 @ =0x00000894 adds r0, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _08052D4C @ =gRoomControls ldrb r1, [r0, #4] lsls r1, r1, #2 @@ -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 @@ -996,7 +996,7 @@ sub_08052EA0: @ 0x08052EA0 ldr r4, _08052EE4 @ =gRoomVars adds r0, r4, #0 movs r1, #0xcc - bl _DmaZero + bl MemClear32 movs r0, #0xff strb r0, [r4, #0x10] strb r0, [r4, #0x11] @@ -1178,7 +1178,7 @@ sub_08052FF4: @ 0x08052FF4 ldr r5, _08053074 @ =gUnk_020342CC adds r0, r5, #0 movs r1, #0x20 - bl _DmaZero + bl MemClear32 str r5, [r5, #0x20] ldr r0, _08053078 @ =gAreaRoomHeaders lsls r6, r6, #2 @@ -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 @@ -1570,17 +1570,17 @@ sub_08053320: @ 0x08053320 movs r4, #0x80 lsls r4, r4, #4 adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _08053380 @ =gBG1Buffer adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _08053384 @ =gBG2Buffer adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _08053388 @ =gBG3Buffer movs r1, #0x80 lsls r1, r1, #5 - bl _DmaZero + bl MemClear32 movs r0, #0x10 bl LoadGfxGroup movs r0, #0x17 @@ -1775,7 +1775,7 @@ sub_080534AC: @ 0x080534AC movs r1, #0 str r1, [r0] ldr r0, _080534E0 @ =0x80100000 - bl PlaySFX + bl SoundReq _080534D6: pop {r4, pc} .align 2, 0 @@ -1964,7 +1964,7 @@ sub_08053634: @ 0x08053634 ldr r1, _08053644 @ =gUnk_02032EC0 movs r0, #3 strb r0, [r1] - bl sub_08056418 + bl MessageInitialize pop {pc} .align 2, 0 _08053644: .4byte gUnk_02032EC0 @@ -2018,7 +2018,7 @@ sub_0805368C: @ 0x0805368C beq _080536A6 bl DeleteEntity movs r0, #0xf0 - bl PlaySFX + bl SoundReq _080536A6: pop {pc} @@ -2169,7 +2169,7 @@ sub_08053758: @ 0x08053758 ldr r0, _080537FC @ =0x00001DC1 strh r0, [r2, #0x20] movs r0, #0xf - bl PlaySFX + bl SoundReq bl sub_0805E5B4 movs r1, #0x80 lsls r1, r1, #1 @@ -2222,7 +2222,7 @@ sub_08053800: @ 0x08053800 ldr r0, _08053888 @ =gBG1Buffer movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 ldr r0, _0805388C @ =0x00000F01 adds r5, r5, r0 ldr r1, [r4] @@ -2732,7 +2732,7 @@ sub_08053C20: @ 0x08053C20 movs r1, #0x10 bl DoFade movs r0, #0x33 - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _08053C50: .4byte gMenu @@ -2751,9 +2751,9 @@ sub_08053C60: @ 0x08053C60 movs r1, #2 bl DoFade movs r0, #0xf4 - bl PlaySFX + bl SoundReq ldr r0, _08053C80 @ =0x80100000 - bl PlaySFX + bl SoundReq movs r0, #3 bl InitScreen pop {pc} @@ -3268,7 +3268,7 @@ _08054098: ldrb r0, [r4, #2] bl ModHealth movs r0, #0x71 - bl PlaySFX + bl SoundReq b _0805427C _080540A6: ldr r0, _080540BC @ =gUnk_080FD5A8 @@ -3278,7 +3278,7 @@ _080540A6: ldrh r0, [r1] bl ModRupees movs r0, #0x6f - bl PlaySFX + bl SoundReq b _0805427C .align 2, 0 _080540BC: .4byte gUnk_080FD5A8 @@ -3350,7 +3350,7 @@ _0805412C: movs r1, #1 bl sub_0807CAA0 ldr r0, _08054148 @ =0x00000109 - bl PlaySFX + bl SoundReq b _0805427C .align 2, 0 _08054144: .4byte gSave @@ -3482,7 +3482,7 @@ _08054240: bl sub_080542C0 _0805424E: ldr r0, _08054258 @ =0x00000103 - bl PlaySFX + bl SoundReq b _0805427C .align 2, 0 _08054258: .4byte 0x00000103 diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s index 3e74e142..8b559fc7 100644 --- a/asm/code_0805436C.s +++ b/asm/code_0805436C.s @@ -61,8 +61,8 @@ sub_080548E8: @ 0x080548E8 bl sub_0805E5C0 bl sub_080AD9B0 bl sub_080AD918 - bl sub_0807FC40 - bl sub_0801B060 + bl UpdateScroll + bl UpdateBgAnim bl sub_08000108 pop {pc} .align 2, 0 @@ -72,7 +72,7 @@ _0805491C: .4byte gMenu thumb_func_start sub_08054920 sub_08054920: @ 0x08054920 push {lr} - bl sub_08056418 + bl MessageInitialize bl sub_0806F38C ldr r1, _08054948 @ =gUnk_080C9CBC ldr r0, _0805494C @ =gUnk_02022740 @@ -258,7 +258,7 @@ sub_08054A60: @ 0x08054A60 ands r0, r1 strb r0, [r4, #0x14] adds r0, r4, #0 - bl sub_0806FBD8 + bl AllocMutableHitbox cmp r0, #0 bne _08054AAC bl DeleteThisEntity @@ -514,7 +514,7 @@ sub_08054C88: @ 0x08054C88 movs r1, #0x10 bl DoFade movs r0, #0x73 - bl PlaySFX + bl SoundReq ldrb r0, [r4, #6] adds r0, #1 strb r0, [r4, #6] @@ -865,7 +865,7 @@ sub_08054EFC: @ 0x08054EFC bl sub_0806FAD8 _08054F54: movs r0, #0xfd - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _08054F5C: .4byte gRoomControls @@ -1264,7 +1264,7 @@ sub_0805524C: @ 0x0805524C adds r0, #1 strb r0, [r3, #7] movs r0, #0xf6 - bl PlaySFX + bl SoundReq b _080552D6 .align 2, 0 _08055270: .4byte gMenu @@ -1313,7 +1313,7 @@ _080552B4: adds r0, #1 strb r0, [r3, #6] movs r0, #0x73 - bl PlaySFX + bl SoundReq _080552D6: pop {r4, pc} .align 2, 0 @@ -1418,7 +1418,7 @@ sub_08055380: @ 0x08055380 movs r1, #0x10 bl DoFade movs r0, #0x73 - bl PlaySFX + bl SoundReq ldrb r0, [r4, #6] adds r0, #1 strb r0, [r4, #6] @@ -1563,7 +1563,7 @@ sub_08055498: @ 0x08055498 movs r1, #0x10 bl DoFade movs r0, #0x73 - bl PlaySFX + bl SoundReq ldrb r0, [r4, #6] adds r0, #1 strb r0, [r4, #6] @@ -2228,7 +2228,7 @@ _080559AE: ldrb r0, [r4, #4] bl sub_080553E0 movs r0, #0x73 - bl PlaySFX + bl SoundReq pop {r4, pc} .align 2, 0 _080559D8: .4byte gMenu @@ -2321,7 +2321,7 @@ sub_08055A6C: @ 0x08055A6C movs r1, #0x10 bl DoFade movs r0, #0x73 - bl PlaySFX + bl SoundReq ldrb r0, [r4, #6] adds r0, #1 strb r0, [r4, #6] @@ -2584,7 +2584,7 @@ _08055C8C: movs r1, #0x10 bl DoFade movs r0, #0x73 - bl PlaySFX + bl SoundReq ldr r0, _08055CAC @ =gMenu ldrb r1, [r0, #6] adds r1, #1 diff --git a/asm/code_08056418.s b/asm/code_08056418.s index bb12835c..97457697 100644 --- a/asm/code_08056418.s +++ b/asm/code_08056418.s @@ -179,7 +179,7 @@ _0805680A: _08056812: adds r0, r4, #0 movs r1, #0 - bl sub_0805F324 + bl sub_GetFontStrWidth adds r3, r0, #0 adds r4, r5, #0 adds r4, #0x56 @@ -242,7 +242,7 @@ _0805687A: b _08056942 _0805688C: ldrh r0, [r5, #0x22] - bl PlaySFX + bl SoundReq b _08056942 _08056894: ldr r1, _080568A8 @ =gUnk_02022780 @@ -267,11 +267,11 @@ _080568B2: beq _080568D2 adds r0, r6, #0 movs r1, #4 - bl _DmaZero + bl MemClear32 ldr r4, _08056910 @ =gUnk_02024030 adds r0, r4, #0 movs r1, #0x18 - bl _DmaZero + bl MemClear32 movs r0, #1 strb r0, [r4] strb r0, [r6] @@ -472,9 +472,9 @@ _08056A30: movs r1, #3 strb r1, [r2] movs r1, #0x18 - bl _DmaZero + bl MemClear32 movs r0, #0x6a - bl PlaySFX + bl SoundReq adds r1, r6, #0 adds r1, #0x89 movs r0, #1 @@ -502,7 +502,7 @@ _08056A6A: beq _08056A90 strb r5, [r4, #3] movs r0, #0x69 - bl PlaySFX + bl SoundReq movs r1, #1 b _08056A92 .align 2, 0 @@ -610,7 +610,7 @@ _08056B48: cmp r0, #0 beq _08056B70 movs r0, #0x68 - bl PlaySFX + bl SoundReq adds r0, r4, #0 adds r0, #0x9a strb r5, [r0] @@ -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 @@ -752,8 +752,8 @@ sub_08056C54: @ 0x08056C54 _08056C60: .4byte gTextBox _08056C64: .4byte gUnk_02022780 - thumb_func_start sub_08056C68 -sub_08056C68: @ 0x08056C68 + thumb_func_start DeleteWindow +DeleteWindow: @ 0x08056C68 push {r4, r5, r6, lr} ldr r5, _08056CB8 @ =gUnk_02036A38 ldrb r0, [r5, #1] @@ -894,8 +894,8 @@ _08056D66: pop {r4, r5, r6, r7, pc} .align 2, 0 - thumb_func_start sub_08056D70 -sub_08056D70: @ 0x08056D70 + thumb_func_start CreateWindow +CreateWindow: @ 0x08056D70 push {r4, lr} ldr r0, _08056DB4 @ =gUnk_02022780 adds r0, #0x9b @@ -915,9 +915,9 @@ sub_08056D70: @ 0x08056D70 ldr r3, _08056DC0 @ =0x0000F07B ldrb r1, [r4, #6] ldrb r2, [r4, #7] - bl sub_08056DC8 - bl sub_08056EC0 - bl sub_08056F1C + bl DispMessageFrame + bl DispString + bl DispCursor ldr r2, _08056DC4 @ =gUnk_02036A38 ldr r0, [r4] ldr r1, [r4, #4] @@ -933,8 +933,8 @@ _08056DBC: .4byte gBG0Buffer _08056DC0: .4byte 0x0000F07B _08056DC4: .4byte gUnk_02036A38 - thumb_func_start sub_08056DC8 -sub_08056DC8: @ 0x08056DC8 + thumb_func_start DispMessageFrame +DispMessageFrame: @ 0x08056DC8 push {r4, r5, r6, r7, lr} mov r7, sb mov r6, r8 @@ -1066,8 +1066,8 @@ _08056EB6: pop {r4, r5, r6, r7, pc} .align 2, 0 - thumb_func_start sub_08056EC0 -sub_08056EC0: @ 0x08056EC0 + thumb_func_start DispString +DispString: @ 0x08056EC0 push {r4, r5, r6, r7, lr} ldr r6, _08056F10 @ =gUnk_02036A40 ldrb r0, [r6, #6] @@ -1116,8 +1116,8 @@ _08056F10: .4byte gUnk_02036A40 _08056F14: .4byte gUnk_02034CB2 _08056F18: .4byte gUnk_0202281E - thumb_func_start sub_08056F1C -sub_08056F1C: @ 0x08056F1C + thumb_func_start DispCursor +DispCursor: @ 0x08056F1C push {lr} ldr r0, _08056F58 @ =gUnk_02022780 adds r0, #0x98 @@ -1163,7 +1163,7 @@ sub_08056F70: @ 0x08056F70 ldr r1, _08056F84 @ =0x0600D040 movs r2, #0xd0 lsls r2, r2, #4 - bl LoadAssetAsync + bl LoadResourceAsync pop {pc} .align 2, 0 _08056F80: .4byte gUnk_02000D00 diff --git a/asm/code_0805E3B0.s b/asm/code_0805E3B0.s index 199df78c..ba150ef6 100644 --- a/asm/code_0805E3B0.s +++ b/asm/code_0805E3B0.s @@ -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 @@ -360,15 +360,15 @@ EraseAllEntities: @ 0x0805E60C bl DeleteAllEntities ldr r0, _0805E654 @ =gUnk_03003DC0 movs r1, #0xc - bl _DmaZero + bl MemClear32 ldr r0, _0805E658 @ =gPlayerEntity movs r1, #0xaa lsls r1, r1, #6 - bl _DmaZero + bl MemClear32 ldr r0, _0805E65C @ =gUnk_02033290 movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 bl sub_0805E98C ldr r0, _0805E660 @ =gEntCount movs r1, #0 diff --git a/asm/code_0805EC04.s b/asm/code_0805EC04.s index 329b46b0..45cad29a 100644 --- a/asm/code_0805EC04.s +++ b/asm/code_0805EC04.s @@ -751,7 +751,7 @@ _0805F2D0: bne _0805F2F0 adds r0, r5, #0 movs r1, #0xc - bl _DmaZero + bl MemClear32 ldrb r0, [r4] movs r1, #1 orrs r0, r1 @@ -781,7 +781,7 @@ _0805F308: cmp r0, r2 bne _0805F318 movs r1, #0xc - bl _DmaZero + bl MemClear32 b _0805F320 .align 2, 0 _0805F314: .4byte gUnk_02036540 @@ -794,8 +794,8 @@ _0805F320: pop {pc} .align 2, 0 - thumb_func_start sub_0805F324 -sub_0805F324: @ 0x0805F324 + thumb_func_start sub_GetFontStrWidth +sub_GetFontStrWidth: @ 0xGetFontStrWidth push {r4, r5, r6, r7, lr} mov r7, sl mov r6, sb @@ -805,7 +805,7 @@ sub_0805F324: @ 0x0805F324 adds r7, r1, #0 mov r1, sp movs r2, #0x30 - bl _DmaCopy + bl MemCopy movs r0, #0 str r0, [sp, #0x34] movs r1, #0 @@ -944,7 +944,7 @@ sub_0805F440: @ 0x0805F440 adds r4, r0, #0 adds r5, r1, #0 movs r1, #0x30 - bl _DmaZero + bl MemClear32 ldr r0, _0805F45C @ =0x0000FFFF cmp r5, r0 bls _0805F460 @@ -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 @@ -1028,7 +1028,7 @@ _0805F486: str r0, [r4, #4] mov r0, sp movs r1, #1 - bl sub_0805F324 + bl sub_GetFontStrWidth lsrs r2, r0, #0x18 ldrb r1, [r4, #0x16] muls r2, r1, r2 @@ -1087,7 +1087,7 @@ _0805F554: adds r1, r4, #0 adds r2, r7, #0 adds r3, r6, #0 - bl sub_08056DC8 + bl DispMessageFrame adds r5, #2 mov r1, sb ldrh r0, [r1, #0x10] @@ -1122,7 +1122,7 @@ _0805F596: _0805F59E: ldr r0, _0805F5C8 @ =gUnk_02034330 movs r1, #0x18 - bl _DmaZero + bl MemClear32 _0805F5A6: mov r0, sb mov r1, sp @@ -1158,10 +1158,10 @@ 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_0805F324 + bl sub_GetFontStrWidth adds r2, r0, #0 ldrb r1, [r4, #0x13] movs r0, #1 @@ -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] diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index 50acd0ae..264756c7 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -842,7 +842,7 @@ sub_0806F364: @ 0x0806F364 adds r1, r2, r3 adds r0, r0, r1 movs r1, #0x10 - bl _DmaZero + bl MemClear32 pop {pc} .align 2, 0 _0806F384: .4byte gArea @@ -1013,7 +1013,7 @@ _0806F444: str r0, [r5, #0x50] _0806F4B4: movs r0, #0xed - bl PlaySFX + bl SoundReq b _0806F4D8 .align 2, 0 _0806F4BC: .4byte gPlayerEntity @@ -1026,7 +1026,7 @@ _0806F4C8: ldr r0, [r0, #0x2c] strb r1, [r0, #0xa] movs r0, #0xef - bl PlaySFX + bl SoundReq _0806F4D8: movs r0, #1 b _0806F4E2 diff --git a/asm/code_0806FA6C.s b/asm/code_0806FA6C.s index 40190422..81ff4789 100644 --- a/asm/code_0806FA6C.s +++ b/asm/code_0806FA6C.s @@ -123,19 +123,19 @@ _0806FBCC: _0806FBD0: .4byte gScreenTransition _0806FBD4: .4byte gPlayerState - thumb_func_start sub_0806FBD8 -sub_0806FBD8: @ 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] @@ -385,7 +385,7 @@ sub_0806FD8C: @ 0x0806FD8C ldr r0, _0806FD9C @ =gUnk_020000C0 movs r1, #0xc0 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 pop {pc} .align 2, 0 _0806FD9C: .4byte gUnk_020000C0 @@ -534,7 +534,7 @@ _0806FE9E: bls _0806FE9E adds r0, r6, #0 movs r1, #0x40 - bl _DmaZero + bl MemClear32 _0806FEB4: pop {r4, r5, r6, pc} .align 2, 0 @@ -973,7 +973,7 @@ _0807018C: adds r0, r5, #0 bl InitializeAnimation ldr r0, _080701F4 @ =0x000001DD - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _080701F0: .4byte gUnk_0811B9A8 @@ -1325,7 +1325,7 @@ _0807049E: adds r0, r4, #0 bl sub_08017744 ldr r0, _080704B8 @ =0x00000199 - bl PlaySFX + bl SoundReq pop {r4, r5, r6, pc} .align 2, 0 _080704B4: .4byte gRoomControls @@ -1358,7 +1358,7 @@ sub_080704D4: @ 0x080704D4 bl sub_080AE008 movs r0, #0x87 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl sub_080704FC pop {r4, pc} @@ -1454,7 +1454,7 @@ sub_0807059C: @ 0x0807059C push {lr} ldr r0, _080705A8 @ =gUnk_02034490 movs r1, #0x18 - bl _DmaZero + bl MemClear32 pop {pc} .align 2, 0 _080705A8: .4byte gUnk_02034490 diff --git a/asm/code_08070698.s b/asm/code_08070698.s index 9fb088c9..10b20c3e 100644 --- a/asm/code_08070698.s +++ b/asm/code_08070698.s @@ -198,7 +198,7 @@ sub_080715D4: @ 0x080715D4 orrs r0, r1 str r0, [r2, #0x30] ldr r0, _08071630 @ =0x0000016F - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _08071628: .4byte gPlayerState @@ -1058,7 +1058,7 @@ _08071C5A: bl sub_0800451C bl ResetPlayer movs r0, #0x87 - bl PlaySFX + bl SoundReq _08071C9C: pop {r4, r5, pc} .align 2, 0 @@ -1105,7 +1105,7 @@ _08071CEE: movs r0, #0xf0 strb r0, [r4, #0xe] movs r0, #0x7b - bl PlaySFX + bl SoundReq _08071CFE: pop {r4, pc} .align 2, 0 @@ -1434,7 +1434,7 @@ sub_08071F50: @ 0x08071F50 strh r0, [r1, #8] bl sub_08077B20 ldr r0, _08071F7C @ =0x00000195 - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _08071F78: .4byte gPlayerState @@ -1936,9 +1936,9 @@ _08072332: bl ResetPlayer movs r0, #0x92 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x7a - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _08072350: .4byte 0x00000401 @@ -1991,7 +1991,7 @@ sub_08072354: @ 0x08072354 bl CreateFx movs r0, #0xd3 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080723C0: pop {r4, pc} .align 2, 0 @@ -2093,7 +2093,7 @@ sub_0807246C: @ 0x0807246C lsls r0, r0, #2 strh r0, [r2, #8] movs r0, #0x7b - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _0807248C: .4byte gPlayerState @@ -2390,16 +2390,16 @@ _080726BE: cmp r1, #0 beq _080726E4 movs r0, #0x79 - bl PlaySFX + bl SoundReq b _080726EA .align 2, 0 _080726E0: .4byte gPlayerState _080726E4: movs r0, #0x78 - bl PlaySFX + bl SoundReq _080726EA: movs r0, #0x7e - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 @@ -2840,7 +2840,7 @@ _08072A14: adds r0, r5, #0 bl sub_08072A60 movs r0, #0x81 - bl PlaySFX + bl SoundReq _08072A4C: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -3089,7 +3089,7 @@ _08072C1E: lsls r0, r0, #4 strh r0, [r1, #8] movs r0, #0x7c - bl PlaySFX + bl SoundReq _08072C40: pop {r4, r5, r6, pc} .align 2, 0 @@ -3449,7 +3449,7 @@ _08072EF8: adds r0, #0x42 strb r1, [r0] movs r0, #0x7d - bl PlaySFX + bl SoundReq _08072F10: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index ee7de176..9ce6bf12 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -37,7 +37,7 @@ _080732EE: cmp r0, #7 bne _08073320 ldr r0, _0807331C @ =0x00000187 - bl PlaySFX + bl SoundReq b _08073328 .align 2, 0 _08073318: .4byte gPlayerState @@ -45,7 +45,7 @@ _0807331C: .4byte 0x00000187 _08073320: movs r0, #0xc4 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08073328: pop {r4, pc} .align 2, 0 @@ -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 @@ -351,7 +351,7 @@ _08073516: strb r0, [r4, #0xe] movs r0, #0xa9 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08073576: adds r0, r4, #0 bl UpdateAnimationSingleFrame @@ -935,7 +935,7 @@ _080739BC: bl sub_0806F948 _080739CE: movs r0, #0x7c - bl PlaySFX + bl SoundReq _080739D4: ldr r2, _080739E8 @ =gPlayerState ldrb r1, [r2, #2] @@ -1139,7 +1139,7 @@ _08073B50: _08073B54: strh r0, [r2, #8] movs r0, #0x7d - bl PlaySFX + bl SoundReq _08073B5C: pop {r4, r5, r6, pc} .align 2, 0 @@ -1243,7 +1243,7 @@ _08073C0C: bl sub_08080964 movs r0, #0xa6 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08073C28: pop {r4, r5, pc} .align 2, 0 @@ -1584,7 +1584,7 @@ _08073E9E: rsbs r0, r0, #0 bl ModHealth movs r0, #0x7a - bl PlaySFX + bl SoundReq _08073EDC: ldr r0, [r5, #0x30] movs r1, #0x40 @@ -1732,7 +1732,7 @@ sub_08073FD0: @ 0x08073FD0 orrs r0, r1 strb r0, [r4, #0x18] movs r0, #0x7c - bl PlaySFX + bl SoundReq _08073FF8: movs r1, #0x80 lsls r1, r1, #6 @@ -1746,7 +1746,7 @@ _08073FF8: strb r0, [r4, #0xd] movs r0, #0xb8 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08074016: pop {r4, pc} @@ -2452,7 +2452,7 @@ sub_0807450C: @ 0x0807450C rsbs r0, r0, #0 bl ModHealth movs r0, #0x7a - bl PlaySFX + bl SoundReq movs r0, #0x18 strb r0, [r4] adds r1, r6, #0 @@ -2581,7 +2581,7 @@ _08074618: bne _08074636 _08074630: movs r0, #0x83 - bl PlaySFX + bl SoundReq _08074636: pop {r4, r5, pc} @@ -2703,7 +2703,7 @@ _08074704: beq _08074720 _08074714: ldr r0, _0807471C @ =0x00000161 - bl PlaySFX + bl SoundReq b _08074732 .align 2, 0 _0807471C: .4byte 0x00000161 @@ -2715,7 +2715,7 @@ _08074720: cmp r0, #0 bne _08074732 ldr r0, _08074764 @ =0x00000161 - bl PlaySFX + bl SoundReq _08074732: ldr r2, _08074768 @ =gPlayerState adds r1, r2, #0 @@ -2872,7 +2872,7 @@ _08074840: bl CreateFx _08074862: ldr r0, _080748B0 @ =0x000001A5 - bl PlaySFX + bl SoundReq bl ResetPlayer _0807486C: ldr r5, _080748AC @ =gPlayerState @@ -3995,7 +3995,7 @@ _0807504E: adds r0, #1 strb r0, [r1] movs r0, #0x7c - bl PlaySFX + bl SoundReq _08075086: pop {pc} .align 2, 0 @@ -4052,7 +4052,7 @@ _080750CE: adds r0, #0x68 strb r1, [r0] movs r0, #0x7d - bl PlaySFX + bl SoundReq _080750F2: pop {r4, pc} @@ -4108,7 +4108,7 @@ sub_0807513C: @ 0x0807513C movs r0, #0 strb r0, [r4] movs r0, #0x7c - bl PlaySFX + bl SoundReq _08075158: ldrb r0, [r4] cmp r0, #2 @@ -4116,9 +4116,9 @@ _08075158: movs r0, #0 strb r0, [r4] ldr r0, _08075188 @ =0x0000014B - bl PlaySFX + bl SoundReq movs r0, #0x7a - bl PlaySFX + bl SoundReq _0807516E: ldrb r1, [r4] movs r0, #0x80 @@ -4198,7 +4198,7 @@ sub_080751E8: @ 0x080751E8 ldr r4, _08075230 @ =gPlayerScriptExecutionContext adds r0, r4, #0 movs r1, #0x24 - bl _DmaZero + bl MemClear32 str r6, [r4] ldr r0, _08075234 @ =gPlayerEntity adds r0, #0x84 @@ -4383,7 +4383,7 @@ sub_08075338: @ 0x08075338 lsls r0, r0, #4 strh r0, [r4, #8] movs r0, #0x75 - bl PlaySFX + bl SoundReq b _080754B4 .align 2, 0 _0807536C: .4byte gPlayerState @@ -4516,7 +4516,7 @@ _0807541E: adds r0, r5, #0 bl sub_08077DF4 movs r0, #0x77 - bl PlaySFX + bl SoundReq b _080754B4 _08075480: ldrb r1, [r4, #0x1b] @@ -4867,7 +4867,7 @@ _080756E0: bl sub_0807A108 _08075726: movs r0, #0x76 - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _08075730: .4byte gPlayerState @@ -5392,7 +5392,7 @@ _08075B08: ands r2, r0 strb r2, [r3, #0xb] ldr r0, _08075B48 @ =0x0000013D - bl PlaySFX + bl SoundReq b _08075B52 .align 2, 0 _08075B44: .4byte gPlayerState @@ -5445,7 +5445,7 @@ _08075B86: bl sub_08077E78 movs r0, #0x9f lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _08075C80 .align 2, 0 _08075BB0: .4byte gPlayerState @@ -6063,7 +6063,7 @@ _08076036: bl ModBombs movs r0, #0x82 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08076076: adds r0, r6, #0 adds r1, r7, #0 @@ -6214,7 +6214,7 @@ _08076198: strb r2, [r4, #7] _0807619A: movs r0, #0x7f - bl PlaySFX + bl SoundReq _080761A0: pop {r3} mov r8, r3 @@ -6316,7 +6316,7 @@ _08076258: _08076264: movs r0, #0x81 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _080762C0 _0807626E: movs r0, #5 @@ -6350,7 +6350,7 @@ _080762A2: bl sub_08077DF4 _080762AA: movs r0, #0x88 - bl PlaySFX + bl SoundReq b _080762C0 .align 2, 0 _080762B4: .4byte 0x00000948 @@ -6954,7 +6954,7 @@ _08076720: _0807673C: bl sub_08077F84 movs r0, #0x78 - bl PlaySFX + bl SoundReq b _08076754 .align 2, 0 _08076748: .4byte gPlayerEntity @@ -7016,7 +7016,7 @@ sub_08076758: @ 0x08076758 strh r0, [r5, #8] movs r0, #0xb9 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _080767FE .align 2, 0 _080767C0: .4byte gPlayerState @@ -7087,7 +7087,7 @@ _08076834: cmp r0, #0 bne _0807684A movs r0, #0x7d - bl PlaySFX + bl SoundReq _0807684A: ldr r2, _08076880 @ =gPlayerState ldr r0, [r2, #0x30] diff --git a/asm/code_08076C80.s b/asm/code_08076C80.s index 5ef6eb26..a2532fc3 100644 --- a/asm/code_08076C80.s +++ b/asm/code_08076C80.s @@ -546,7 +546,7 @@ _0807720E: movs r0, #3 strb r0, [r4, #4] ldr r0, _08077244 @ =0x00000107 - bl PlaySFX + bl SoundReq b _080772A4 .align 2, 0 _08077240: .4byte gPlayerEntity @@ -597,7 +597,7 @@ _0807728C: _0807729C: movs r0, #0x84 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080772A4: pop {r4, r5, pc} .align 2, 0 @@ -727,7 +727,7 @@ _0807738C: beq _080773BC movs r0, #0x84 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq ldrb r2, [r4, #0xe] adds r0, r5, #0 movs r1, #0x1e @@ -797,7 +797,7 @@ _08077432: strb r0, [r4, #4] strb r6, [r4, #5] ldr r0, _08077444 @ =0x00000119 - bl PlaySFX + bl SoundReq _0807743E: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index ee57b918..b6c78cf4 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -116,7 +116,7 @@ _080780A0: movs r0, #4 strb r0, [r2] movs r0, #0xd8 - bl PlaySFX + bl SoundReq b _080780DA .align 2, 0 _080780BC: .4byte 0x0000031F @@ -128,7 +128,7 @@ _080780C0: cmp r0, #0 bne _080780DA movs r0, #0xd7 - bl PlaySFX + bl SoundReq b _080780DA _080780D6: movs r0, #1 @@ -642,7 +642,7 @@ sub_080784C8: @ 0x080784C8 movs r1, #0xc4 lsls r1, r1, #1 adds r0, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _080784E0 @ =gUnk_0811C000 str r0, [r4, #4] pop {r4, pc} diff --git a/asm/code_08078778.s b/asm/code_08078778.s index 3adfafaa..e1ddb07e 100644 --- a/asm/code_08078778.s +++ b/asm/code_08078778.s @@ -70,7 +70,7 @@ sub_080788E0: @ 0x080788E0 ldr r1, _08078900 @ =gUnk_03003DF8 adds r0, r0, r1 movs r1, #0xc - bl _DmaZero + bl MemClear32 _080788FC: pop {pc} .align 2, 0 @@ -538,11 +538,11 @@ 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 - bl _DmaZero + bl MemClear32 pop {pc} .align 2, 0 _08078CAC: .4byte gPlayerState @@ -1156,7 +1156,7 @@ sub_080790E4: @ 0x080790E4 rsbs r0, r0, #0 bl ModHealth movs r0, #0x7a - bl PlaySFX + bl SoundReq b _08079182 .align 2, 0 _08079128: .4byte gPlayerState @@ -2819,7 +2819,7 @@ _08079D92: strb r0, [r1] bl sub_08077B20 ldr r0, _08079DC8 @ =0x00000193 - bl PlaySFX + bl SoundReq _08079DBE: pop {pc} .align 2, 0 @@ -2849,7 +2849,7 @@ sub_08079DCC: @ 0x08079DCC movs r0, #0xe strb r0, [r3, #0xc] ldr r0, _08079E04 @ =0x00000193 - bl PlaySFX + bl SoundReq _08079DF8: pop {pc} .align 2, 0 @@ -4929,7 +4929,7 @@ _0807AD52: orrs r0, r1 strb r0, [r2] ldr r0, _0807ADA0 @ =0x00000163 - bl PlaySFX + bl SoundReq _0807AD74: ldr r0, _0807ADA4 @ =gPlayerState adds r0, #0x26 @@ -5014,7 +5014,7 @@ _0807ADF8: strb r4, [r0] _0807AE0E: ldr r0, _0807AE18 @ =0x00000163 - bl PlaySFX + bl SoundReq movs r0, #1 b _0807AE1E .align 2, 0 @@ -5066,7 +5066,7 @@ _0807AE64: bl sub_08079520 movs r0, #0xb1 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0807AE74: movs r0, #0x10 bl sub_080793E4 @@ -5090,7 +5090,7 @@ _0807AE74: rsbs r0, r0, #0 bl ModHealth movs r0, #0x7a - bl PlaySFX + bl SoundReq _0807AEA8: ldrb r1, [r4, #0x15] movs r0, #0x80 @@ -5638,7 +5638,7 @@ sub_0807B264: @ 0x0807B264 strb r0, [r1] movs r0, #0xa9 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0807B2B0: pop {r4, pc} .align 2, 0 diff --git a/asm/code_0807B9B8.s b/asm/code_0807B9B8.s index 127addc9..393c255c 100644 --- a/asm/code_0807B9B8.s +++ b/asm/code_0807B9B8.s @@ -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: @@ -948,19 +948,19 @@ sub_0807C0DC: @ 0x0807C0DC lsls r6, r6, #6 adds r0, r5, #0 adds r1, r6, #0 - bl _DmaZero + bl MemClear32 adds r0, r5, r6 movs r1, #0x80 lsls r1, r1, #5 - bl _DmaZero + bl MemClear32 ldr r0, _0807C160 @ =gUnk_02019EE0 movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _0807C164 @ =gMapDataTopSpecial adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _0807C168 @ =gArea ldr r1, _0807C16C @ =0x0000085C adds r0, r0, r1 @@ -999,7 +999,7 @@ _0807C174: .4byte 0x0000FFFF _0807C178: adds r0, r2, #4 adds r1, r6, #0 - bl _DmaZero + bl MemClear32 movs r3, #1 mov sb, r3 _0807C184: @@ -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,25 +1161,25 @@ _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 adds r0, r5, #0 adds r1, r6, #0 - bl _DmaZero + bl MemClear32 ldr r4, _0807C350 @ =gMapDataTopSpecial adds r5, r4, r6 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 adds r0, r5, #0 adds r1, r6, #0 - bl _DmaZero + bl MemClear32 _0807C326: mov r1, sb cmp r1, #0 @@ -1406,10 +1406,10 @@ sub_0807C4F8: @ 0x0807C4F8 movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _0807C59C @ =gMapDataTopSpecial adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r5, _0807C5A0 @ =gUnk_02022830 ldr r0, _0807C5A4 @ =gArea ldr r1, _0807C5A8 @ =0x0000085C @@ -1449,25 +1449,25 @@ _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 adds r0, r5, #0 adds r1, r6, #0 - bl _DmaZero + bl MemClear32 ldr r4, _0807C59C @ =gMapDataTopSpecial adds r5, r4, r6 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 adds r0, r5, #0 adds r1, r6, #0 - bl _DmaZero + bl MemClear32 _0807C592: pop {r4, r5, r6, pc} .align 2, 0 @@ -1694,7 +1694,7 @@ _0807C710: _0807C726: adds r0, r4, #0 movs r1, #0x40 - bl _DmaZero + bl MemClear32 adds r4, #0x40 adds r5, #1 cmp r5, r7 @@ -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 @@ -1984,7 +1984,7 @@ _0807C92E: _0807C946: adds r0, r4, #0 movs r1, #0x80 - bl _DmaZero + bl MemClear32 adds r4, #0x80 adds r5, #1 cmp r5, r6 diff --git a/asm/code_0807F0D8.s b/asm/code_0807F0D8.s index 51137693..11f24fbc 100644 --- a/asm/code_0807F0D8.s +++ b/asm/code_0807F0D8.s @@ -432,7 +432,7 @@ sub_0807F3C8: @ 0x0807F3C8 push {lr} bl sub_0807F36C movs r0, #0xe5 - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 @@ -1598,8 +1598,8 @@ _0807FC32: .align 2, 0 _0807FC3C: .4byte gRoomControls - thumb_func_start sub_0807FC40 -sub_0807FC40: @ 0x0807FC40 + thumb_func_start UpdateScroll +UpdateScroll: @ 0xUpdateScroll push {lr} ldr r0, _0807FC5C @ =gRoomControls ldrb r2, [r0, #0xf] @@ -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 @@ -2934,11 +2934,11 @@ sub_08080668: @ 0x08080668 ldr r5, _080806A4 @ =gRoomControls adds r0, r5, #0 movs r1, #0x38 - bl _DmaZero + bl MemClear32 ldr r4, _080806A8 @ =gUnk_03004030 adds r0, r4, #0 movs r1, #0xc - bl _DmaZero + bl MemClear32 ldr r0, _080806AC @ =0x0000FFFF strh r0, [r5, #0x22] movs r0, #0xff @@ -2950,10 +2950,10 @@ sub_08080668: @ 0x08080668 movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _080806B8 @ =gMapDataTopSpecial adds r1, r4, #0 - bl _DmaZero + bl MemClear32 pop {r4, r5, pc} .align 2, 0 _080806A4: .4byte gRoomControls @@ -3235,7 +3235,7 @@ _0808089A: ldrh r0, [r4, #0x10] cmp r0, #0 beq _080808B8 - bl PlaySFX + bl SoundReq _080808B8: ldr r0, _080808D4 @ =gUnk_0811E7C4 ldrh r1, [r4] diff --git a/asm/code_0808C964.s b/asm/code_0808C964.s index 68c04a5d..26b741cb 100644 --- a/asm/code_0808C964.s +++ b/asm/code_0808C964.s @@ -136,7 +136,7 @@ _0808CA40: _0808CA50: movs r0, #0x97 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0808CA78 .align 2, 0 _0808CA5C: .4byte gUnk_02018EB0 @@ -151,7 +151,7 @@ _0808CA60: strb r0, [r2, #0x1a] movs r0, #0x97 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0808CA78: ldrb r0, [r4, #9] cmp r0, #0x75 diff --git a/asm/code_080A29BC.s b/asm/code_080A29BC.s index 5ab95a89..e5f4bf59 100644 --- a/asm/code_080A29BC.s +++ b/asm/code_080A29BC.s @@ -610,7 +610,7 @@ _080A2F06: bne _080A2F30 movs r0, #0x8c lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #8 str r0, [r4, #0x6c] b _080A2F30 @@ -848,7 +848,7 @@ _080A30CC: adds r0, r4, #0 bl sub_0806F69C ldr r0, _080A30F4 @ =0x0000013F - bl PlaySFX + bl SoundReq b _080A30FC .align 2, 0 _080A30EC: .4byte gPlayerEntity @@ -995,7 +995,7 @@ sub_080A3210: @ 0x080A3210 ldr r4, _080A3230 @ =gUnk_02021EE0 adds r0, r4, #0 movs r1, #0x18 - bl _DmaZero + bl MemClear32 bl sub_080A35C8 movs r0, #0x80 lsls r0, r0, #1 diff --git a/asm/code_080A3480.s b/asm/code_080A3480.s index e4183f7d..9cf47673 100644 --- a/asm/code_080A3480.s +++ b/asm/code_080A3480.s @@ -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: @@ -354,7 +354,7 @@ sub_080A36F8: @ 0x080A36F8 ldr r0, _080A3760 @ =gBG1Buffer movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 ldr r1, _080A3764 @ =gScreen movs r2, #0 movs r0, #1 @@ -372,7 +372,7 @@ sub_080A36F8: @ 0x080A36F8 movs r0, #1 strb r0, [r5, #0x1a] movs r0, #9 - bl PlaySFX + bl SoundReq _080A374A: movs r0, #4 movs r1, #8 @@ -410,7 +410,7 @@ _080A378A: ldr r0, _080A37B8 @ =gBG1Buffer movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 movs r1, #0x10 ldrsh r0, [r4, r1] ldr r2, _080A37BC @ =gUnk_081272E0 @@ -580,7 +580,7 @@ sub_080A38D0: @ 0x080A38D0 movs r6, #0x80 lsls r6, r6, #4 adds r1, r6, #0 - bl _DmaZero + bl MemClear32 ldr r4, _080A3924 @ =gScreen movs r0, #0 mov r8, r0 @@ -588,7 +588,7 @@ sub_080A38D0: @ 0x080A38D0 strh r5, [r4, #0x1a] ldr r0, _080A3928 @ =gBG2Buffer adds r1, r6, #0 - bl _DmaZero + bl MemClear32 strh r5, [r4, #0x26] adds r4, #0x68 movs r0, #0x80 @@ -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 @@ -712,7 +712,7 @@ _080A39C8: movs r0, #0xc0 lsls r0, r0, #0x13 movs r1, #0x20 - bl _DmaZero + bl MemClear32 movs r0, #0 movs r1, #0 bl sub_08052418 @@ -790,7 +790,7 @@ _080A3A8C: movs r0, #0x3c strh r0, [r1, #8] movs r0, #0x6a - bl PlaySFX + bl SoundReq _080A3A9A: ldr r1, _080A3AB4 @ =gMenu ldrb r0, [r1, #3] @@ -801,7 +801,7 @@ _080A3A9A: adds r1, r4, #0 bl sub_08052418 movs r0, #0x69 - bl PlaySFX + bl SoundReq b _080A3B36 .align 2, 0 _080A3AB4: .4byte gMenu @@ -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 diff --git a/asm/code_080A3BD0.s b/asm/code_080A3BD0.s index 247231b9..18beb360 100644 --- a/asm/code_080A3BD0.s +++ b/asm/code_080A3BD0.s @@ -84,7 +84,7 @@ _080A3CF0: beq _080A3CFE strb r1, [r3] movs r0, #0x69 - bl PlaySFX + bl SoundReq _080A3CFE: ldr r2, _080A3D28 @ =gInput ldrh r1, [r2, #2] @@ -95,7 +95,7 @@ _080A3CFE: movs r0, #2 bl sub_080A7114 movs r0, #0x6c - bl PlaySFX + bl SoundReq b _080A3DA8 .align 2, 0 _080A3D18: .4byte 0x0001FFFF @@ -276,7 +276,7 @@ sub_080A3E48: @ 0x080A3E48 beq _080A3E84 movs r0, #0x8c lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #4 bl sub_080A7114 b _080A3EC8 @@ -317,7 +317,7 @@ _080A3E84: adds r0, #0x6a strh r2, [r0] movs r0, #0xfa - bl PlaySFX + bl SoundReq _080A3EC8: pop {r4, pc} .align 2, 0 @@ -379,7 +379,7 @@ sub_080A3F10: @ 0x080A3F10 movs r0, #1 bl sub_080A7114 movs r0, #0x6d - bl PlaySFX + bl SoundReq _080A3F46: pop {r4, pc} .align 2, 0 @@ -427,7 +427,7 @@ sub_080A3F68: @ 0x080A3F68 _080A3F96: bl sub_080A4468 movs r0, #0xcd - bl PlaySFX + bl SoundReq ldr r0, _080A3FC8 @ =0x00000702 movs r1, #0xe bl sub_080563C8 @@ -457,7 +457,7 @@ sub_080A3FCC: @ 0x080A3FCC movs r1, #2 strb r1, [r0, #6] ldr r0, _080A3FF0 @ =0x00000147 - bl PlaySFX + bl SoundReq _080A3FE6: pop {pc} .align 2, 0 @@ -497,7 +497,7 @@ _080A4018: bl CreateObject movs r0, #0xe5 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080A4036: pop {pc} @@ -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 @@ -935,7 +935,7 @@ sub_080A4398: @ 0x080A4398 push {lr} ldr r0, _080A43A4 @ =gUnk_02019EE0 movs r1, #0x40 - bl _DmaZero + bl MemClear32 pop {pc} .align 2, 0 _080A43A4: .4byte gUnk_02019EE0 @@ -1119,7 +1119,7 @@ sub_080A44E0: @ 0x080A44E0 mov r8, r0 ldr r0, [r4, #8] mov r1, r8 - bl _DmaZero + bl MemClear32 adds r0, r6, #0 adds r1, r4, #0 bl sub_0805F76C @@ -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 @@ -1174,7 +1174,7 @@ _080A4550: b _080A4576 _080A456A: adds r0, r4, #0 - bl sub_0804A57C + bl EnemyInit ldrb r0, [r4, #9] strb r0, [r4, #0xf] movs r0, #0x66 @@ -1269,11 +1269,11 @@ sub_080A4608: @ 0x080A4608 ldr r0, _080A46A4 @ =gBG0Buffer movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 ldr r0, _080A46A8 @ =gBG3Buffer movs r1, #0x80 lsls r1, r1, #5 - bl _DmaZero + bl MemClear32 ldr r2, _080A46AC @ =gScreen adds r1, r2, #0 adds r1, #0x58 @@ -1336,7 +1336,7 @@ sub_080A46C0: @ 0x080A46C0 lsls r0, r0, #1 bl sub_080A3248 movs r0, #0x6c - bl PlaySFX + bl SoundReq movs r0, #2 bl ClearRoomFlag bl sub_080A71DC @@ -1456,7 +1456,7 @@ _080A4788: adds r1, #0x9c _080A47BE: adds r0, r1, #0 - bl PlaySFX + bl SoundReq _080A47C4: pop {r4, pc} .align 2, 0 @@ -1631,7 +1631,7 @@ _080A48F6: beq _080A490E strb r4, [r6, #0x1c] movs r0, #0x69 - bl PlaySFX + bl SoundReq movs r0, #2 bl sub_080A7114 movs r5, #0 @@ -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,12 +1910,12 @@ _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: ldr r1, _080A4B40 @ =0x06014000 - bl LoadAssetAsync + bl LoadResourceAsync _080A4B3A: pop {r3} mov r8, r3 @@ -1976,16 +1976,16 @@ sub_080A4BA0: @ 0x080A4BA0 adds r6, r1, #0 add r0, sp, #0x18 movs r1, #0x30 - bl _DmaZero + bl MemClear32 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 @@ -2123,11 +2123,11 @@ sub_080A4CBC: @ 0x080A4CBC lsls r5, r5, #4 adds r0, r4, #0 adds r1, r5, #0 - bl _DmaZero + bl MemClear32 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 @@ -2217,7 +2217,7 @@ sub_080A4D88: @ 0x080A4D88 push {lr} ldr r0, _080A4DA4 @ =gUnk_020344A0 movs r1, #8 - bl _DmaZero + bl MemClear32 movs r0, #1 movs r1, #0 bl MenuFadeIn @@ -2245,21 +2245,21 @@ sub_080A4DB8: @ 0x080A4DB8 movs r4, #0x80 lsls r4, r4, #4 adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _080A4E5C @ =gBG1Buffer adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _080A4E60 @ =gBG2Buffer adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _080A4E64 @ =gUnk_0200AF34 movs r1, #0xc0 lsls r1, r1, #2 - bl _DmaZero + bl MemClear32 ldr r4, _080A4E68 @ =gMenu adds r0, r4, #0 movs r1, #0x30 - bl _DmaZero + bl MemClear32 ldr r0, _080A4E6C @ =0x0000FFFF strh r0, [r4, #0x2e] ldr r0, _080A4E70 @ =gUnk_02034490 @@ -2552,7 +2552,7 @@ _080A5042: movs r4, #0 strb r5, [r0, #0x14] movs r0, #0x65 - bl PlaySFX + bl SoundReq ldr r0, _080A5078 @ =gMenu str r4, [r0, #0xc] _080A5052: @@ -2580,7 +2580,7 @@ _080A5080: ldr r0, _080A5098 @ =gBG0Buffer movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 ldr r1, _080A509C @ =gScreen movs r0, #1 strh r0, [r1, #0xe] @@ -2910,7 +2910,7 @@ _080A52EC: bl ForceEquipItem _080A530A: movs r0, #0x6a - bl PlaySFX + bl SoundReq b _080A5336 .align 2, 0 _080A5314: .4byte gMenu @@ -2942,7 +2942,7 @@ _080A5336: beq _080A5346 strb r4, [r5, #3] movs r0, #0x69 - bl PlaySFX + bl SoundReq _080A5346: adds r0, r5, #0 adds r0, #0x10 @@ -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 diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index 8ad62f9b..0700fdd6 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -193,7 +193,7 @@ _080A56F8: ldr r0, _080A5708 @ =gMenu strb r3, [r0, #3] movs r0, #0x69 - bl PlaySFX + bl SoundReq b _080A575E .align 2, 0 _080A5708: .4byte gMenu @@ -242,7 +242,7 @@ _080A5752: adds r0, r1, #0 bl sub_080A4E84 movs r0, #0x6a - bl PlaySFX + bl SoundReq _080A575E: ldr r0, _080A5780 @ =gMenu ldrb r1, [r0, #3] @@ -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] @@ -606,13 +606,13 @@ _080A5A10: movs r0, #2 bl sub_080A7114 movs r0, #0x6a - bl PlaySFX + bl SoundReq b _080A5A52 _080A5A2E: movs r0, #3 bl sub_080A7114 movs r0, #0x6c - bl PlaySFX + bl SoundReq b _080A5A52 _080A5A3C: ldrb r0, [r1, #3] @@ -623,7 +623,7 @@ _080A5A3C: adds r1, r2, #0 bl sub_08052418 movs r0, #0x69 - bl PlaySFX + bl SoundReq _080A5A52: pop {pc} @@ -796,7 +796,7 @@ _080A5B76: adds r1, r4, #0 bl sub_08052418 movs r0, #0x69 - bl PlaySFX + bl SoundReq _080A5B8E: cmp r5, #0 beq _080A5BB6 @@ -812,7 +812,7 @@ _080A5B8E: b _080A5BB6 _080A5BAA: movs r0, #0x6c - bl PlaySFX + bl SoundReq movs r0, #2 bl sub_080A4E84 _080A5BB6: @@ -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 @@ -967,7 +967,7 @@ _080A5CE6: adds r0, r2, #0 bl sub_080A5CFC movs r0, #0x69 - bl PlaySFX + bl SoundReq _080A5CFA: pop {pc} @@ -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 @@ -1535,7 +1535,7 @@ _080A6164: beq _080A6178 strb r2, [r1, #3] movs r0, #0x69 - bl PlaySFX + bl SoundReq _080A6178: pop {pc} .align 2, 0 @@ -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 @@ -1749,7 +1749,7 @@ _080A6326: cmp r0, #0 beq _080A635A movs r0, #0x6a - bl PlaySFX + bl SoundReq movs r0, #6 bl sub_080A4E84 b _080A635A @@ -1778,7 +1778,7 @@ _080A635A: ldr r0, _080A6374 @ =gMenu strb r4, [r0, #3] movs r0, #0x69 - bl PlaySFX + bl SoundReq _080A6368: ldr r0, _080A6374 @ =gMenu ldrb r0, [r0, #3] @@ -2077,7 +2077,7 @@ sub_080A65AC: @ 0x080A65AC movs r0, #0x20 strb r0, [r1] adds r0, #0xe3 - bl PlaySFX + bl SoundReq _080A65DA: ldrh r0, [r4, #8] subs r0, #1 @@ -2442,7 +2442,7 @@ _080A6886: ldr r0, _080A68D0 @ =gUnk_02019EE0 movs r1, #0x80 lsls r1, r1, #3 - bl _DmaZero + bl MemClear32 pop {r4, r5, r6, r7, pc} .align 2, 0 _080A68AC: .4byte gUnk_02032EC0 @@ -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 @@ -2897,7 +2897,7 @@ _080A6C50: _080A6C58: .4byte gInput _080A6C5C: ldr r0, _080A6C6C @ =0x00000103 - bl PlaySFX + bl SoundReq _080A6C62: ldr r1, _080A6C70 @ =gMenu ldrh r0, [r1, #8] @@ -3029,7 +3029,7 @@ _080A6D58: beq _080A6D6E strb r0, [r1, #3] movs r0, #0x69 - bl PlaySFX + bl SoundReq _080A6D6E: pop {r4, pc} .align 2, 0 @@ -3139,7 +3139,7 @@ _080A6E18: movs r0, #0 strb r0, [r1] movs r0, #0x6c - bl PlaySFX + bl SoundReq _080A6E3A: pop {pc} .align 2, 0 @@ -3307,7 +3307,7 @@ sub_080A6F6C: @ 0x080A6F6C ldr r0, _080A6FA8 @ =gUnk_020350F0 movs r1, #0x80 lsls r1, r1, #1 - bl _DmaZero + bl MemClear32 movs r0, #0xff ands r0, r4 cmp r0, #0 @@ -3376,7 +3376,7 @@ _080A6FFA: ldr r0, _080A7038 @ =gUnk_020350F0 movs r1, #0x80 lsls r1, r1, #1 - bl _DmaZero + bl MemClear32 movs r0, #0xff ands r0, r4 cmp r0, #0 @@ -3413,14 +3413,14 @@ sub_080A7040: @ 0x080A7040 movs r1, #0xc0 lsls r1, r1, #2 adds r0, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _080A7098 @ =0xFFFFFE00 adds r4, r4, r0 ldr r1, _080A709C @ =0x0600E000 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 @@ -3456,7 +3456,7 @@ sub_080A70AC: @ 0x080A70AC movs r1, #0xc0 lsls r1, r1, #2 adds r0, r4, #0 - bl _DmaZero + bl MemClear32 adds r2, r4, #0 subs r2, #0x34 movs r0, #0x7f @@ -3519,7 +3519,7 @@ sub_080A7124: @ 0x080A7124 ldr r0, _080A7134 @ =gUnk_02032EC0 movs r1, #0xed lsls r1, r1, #2 - bl _DmaZero + bl MemClear32 pop {pc} .align 2, 0 _080A7134: .4byte gUnk_02032EC0 @@ -3536,16 +3536,16 @@ MenuFadeIn: @ 0x080A7138 movs r1, #0xed lsls r1, r1, #2 adds r0, r4, #0 - bl _DmaZero + 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 @@ -3767,23 +3767,23 @@ sub_080A7328: @ 0x080A7328 bl DeleteAllEntities ldr r0, _080A738C @ =gMenu movs r1, #0x30 - bl _DmaZero + bl MemClear32 ldr r0, _080A7390 @ =gRoomControls movs r1, #0x38 - bl _DmaZero + bl MemClear32 ldr r0, _080A7394 @ =gUnk_03000420 movs r1, #0x80 lsls r1, r1, #1 - bl _DmaZero + bl MemClear32 ldr r4, _080A7398 @ =gUnk_02033280 adds r0, r4, #0 movs r1, #0xc - bl _DmaZero + bl MemClear32 movs r0, #8 strb r0, [r4, #8] movs r0, #1 bl sub_0801DA90 - bl sub_08056418 + bl MessageInitialize bl sub_080ADD30 movs r0, #0 bl sub_0801CFA8 @@ -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 sub_0806FBD8 + bl AllocMutableHitbox cmp r0, #0 bne _080A75BA bl DeleteThisEntity @@ -4161,7 +4161,7 @@ _080A7692: lsls r0, r0, #1 adds r0, r0, r4 ldrh r0, [r0] - bl PlaySFX + bl SoundReq b _080A76C2 .align 2, 0 _080A76B0: .4byte gPlayerState @@ -4173,7 +4173,7 @@ _080A76BC: _080A76C2: movs r0, #0x87 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq pop {r4, r5, pc} thumb_func_start sub_080A76CC @@ -4237,7 +4237,7 @@ _080A7728: beq _080A77C4 movs r0, #0x8b lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _080A77C4 .align 2, 0 _080A7740: .4byte gPlayerEntity @@ -4401,7 +4401,7 @@ _080A7868: cmp r0, #0 beq _080A7880 movs r0, #0x77 - bl PlaySFX + bl SoundReq _080A7880: ldrb r0, [r4, #0x1e] cmp r0, #0x8a @@ -4943,7 +4943,7 @@ sub_080A7C7C: @ 0x080A7C7C push {lr} ldr r0, _080A7C88 @ =gUnk_02017660 movs r1, #0x40 - bl _DmaZero + bl MemClear32 pop {pc} .align 2, 0 _080A7C88: .4byte gUnk_02017660 @@ -4999,7 +4999,7 @@ _080A7CDC: movs r1, #0x78 bl sub_0805E4E0 ldr r0, _080A7CF8 @ =0x0000011B - bl PlaySFX + bl SoundReq _080A7CF4: pop {r4, r5, r6, pc} .align 2, 0 @@ -5935,7 +5935,7 @@ _080A836E: sub_080A83A0: @ 0x080A83A0 push {r4, lr} adds r4, r0, #0 - bl sub_0806FBD8 + bl AllocMutableHitbox cmp r0, #0 beq _080A83B0 movs r0, #1 @@ -7385,7 +7385,7 @@ sub_080A8E28: @ 0x080A8E28 movs r1, #0x51 bl InitializeAnimation ldr r0, _080A8E84 @ =0x000001B5 - bl PlaySFX + bl SoundReq _080A8E6E: ldrb r4, [r5, #0xa] cmp r4, #2 @@ -8083,7 +8083,7 @@ _080A93BE: strb r0, [r4, #0x10] str r2, [r5, #0x54] movs r0, #0xfc - bl PlaySFX + bl SoundReq _080A93DA: pop {r4, r5, pc} @@ -8268,7 +8268,7 @@ sub_080A9518: @ 0x080A9518 movs r1, #0 bl InitializeAnimation ldr r0, _080A953C @ =0x00000149 - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _080A953C: .4byte 0x00000149 @@ -8541,7 +8541,7 @@ _080A9718: bl InitializeAnimation _080A9756: ldr r0, _080A9768 @ =0x000001B5 - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _080A9760: .4byte gPlayerEntity @@ -8662,7 +8662,7 @@ _080A9804: strb r0, [r1] _080A983C: ldr r0, _080A98B8 @ =0x00000127 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl sub_080A99F0 _080A9848: @@ -8714,7 +8714,7 @@ _080A989A: _080A98A4: movs r0, #0xb2 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq ldrh r0, [r5] cmp r0, #0 bne _080A98BC @@ -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 @@ -11416,7 +11416,7 @@ _080AACB4: .4byte gPlayerState _080AACB8: .4byte gPlayerEntity _080AACBC: ldr r0, _080AACDC @ =0x00000119 - bl PlaySFX + bl SoundReq ldr r0, [r4, #0x50] adds r1, r4, #0 bl CopyPosition @@ -12330,7 +12330,7 @@ sub_080AB318: @ 0x080AB318 movs r1, #0x51 bl InitializeAnimation ldr r0, _080AB3E0 @ =0x000001B5 - bl PlaySFX + bl SoundReq adds r0, r6, #0 bl sub_080AB4F8 movs r1, #0x2e @@ -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 @@ -13637,7 +13637,7 @@ sub_080ABCC4: @ 0x080ABCC4 movs r1, #0 bl InitializeAnimation ldr r0, _080ABD40 @ =0x0000014B - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _080ABD3C: .4byte gRoomControls @@ -13799,7 +13799,7 @@ _080ABE56: movs r1, #0 bl InitializeAnimation ldr r0, _080ABE84 @ =0x0000012D - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _080ABE84: .4byte 0x0000012D @@ -13860,7 +13860,7 @@ _080ABEEC: movs r1, #0 bl InitializeAnimation ldr r0, _080ABF00 @ =0x00000193 - bl PlaySFX + bl SoundReq pop {r4, pc} .align 2, 0 _080ABEFC: .4byte 0x0000013F @@ -13914,7 +13914,7 @@ sub_080ABF40: @ 0x080ABF40 movs r1, #0 bl InitializeAnimation ldr r0, _080ABFA4 @ =0x00000199 - bl PlaySFX + bl SoundReq _080ABF66: ldrh r2, [r4, #0x36] movs r0, #0x36 @@ -14051,7 +14051,7 @@ _080AC058: strh r0, [r4, #0x36] ldr r0, _080AC070 @ =0x00000149 _080AC06A: - bl PlaySFX + bl SoundReq pop {r4, pc} .align 2, 0 _080AC070: .4byte 0x00000149 @@ -14086,7 +14086,7 @@ _080AC084: cmp r0, #0 bne _080AC0B2 ldr r0, _080AC0E8 @ =0x00000149 - bl PlaySFX + bl SoundReq _080AC0B2: adds r0, r4, #0 bl GetNextFrame @@ -14110,7 +14110,7 @@ _080AC0B2: lsls r0, r0, #1 strh r0, [r4, #0x24] adds r0, #0x13 - bl PlaySFX + bl SoundReq b _080AC0F8 .align 2, 0 _080AC0E8: .4byte 0x00000149 @@ -14622,7 +14622,7 @@ _080AC4A2: strb r1, [r0] movs r0, #0x8b lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _080AC50A _080AC4BE: ldrb r0, [r4, #0xf] @@ -15301,7 +15301,7 @@ _080AC964: strb r0, [r5, #0x15] movs r0, #0x97 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080AC9C0: pop {r4, r5, pc} .align 2, 0 @@ -15435,7 +15435,7 @@ _080ACAB0: _080ACAB6: strb r0, [r4, #0x15] movs r0, #0xd8 - bl PlaySFX + bl SoundReq b _080ACAC4 _080ACAC0: bl DeleteThisEntity @@ -15457,7 +15457,7 @@ sub_080ACAC8: @ 0x080ACAC8 movs r1, #7 bl InitializeAnimation ldr r0, _080ACAEC @ =0x00000199 - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _080ACAE8: .4byte 0x0000FFFC @@ -16361,7 +16361,7 @@ _080AD188: bne _080AD196 movs r0, #0x82 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080AD196: adds r0, r4, #0 bl UpdateSpriteForCollisionLayer @@ -16402,7 +16402,7 @@ _080AD1DA: _080AD1E0: movs r0, #0x82 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq ldrb r0, [r4, #0xe] adds r0, #1 strb r0, [r4, #0xe] @@ -16439,7 +16439,7 @@ _080AD220: cmp r5, #0 beq _080AD244 movs r0, #0x79 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl sub_080AD27C b _080AD26E diff --git a/asm/code_080AD90C.s b/asm/code_080AD90C.s index a8d4a86c..d08c7ef4 100644 --- a/asm/code_080AD90C.s +++ b/asm/code_080AD90C.s @@ -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 @@ -386,7 +386,7 @@ _080ADBE0: cmp r5, #0 beq _080ADBF2 adds r0, r5, #0 - bl PlaySFX + bl SoundReq _080ADBF2: movs r0, #0xf strb r0, [r4, #0xf] @@ -567,7 +567,7 @@ sub_080ADD30: @ 0x080ADD30 movs r1, #0x85 lsls r1, r1, #2 adds r0, r4, #0 - bl _DmaZero + bl MemClear32 movs r5, #0 adds r4, #4 movs r0, #0x10 @@ -718,7 +718,7 @@ _080ADE54: .4byte gUnk_02024494 _080ADE58: adds r0, r1, #0 movs r1, #0xc - bl _DmaZero + bl MemClear32 _080ADE60: adds r5, #0xc adds r4, #1 @@ -1084,7 +1084,7 @@ sub_080AE104: @ 0x080AE104 adds r1, r1, r5 lsls r1, r1, #2 adds r0, r4, #0 - bl _DmaZero + bl MemClear32 strb r5, [r4, #1] strh r6, [r4, #4] adds r0, r4, #0 @@ -1396,7 +1396,7 @@ _080AE350: stm r0!, {r2, r3, r7} adds r0, r6, #0 movs r1, #0xc - bl _DmaZero + bl MemClear32 adds r6, #0xc adds r5, #0xc movs r0, #0xc diff --git a/asm/createBowEntity.s b/asm/createBowEntity.s index cefbb1e6..aad3ec59 100644 --- a/asm/createBowEntity.s +++ b/asm/createBowEntity.s @@ -147,7 +147,7 @@ _080190E8: adds r0, r4, #0 bl InitializeAnimation movs r0, #0xfc - bl PlaySFX + bl SoundReq b _08019178 .align 2, 0 _080190F8: .4byte gUnk_080B3E40 diff --git a/asm/crenalBeanSprout.s b/asm/crenalBeanSprout.s index 9cbb5a75..f89d5250 100644 --- a/asm/crenalBeanSprout.s +++ b/asm/crenalBeanSprout.s @@ -483,7 +483,7 @@ _0809669C: movs r0, #0xdc bl sub_0807BA8C movs r0, #0x79 - bl PlaySFX + bl SoundReq _080966F6: pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -754,7 +754,7 @@ _080968C4: bl sub_0807B7D8 _080968F0: ldr r0, _08096900 @ =0x000001DB - bl PlaySFX + bl SoundReq pop {r4, r5, r6, pc} .align 2, 0 _080968F8: .4byte 0x000001CD @@ -842,7 +842,7 @@ sub_08096988: @ 0x08096988 cmp r0, #0 bne _080969A2 movs r0, #0x72 - bl PlaySFX + bl SoundReq _080969A2: pop {pc} diff --git a/asm/cucco.s b/asm/cucco.s index 2036fc70..ccd70dd0 100644 --- a/asm/cucco.s +++ b/asm/cucco.s @@ -264,7 +264,7 @@ _0806E694: bl sub_080791D0 _0806E698: movs r0, #0xd5 - bl PlaySFX + bl SoundReq adds r1, r4, #0 adds r1, #0x39 movs r0, #0 diff --git a/asm/cuccoChick.s b/asm/cuccoChick.s index a1e8a869..dd10f79d 100644 --- a/asm/cuccoChick.s +++ b/asm/cuccoChick.s @@ -193,7 +193,7 @@ _0806E870: bl sub_080791D0 _0806E874: movs r0, #0xd6 - bl PlaySFX + bl SoundReq adds r1, r4, #0 adds r1, #0x39 movs r0, #0 diff --git a/asm/deathFx.s b/asm/deathFx.s index 63eafe4a..99e0e7db 100644 --- a/asm/deathFx.s +++ b/asm/deathFx.s @@ -66,7 +66,7 @@ _08081674: movs r1, #0 bl InitAnimationForceUpdate ldr r0, _08081698 @ =0x00000129 - bl PlaySFX + bl SoundReq b _0808170C .align 2, 0 _08081698: .4byte 0x00000129 diff --git a/asm/dog.s b/asm/dog.s index 1637c489..5dddb0a4 100644 --- a/asm/dog.s +++ b/asm/dog.s @@ -710,7 +710,7 @@ _0806A060: adds r0, r4, #0 bl sub_0806A080 movs r0, #0xd1 - bl PlaySFX + bl SoundReq bl sub_080791D0 _0806A076: adds r1, r4, #0 diff --git a/asm/drawHealth.s b/asm/drawHealth.s index 2e830c72..97712ac3 100644 --- a/asm/drawHealth.s +++ b/asm/drawHealth.s @@ -80,7 +80,7 @@ _0801C718: cmp r1, #0 bne _0801C740 movs r0, #0x71 - bl PlaySFX + bl SoundReq _0801C740: ldrb r0, [r7, #3] adds r0, #1 diff --git a/asm/drawRupees.s b/asm/drawRupees.s index bd6bf8be..50ab1577 100644 --- a/asm/drawRupees.s +++ b/asm/drawRupees.s @@ -127,7 +127,7 @@ _0801C58A: cmp r0, #0 bne _0801C5A4 movs r0, #0x6f - bl PlaySFX + bl SoundReq _0801C5A4: ldr r4, _0801C5D4 @ =gUnk_0200AF00 ldrh r3, [r4, #0xe] diff --git a/asm/dust.s b/asm/dust.s index 2f2faa92..2a5392c6 100644 --- a/asm/dust.s +++ b/asm/dust.s @@ -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 @@ -449,7 +449,7 @@ _08044440: movs r0, #0x12 bl SetGlobalFlag movs r0, #0x72 - bl PlaySFX + bl SoundReq bl DeleteThisEntity _08044458: movs r2, #0 diff --git a/asm/enemy5A.s b/asm/enemy5A.s index fe64ca1d..fedd8dc6 100644 --- a/asm/enemy5A.s +++ b/asm/enemy5A.s @@ -82,11 +82,11 @@ _0804575C: beq _0804576C movs r0, #0xbd lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _080457D0 _0804576C: ldr r0, _08045774 @ =0x00000119 - bl PlaySFX + bl SoundReq b _080457D0 .align 2, 0 _08045774: .4byte 0x00000119 diff --git a/asm/enemy5F.s b/asm/enemy5F.s index 132faf11..0c4df266 100644 --- a/asm/enemy5F.s +++ b/asm/enemy5F.s @@ -55,7 +55,7 @@ _08048314: bl InitializeAnimation movs r0, #0xb3 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08048326: adds r0, r4, #0 bl sub_080485D8 @@ -228,7 +228,7 @@ _08048456: movs r1, #5 bl InitializeAnimation ldr r0, _08048474 @ =0x0000019B - bl PlaySFX + bl SoundReq _0804846A: adds r0, r4, #0 bl sub_080485FC @@ -386,7 +386,7 @@ _08048562: bl sub_080485FC movs r0, #0xb3 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0804859E: pop {r4, pc} diff --git a/asm/enemy62.s b/asm/enemy62.s index 9c21195f..d9e780b5 100644 --- a/asm/enemy62.s +++ b/asm/enemy62.s @@ -93,7 +93,7 @@ sub_08048E1C: @ 0x08048E1C subs r0, r2, r0 strb r0, [r1] ldr r0, _08048E44 @ =0x00000127 - bl PlaySFX + bl SoundReq b _08048E5C .align 2, 0 _08048E44: .4byte 0x00000127 @@ -102,7 +102,7 @@ _08048E48: strb r0, [r1] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x28 movs r1, #0 bl sub_08080964 diff --git a/asm/enemy64.s b/asm/enemy64.s index 2c5b8bfd..19beed75 100644 --- a/asm/enemy64.s +++ b/asm/enemy64.s @@ -877,7 +877,7 @@ sub_080496EC: @ 0x080496EC adds r4, r0, #0 movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq bl sub_08079F8C cmp r0, #0 beq _08049720 @@ -975,7 +975,7 @@ sub_08049788: @ 0x08049788 strb r0, [r4, #0x15] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _080497C6 _080497B8: ldrb r0, [r4, #0x15] @@ -1094,7 +1094,7 @@ sub_08049888: @ 0x08049888 movs r0, #0xa0 strb r0, [r1, #0xe] movs r0, #0x72 - bl PlaySFX + bl SoundReq movs r0, #0x7c bl SetFlag movs r0, #1 @@ -1154,7 +1154,7 @@ _0804990E: movs r2, #2 bl SetTile movs r0, #0x71 - bl PlaySFX + bl SoundReq b _0804993E .align 2, 0 _0804991C: .4byte 0x00004081 @@ -1170,7 +1170,7 @@ _08049920: movs r2, #2 bl SetTile movs r0, #0x71 - bl PlaySFX + bl SoundReq _0804993E: pop {pc} .align 2, 0 diff --git a/asm/ezloCap.s b/asm/ezloCap.s deleted file mode 100644 index 0c0c0d46..00000000 --- a/asm/ezloCap.s +++ /dev/null @@ -1,645 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start EzloCap -EzloCap: @ 0x0806D86C - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0xc] - cmp r0, #0 - bne _0806D888 - adds r0, #1 - strb r0, [r4, #0xc] - adds r0, r4, #0 - movs r1, #2 - bl sub_0805E3A0 - adds r0, r4, #0 - bl sub_0807DD50 -_0806D888: - adds r0, r4, #0 - movs r1, #0 - bl sub_0807DDAC - adds r0, r4, #0 - bl sub_0807DDE4 - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0806D8A0 -sub_0806D8A0: @ 0x0806D8A0 - push {r4, r5, lr} - adds r4, r0, #0 - adds r3, r1, #0 - movs r2, #0 - movs r0, #8 - strb r0, [r3, #0x19] - ldr r0, [r3, #8] - movs r1, #2 - orrs r0, r1 - str r0, [r3, #8] - str r2, [r3, #0x14] - movs r2, #0x10 - ldrb r0, [r4, #0x18] - lsls r0, r0, #0x19 - cmp r0, #0 - bge _0806D8C2 - rsbs r2, r2, #0 -_0806D8C2: - ldr r1, _0806D900 @ =gPlayerEntity - movs r5, #0x2e - ldrsh r0, [r1, r5] - adds r2, r2, r0 - movs r0, #0x32 - ldrsh r1, [r1, r0] - adds r1, #2 - strh r2, [r3, #0x1e] - strh r1, [r3, #0x22] - movs r3, #0x2e - ldrsh r0, [r4, r3] - subs r2, r2, r0 - movs r5, #0x32 - ldrsh r0, [r4, r5] - subs r1, r1, r0 - adds r0, r2, #0 - bl sub_080045DA - strb r0, [r4, #0x15] - ldrb r2, [r4, #0x14] - movs r1, #0x80 - ands r1, r2 - ldr r2, _0806D904 @ =gUnk_08114134 - lsls r0, r0, #0x18 - lsrs r0, r0, #0x1c - adds r0, r0, r2 - ldrb r0, [r0] - orrs r1, r0 - strb r1, [r4, #0x14] - pop {r4, r5, pc} - .align 2, 0 -_0806D900: .4byte gPlayerEntity -_0806D904: .4byte gUnk_08114134 - - thumb_func_start sub_0806D908 -sub_0806D908: @ 0x0806D908 - push {r4, r5, lr} - adds r4, r0, #0 - movs r1, #0x2e - ldrsh r0, [r4, r1] - movs r2, #0x32 - ldrsh r1, [r4, r2] - ldr r3, _0806D93C @ =gPlayerEntity - movs r5, #0x2e - ldrsh r2, [r3, r5] - movs r5, #0x32 - ldrsh r3, [r3, r5] - bl sub_080045D4 - strb r0, [r4, #0x15] - ldrb r2, [r4, #0x14] - movs r1, #0x80 - ands r1, r2 - ldr r2, _0806D940 @ =gUnk_08114144 - lsls r0, r0, #0x18 - lsrs r0, r0, #0x19 - adds r0, r0, r2 - ldrb r0, [r0] - orrs r1, r0 - strb r1, [r4, #0x14] - pop {r4, r5, pc} - .align 2, 0 -_0806D93C: .4byte gPlayerEntity -_0806D940: .4byte gUnk_08114144 - - thumb_func_start sub_0806D944 -sub_0806D944: @ 0x0806D944 - push {lr} - adds r2, r0, #0 - ldrb r0, [r2, #0x18] - movs r3, #0x41 - rsbs r3, r3, #0 - ands r3, r0 - strb r3, [r2, #0x18] - ldr r0, _0806D968 @ =gPlayerEntity - ldr r1, [r2, #0x2c] - ldr r0, [r0, #0x2c] - cmp r1, r0 - bgt _0806D964 - movs r1, #0x40 - adds r0, r3, #0 - orrs r0, r1 - strb r0, [r2, #0x18] -_0806D964: - pop {pc} - .align 2, 0 -_0806D968: .4byte gPlayerEntity - - thumb_func_start sub_0806D96C -sub_0806D96C: @ 0x0806D96C - push {r4, lr} - adds r4, r0, #0 - movs r1, #0x42 - movs r2, #0 - bl CreateFx - adds r2, r0, #0 - cmp r2, #0 - beq _0806D99C - adds r3, r2, #0 - adds r3, #0x29 - ldrb r1, [r3] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r3] - ldr r3, _0806D9A0 @ =0xFFE80000 - adds r0, r4, #0 - adds r1, r2, #0 - movs r2, #0 - bl PositionRelative -_0806D99C: - pop {r4, pc} - .align 2, 0 -_0806D9A0: .4byte 0xFFE80000 - - thumb_func_start sub_0806D9A4 -sub_0806D9A4: @ 0x0806D9A4 - push {lr} - ldr r1, _0806D9BC @ =gPlayerEntity - ldr r2, [r0, #0x2c] - ldr r0, [r1, #0x2c] - adds r3, r1, #0 - cmp r2, r0 - bgt _0806D9C0 - ldrb r1, [r3, #0x18] - movs r0, #0x41 - rsbs r0, r0, #0 - ands r0, r1 - b _0806D9C6 - .align 2, 0 -_0806D9BC: .4byte gPlayerEntity -_0806D9C0: - ldrb r0, [r3, #0x18] - movs r1, #0x40 - orrs r0, r1 -_0806D9C6: - strb r0, [r3, #0x18] - movs r0, #4 - strb r0, [r3, #0x14] - pop {pc} - .align 2, 0 - - thumb_func_start NPC4E -NPC4E: @ 0x0806D9D0 - push {lr} - adds r2, r0, #0 - ldrb r0, [r2, #0xc] - cmp r0, #0 - bne _0806D9F8 - movs r0, #1 - strb r0, [r2, #0xc] - ldrb r1, [r2, #0x18] - subs r0, #5 - ands r0, r1 - strb r0, [r2, #0x18] - ldr r0, _0806D9F4 @ =gUnk_080FD170 - str r0, [r2, #0x48] - adds r0, r2, #0 - bl sub_0807DD50 - b _0806DA00 - .align 2, 0 -_0806D9F4: .4byte gUnk_080FD170 -_0806D9F8: - adds r0, r2, #0 - movs r1, #0 - bl sub_0807DD94 -_0806DA00: - pop {pc} - .align 2, 0 - - thumb_func_start sub_0806DA04 -sub_0806DA04: @ 0x0806DA04 - push {lr} - ldr r3, [r1, #4] - lsls r3, r3, #3 - ldr r1, _0806DA18 @ =gUnk_0811415C - adds r3, r3, r1 - ldrb r2, [r3, #4] - movs r1, #1 - bl sub_08078850 - pop {pc} - .align 2, 0 -_0806DA18: .4byte gUnk_0811415C - - thumb_func_start sub_0806DA1C -sub_0806DA1C: @ 0x0806DA1C - push {lr} - ldr r3, _0806DA34 @ =gUnk_081141A4 - ldr r2, [r1, #4] - lsls r0, r2, #2 - adds r0, r0, r3 - ldr r0, [r0] - ldr r1, _0806DA38 @ =gUnk_081141E4 - adds r2, r2, r1 - ldrb r1, [r2] - bl sub_0808091C - pop {pc} - .align 2, 0 -_0806DA34: .4byte gUnk_081141A4 -_0806DA38: .4byte gUnk_081141E4 - - thumb_func_start sub_0806DA3C -sub_0806DA3C: @ 0x0806DA3C - push {lr} - adds r2, r0, #0 - ldrb r0, [r2, #0xa] - subs r0, #1 - cmp r0, #0xa - bhi _0806DA84 - lsls r0, r0, #2 - ldr r1, _0806DA54 @ =_0806DA58 - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0806DA54: .4byte _0806DA58 -_0806DA58: @ jump table - .4byte _0806DA88 @ case 0 - .4byte _0806DA8C @ case 1 - .4byte _0806DA90 @ case 2 - .4byte _0806DA94 @ case 3 - .4byte _0806DA98 @ case 4 - .4byte _0806DAA0 @ case 5 - .4byte _0806DAA0 @ case 6 - .4byte _0806DAA0 @ case 7 - .4byte _0806DAA0 @ case 8 - .4byte _0806DAA0 @ case 9 - .4byte _0806DA9C @ case 10 -_0806DA84: - movs r0, #0 - b _0806DAA6 -_0806DA88: - movs r0, #1 - b _0806DAA6 -_0806DA8C: - movs r0, #2 - b _0806DAA6 -_0806DA90: - movs r0, #3 - b _0806DAA6 -_0806DA94: - movs r0, #4 - b _0806DAA6 -_0806DA98: - movs r0, #5 - b _0806DAA6 -_0806DA9C: - movs r0, #9 - b _0806DAA6 -_0806DAA0: - adds r0, r2, #0 - bl sub_0801E99C -_0806DAA6: - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - pop {pc} - - thumb_func_start sub_0806DAAC -sub_0806DAAC: @ 0x0806DAAC - push {r4, lr} - adds r4, r1, #0 - bl sub_0806DA3C - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - bl CheckKinstoneFused - str r0, [r4, #0x14] - ldr r2, _0806DACC @ =gUnk_02033280 - ldrb r1, [r2, #7] - movs r0, #1 - orrs r0, r1 - strb r0, [r2, #7] - pop {r4, pc} - .align 2, 0 -_0806DACC: .4byte gUnk_02033280 - - thumb_func_start sub_0806DAD0 -sub_0806DAD0: @ 0x0806DAD0 - push {r4, lr} - adds r4, r0, #0 - bl sub_0806DA3C - adds r1, r0, #0 - lsls r1, r1, #0x18 - lsrs r1, r1, #0x18 - adds r0, r4, #0 - bl sub_08078790 - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0806DAE8 -sub_0806DAE8: @ 0x0806DAE8 - push {lr} - ldrb r0, [r0, #0xa] - subs r0, #1 - cmp r0, #4 - bhi _0806DB3A - lsls r0, r0, #2 - ldr r1, _0806DAFC @ =_0806DB00 - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0806DAFC: .4byte _0806DB00 -_0806DB00: @ jump table - .4byte _0806DB14 @ case 0 - .4byte _0806DB1C @ case 1 - .4byte _0806DB24 @ case 2 - .4byte _0806DB2C @ case 3 - .4byte _0806DB34 @ case 4 -_0806DB14: - movs r0, #0xee - bl SetLocalFlag - b _0806DB3A -_0806DB1C: - movs r0, #0xef - bl SetLocalFlag - b _0806DB3A -_0806DB24: - movs r0, #0xf0 - bl SetLocalFlag - b _0806DB3A -_0806DB2C: - movs r0, #0xf1 - bl SetLocalFlag - b _0806DB3A -_0806DB34: - movs r0, #0xf2 - bl SetLocalFlag -_0806DB3A: - movs r0, #0xcd - bl PlaySFX - pop {pc} - .align 2, 0 - - thumb_func_start sub_0806DB44 -sub_0806DB44: @ 0x0806DB44 - push {r4, lr} - adds r4, r1, #0 - movs r0, #0 - str r0, [r4, #0x14] - movs r0, #0xee - bl CheckLocalFlag - cmp r0, #0 - beq _0806DB82 - movs r0, #0xef - bl CheckLocalFlag - cmp r0, #0 - beq _0806DB82 - movs r0, #0xf0 - bl CheckLocalFlag - cmp r0, #0 - beq _0806DB82 - movs r0, #0xf1 - bl CheckLocalFlag - cmp r0, #0 - beq _0806DB82 - movs r0, #0xf2 - bl CheckLocalFlag - cmp r0, #0 - beq _0806DB82 - movs r0, #1 - str r0, [r4, #0x14] -_0806DB82: - pop {r4, pc} - - thumb_func_start sub_0806DB84 -sub_0806DB84: @ 0x0806DB84 - push {r4, r5, lr} - adds r5, r0, #0 - ldr r0, _0806DBE4 @ =gUnk_08114154 - str r0, [r5, #0x48] - movs r0, #0x3e - movs r1, #4 - movs r2, #0 - bl CreateObject - adds r4, r0, #0 - cmp r4, #0 - beq _0806DBB6 - ldr r2, _0806DBE8 @ =0xFFF80000 - adds r0, r5, #0 - adds r1, r4, #0 - movs r3, #0 - bl PositionRelative - ldr r1, _0806DBEC @ =gUnk_08016030 - adds r0, r4, #0 - bl StartCutscene - adds r1, r4, #0 - adds r1, #0x84 - str r0, [r1] -_0806DBB6: - movs r0, #0x3e - movs r1, #5 - movs r2, #0 - bl CreateObject - adds r4, r0, #0 - cmp r4, #0 - beq _0806DBE2 - movs r2, #0x80 - lsls r2, r2, #0xc - adds r0, r5, #0 - adds r1, r4, #0 - movs r3, #0 - bl PositionRelative - ldr r1, _0806DBF0 @ =gUnk_0801606C - adds r0, r4, #0 - bl StartCutscene - adds r1, r4, #0 - adds r1, #0x84 - str r0, [r1] -_0806DBE2: - pop {r4, r5, pc} - .align 2, 0 -_0806DBE4: .4byte gUnk_08114154 -_0806DBE8: .4byte 0xFFF80000 -_0806DBEC: .4byte gUnk_08016030 -_0806DBF0: .4byte gUnk_0801606C - - thumb_func_start sub_0806DBF4 -sub_0806DBF4: @ 0x0806DBF4 - push {r4, lr} - adds r4, r0, #0 - cmp r4, #1 - blo _0806DC36 - cmp r4, #4 - bls _0806DC04 - cmp r4, #6 - bne _0806DC36 -_0806DC04: - movs r4, #1 - movs r0, #2 - bl GetInventoryValue - cmp r0, #0 - beq _0806DC12 - movs r4, #2 -_0806DC12: - movs r0, #3 - bl GetInventoryValue - cmp r0, #0 - beq _0806DC1E - movs r4, #3 -_0806DC1E: - movs r0, #4 - bl GetInventoryValue - cmp r0, #0 - beq _0806DC2A - movs r4, #4 -_0806DC2A: - movs r0, #6 - bl GetInventoryValue - cmp r0, #0 - beq _0806DC36 - movs r4, #6 -_0806DC36: - adds r0, r4, #0 - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0806DC3C -sub_0806DC3C: @ 0x0806DC3C - ldr r2, _0806DC54 @ =gSave - adds r1, r2, #0 - adds r1, #0xb4 - ldrb r3, [r1] - adds r1, r0, #0 - adds r1, #0x68 - strb r3, [r1] - adds r2, #0xb5 - ldrb r1, [r2] - adds r0, #0x69 - strb r1, [r0] - bx lr - .align 2, 0 -_0806DC54: .4byte gSave - - thumb_func_start sub_0806DC58 -sub_0806DC58: @ 0x0806DC58 - push {r4, lr} - adds r4, r0, #0 - adds r0, #0x68 - ldrb r0, [r0] - bl sub_0806DBF4 - movs r1, #0 - bl ForceEquipItem - adds r4, #0x69 - ldrb r0, [r4] - bl sub_0806DBF4 - movs r1, #1 - bl ForceEquipItem - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0806DC7C -sub_0806DC7C: @ 0x0806DC7C - push {r4, lr} - ldr r4, _0806DC84 @ =gUnk_081141F4 - b _0806DC94 - .align 2, 0 -_0806DC84: .4byte gUnk_081141F4 -_0806DC88: - ldrh r1, [r4] - adds r4, #2 - ldr r0, _0806DC9C @ =0x00004072 - movs r2, #1 - bl SetTileType -_0806DC94: - ldrh r0, [r4] - cmp r0, #0 - bne _0806DC88 - pop {r4, pc} - .align 2, 0 -_0806DC9C: .4byte 0x00004072 - - thumb_func_start sub_0806DCA0 -sub_0806DCA0: @ 0x0806DCA0 - push {r4, lr} - ldr r4, _0806DCA8 @ =gUnk_081141F4 - b _0806DCB6 - .align 2, 0 -_0806DCA8: .4byte gUnk_081141F4 -_0806DCAC: - ldrh r0, [r4] - adds r4, #2 - movs r1, #1 - bl sub_0807BA8C -_0806DCB6: - ldrh r0, [r4] - cmp r0, #0 - bne _0806DCAC - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0806DCC0 -sub_0806DCC0: @ 0x0806DCC0 - ldr r0, _0806DCD0 @ =gScreenTransition - movs r1, #0xf9 - lsls r1, r1, #3 - strh r1, [r0, #0x20] - movs r1, #0xf8 - strh r1, [r0, #0x22] - bx lr - .align 2, 0 -_0806DCD0: .4byte gScreenTransition - - thumb_func_start NPC4E_Fusion -NPC4E_Fusion: @ 0x0806DCD4 - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0xc] - cmp r0, #0 - bne _0806DD40 - adds r0, #1 - strb r0, [r4, #0xc] - ldrb r0, [r4, #0xa] - subs r0, #1 - cmp r0, #0xa - bhi _0806DD40 - lsls r0, r0, #2 - ldr r1, _0806DCF4 @ =_0806DCF8 - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0806DCF4: .4byte _0806DCF8 -_0806DCF8: @ jump table - .4byte _0806DD24 @ case 0 - .4byte _0806DD24 @ case 1 - .4byte _0806DD24 @ case 2 - .4byte _0806DD24 @ case 3 - .4byte _0806DD24 @ case 4 - .4byte _0806DD2C @ case 5 - .4byte _0806DD2C @ case 6 - .4byte _0806DD2C @ case 7 - .4byte _0806DD2C @ case 8 - .4byte _0806DD2C @ case 9 - .4byte _0806DD34 @ case 10 -_0806DD24: - adds r0, r4, #0 - bl sub_0809623C - b _0806DD40 -_0806DD2C: - adds r0, r4, #0 - bl sub_08096260 - b _0806DD40 -_0806DD34: - adds r0, r4, #0 - movs r1, #0 - bl sub_0806DB84 - movs r0, #0 - str r0, [r4, #0x48] -_0806DD40: - pop {r4, pc} - .align 2, 0 diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index a7c5226d..bf0213bb 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -309,7 +309,7 @@ sub_08087DBC: @ 0x08087DBC bl InitializeAnimation movs r0, #0x88 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _08087E5A .align 2, 0 _08087E0C: .4byte gUnk_08120AA8 @@ -404,7 +404,7 @@ _08087EB6: cmp r1, #0 beq _08087ED8 movs r0, #0x6a - bl PlaySFX + bl SoundReq movs r0, #2 strb r0, [r5] movs r0, #0x3c @@ -553,7 +553,7 @@ _08087FD6: _08087FE0: strb r0, [r1] movs r0, #0x69 - bl PlaySFX + bl SoundReq b _08088032 _08087FEA: adds r1, r5, #0 @@ -593,7 +593,7 @@ _08088028: strb r3, [r7] strb r2, [r1] movs r0, #0x69 - bl PlaySFX + bl SoundReq _08088032: pop {r4, r5, r6, r7, pc} @@ -607,7 +607,7 @@ sub_08088034: @ 0x08088034 movs r0, #0x14 strb r0, [r1, #0xe] movs r0, #0x6d - bl PlaySFX + bl SoundReq _08088048: pop {pc} .align 2, 0 diff --git a/asm/fileScreen.s b/asm/fileScreen.s index 534bdbd8..341bfde7 100755 --- a/asm/fileScreen.s +++ b/asm/fileScreen.s @@ -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 @@ -35,13 +35,13 @@ sub_080519B0: @ 0x080519B0 movs r0, #1 bl sub_0801DA90 bl sub_080A3210 - bl sub_0801DA7C + bl zMallocInit bl sub_080A7124 bl sub_0807059C ldr r4, _08051A08 @ =gScreenTransition adds r0, r4, #0 movs r1, #0xb0 - bl _DmaZero + bl MemClear32 bl sub_08049CD4 bl sub_080300AC bl sub_0807CA18 @@ -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 @@ -76,11 +76,11 @@ sub_08051A14: @ 0x08051A14 str r0, [r1, #4] ldr r0, _08051A74 @ =gUnk_03000000 ldr r1, _08051A78 @ =0x00000B74 - bl _DmaZero + bl MemClear32 ldr r0, _08051A7C @ =gUnk_02032EC0 movs r1, #0xed lsls r1, r1, #2 - bl _DmaZero + bl MemClear32 bl EraseAllEntities bl sub_080197AC bl sub_08080668 @@ -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,14 +136,14 @@ 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 strb r2, [r0, #8] strb r2, [r0, #4] strb r2, [r0, #5] - bl sub_08056418 + bl MessageInitialize bl sub_08052CFC movs r0, #0 bl sub_0801C370 @@ -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 @@ -162,9 +162,9 @@ sub_08051AF0: @ 0x08051AF0 bl sub_0805BBBC cmp r0, #0 bne _08051B02 - bl sub_0807FC40 + bl UpdateScroll _08051B02: - bl sub_0801B060 + bl UpdateBgAnim bl sub_08000108 bl sub_0801C344 bl sub_0805E5F8 @@ -196,7 +196,7 @@ _08051B02: ldr r0, _08051BC0 @ =0x800B0000 orrs r2, r0 adds r0, r2, #0 - bl PlaySFX + bl SoundReq _08051B5A: bl sub_0805E9F4 bl sub_0805BC04 @@ -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,9 +272,9 @@ _08051C06: bl FlushSprites bl sub_0805E5C0 bl sub_08080A40 - bl sub_080175F4 - bl sub_0807FC40 - bl sub_0801B060 + bl CollisionMain + bl UpdateScroll + bl UpdateBgAnim bl sub_08000108 bl sub_08052C3C bl sub_0801C344 @@ -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 @@ -607,8 +607,8 @@ sub_08051F04: @ 0x08051F04 bl sub_0805E5C0 bl sub_080AD9B0 bl sub_080AD918 - bl sub_0807FC40 - bl sub_0801B060 + bl UpdateScroll + bl UpdateBgAnim bl sub_0805E5F8 bl sub_08000108 pop {pc} @@ -641,7 +641,7 @@ _08051F68: strb r0, [r2] movs r0, #0x10 bl sub_080500F4 - bl sub_08056418 + bl MessageInitialize _08051F76: pop {pc} @@ -727,17 +727,17 @@ _0805200C: .4byte gMenu sub_08052010: @ 0x08052010 push {r4, lr} bl sub_080A3210 - bl sub_08056418 + bl MessageInitialize movs r0, #1 bl sub_0801DA90 ldr r0, _0805207C @ =gBG1Buffer movs r4, #0x80 lsls r4, r4, #4 adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _08052080 @ =gBG2Buffer adds r1, r4, #0 - bl _DmaZero + bl MemClear32 bl sub_080A4D34 movs r0, #0xa bl LoadPaletteGroup @@ -749,10 +749,10 @@ sub_08052010: @ 0x08052010 movs r0, #0xc0 lsls r0, r0, #0x13 movs r1, #0x20 - bl _DmaZero + bl MemClear32 ldr r0, _08052084 @ =gMenu movs r1, #0x30 - bl _DmaZero + bl MemClear32 ldr r1, _08052088 @ =gScreen ldrh r2, [r1] movs r3, #0x80 @@ -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,10 +827,10 @@ 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 PlaySFX + bl SoundReq movs r0, #4 bl sub_080500F4 ldr r0, _08052128 @ =0xFFFF0001 @@ -843,6 +843,6 @@ _08052114: _08052118: .4byte gFadeControl _0805211C: .4byte gMenu _08052120: .4byte gSave -_08052124: .4byte gUnk_03001000 +_08052124: .4byte gMain _08052128: .4byte 0xFFFF0001 diff --git a/asm/fourElements.s b/asm/fourElements.s index bd33c8b4..63271cb5 100644 --- a/asm/fourElements.s +++ b/asm/fourElements.s @@ -185,14 +185,14 @@ sub_080A02CC: @ 0x080A02CC movs r1, #2 bl DoFade movs r0, #0xf8 - bl PlaySFX + bl SoundReq movs r0, #0xa4 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #5 - bl PlaySFX + bl SoundReq ldr r0, _080A0348 @ =0x80110000 - bl PlaySFX + bl SoundReq _080A0342: pop {r4, pc} .align 2, 0 @@ -324,7 +324,7 @@ sub_080A0424: @ 0x080A0424 strb r0, [r1] movs r0, #0xbc lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080A0442: pop {pc} diff --git a/asm/gleerok.s b/asm/gleerok.s index fba60dd6..d6272ec5 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -62,7 +62,7 @@ _0802D04C: ldr r0, _0802D08C @ =0x00001442 strh r0, [r1] movs r0, #0xf6 - bl PlaySFX + bl SoundReq b _0802D148 .align 2, 0 _0802D088: .4byte gScreen @@ -109,7 +109,7 @@ _0802D0D2: cmp r0, #0 bne _0802D148 movs r0, #0xf7 - bl PlaySFX + bl SoundReq b _0802D148 .align 2, 0 _0802D0EC: .4byte gScreen @@ -117,7 +117,7 @@ _0802D0F0: .4byte gPlayerEntity _0802D0F4: movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl sub_0804A7D4 b _0802D148 @@ -372,7 +372,7 @@ _0802D2E4: bne _0802D2F8 movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0802D2F8: ldr r0, [r5] movs r1, #0xf @@ -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] @@ -826,7 +826,7 @@ sub_0802D674: @ 0x0802D674 cmp r0, #0x96 bne _0802D692 ldr r0, _0802D6BC @ =0x00000127 - bl PlaySFX + bl SoundReq _0802D692: ldr r0, [r4, #0x7c] subs r1, r0, #1 @@ -841,7 +841,7 @@ _0802D692: ldr r0, _0802D6C0 @ =gRoomControls str r4, [r0, #0x30] ldr r0, _0802D6BC @ =0x00000127 - bl PlaySFX + bl SoundReq b _0802D6EC .align 2, 0 _0802D6B4: .4byte gUnk_02034490 @@ -1018,7 +1018,7 @@ sub_0802D7B4: @ 0x0802D7B4 ldr r0, _0802D80C @ =gUnk_02034490 strb r3, [r0] movs r0, #0x2e - bl PlaySFX + bl SoundReq b _0802D868 .align 2, 0 _0802D7FC: .4byte gUnk_080CD7F8 @@ -1036,7 +1036,7 @@ _0802D810: adds r0, #2 strb r0, [r5, #0xf] ldr r0, _0802D828 @ =0x00000127 - bl PlaySFX + bl SoundReq b _0802D830 .align 2, 0 _0802D828: .4byte 0x00000127 @@ -1225,7 +1225,7 @@ _0802D97A: bls _0802D97A movs r0, #0xa8 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0802D99C: bl DeleteThisEntity b _0802DB7E @@ -1380,7 +1380,7 @@ _0802DA96: strb r2, [r0] movs r0, #0x86 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0802DB20 .align 2, 0 _0802DAD4: .4byte gUnk_080CD884 @@ -2098,7 +2098,7 @@ _0802DFF8: movs r0, #0x18 strb r0, [r1, #0xe] ldr r0, _0802E030 @ =0x00000127 - bl PlaySFX + bl SoundReq _0802E026: adds r0, r5, #0 bl sub_0802E518 @@ -2228,7 +2228,7 @@ _0802E0F4: bl sub_08078B48 movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0802E1CA .align 2, 0 _0802E128: .4byte gPlayerEntity @@ -2296,7 +2296,7 @@ _0802E190: cmp r0, #0 ble _0802E1B2 ldr r0, _0802E1CC @ =0x00000127 - bl PlaySFX + bl SoundReq _0802E1B2: ldrh r0, [r5] cmp r0, #0x77 @@ -2388,7 +2388,7 @@ _0802E23A: bl CreateFx movs r0, #0x92 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq cmp r4, #5 bne _0802E2F0 adds r0, r5, #0 @@ -2657,7 +2657,7 @@ _0802E452: movs r2, #0 bl CreateFx movs r0, #0x7d - bl PlaySFX + bl SoundReq _0802E46E: ldrb r0, [r4] cmp r0, #0xa diff --git a/asm/gyorgChild.s b/asm/gyorgChild.s index 87995eb8..c812d0ff 100644 --- a/asm/gyorgChild.s +++ b/asm/gyorgChild.s @@ -376,7 +376,7 @@ _080488E8: bne _080488FA movs r0, #0xcc lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080488FA: pop {r4, pc} .align 2, 0 diff --git a/asm/gyorgFemale.s b/asm/gyorgFemale.s index 96d884d9..14d08573 100644 --- a/asm/gyorgFemale.s +++ b/asm/gyorgFemale.s @@ -112,10 +112,10 @@ sub_0804614C: @ 0x0804614C movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _08046250 @ =gMapDataTopSpecial adds r1, r4, #0 - bl _DmaZero + bl MemClear32 adds r0, r6, #0 movs r1, #0 bl sub_0804660C @@ -432,7 +432,7 @@ _0804646A: strb r2, [r0] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08046494: pop {r4, r5, r6, pc} .align 2, 0 @@ -445,10 +445,10 @@ sub_08046498: @ 0x08046498 movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl _DmaZero + bl MemClear32 ldr r0, _080464BC @ =gMapDataTopSpecial adds r1, r4, #0 - bl _DmaZero + bl MemClear32 adds r0, r5, #0 bl sub_080464C0 pop {r4, r5, pc} @@ -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 @@ -486,7 +486,7 @@ _080464DE: ldr r0, _0804650C @ =gUnk_02019EE0 movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 ldr r1, _08046514 @ =gUnk_02000070 movs r0, #1 strb r0, [r1] @@ -737,7 +737,7 @@ _080466D0: movs r0, #0xff strb r0, [r7] adds r0, #0x28 - bl PlaySFX + bl SoundReq adds r5, r4, #0 adds r5, #0x45 ldrb r0, [r5] diff --git a/asm/gyorgFemaleEye.s b/asm/gyorgFemaleEye.s index 30a31622..2a8c346b 100644 --- a/asm/gyorgFemaleEye.s +++ b/asm/gyorgFemaleEye.s @@ -365,7 +365,7 @@ _08048C34: adds r0, r4, #0 bl InitializeAnimation ldr r0, _08048CB4 @ =0x00000119 - bl PlaySFX + bl SoundReq _08048C6C: adds r0, r4, #0 bl GetNextFrame diff --git a/asm/houseDoorInterior.s b/asm/houseDoorInterior.s index fe322524..70f542b4 100644 --- a/asm/houseDoorInterior.s +++ b/asm/houseDoorInterior.s @@ -92,7 +92,7 @@ sub_08092BF8: @ 0x08092BF8 movs r0, #2 strb r0, [r4, #0xc] ldr r0, _08092C1C @ =0x00000111 - bl PlaySFX + bl SoundReq b _08092C92 .align 2, 0 _08092C1C: .4byte 0x00000111 @@ -150,7 +150,7 @@ _08092C78: movs r2, #0 bl sub_08078AC0 ldr r0, _08092C94 @ =0x00000111 - bl PlaySFX + bl SoundReq _08092C92: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/intr.s b/asm/intr.s index f5a1c345..388274a3 100644 --- a/asm/intr.s +++ b/asm/intr.s @@ -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 @@ -649,8 +649,8 @@ _080B21A4: .4byte 0x01010101 _080B21A8: .4byte gUnk_02000006 _080B21AC: .4byte gUnk_08000F54 - arm_func_start sub_080B21B0 -sub_080B21B0: @ 0x080B21B0 + arm_func_start UpdateEntities +UpdateEntities: @ 0x080B21B0 ldr fp, _080B2270 @ =gUnk_03003DD0 ldr r1, [fp] ldm r1, {r7, r8, sb, sl} @@ -695,14 +695,14 @@ _080B2238: pop {r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr _080B2248: .4byte DeleteThisEntity -_080B224C: .4byte sub_08016F28 +_080B224C: .4byte PlayerUpdate _080B2250: .4byte DeleteThisEntity -_080B2254: .4byte sub_080011C4 -_080B2258: .4byte sub_08016AE4 +_080B2254: .4byte EnemyUpdate +_080B2258: .4byte ProjectileUpdate _080B225C: .4byte DeleteThisEntity -_080B2260: .4byte sub_080174A4 -_080B2264: .4byte sub_08017530 -_080B2268: .4byte sub_08017338 +_080B2260: .4byte ObjectUpdate +_080B2264: .4byte NPCUpdate +_080B2268: .4byte ItemUpdate _080B226C: .4byte sub_08017508 _080B2270: .4byte gUnk_03003DD0 _080B2274: .4byte gUnk_080026A4 diff --git a/asm/item11.s b/asm/item11.s index bd3ef454..e8e29fba 100644 --- a/asm/item11.s +++ b/asm/item11.s @@ -188,7 +188,7 @@ sub_08018FA0: @ 0x08018FA0 _08018FBC: ldrb r0, [r2, #0xa] adds r0, #0xea - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _08018FC8: .4byte gPlayerEntity diff --git a/asm/jarPortal.s b/asm/jarPortal.s index 7a6fc73b..09c48e54 100644 --- a/asm/jarPortal.s +++ b/asm/jarPortal.s @@ -285,7 +285,7 @@ _0808C082: strb r0, [r4, #0xf] movs r0, #0xa9 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0808C0A6: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/kid.s b/asm/kid.s index 9d6a3bef..88f596e0 100644 --- a/asm/kid.s +++ b/asm/kid.s @@ -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 diff --git a/asm/ladderUp.s b/asm/ladderUp.s index a9fe683f..1344665a 100644 --- a/asm/ladderUp.s +++ b/asm/ladderUp.s @@ -108,7 +108,7 @@ _0808DC0E: movs r1, #0 bl sub_08080964 ldr r0, _0808DC28 @ =0x0000010B - bl PlaySFX + bl SoundReq movs r0, #2 strb r0, [r7, #0xc] movs r0, #0x3c @@ -128,7 +128,7 @@ _0808DC3A: movs r0, #3 strb r0, [r7, #0xc] movs r0, #0x73 - bl PlaySFX + bl SoundReq b _0808DD72 _0808DC46: ldrb r0, [r7, #0xb] diff --git a/asm/librarians.s b/asm/librarians.s index 96a02644..0545aeac 100644 --- a/asm/librarians.s +++ b/asm/librarians.s @@ -195,7 +195,7 @@ _0806BB52: movs r1, #0xc bl InitializeAnimation movs r0, #0xcd - bl PlaySFX + bl SoundReq b _0806BB78 _0806BB70: adds r0, r4, #0 diff --git a/asm/lilypadLarge.s b/asm/lilypadLarge.s index a702d9ac..5202438a 100644 --- a/asm/lilypadLarge.s +++ b/asm/lilypadLarge.s @@ -277,7 +277,7 @@ _080856EE: beq _080856FC strb r1, [r7, #0xf] movs r0, #0x83 - bl PlaySFX + bl SoundReq _080856FC: adds r2, r7, #0 adds r2, #0x41 @@ -833,7 +833,7 @@ _08085B22: movs r3, #0 bl CreateObjectWithParent ldr r0, _08085B3C @ =0x0000012D - bl PlaySFX + bl SoundReq _08085B34: pop {r4, pc} .align 2, 0 @@ -1385,7 +1385,7 @@ sub_08085F48: @ 0x08085F48 strb r0, [r5, #0x12] _08085F6A: movs r0, #0x83 - bl PlaySFX + bl SoundReq ldr r1, [r4, #0x78] ldr r0, _08085F84 @ =0x0127FFFF cmp r1, r0 diff --git a/asm/lockedDoor.s b/asm/lockedDoor.s index a41b0bfb..f59c48ab 100644 --- a/asm/lockedDoor.s +++ b/asm/lockedDoor.s @@ -470,7 +470,7 @@ sub_08083658: @ 0x08083658 movs r1, #0x3c bl sub_0805E4E0 ldr r0, _0808369C @ =0x0000010B - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _08083698: .4byte gUnk_0811F680 diff --git a/asm/manager10.s b/asm/manager10.s index eadc82ba..2826845f 100644 --- a/asm/manager10.s +++ b/asm/manager10.s @@ -101,7 +101,7 @@ sub_08059608: @ 0x08059608 adds r0, r0, r2 ldr r0, [r0] str r0, [r1] - bl PlaySFX + bl SoundReq b _08059682 .align 2, 0 _08059634: .4byte gArea @@ -120,7 +120,7 @@ _08059638: movs r0, #0x78 strb r0, [r4] ldr r0, _08059664 @ =0x800D0000 - bl PlaySFX + bl SoundReq b _08059682 .align 2, 0 _0805965C: .4byte gArea @@ -138,7 +138,7 @@ _08059668: movs r0, #0x78 strb r0, [r4] ldr r0, _0805968C @ =0x800D0000 - bl PlaySFX + bl SoundReq _08059682: pop {r4, pc} .align 2, 0 @@ -338,11 +338,11 @@ _08059800: lsls r5, r5, #4 adds r0, r4, #0 adds r1, r5, #0 - bl _DmaZero + bl MemClear32 ldr r1, _08059820 @ =0x0600E800 adds r0, r4, #0 adds r2, r5, #0 - bl LoadAssetAsync + bl LoadResourceAsync b _08059838 .align 2, 0 _0805981C: .4byte gBG3Buffer @@ -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 diff --git a/asm/manager12.s b/asm/manager12.s index 7c990102..5ead9b73 100644 --- a/asm/manager12.s +++ b/asm/manager12.s @@ -245,7 +245,7 @@ _08059B94: ldr r1, _08059BE8 @ =0x06001800 movs r2, #0x80 lsls r2, r2, #4 - bl LoadAssetAsync + bl LoadResourceAsync b _08059C5E .align 2, 0 _08059BD8: .4byte 0x000004AB @@ -384,12 +384,12 @@ _08059CEC: movs r5, #0x80 lsls r5, r5, #5 adds r2, r5, #0 - bl LoadAssetAsync + bl LoadResourceAsync ldr r0, [r6, #8] adds r0, r0, r4 ldr r1, [r6, #0xc] adds r2, r5, #0 - bl LoadAssetAsync + bl LoadResourceAsync pop {r4, r5, r6, pc} .align 2, 0 _08059D10: .4byte gUnk_08108468 diff --git a/asm/manager14.s b/asm/manager14.s index 68765dba..cfdf3e17 100644 --- a/asm/manager14.s +++ b/asm/manager14.s @@ -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 diff --git a/asm/manager22.s b/asm/manager22.s index fb9246b5..4159a42b 100644 --- a/asm/manager22.s +++ b/asm/manager22.s @@ -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] diff --git a/asm/manager24.s b/asm/manager24.s index 8718bf74..9d1d530e 100644 --- a/asm/manager24.s +++ b/asm/manager24.s @@ -89,7 +89,7 @@ sub_0805BFA4: @ 0x0805BFA4 cmp r0, #0 bne _0805BFC0 movs r0, #0x72 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl DeleteManager _0805BFC0: diff --git a/asm/manager2B.s b/asm/manager2B.s index 4320672d..a3227878 100644 --- a/asm/manager2B.s +++ b/asm/manager2B.s @@ -117,7 +117,7 @@ _0805D0D8: movs r0, #8 strb r0, [r4, #0xe] movs r0, #0x72 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl sub_0805D11C _0805D0F6: diff --git a/asm/manager2C.s b/asm/manager2C.s index 99d1abc3..4da87eb7 100644 --- a/asm/manager2C.s +++ b/asm/manager2C.s @@ -44,7 +44,7 @@ _0805D184: ldr r4, _0805D1F8 @ =gUnk_030010AC adds r0, r4, #0 movs r1, #0x20 - bl _DmaZero + bl MemClear32 subs r4, #0xc movs r1, #0 movs r0, #1 diff --git a/asm/manager2E.s b/asm/manager2E.s index 7eb32ec4..c5b8388b 100644 --- a/asm/manager2E.s +++ b/asm/manager2E.s @@ -78,13 +78,13 @@ sub_0805D2F4: @ 0x0805D2F4 ldrsh r0, [r4, r1] cmp r0, #0 beq _0805D314 - bl PlaySFX + bl SoundReq b _0805D31A .align 2, 0 _0805D310: .4byte gUnk_03003DC0 _0805D314: movs r0, #0x72 - bl PlaySFX + bl SoundReq _0805D31A: ldrh r0, [r4, #0x3c] cmp r0, #0 @@ -166,7 +166,7 @@ sub_0805D384: @ 0x0805D384 adds r1, r0, #0 _0805D3A4: adds r0, r1, #0 - bl PlaySFX + bl SoundReq ldrh r0, [r4, #0x3c] bl SetFlag b _0805D3C6 diff --git a/asm/manager33.s b/asm/manager33.s index dc8db449..e42eafd4 100644 --- a/asm/manager33.s +++ b/asm/manager33.s @@ -55,7 +55,7 @@ sub_0805DAE8: @ 0x0805DAE8 movs r0, #0x5a strb r0, [r2, #0xe] adds r0, #0xb0 - bl PlaySFX + bl SoundReq b _0805DB88 .align 2, 0 _0805DB4C: .4byte gRoomControls diff --git a/asm/manager34.s b/asm/manager34.s index 4990452c..c7cb0680 100644 --- a/asm/manager34.s +++ b/asm/manager34.s @@ -116,7 +116,7 @@ _0805DC48: bne _0805DC6C movs r0, #0x93 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0805DC6C _0805DC58: cmp r0, #0xc7 @@ -127,7 +127,7 @@ _0805DC58: bne _0805DC6C movs r0, #0x93 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0805DC6C: pop {r4, pc} .align 2, 0 diff --git a/asm/manager36.s b/asm/manager36.s index 4c768dcc..5245d37b 100644 --- a/asm/manager36.s +++ b/asm/manager36.s @@ -28,7 +28,7 @@ _0805DDCE: ldrh r0, [r3] strb r0, [r2, #0xe] ldrh r0, [r3, #2] - bl PlaySFX + bl SoundReq b _0805DDE8 .align 2, 0 _0805DDE0: .4byte gUnk_08108DA8 diff --git a/asm/manager37.s b/asm/manager37.s index d6ed6fee..1068f88c 100644 --- a/asm/manager37.s +++ b/asm/manager37.s @@ -138,7 +138,7 @@ _0805DF1A: strb r0, [r2] _0805DF3C: movs r0, #0x32 - bl PlaySFX + bl SoundReq _0805DF42: pop {r4, r5, pc} .align 2, 0 @@ -211,7 +211,7 @@ _0805DFB8: movs r1, #4 bl DoFade movs r0, #0xf6 - bl PlaySFX + bl SoundReq _0805DFCA: pop {pc} @@ -288,7 +288,7 @@ _0805E040: movs r1, #4 bl DoFade movs r0, #0xf7 - bl PlaySFX + bl SoundReq _0805E062: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/managerF.s b/asm/managerF.s index 742e934b..b9d9444a 100644 --- a/asm/managerF.s +++ b/asm/managerF.s @@ -59,7 +59,7 @@ _08058EF2: bl sub_08058F44 movs r0, #0x92 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq bl DeleteThisEntity _08058F40: pop {r4, r5, r6, pc} @@ -348,7 +348,7 @@ sub_08059124: @ 0x08059124 ldrb r1, [r4, #0xb] bl sub_0807BA8C movs r0, #0xcd - bl PlaySFX + bl SoundReq bl DeleteThisEntity b _080591C8 _08059174: @@ -540,7 +540,7 @@ _080592C8: bl sub_0805930C movs r0, #0xb7 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq bl DeleteThisEntity _080592EA: pop {r4, pc} diff --git a/asm/mazaalBracelet.s b/asm/mazaalBracelet.s index b24cfa78..c3fa21a1 100644 --- a/asm/mazaalBracelet.s +++ b/asm/mazaalBracelet.s @@ -104,7 +104,7 @@ _0803A1EA: adds r0, #0x3d strb r1, [r0] ldr r0, _0803A20C @ =0x00000127 - bl PlaySFX + bl SoundReq b _0803A23E .align 2, 0 _0803A20C: .4byte 0x00000127 @@ -128,7 +128,7 @@ _0803A210: movs r1, #9 bl InitAnimationForceUpdate ldr r0, _0803A248 @ =0x00000127 - bl PlaySFX + bl SoundReq _0803A23E: ldr r1, _0803A24C @ =gUnk_080CFC14 adds r0, r4, #0 @@ -418,7 +418,7 @@ _0803A468: bl InitAnimationForceUpdate movs r0, #0xb7 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0803A546 _0803A49A: adds r0, r4, #0 @@ -699,7 +699,7 @@ _0803A6A8: cmp r0, #0 beq _0803A6BE ldr r0, _0803A6E0 @ =0x00000157 - bl PlaySFX + bl SoundReq _0803A6BE: ldr r2, _0803A6E4 @ =gUnk_080CED6C ldr r0, [r4, #0x50] @@ -802,7 +802,7 @@ sub_0803A740: @ 0x0803A740 bl sub_08080964 movs r0, #0xac lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0803A77E: pop {pc} @@ -1013,7 +1013,7 @@ sub_0803A8B8: @ 0x0803A8B8 movs r1, #1 bl InitAnimationForceUpdate ldr r0, _0803A908 @ =0x00000153 - bl PlaySFX + bl SoundReq pop {r4, pc} .align 2, 0 _0803A904: .4byte gUnk_080CED6C @@ -1266,7 +1266,7 @@ sub_0803AA98: @ 0x0803AA98 bl InitAnimationForceUpdate movs r0, #0xb7 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0803AB0A: pop {r4, pc} .align 2, 0 @@ -1555,7 +1555,7 @@ _0803AD1A: bl sub_08080964 movs r0, #0xac lsls r0, r0, #1 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl sub_0803B804 b _0803ADA4 @@ -1600,7 +1600,7 @@ _0803AD74: bl sub_08080964 movs r0, #0xac lsls r0, r0, #1 - bl PlaySFX + bl SoundReq adds r0, r4, #0 bl sub_0803B804 b _0803ADAA @@ -1941,7 +1941,7 @@ _0803AFF4: bl sub_08080964 movs r0, #0xac lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0803B018: pop {pc} .align 2, 0 @@ -2099,7 +2099,7 @@ _0803B11E: movs r1, #9 bl InitAnimationForceUpdate ldr r0, _0803B140 @ =0x0000014F - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _0803B13C: .4byte gUnk_080FD374 @@ -3123,7 +3123,7 @@ sub_0803B870: @ 0x0803B870 bl InitAnimationForceUpdate movs r0, #0xb7 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #1 b _0803B8E6 .align 2, 0 @@ -3248,7 +3248,7 @@ _0803B9A8: adds r0, #0x74 strb r1, [r0] ldr r0, _0803BA10 @ =0x000001A9 - bl PlaySFX + bl SoundReq _0803B9C0: ldrb r1, [r4, #0xf] adds r0, r4, #0 @@ -3263,7 +3263,7 @@ _0803B9C0: cmp r0, #0 bne _0803B9E0 ldr r0, _0803BA10 @ =0x000001A9 - bl PlaySFX + bl SoundReq _0803B9E0: ldrb r0, [r5] cmp r0, #0 @@ -3332,7 +3332,7 @@ _0803BA46: cmp r0, #0 bne _0803BA66 ldr r0, _0803BA68 @ =0x000001A9 - bl PlaySFX + bl SoundReq _0803BA66: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/mazaalHead.s b/asm/mazaalHead.s index 72fd4084..d1803157 100644 --- a/asm/mazaalHead.s +++ b/asm/mazaalHead.s @@ -315,7 +315,7 @@ _08034114: strb r1, [r0] bl sub_080791D0 movs r0, #0x2e - bl PlaySFX + bl SoundReq _0803413E: pop {r4, pc} .align 2, 0 @@ -542,7 +542,7 @@ sub_080342C8: @ 0x080342C8 cmp r0, #0 bne _080342E4 ldr r0, _080342FC @ =0x00000115 - bl PlaySFX + bl SoundReq _080342E4: ldr r2, _08034300 @ =gUnk_080CECEC ldrb r0, [r4, #0xe] @@ -585,7 +585,7 @@ _08034304: movs r1, #0 bl sub_08080964 ldr r0, _08034344 @ =0x000001A1 - bl PlaySFX + bl SoundReq _08034340: pop {r4, pc} .align 2, 0 @@ -1667,7 +1667,7 @@ sub_08034AEC: @ 0x08034AEC adds r1, #1 bl InitializeAnimation ldr r0, _08034B08 @ =0x00000151 - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _08034B08: .4byte 0x00000151 diff --git a/asm/minecart.s b/asm/minecart.s index 2ec63ae3..9192a4e1 100644 --- a/asm/minecart.s +++ b/asm/minecart.s @@ -248,7 +248,7 @@ _08091DA0: strb r1, [r0, #6] movs r0, #0x9e lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08091DD8: pop {r4, pc} .align 2, 0 diff --git a/asm/minishEzlo.s b/asm/minishEzlo.s index 057a51b8..39185631 100644 --- a/asm/minishEzlo.s +++ b/asm/minishEzlo.s @@ -152,7 +152,7 @@ sub_0806305C: @ 0x0806305C movs r0, #0x10 strh r0, [r4] ldr r0, _080630A0 @ =0x0000016F - bl PlaySFX + bl SoundReq pop {r4, pc} .align 2, 0 _080630A0: .4byte 0x0000016F diff --git a/asm/mountainMinish.s b/asm/mountainMinish.s index 60dde3ec..916c1f91 100644 --- a/asm/mountainMinish.s +++ b/asm/mountainMinish.s @@ -287,7 +287,7 @@ _0806802C: lsls r0, r0, #1 adds r0, r0, r4 ldrh r0, [r0] - bl PlaySFX + bl SoundReq b _0806807E .align 2, 0 _08068064: .4byte gUnk_0811137A diff --git a/asm/non_matching/arm_proxy/sub_080173A4.inc b/asm/non_matching/arm_proxy/ItemInit.inc similarity index 100% rename from asm/non_matching/arm_proxy/sub_080173A4.inc rename to asm/non_matching/arm_proxy/ItemInit.inc diff --git a/asm/non_matching/arm_proxy/sub_08017530.inc b/asm/non_matching/arm_proxy/sub_08017530.inc index f8699eeb..4c2b9134 100644 --- a/asm/non_matching/arm_proxy/sub_08017530.inc +++ b/asm/non_matching/arm_proxy/sub_08017530.inc @@ -77,7 +77,7 @@ _080175A4: strh r0, [r2, #6] _080175CC: adds r0, r4, #0 - bl sub_0800404C + bl DrawEntity _080175D2: pop {r4} pop {r0} diff --git a/asm/non_matching/arm_proxy/sub_08016DF8.inc b/asm/non_matching/arm_proxy/sub_08017744.inc similarity index 100% rename from asm/non_matching/arm_proxy/sub_08016DF8.inc rename to asm/non_matching/arm_proxy/sub_08017744.inc diff --git a/asm/non_matching/ezloCap/sub_0806D8A0.inc b/asm/non_matching/ezloCap/sub_0806D8A0.inc new file mode 100644 index 00000000..64c18349 --- /dev/null +++ b/asm/non_matching/ezloCap/sub_0806D8A0.inc @@ -0,0 +1,55 @@ + .syntax unified + + .text + + push {r4, r5, lr} + adds r4, r0, #0 + adds r3, r1, #0 + movs r2, #0 + movs r0, #8 + strb r0, [r3, #0x19] + ldr r0, [r3, #8] + movs r1, #2 + orrs r0, r1 + str r0, [r3, #8] + str r2, [r3, #0x14] + movs r2, #0x10 + ldrb r0, [r4, #0x18] + lsls r0, r0, #0x19 + cmp r0, #0 + bge _0806D8C2 + rsbs r2, r2, #0 +_0806D8C2: + ldr r1, _0806D900 @ =gPlayerEntity + movs r5, #0x2e + ldrsh r0, [r1, r5] + adds r2, r2, r0 + movs r0, #0x32 + ldrsh r1, [r1, r0] + adds r1, #2 + strh r2, [r3, #0x1e] + strh r1, [r3, #0x22] + movs r3, #0x2e + ldrsh r0, [r4, r3] + subs r2, r2, r0 + movs r5, #0x32 + ldrsh r0, [r4, r5] + subs r1, r1, r0 + adds r0, r2, #0 + bl sub_080045DA + strb r0, [r4, #0x15] + ldrb r2, [r4, #0x14] + movs r1, #0x80 + ands r1, r2 + ldr r2, _0806D904 @ =gUnk_08114134 + lsls r0, r0, #0x18 + lsrs r0, r0, #0x1c + adds r0, r0, r2 + ldrb r0, [r0] + orrs r1, r0 + strb r1, [r4, #0x14] + pop {r4, r5, pc} + .align 2, 0 +_0806D900: .4byte gPlayerEntity +_0806D904: .4byte gUnk_08114134 + .syntax divided diff --git a/asm/non_matching/ezloCap/sub_0806D908.inc b/asm/non_matching/ezloCap/sub_0806D908.inc new file mode 100644 index 00000000..d8e1a399 --- /dev/null +++ b/asm/non_matching/ezloCap/sub_0806D908.inc @@ -0,0 +1,32 @@ + .syntax unified + + .text + + push {r4, r5, lr} + adds r4, r0, #0 + movs r1, #0x2e + ldrsh r0, [r4, r1] + movs r2, #0x32 + ldrsh r1, [r4, r2] + ldr r3, _0806D93C @ =gPlayerEntity + movs r5, #0x2e + ldrsh r2, [r3, r5] + movs r5, #0x32 + ldrsh r3, [r3, r5] + bl sub_080045D4 + strb r0, [r4, #0x15] + ldrb r2, [r4, #0x14] + movs r1, #0x80 + ands r1, r2 + ldr r2, _0806D940 @ =gUnk_08114144 + lsls r0, r0, #0x18 + lsrs r0, r0, #0x19 + adds r0, r0, r2 + ldrb r0, [r0] + orrs r1, r0 + strb r1, [r4, #0x14] + pop {r4, r5, pc} + .align 2, 0 +_0806D93C: .4byte gPlayerEntity +_0806D940: .4byte gUnk_08114144 + .syntax divided diff --git a/asm/non_matching/ezloCap/sub_0806DA04.inc b/asm/non_matching/ezloCap/sub_0806DA04.inc new file mode 100644 index 00000000..4b0ae7b6 --- /dev/null +++ b/asm/non_matching/ezloCap/sub_0806DA04.inc @@ -0,0 +1,15 @@ + .syntax unified + .text + + push {lr} + ldr r3, [r1, #4] + lsls r3, r3, #3 + ldr r1, _0806DA18 @ =gUnk_0811415C + adds r3, r3, r1 + ldrb r2, [r3, #4] + movs r1, #1 + bl sub_08078850 + pop {pc} + .align 2, 0 +_0806DA18: .4byte gUnk_0811415C + .syntax divided \ No newline at end of file diff --git a/asm/non_matching/fileScreen/sub_08050EF4.inc b/asm/non_matching/fileScreen/sub_08050EF4.inc index 7d2b850a..1ef73ae0 100644 --- a/asm/non_matching/fileScreen/sub_08050EF4.inc +++ b/asm/non_matching/fileScreen/sub_08050EF4.inc @@ -95,7 +95,7 @@ _08050F9C: movs r1, #0 bl CreateDialogBox movs r0, #0x6a - bl PlaySFX + bl SoundReq b _08050FBA _08050FAC: ldrb r0, [r6, #4] @@ -103,7 +103,7 @@ _08050FAC: ldrb r0, [r6, #5] strb r0, [r1, #3] movs r0, #0x6c - bl PlaySFX + bl SoundReq _08050FBA: adds r0, r5, #0 bl sub_080A7114 @@ -120,7 +120,7 @@ _08050FD0: beq _08050FE2 strb r3, [r1, #1] movs r0, #0x69 - bl PlaySFX + bl SoundReq b _08050FF4 _08050FE2: cmp r2, r8 @@ -129,7 +129,7 @@ _08050FE2: ldrb r0, [r6, #6] bl LoadOptionsFromSave movs r0, #0x69 - bl PlaySFX + bl SoundReq _08050FF4: pop {r3} mov r8, r3 diff --git a/asm/non_matching/fileScreen/sub_080610B8.inc b/asm/non_matching/fileScreen/sub_080610B8.inc index 450a32ba..f7b6721c 100644 --- a/asm/non_matching/fileScreen/sub_080610B8.inc +++ b/asm/non_matching/fileScreen/sub_080610B8.inc @@ -80,7 +80,7 @@ _08051130: cmp r5, #0 beq _0805114C movs r0, #0x67 - bl PlaySFX + bl SoundReq _0805114C: cmp r6, #0 beq _0805123A @@ -339,7 +339,7 @@ _08051330: strb r4, [r1, #1] bl sub_08051458 movs r0, #0x68 - bl PlaySFX + bl SoundReq _0805134C: pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/asm/non_matching/game/sub_08052418.inc b/asm/non_matching/game/sub_08052418.inc index 5e372531..179cce1d 100644 --- a/asm/non_matching/game/sub_08052418.inc +++ b/asm/non_matching/game/sub_08052418.inc @@ -6,7 +6,7 @@ ldr r0, _08052494 @ =gBG1Buffer movs r1, #0x80 lsls r1, r1, #4 - bl _DmaZero + bl MemClear32 ldr r0, _08052498 @ =gUnk_020227E8 movs r1, #0xf str r1, [r0] @@ -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 diff --git a/asm/non_matching/managerC/sub_08058D34.inc b/asm/non_matching/managerC/sub_08058D34.inc index 9749bb14..9f0aac05 100644 --- a/asm/non_matching/managerC/sub_08058D34.inc +++ b/asm/non_matching/managerC/sub_08058D34.inc @@ -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 diff --git a/asm/non_matching/sub_0804BF38.inc b/asm/non_matching/sub_0804BF38.inc index 4f2f3775..76232201 100644 --- a/asm/non_matching/sub_0804BF38.inc +++ b/asm/non_matching/sub_0804BF38.inc @@ -98,7 +98,7 @@ _0804BFE8: ldrh r1, [r4, #0xc] bl sub_08080964 ldrh r0, [r4, #0xe] - bl PlaySFX + bl SoundReq pop {r3, r4, r5} mov r8, r3 mov sb, r4 diff --git a/asm/non_matching/sub_08054524.inc b/asm/non_matching/sub_08054524.inc index 08eb30ff..90a65e1f 100644 --- a/asm/non_matching/sub_08054524.inc +++ b/asm/non_matching/sub_08054524.inc @@ -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 diff --git a/asm/non_matching/sub_080560B8.inc b/asm/non_matching/sub_080560B8.inc index 87523947..68ee7bcd 100644 --- a/asm/non_matching/sub_080560B8.inc +++ b/asm/non_matching/sub_080560B8.inc @@ -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: @@ -54,7 +54,7 @@ _08056112: ldr r4, _0805612C @ =gUnk_02000010 adds r0, r4, #0 movs r1, #0x20 - bl _DmaZero + bl MemClear32 ldr r0, _08056130 @ =0x4D435A33 str r0, [r4] _08056124: diff --git a/asm/non_matching/textbox/sub_080564EC.inc b/asm/non_matching/textbox/sub_080564EC.inc index 3fec0269..4c3fdf84 100644 --- a/asm/non_matching/textbox/sub_080564EC.inc +++ b/asm/non_matching/textbox/sub_080564EC.inc @@ -2,18 +2,18 @@ push {r4, lr} ldr r0, _08056598 @ =gUnk_02036A40 movs r1, #8 - bl _DmaZero + bl MemClear32 ldr r0, _0805659C @ =gUnk_02024030 movs r1, #0x18 - bl _DmaZero + bl MemClear32 ldr r4, _080565A0 @ =gUnk_02022780 adds r0, r4, #0 movs r1, #0xa8 - bl _DmaZero + bl MemClear32 ldr r0, _080565A4 @ =gTextBox adds r1, r4, #0 movs r2, #0x20 - bl _DmaCopy + bl MemCopy ldrb r0, [r4, #2] cmp r0, #0x63 bne _08056520 diff --git a/asm/npc5.s b/asm/npc5.s index 3e49b7fc..a489d264 100644 --- a/asm/npc5.s +++ b/asm/npc5.s @@ -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 diff --git a/asm/object10.s b/asm/object10.s index dc1d3334..b1aad4e8 100644 --- a/asm/object10.s +++ b/asm/object10.s @@ -82,7 +82,7 @@ sub_0808483C: @ 0x0808483C bl SetTile movs r0, #0x89 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq pop {r4, r5, pc} .align 2, 0 _080848C0: .4byte gRoomControls @@ -228,7 +228,7 @@ sub_080849D8: @ 0x080849D8 cmp r1, #1 bne _080849EE movs r0, #0x76 - bl PlaySFX + bl SoundReq ldrb r0, [r4, #0xf] b _080849F2 _080849EE: @@ -377,7 +377,7 @@ _08084AF8: ldr r0, [r4, #0x54] bl DeleteEntity ldr r0, _08084B18 @ =0x0000018F - bl PlaySFX + bl SoundReq bl DeleteThisEntity _08084B16: pop {r4, r5, pc} diff --git a/asm/object36.s b/asm/object36.s index 371fdc49..e8d71409 100644 --- a/asm/object36.s +++ b/asm/object36.s @@ -256,7 +256,7 @@ sub_0808BD00: @ 0x0808BD00 movs r0, #0x17 bl SetGlobalFlag movs r0, #0x72 - bl PlaySFX + bl SoundReq bl DeleteThisEntity pop {pc} diff --git a/asm/object3D.s b/asm/object3D.s index fd19ab4f..a6dbf01d 100644 --- a/asm/object3D.s +++ b/asm/object3D.s @@ -170,7 +170,7 @@ sub_0808D030: @ 0x0808D030 adds r0, r4, #0 subs r0, #0x20 ldr r1, _0808D05C @ =0x00000B74 - bl _DmaZero + bl MemClear32 movs r1, #0xa8 lsls r1, r1, #2 adds r0, r1, #0 diff --git a/asm/object3E.s b/asm/object3E.s index 1a988dca..87dc86a0 100644 --- a/asm/object3E.s +++ b/asm/object3E.s @@ -270,7 +270,7 @@ sub_0808D280: @ 0x0808D280 movs r0, #0x10 strh r0, [r1] movs r0, #0xf6 - bl PlaySFX + bl SoundReq _0808D2C4: add sp, #4 pop {r4, pc} @@ -346,7 +346,7 @@ _0808D31C: cmp r0, #0 bne _0808D350 ldr r0, _0808D35C @ =0x0000010F - bl PlaySFX + bl SoundReq _0808D350: pop {r4, r5, pc} .align 2, 0 @@ -540,7 +540,7 @@ sub_0808D474: @ 0x0808D474 lsls r0, r0, #5 strh r0, [r1] ldr r0, _0808D4D0 @ =0x00000179 - bl PlaySFX + bl SoundReq b _0808D50E .align 2, 0 _0808D4CC: .4byte gScreen diff --git a/asm/object4B.s b/asm/object4B.s index 2ac8f492..80b99e0e 100644 --- a/asm/object4B.s +++ b/asm/object4B.s @@ -120,7 +120,7 @@ sub_0808F80C: @ 0x0808F80C movs r1, #3 bl InitializeAnimation ldr r0, _0808F854 @ =0x0000012B - bl PlaySFX + bl SoundReq _0808F850: pop {r4, pc} .align 2, 0 @@ -195,7 +195,7 @@ _0808F8C8: movs r1, #3 bl InitializeAnimation ldr r0, _0808F8EC @ =0x0000012B - bl PlaySFX + bl SoundReq _0808F8EA: pop {r4, pc} .align 2, 0 diff --git a/asm/object6.s b/asm/object6.s index 35e27958..2f89320b 100644 --- a/asm/object6.s +++ b/asm/object6.s @@ -124,7 +124,7 @@ _080829A4: movs r1, #7 bl InitAnimationForceUpdate movs r0, #0xf3 - bl PlaySFX + bl SoundReq b _080829E2 .align 2, 0 _080829C8: .4byte gPlayerEntity diff --git a/asm/object61.s b/asm/object61.s index 48b66188..3a44eecf 100644 --- a/asm/object61.s +++ b/asm/object61.s @@ -153,7 +153,7 @@ _08093538: strb r0, [r5, #0xf] movs r0, #0x92 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08093544: adds r0, r5, #0 adds r0, #0x6e diff --git a/asm/object64.s b/asm/object64.s index dc28fa20..ab77b6f9 100644 --- a/asm/object64.s +++ b/asm/object64.s @@ -191,7 +191,7 @@ _08093F72: cmp r1, r0 bne _08093F8E movs r0, #0x7a - bl PlaySFX + bl SoundReq bl sub_08079D84 _08093F8E: bl DeleteThisEntity diff --git a/asm/object67.s b/asm/object67.s index 6f1acd48..aa5a10de 100644 --- a/asm/object67.s +++ b/asm/object67.s @@ -257,7 +257,7 @@ _0809430A: _08094312: strh r0, [r1] adds r0, r4, #0 - bl sub_0806FBD8 + bl AllocMutableHitbox cmp r0, #0 beq _0809438A ldr r2, [r4, #0x48] diff --git a/asm/object6A.s b/asm/object6A.s index dd1859cc..f6cde33d 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -374,7 +374,7 @@ sub_08094CDC: @ 0x08094CDC strh r0, [r2, #0x32] movs r0, #0xa2 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08094D0A: pop {pc} .align 2, 0 @@ -426,7 +426,7 @@ sub_08094D34: @ 0x08094D34 strh r0, [r2, #0x32] movs r0, #0xa2 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08094D68: pop {pc} .align 2, 0 @@ -511,7 +511,7 @@ sub_08094DD8: @ 0x08094DD8 strh r0, [r2, #0x32] movs r0, #0xa2 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08094E06: pop {pc} .align 2, 0 @@ -1027,7 +1027,7 @@ _080951E8: adds r0, #1 strb r0, [r4, #0xe] movs r0, #0xe6 - bl PlaySFX + bl SoundReq _08095218: ldr r3, [r4, #0x50] cmp r3, #0 @@ -1471,7 +1471,7 @@ _0809550A: movs r1, #0xde lsls r1, r1, #1 adds r0, r0, r1 - bl PlaySFX + bl SoundReq adds r1, r5, #0 b _08095630 .align 2, 0 @@ -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] @@ -2825,7 +2825,7 @@ _08095FC2: strb r0, [r2] movs r0, #0xea lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08095FE0: ldrh r0, [r5, #0x12] adds r1, r4, #0 diff --git a/asm/object74.s b/asm/object74.s index 934ece51..9290d093 100644 --- a/asm/object74.s +++ b/asm/object74.s @@ -162,7 +162,7 @@ sub_08097C20: @ 0x08097C20 ands r0, r1 strb r0, [r4, #0x19] movs r0, #0x72 - bl PlaySFX + bl SoundReq movs r0, #0x63 bl SetGlobalFlag _08097CA6: @@ -209,7 +209,7 @@ sub_08097CB4: @ 0x08097CB4 strh r0, [r1] movs r0, #0xa5 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq pop {pc} .align 2, 0 _08097CF8: .4byte gScreen diff --git a/asm/object79.s b/asm/object79.s index 4906d890..ffa9e8e9 100644 --- a/asm/object79.s +++ b/asm/object79.s @@ -121,7 +121,7 @@ sub_0809803C: @ 0x0809803C bl InitAnimationForceUpdate movs r0, #0xbc lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _08098082 .align 2, 0 _0809806C: .4byte gPlayerEntity @@ -175,7 +175,7 @@ _080980A8: strh r0, [r2] movs r0, #0xbc lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _080980E6 .align 2, 0 _080980D4: .4byte 0xFFFF0000 diff --git a/asm/object87.s b/asm/object87.s index c6c724ce..f4bf6ed0 100644 --- a/asm/object87.s +++ b/asm/object87.s @@ -136,7 +136,7 @@ _08099FCE: bl InitializeAnimation movs r0, #0xa6 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0809A1B6 _0809A00C: ldr r0, [r5, #0x50] @@ -329,14 +329,14 @@ _0809A132: cmp r0, #0 beq _0809A1A8 ldr r0, _0809A1A4 @ =0x000001A3 - bl PlaySFX + bl SoundReq b _0809A1B6 .align 2, 0 _0809A1A0: .4byte gRoomControls _0809A1A4: .4byte 0x000001A3 _0809A1A8: movs r0, #0xe8 - bl PlaySFX + bl SoundReq b _0809A1B6 _0809A1B0: movs r0, #0xf0 diff --git a/asm/object89.s b/asm/object89.s index 5e3c18a6..4dce01fc 100644 --- a/asm/object89.s +++ b/asm/object89.s @@ -302,7 +302,7 @@ sub_0809ACE8: @ 0x0809ACE8 movs r0, #1 strb r0, [r4, #0xd] movs r0, #0x73 - bl PlaySFX + bl SoundReq movs r0, #0x31 bl SetFlag adds r0, r4, #0 diff --git a/asm/object8E.s b/asm/object8E.s index 063c12a4..ff4bb033 100644 --- a/asm/object8E.s +++ b/asm/object8E.s @@ -97,7 +97,7 @@ _0809B8D8: cmp r0, #0 bne _0809B8F0 ldr r0, _0809B910 @ =0x00000133 - bl PlaySFX + bl SoundReq _0809B8F0: ldr r0, [r5] movs r1, #3 @@ -130,7 +130,7 @@ _0809B914: str r0, [r1, #0x30] movs r0, #0x9a lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0809B972 .align 2, 0 _0809B938: .4byte gScreen @@ -280,7 +280,7 @@ _0809BA40: cmp r0, #0 bne _0809BA58 ldr r0, _0809BA78 @ =0x00000133 - bl PlaySFX + bl SoundReq _0809BA58: ldr r0, [r5] movs r1, #3 @@ -308,7 +308,7 @@ _0809BA7C: str r0, [r1, #0x30] movs r0, #0x9a lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0809BAC2 .align 2, 0 _0809BA94: .4byte gRoomControls @@ -443,7 +443,7 @@ _0809BB88: cmp r0, #0 bne _0809BBA6 ldr r0, _0809BBC0 @ =0x00000133 - bl PlaySFX + bl SoundReq _0809BBA6: ldr r0, [r4] movs r1, #1 @@ -479,7 +479,7 @@ _0809BBC4: strh r0, [r4, #0x32] movs r0, #0x9a lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0809BC68 .align 2, 0 _0809BBF4: .4byte 0x0000DFFF @@ -501,7 +501,7 @@ _0809BBF8: movs r0, #0x35 bl SetLocalFlag movs r0, #0x72 - bl PlaySFX + bl SoundReq b _0809BC68 _0809BC24: ldrb r0, [r4, #0xe] @@ -638,7 +638,7 @@ _0809BD20: cmp r0, #0 bne _0809BD38 ldr r0, _0809BD5C @ =0x00000133 - bl PlaySFX + bl SoundReq _0809BD38: ldr r0, [r6] ands r0, r5 @@ -677,7 +677,7 @@ _0809BD64: bl SetLocalFlag movs r0, #0x9a lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0809BDAE .align 2, 0 _0809BD90: .4byte gScreen @@ -760,7 +760,7 @@ _0809BE0C: cmp r0, #0 bne _0809BE70 ldr r0, _0809BE30 @ =0x00000133 - bl PlaySFX + bl SoundReq b _0809BE70 .align 2, 0 _0809BE2C: .4byte gScreenTransition @@ -775,7 +775,7 @@ _0809BE34: str r0, [r1, #0x30] movs r0, #0x9a lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0809BE70 .align 2, 0 _0809BE4C: .4byte gRoomControls diff --git a/asm/object91.s b/asm/object91.s index fff595ca..80fbd82d 100644 --- a/asm/object91.s +++ b/asm/object91.s @@ -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 @@ -632,7 +632,7 @@ _0809C892: movs r0, #0x1e strb r0, [r5] movs r0, #0xe6 - bl PlaySFX + bl SoundReq b _0809C8B8 .align 2, 0 _0809C8A8: .4byte gTextBox @@ -749,7 +749,7 @@ _0809C948: movs r1, #0xef bl sub_0809CC30 movs r0, #0xe8 - bl PlaySFX + bl SoundReq _0809C980: pop {r4, r5, pc} .align 2, 0 @@ -893,7 +893,7 @@ _0809CA30: movs r0, #1 strb r0, [r1] movs r0, #0xed - bl PlaySFX + bl SoundReq b _0809CAC4 _0809CA92: subs r0, #1 @@ -978,7 +978,7 @@ _0809CB26: cmp r0, #0 bne _0809CB38 ldr r0, _0809CB48 @ =0x00000163 - bl PlaySFX + bl SoundReq _0809CB38: pop {r4, r5, pc} .align 2, 0 @@ -1087,7 +1087,7 @@ sub_0809CBE4: @ 0x0809CBE4 strb r0, [r2, #0xf] movs r0, #0xcf lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0809CC2C _0809CC16: movs r0, #0 @@ -1099,7 +1099,7 @@ _0809CC16: strb r0, [r2, #0xf] movs r0, #0xcf lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0809CC2C: pop {r4, pc} .align 2, 0 diff --git a/asm/object96.s b/asm/object96.s index 5bf36641..26f40c61 100644 --- a/asm/object96.s +++ b/asm/object96.s @@ -159,7 +159,7 @@ _0809D888: bl _call_via_r1 _0809D8AC: movs r0, #0x6e - bl PlaySFX + bl SoundReq _0809D8B2: ldrb r4, [r5, #0xa] ldrb r0, [r6, #0xd] @@ -226,7 +226,7 @@ sub_0809D91C: @ 0x0809D91C bl sub_0806FAD8 _0809D934: movs r0, #0x72 - bl PlaySFX + bl SoundReq pop {r4, pc} thumb_func_start sub_0809D93C diff --git a/asm/object97.s b/asm/object97.s index f90fc4ea..c597b8ea 100644 --- a/asm/object97.s +++ b/asm/object97.s @@ -323,7 +323,7 @@ sub_0809DBE4: @ 0x0809DBE4 movs r0, #1 strb r0, [r4, #0xe] movs r0, #0x6e - bl PlaySFX + bl SoundReq pop {r4, pc} thumb_func_start sub_0809DC14 @@ -360,7 +360,7 @@ _0809DC3C: bl UpdateSpriteForCollisionLayer _0809DC54: movs r0, #0x6e - bl PlaySFX + bl SoundReq _0809DC5A: adds r0, r4, #0 bl sub_0809DB88 @@ -466,7 +466,7 @@ sub_0809DD0C: @ 0x0809DD0C strb r0, [r4, #0xc] movs r0, #0xa3 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0809DD2A: adds r0, r4, #0 bl UpdateAnimationSingleFrame @@ -497,7 +497,7 @@ sub_0809DD34: @ 0x0809DD34 strh r0, [r1] movs r0, #0xa3 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0809DD64: adds r0, r4, #0 bl sub_0809E238 @@ -557,7 +557,7 @@ sub_0809DDBC: @ 0x0809DDBC adds r0, #1 strb r0, [r4, #0xc] ldr r0, _0809DDE0 @ =0x0000015B - bl PlaySFX + bl SoundReq _0809DDD8: adds r0, r4, #0 bl UpdateAnimationSingleFrame @@ -724,7 +724,7 @@ _0809DF16: adds r0, r4, #0 bl InitAnimationForceUpdate ldr r0, _0809DF60 @ =0x00000123 - bl PlaySFX + bl SoundReq ldr r5, [r4, #0x54] cmp r5, #0 beq _0809DF98 @@ -760,9 +760,9 @@ _0809DF64: adds r0, r4, #0 bl InitAnimationForceUpdate ldr r0, _0809DF8C @ =0x00000123 - bl PlaySFX + bl SoundReq ldr r0, _0809DF90 @ =0x000001F3 - bl PlaySFX + bl SoundReq b _0809DF98 .align 2, 0 _0809DF8C: .4byte 0x00000123 @@ -803,7 +803,7 @@ sub_0809DFA0: @ 0x0809DFA0 strb r0, [r4, #0xf] movs r0, #0x81 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0809DFD6: adds r0, r4, #0 bl sub_0809DFE0 @@ -970,7 +970,7 @@ _0809E0FE: adds r1, r6, #0 bl sub_0807DEDC ldr r0, _0809E128 @ =0x00000123 - bl PlaySFX + bl SoundReq ldr r0, _0809E12C @ =gUnk_02033280 strb r4, [r0, #6] b _0809E1BC @@ -1044,7 +1044,7 @@ _0809E170: strb r0, [r5, #0xf] movs r0, #0x81 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0809E1BC _0809E1B6: ldr r1, _0809E1C4 @ =gUnk_02033280 diff --git a/asm/objectA9.s b/asm/objectA9.s index ccf59604..5a290a2d 100644 --- a/asm/objectA9.s +++ b/asm/objectA9.s @@ -37,7 +37,7 @@ sub_0809FEF8: @ 0x0809FEF8 lsls r0, r0, #1 adds r0, r0, r1 ldrh r0, [r0] - bl PlaySFX + bl SoundReq pop {r4, pc} .align 2, 0 _0809FF20: .4byte gUnk_0812485C diff --git a/asm/objectB.s b/asm/objectB.s index 0c7b636e..e7f17d89 100644 --- a/asm/objectB.s +++ b/asm/objectB.s @@ -117,7 +117,7 @@ _08083C4A: strh r1, [r0] _08083C62: ldr r0, _08083C70 @ =0x00000109 - bl PlaySFX + bl SoundReq b _08083C98 .align 2, 0 _08083C6C: .4byte gUnk_080FD964 diff --git a/asm/objectB3.s b/asm/objectB3.s index 68950cef..91fd1641 100644 --- a/asm/objectB3.s +++ b/asm/objectB3.s @@ -181,7 +181,7 @@ sub_080A0B60: @ 0x080A0B60 strb r0, [r2, #0xc] movs r0, #0x9b lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080A0B7C: pop {pc} .align 2, 0 diff --git a/asm/objectB9.s b/asm/objectB9.s index 0622cef1..bf5cd9ec 100644 --- a/asm/objectB9.s +++ b/asm/objectB9.s @@ -128,7 +128,7 @@ _080A12B2: adds r0, r0, r1 ldrh r0, [r0] str r3, [sp] - bl PlaySFX + bl SoundReq ldr r3, [sp] b _080A132E .align 2, 0 @@ -187,7 +187,7 @@ _080A132E: cmp r0, #0 bgt _080A1370 movs r0, #0xe2 - bl PlaySFX + bl SoundReq bl sub_08050384 b _080A1376 .align 2, 0 @@ -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 diff --git a/asm/objectBA.s b/asm/objectBA.s index b55d3613..7dcc5217 100644 --- a/asm/objectBA.s +++ b/asm/objectBA.s @@ -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 @@ -153,7 +153,7 @@ _080A171E: adds r0, r0, r4 strh r0, [r2, #0x18] ldr r0, _080A1840 @ =0x80100000 - bl PlaySFX + bl SoundReq ldr r0, _080A1844 @ =gArea movs r2, #0x86 lsls r2, r2, #4 @@ -254,7 +254,7 @@ sub_080A189C: @ 0x080A189C strb r1, [r0] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x96 movs r1, #1 bl sub_08080964 @@ -376,7 +376,7 @@ sub_080A1990: @ 0x080A1990 strb r0, [r1] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x96 movs r1, #1 bl sub_08080964 @@ -495,7 +495,7 @@ sub_080A1A80: @ 0x080A1A80 strh r0, [r1] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x96 movs r1, #1 bl sub_08080964 @@ -589,7 +589,7 @@ sub_080A1B4C: @ 0x080A1B4C bl sub_08080964 movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq adds r1, r4, #0 adds r1, #0x78 movs r0, #0xc0 @@ -714,7 +714,7 @@ _080A1C66: _080A1C76: movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0xb4 lsls r0, r0, #2 movs r1, #2 @@ -723,7 +723,7 @@ _080A1C76: _080A1C8A: movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x4b movs r1, #1 bl sub_08080964 diff --git a/asm/objectE.s b/asm/objectE.s index 50ea5063..3e760cf7 100644 --- a/asm/objectE.s +++ b/asm/objectE.s @@ -56,7 +56,7 @@ _08084472: bl CreateFx movs r0, #0x93 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq bl DeleteThisEntity _080844C2: pop {r4, r5, pc} diff --git a/asm/ocarina.s b/asm/ocarina.s index f6c295b2..5fc9ec5b 100644 --- a/asm/ocarina.s +++ b/asm/ocarina.s @@ -99,7 +99,7 @@ _08076BB8: bl sub_08077D38 ldr r0, _08076C28 @ =0x00000216 - bl PlaySFX + bl SoundReq bl sub_0805E544 diff --git a/asm/octorokBoss.s b/asm/octorokBoss.s index 6bc4b9a0..419c15ac 100644 --- a/asm/octorokBoss.s +++ b/asm/octorokBoss.s @@ -138,7 +138,7 @@ sub_08035288: @ 0x08035288 bl sub_08078B48 movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _080352FA .align 2, 0 _080352C4: .4byte gUnk_02034490 @@ -671,7 +671,7 @@ _080356B2: strb r1, [r0] movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq adds r0, r7, #0 bl sub_0804A7D4 b _080356F0 @@ -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 @@ -1115,7 +1115,7 @@ sub_08035A24: @ 0x08035A24 ldr r0, [r0] strb r1, [r0] ldr r0, _08035A50 @ =0x00000159 - bl PlaySFX + bl SoundReq b _08035A64 .align 2, 0 _08035A50: .4byte 0x00000159 @@ -1267,7 +1267,7 @@ sub_08035B34: @ 0x08035B34 ldr r0, _08035B78 @ =gUnk_02034490 strb r4, [r0] movs r0, #0x2e - bl PlaySFX + bl SoundReq b _08035B92 .align 2, 0 _08035B70: .4byte gPlayerEntity @@ -2047,10 +2047,10 @@ _0803612C: bl sub_08080964 movs r0, #0xac lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0xa6 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0803617C _08036178: subs r0, #1 @@ -2149,7 +2149,7 @@ _08036228: _0803622E: strb r0, [r1] ldr r0, _08036238 @ =0x00000155 - bl PlaySFX + bl SoundReq _08036236: pop {pc} .align 2, 0 @@ -2210,7 +2210,7 @@ _08036292: strb r0, [r3] _0803629A: ldr r0, _080362A4 @ =0x00000155 - bl PlaySFX + bl SoundReq _080362A0: pop {pc} .align 2, 0 @@ -2472,7 +2472,7 @@ _0803640C: rsbs r0, r0, #0 strb r0, [r1, #3] movs r0, #0xed - bl PlaySFX + bl SoundReq b _080364AA .align 2, 0 _08036498: .4byte gPlayerEntity @@ -2576,7 +2576,7 @@ _08036510: adds r0, r4, #0 bl sub_08036C90 movs r0, #0xef - bl PlaySFX + bl SoundReq b _08036652 .align 2, 0 _0803656C: .4byte gPlayerEntity @@ -2738,7 +2738,7 @@ _08036678: bne _080366A0 movs r0, #0x92 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _080366A0: adds r0, r5, #0 movs r1, #0x87 @@ -2945,10 +2945,10 @@ _080367FE: bl sub_08080964 movs r0, #0xac lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0xa6 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0803683A: adds r1, r4, #0 adds r1, #0x79 @@ -2970,7 +2970,7 @@ _08036852: cmp r0, #0 bne _08036864 ldr r0, _0803686C @ =0x00000159 - bl PlaySFX + bl SoundReq _08036864: pop {r4, r5, pc} .align 2, 0 @@ -3789,7 +3789,7 @@ _08036E62: ldr r0, [r6] strb r5, [r0] ldr r0, _08036E88 @ =0x00000159 - bl PlaySFX + bl SoundReq b _08036F00 .align 2, 0 _08036E84: .4byte gRoomVars @@ -3966,14 +3966,14 @@ sub_08036FAC: @ 0x08036FAC cmp r0, #0 bne _08036FD8 ldr r0, _08036FD4 @ =0x00000163 - bl PlaySFX + bl SoundReq b _08036FDE .align 2, 0 _08036FD0: .4byte gScreenTransition _08036FD4: .4byte 0x00000163 _08036FD8: ldr r0, _08036FE0 @ =0x000001B1 - bl PlaySFX + bl SoundReq _08036FDE: pop {pc} .align 2, 0 diff --git a/asm/phonograph.s b/asm/phonograph.s index c1fd3df9..962139ae 100644 --- a/asm/phonograph.s +++ b/asm/phonograph.s @@ -178,7 +178,7 @@ _0806EA4E: adds r0, r0, r4 movs r1, #0 ldrsh r0, [r0, r1] - bl PlaySFX + bl SoundReq ldrh r0, [r7] strh r0, [r5] movs r2, #0 @@ -194,7 +194,7 @@ _0806EA74: .4byte gInput _0806EA78: .4byte gUnk_081145E4 _0806EA7C: ldr r0, _0806EAB4 @ =0x80010000 - bl PlaySFX + bl SoundReq movs r0, #0 strh r0, [r5] _0806EA86: diff --git a/asm/pullableMushroom.s b/asm/pullableMushroom.s index 9390dd8d..61211893 100644 --- a/asm/pullableMushroom.s +++ b/asm/pullableMushroom.s @@ -572,7 +572,7 @@ _0808AE48: strb r0, [r4, #0x18] movs r0, #0x97 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0808AE80 _0808AE54: adds r0, r4, #0 @@ -664,7 +664,7 @@ sub_0808AEB0: @ 0x0808AEB0 movs r0, #4 str r0, [r4, #0x7c] ldr r0, _0808AF1C @ =0x0000012F - bl PlaySFX + bl SoundReq _0808AF08: movs r0, #1 strb r0, [r4, #0xf] @@ -778,7 +778,7 @@ sub_0808AFD4: @ 0x0808AFD4 strb r0, [r2, #0x15] movs r0, #0x98 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq pop {pc} thumb_func_start sub_0808AFF0 @@ -829,7 +829,7 @@ _0808B01E: strb r5, [r4, #0xc] movs r0, #0x98 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0808B050: pop {r4, r5, pc} .align 2, 0 diff --git a/asm/pushableGrave.s b/asm/pushableGrave.s index d65652f4..780b29c7 100644 --- a/asm/pushableGrave.s +++ b/asm/pushableGrave.s @@ -264,7 +264,7 @@ _08097774: movs r1, #0x60 bl sub_0805E4E0 ldr r0, _0809779C @ =0x0000010F - bl PlaySFX + bl SoundReq _0809779A: pop {pc} .align 2, 0 @@ -471,7 +471,7 @@ _08097892: bl sub_0807B9B8 _08097934: ldr r0, _08097944 @ =0x0000010F - bl PlaySFX + bl SoundReq movs r0, #1 b _08097988 .align 2, 0 diff --git a/asm/pushableRock.s b/asm/pushableRock.s index c9d147b7..2cf721cd 100644 --- a/asm/pushableRock.s +++ b/asm/pushableRock.s @@ -245,7 +245,7 @@ _0808A69E: ldrh r0, [r5] bl SetFlag movs r0, #0xcd - bl PlaySFX + bl SoundReq adds r0, r4, #0 movs r1, #5 bl InitializeAnimation diff --git a/asm/rem.s b/asm/rem.s index aff7c85d..1389ec91 100644 --- a/asm/rem.s +++ b/asm/rem.s @@ -208,7 +208,7 @@ _0806A568: orrs r0, r1 str r0, [r2] ldr r0, _0806A5B8 @ =0x0000011B - bl PlaySFX + bl SoundReq _0806A590: ldrb r1, [r5] movs r0, #0x80 @@ -286,7 +286,7 @@ _0806A60A: adds r0, #0x78 strb r0, [r4, #0xe] movs r0, #0xcc - bl PlaySFX + bl SoundReq _0806A628: adds r0, r4, #0 bl GetNextFrame @@ -323,7 +323,7 @@ _0806A65A: movs r0, #0 strb r0, [r1] movs r0, #0x72 - bl PlaySFX + bl SoundReq _0806A66E: pop {r4, pc} .align 2, 0 diff --git a/asm/rope.s b/asm/rope.s index d16b913c..3a748174 100644 --- a/asm/rope.s +++ b/asm/rope.s @@ -190,7 +190,7 @@ _08031496: orrs r1, r2 strb r1, [r4, #0x1b] ldr r0, _080314C8 @ =0x0000012D - bl PlaySFX + bl SoundReq b _080314FA .align 2, 0 _080314C8: .4byte 0x0000012D diff --git a/asm/smallIceBlock.s b/asm/smallIceBlock.s index ab6f9052..c0f3887b 100644 --- a/asm/smallIceBlock.s +++ b/asm/smallIceBlock.s @@ -256,7 +256,7 @@ _08099364: movs r2, #0 bl sub_080A2A3C movs r0, #0x72 - bl PlaySFX + bl SoundReq b _080993BA .align 2, 0 _0809939C: .4byte gUnk_08123748 @@ -271,7 +271,7 @@ _080993A0: movs r2, #0 bl sub_080A2A3C movs r0, #0x72 - bl PlaySFX + bl SoundReq _080993BA: movs r0, #4 strb r0, [r4, #0xc] diff --git a/asm/playSFX.s b/asm/soundReq.s similarity index 97% rename from asm/playSFX.s rename to asm/soundReq.s index bd50a434..6b5ef1c2 100644 --- a/asm/playSFX.s +++ b/asm/soundReq.s @@ -6,11 +6,11 @@ .text - thumb_func_start PlaySFX -PlaySFX: @ 0x080A3268 + thumb_func_start SoundReq +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 diff --git a/asm/stairsInteract.s b/asm/stairsInteract.s index 6a20386a..025c0ec3 100644 --- a/asm/stairsInteract.s +++ b/asm/stairsInteract.s @@ -77,7 +77,7 @@ _08073218: movs r0, #2 strb r0, [r4, #0x14] ldr r0, _0807326C @ =0x00000187 - bl PlaySFX + bl SoundReq b _08073294 .align 2, 0 _0807326C: .4byte 0x00000187 @@ -98,7 +98,7 @@ _08073270: strb r0, [r4, #0x14] movs r0, #0xc4 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08073294: adds r0, r4, #0 bl sub_08066DE4 diff --git a/asm/sub_08016AE4.s b/asm/sub_08016AE4.s index 6a71e6bf..b389ddfd 100644 --- a/asm/sub_08016AE4.s +++ b/asm/sub_08016AE4.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_08016AE4 -sub_08016AE4: @ 0x08016AE4 + thumb_func_start ProjectileUpdate +ProjectileUpdate: @ 0x08016AE4 mov r3, lr push {r3, r4} adds r4, r0, #0 @@ -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 diff --git a/asm/sub_0807CA18.s b/asm/sub_0807CA18.s index f955c199..a4a4631a 100644 --- a/asm/sub_0807CA18.s +++ b/asm/sub_0807CA18.s @@ -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} diff --git a/asm/updateBackgroundRegisters.s b/asm/updateBackgroundRegisters.s index a529894e..94c37ab2 100644 --- a/asm/updateBackgroundRegisters.s +++ b/asm/updateBackgroundRegisters.s @@ -5,8 +5,8 @@ .text - thumb_func_start UpdateBackgroundRegisters -UpdateBackgroundRegisters: @ 0x08016CF4 + thumb_func_start DispCtrlSet +DispCtrlSet: @ 0x08016CF4 ldr r3, _08016DF0 @ =gScreen ldrh r1, [r3] ldrh r0, [r3, #6] diff --git a/asm/vaati.s b/asm/vaati.s index 49e70e22..982a913c 100644 --- a/asm/vaati.s +++ b/asm/vaati.s @@ -322,7 +322,7 @@ sub_08066C94: @ 0x08066C94 movs r1, #0 bl sub_0805DA90 movs r0, #0xf7 - bl PlaySFX + bl SoundReq pop {pc} thumb_func_start sub_08066CA4 @@ -331,5 +331,5 @@ sub_08066CA4: @ 0x08066CA4 movs r1, #1 bl sub_0805DA90 movs r0, #0xf6 - bl PlaySFX + bl SoundReq pop {pc} diff --git a/asm/vaatiArm.s b/asm/vaatiArm.s index c3ec0207..b8d9e69f 100644 --- a/asm/vaatiArm.s +++ b/asm/vaatiArm.s @@ -353,7 +353,7 @@ _080427EE: bl InitAnimationForceUpdate movs r0, #0xaf lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0804280E _080427FC: ldrb r0, [r6, #0xe] @@ -518,7 +518,7 @@ sub_080428FC: @ 0x080428FC rsbs r0, r0, #0 strh r0, [r1, #8] ldr r0, _08042940 @ =0x00000153 - bl PlaySFX + bl SoundReq movs r2, #0 movs r3, #0x3b _0804292A: @@ -891,7 +891,7 @@ _08042BBA: ands r0, r1 strb r0, [r4, #0x18] ldr r0, _08042BDC @ =0x00000161 - bl PlaySFX + bl SoundReq _08042BD4: adds r6, #1 cmp r6, #3 @@ -1146,7 +1146,7 @@ _08042D8E: bl CopyPosition movs r0, #0xb3 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08042DB4: ldrb r0, [r4, #0x18] movs r2, #4 @@ -1354,7 +1354,7 @@ _08042F3C: movs r1, #0xf bl InitAnimationForceUpdate ldr r0, _08042FD4 @ =0x0000019B - bl PlaySFX + bl SoundReq _08042F4E: ldr r0, [r4, #0x64] adds r7, r0, #0 @@ -1518,7 +1518,7 @@ _08043076: cmp r2, #4 bls _08043076 ldr r0, _08043090 @ =0x00000153 - bl PlaySFX + bl SoundReq b _080430C6 .align 2, 0 _08043090: .4byte 0x00000153 @@ -1679,7 +1679,7 @@ _08043194: cmp r0, #1 bne _080431BC ldr r0, _080431E4 @ =0x00000161 - bl PlaySFX + bl SoundReq _080431BC: ldrb r1, [r4, #0x18] adds r0, r7, #0 @@ -1971,7 +1971,7 @@ _080433BC: bne _0804341C movs r0, #0xaf lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0804341C .align 2, 0 _080433E4: .4byte gUnk_080D1414 @@ -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 diff --git a/asm/vaatiReborn.s b/asm/vaatiReborn.s index 0b4450b3..3e900ff0 100644 --- a/asm/vaatiReborn.s +++ b/asm/vaatiReborn.s @@ -247,7 +247,7 @@ _0806B83A: movs r0, #0x20 strb r0, [r5, #0xf] ldr r0, _0806B848 @ =0x000001A9 - bl PlaySFX + bl SoundReq b _0806B95A .align 2, 0 _0806B848: .4byte 0x000001A9 @@ -366,7 +366,7 @@ _0806B91E: movs r0, #0x20 strb r0, [r5, #0xf] ldr r0, _0806B938 @ =0x000001A9 - bl PlaySFX + bl SoundReq b _0806B95A .align 2, 0 _0806B938: .4byte 0x000001A9 diff --git a/asm/vaatiRebornEnemy.s b/asm/vaatiRebornEnemy.s index 235a04ad..51485753 100644 --- a/asm/vaatiRebornEnemy.s +++ b/asm/vaatiRebornEnemy.s @@ -476,7 +476,7 @@ _0803D438: movs r1, #3 bl InitAnimationForceUpdate ldr r0, _0803D454 @ =0x0000019B - bl PlaySFX + bl SoundReq b _0803D558 .align 2, 0 _0803D454: .4byte 0x0000019B @@ -553,7 +553,7 @@ _0803D4D0: movs r1, #4 bl InitAnimationForceUpdate movs r0, #0xf5 - bl PlaySFX + bl SoundReq b _0803D558 .align 2, 0 _0803D4F4: .4byte gUnk_080D04AC @@ -716,7 +716,7 @@ _0803D5F8: bne _0803D620 movs r0, #0xd8 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0803D620: adds r0, r4, #0 movs r1, #1 @@ -904,7 +904,7 @@ _0803D764: adds r0, #0x40 strb r0, [r4, #0xf] movs r0, #0xf4 - bl PlaySFX + bl SoundReq b _0803D81C _0803D78E: ldrb r0, [r4, #0xf] @@ -1037,7 +1037,7 @@ _0803D870: strb r0, [r4] movs r0, #0xa8 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq adds r0, r5, #0 movs r1, #0x18 movs r2, #0 @@ -1061,7 +1061,7 @@ _0803D8B0: bne _0803D8EE movs r0, #0xcb lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0803D8EE _0803D8C2: ldrb r0, [r5, #0xf] @@ -1077,7 +1077,7 @@ _0803D8CE: movs r0, #1 strb r0, [r5, #0xf] ldr r0, _0803D8F8 @ =0x0000014F - bl PlaySFX + bl SoundReq _0803D8DE: ldrb r0, [r5, #0xe] cmp r0, #0 @@ -1604,7 +1604,7 @@ _0803DC66: strb r0, [r5, #0x15] strb r7, [r4, #0xe] ldr r0, _0803DCE8 @ =0x80100000 - bl PlaySFX + bl SoundReq ldr r0, _0803DCEC @ =gArea movs r2, #0x86 lsls r2, r2, #4 @@ -1633,7 +1633,7 @@ _0803DCFA: cmp r0, #0 ble _0803DD20 ldr r0, _0803DD50 @ =0x00000127 - bl PlaySFX + bl SoundReq movs r0, #0xc movs r1, #1 bl sub_08080964 diff --git a/asm/vaatiTransfigured.s b/asm/vaatiTransfigured.s index 81a0d5b7..246058b5 100644 --- a/asm/vaatiTransfigured.s +++ b/asm/vaatiTransfigured.s @@ -499,7 +499,7 @@ _0803FB16: strb r0, [r7, #0x10] movs r0, #0xa6 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x14 b _0803FC4A _0803FB34: @@ -568,7 +568,7 @@ _0803FBA0: strb r0, [r7, #0xe] bl sub_0807A108 ldr r0, _0803FBB4 @ =0x00000127 - bl PlaySFX + bl SoundReq b _0803FD4E .align 2, 0 _0803FBB4: .4byte 0x00000127 @@ -645,7 +645,7 @@ _0803FC08: bl sub_080408EC movs r0, #0xa6 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x1e _0803FC4A: movs r1, #4 @@ -662,7 +662,7 @@ _0803FC52: bne _0803FC6C movs r0, #0xd8 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0803FD32 _0803FC6C: movs r0, #7 @@ -670,7 +670,7 @@ _0803FC6C: cmp r1, #0 bne _0803FD32 ldr r0, _0803FC7C @ =0x00000149 - bl PlaySFX + bl SoundReq b _0803FD32 .align 2, 0 _0803FC7C: .4byte 0x00000149 @@ -736,7 +736,7 @@ _0803FCA8: strb r0, [r2] movs r0, #0x92 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq b _0803FD32 .align 2, 0 _0803FD08: .4byte 0x0000FFF9 @@ -820,7 +820,7 @@ _0803FD82: lsls r0, r0, #0xa str r0, [r4, #0x20] ldr r0, _0803FDA4 @ =0x0000012B - bl PlaySFX + bl SoundReq b _0803FE86 .align 2, 0 _0803FDA4: .4byte 0x0000012B @@ -872,7 +872,7 @@ _0803FDF0: _0803FDFA: movs r0, #0xa6 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #0x1e movs r1, #4 bl sub_08080964 @@ -1284,7 +1284,7 @@ _080400C2: strb r0, [r2] movs r0, #0xb7 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08040120: adds r0, r4, #0 bl UpdateAnimationSingleFrame @@ -1765,7 +1765,7 @@ _080404A6: movs r0, #0xa strb r0, [r4, #0xe] ldr r0, _080404CC @ =0x00000149 - bl PlaySFX + bl SoundReq _080404BC: ldr r0, [r4, #0x50] adds r1, r4, #0 @@ -1901,7 +1901,7 @@ _080405A8: movs r0, #0xa strb r0, [r4, #0xe] ldr r0, _080405D4 @ =0x00000149 - bl PlaySFX + bl SoundReq _080405BE: adds r0, r4, #0 bl GetNextFrame @@ -2511,7 +2511,7 @@ _08040A04: strb r0, [r1] strb r2, [r3] ldr r0, _08040A38 @ =0x00000155 - bl PlaySFX + bl SoundReq b _08040A68 .align 2, 0 _08040A38: .4byte 0x00000155 @@ -2536,7 +2536,7 @@ _08040A3C: str r0, [r4, #0x20] movs r0, #0xb2 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08040A68: adds r0, r4, #0 adds r0, #0x81 @@ -2571,7 +2571,7 @@ _08040A84: movs r1, #1 bl sub_08080964 ldr r0, _08040ACC @ =0x00000127 - bl PlaySFX + bl SoundReq _08040AB0: ldrb r0, [r5] cmp r0, #0x8a @@ -2605,7 +2605,7 @@ sub_08040AD4: @ 0x08040AD4 cmp r0, #0 bne _08040AF0 ldr r0, _08040B0C @ =0x000001A9 - bl PlaySFX + bl SoundReq _08040AF0: movs r0, #3 ands r4, r0 diff --git a/asm/vaatiWrath.s b/asm/vaatiWrath.s index 5a0bea7b..cb1c8367 100644 --- a/asm/vaatiWrath.s +++ b/asm/vaatiWrath.s @@ -45,10 +45,10 @@ VaatiWrath: @ 0x08041330 strb r0, [r4, #0xc] strb r1, [r4, #0xd] ldr r0, _08041398 @ =0x80010000 - bl PlaySFX + bl SoundReq movs r0, #0x94 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08041384: ldr r0, _0804139C @ =gUnk_080D0E1C ldrb r1, [r4, #0xa] @@ -228,7 +228,7 @@ _080414C8: cmp r0, #0 bne _080414F4 ldr r0, _0804150C @ =0x000001A9 - bl PlaySFX + bl SoundReq _080414F4: movs r0, #0x36 ldrsh r1, [r4, r0] @@ -239,7 +239,7 @@ _080414F4: movs r0, #2 strb r0, [r4, #0xd] ldr r0, _0804150C @ =0x000001A9 - bl PlaySFX + bl SoundReq b _080415E6 .align 2, 0 _0804150C: .4byte 0x000001A9 @@ -875,7 +875,7 @@ _080419A6: movs r1, #0x1e bl InitializeAnimation ldr r0, _080419FC @ =0x00000127 - bl PlaySFX + bl SoundReq _080419F6: pop {r4, pc} .align 2, 0 @@ -1303,7 +1303,7 @@ _08041D40: strb r0, [r4, #0x18] movs r0, #0xe2 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _08041D7C: pop {r4, r5, pc} .align 2, 0 @@ -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 diff --git a/asm/warpPoint.s b/asm/warpPoint.s index f2f0d1fa..99f34f71 100644 --- a/asm/warpPoint.s +++ b/asm/warpPoint.s @@ -206,7 +206,7 @@ sub_0808B590: @ 0x0808B590 adds r0, r4, #0 bl sub_0805E4E0 ldr r0, _0808B5E0 @ =0x00000113 - bl PlaySFX + bl SoundReq b _0808B5E6 .align 2, 0 _0808B5DC: .4byte gPlayerEntity @@ -258,7 +258,7 @@ _0808B624: bne _0808B638 movs r0, #0x8a lsls r0, r0, #1 - bl PlaySFX + bl SoundReq _0808B638: ldrb r1, [r4, #0xf] movs r0, #1 diff --git a/asm/waterfallOpening.s b/asm/waterfallOpening.s index 147d41ae..79dcbc42 100644 --- a/asm/waterfallOpening.s +++ b/asm/waterfallOpening.s @@ -84,7 +84,7 @@ _0809FFCE: adds r0, r4, #0 bl LoadFixedGFX movs r0, #0xf6 - bl PlaySFX + bl SoundReq b _080A005A _080A0006: adds r1, r4, #0 @@ -125,7 +125,7 @@ _080A0038: adds r0, #1 strb r0, [r1, #6] movs r0, #0x73 - bl PlaySFX + bl SoundReq _080A005A: adds r0, r4, #0 bl sub_080A00B0 diff --git a/asm/whirlwind.s b/asm/whirlwind.s index 4b9a42e2..f5ed706c 100644 --- a/asm/whirlwind.s +++ b/asm/whirlwind.s @@ -238,9 +238,9 @@ _08092E16: strb r0, [r5, #0xc] bl sub_08077B20 ldr r0, _08092E90 @ =0x00000153 - bl PlaySFX + bl SoundReq movs r0, #0x79 - bl PlaySFX + bl SoundReq _08092E84: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/asm/windTribeTeleporter.s b/asm/windTribeTeleporter.s index b5630d2f..7476e405 100644 --- a/asm/windTribeTeleporter.s +++ b/asm/windTribeTeleporter.s @@ -61,7 +61,7 @@ sub_080A0F44: @ 0x080A0F44 bl sub_0805E544 movs r0, #0x89 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #3 strb r0, [r5, #0xc] strb r4, [r5, #0xd] @@ -99,7 +99,7 @@ sub_080A0FB0: @ 0x080A0FB0 bl sub_0805E544 movs r0, #0x89 lsls r0, r0, #1 - bl PlaySFX + bl SoundReq movs r0, #2 strb r0, [r5, #0xc] strb r4, [r5, #0xd] @@ -159,7 +159,7 @@ _080A1038: movs r0, #0x1e strb r0, [r4, #0xe] adds r0, #0xf5 - bl PlaySFX + bl SoundReq b _080A10D4 _080A1056: ldr r0, _080A1060 @ =gScreenTransition @@ -257,7 +257,7 @@ _080A10FE: movs r0, #0x1e strb r0, [r2, #0xe] adds r0, #0xf6 - bl PlaySFX + bl SoundReq b _080A11BA _080A110E: ldrb r0, [r2, #0xe] diff --git a/asm/zeldaFollower.s b/asm/zeldaFollower.s index d6465b1b..34f0cbf1 100644 --- a/asm/zeldaFollower.s +++ b/asm/zeldaFollower.s @@ -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 diff --git a/include/entity.h b/include/entity.h index d1593d1d..a1dd6d93 100644 --- a/include/entity.h +++ b/include/entity.h @@ -5,26 +5,29 @@ #include "global.h" #include "sprite.h" +typedef enum { + PLAYER = 1, + ENEMY = 3, + PROJECTILE = 4, + OBJECT = 6, + NPC = 7, + PLAYER_ITEM = 8, + MANAGER = 9, +} EntityType; + typedef struct { void* entity1; void* entity2; u8 filler[14]; } UnkStruct; -typedef struct { - u8 type; - u8 subtype; - u8 form; - u8 parameter; -} EntityType; - typedef struct { s8 offset_x; s8 offset_y; u8 unk2[4]; u8 width; u8 height; -} BoundingBox; +} Hitbox; typedef struct { s8 offset_x; @@ -34,12 +37,15 @@ typedef struct { u8 height; u8 depth; u8 unknown2[3]; -} BoundingBox3D; +} Hitbox3D; typedef struct Entity { /*0x00*/ struct Entity* prev; /*0x04*/ struct Entity* next; - /*0x08*/ EntityType entityType; + /*0x08*/ u8 kind; // was: type + /*0x09*/ u8 id; // was: subtype + /*0x0a*/ u8 type; // was: form + /*0x0b*/ u8 type2; // was: parameter /*0x0c*/ u8 action; /*0x0d*/ u8 previousActionFlag; /*0x0e*/ u8 actionDelay; @@ -112,7 +118,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 +138,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; diff --git a/include/functions.h b/include/functions.h index 9e8b7d0b..2c91bdd9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -12,7 +12,7 @@ // Identified - to be sorted into header files extern u32 Random(void); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void ShowNPCDialogue(Entity*, Dialog*); extern u32 UpdateFuseInteraction(); extern void DeleteEntity(Entity*); @@ -20,7 +20,7 @@ extern u32 __modsi3(u32, u32); extern void DoFade(u32, u32); extern u32 GetInventoryValue(u32); extern u32 CheckKinstoneFused(u32); -extern void ForceEquipItem(u8, u8); +extern void ForceEquipItem(u32, u8); extern void LoadRoomEntityList(); void CopyPosition(Entity*, Entity*); extern void ResolveEntityOnTop(Entity*, Entity*); @@ -32,7 +32,7 @@ extern Entity* CreatePlayerItem(u32, u32, u32, u32); extern Entity* GetEmptyEntity(void); extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer); extern u32 GetTileType(u32 pos, u32 layer); -extern void _DmaZero(void* src, u32 count); +extern void MemClear32(void* src, u32 count); extern void EraseAllEntities(void); extern void SetTile(u32, u32, u32); extern void SetDirtTile(u32); @@ -42,15 +42,15 @@ 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); -extern void _DmaZero(void*, u32); +extern void MemClear32(void*, u32); extern void MenuFadeIn(u32, u32); -extern void LoadAssetAsync(const void*, u32, u32); +extern void LoadResourceAsync(const void*, u32, u32); extern void LoadPaletteGroup(u32); extern void TryLoadPrologueHyruleTown(void); extern Manager* GetEmptyManager(void); @@ -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); @@ -312,8 +312,8 @@ extern u32 sub_08056134(void); extern void sub_08004484(Entity*, Entity*); extern void sub_080564C8(u32); extern void sub_08056F70(void); -extern void sub_08056C68(void); -extern void sub_08056D70(void); +extern void DeleteWindow(void); +extern void CreateWindow(void); extern void sub_0805EEB4(u8*, u32, u32); extern void sub_08056FBC(void*); extern void sub_08056C54(u32); diff --git a/include/greatFairy.h b/include/greatFairy.h index f3eb845e..31a37c99 100644 --- a/include/greatFairy.h +++ b/include/greatFairy.h @@ -11,7 +11,7 @@ extern Entity* GreatFairy_CreateForm(Entity*, u32, u32); extern void PositionRelative(); extern void CopyPosition(); extern void DoFade(); -extern void PlaySFX(); +extern void SoundReq(); extern void GetNextFrame(); extern void sub_0805EC9C(); extern void sub_0805EC60(); diff --git a/include/main.h b/include/main.h index 55e7b341..6ab823a6 100644 --- a/include/main.h +++ b/include/main.h @@ -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(); @@ -84,16 +84,16 @@ extern void sub_0807CE90(void); extern void sub_080560B8(void); extern void sub_08056208(void); extern void sub_0804FFE4(void); -extern void sub_08056418(void); +extern void MessageInitialize(void); extern void sub_080ADD30(void); extern void InitScreen(u32); -extern void sub_08016E78(void); +extern void PrepNextFrame(void); extern void ReadKeyInput(void); extern void DoSoftReset(void); extern void sub_08056260(void); extern void VBlankIntrWait(); -extern void sub_08056458(void); +extern void MessageUpdate(void); extern void sub_08050154(void); extern void sub_080A3480(void); diff --git a/include/object.h b/include/object.h index 5480a8a2..465ef064 100644 --- a/include/object.h +++ b/include/object.h @@ -4,6 +4,203 @@ #include "global.h" #include "entity.h" +typedef enum { + GROUND_ITEM, + DEATH_FX, + SHOP_ITEM, + BUTTON, + OBJECT_4, + POT, + OBJECT_6, + PUSHED_BLOCK, + LOCKED_DOOR, + OBJECT_9, + OBJECT_A, + OBJECT_B, + CHEST_SPAWNER, + OBJECT_D, + OBJECT_E, + SPECIAL_FX, + OBJECT_10, + OBJECT_11, + OBJECT_12, + RAILTRACK, + LILYPAD_LARGE, + OBJECT_15, + FLOATING_PLATFORM, + OBJECT_17, + EVIL_SPIRIT, + HOUSE_DOOR_EXT, + OBJECT_1A, + GREAT_FAIRY, + OBJECT_1C, + OBJECT_1D, + OBJECT_1E, + OBJECT_1F, + OBJECT_20, + OBJECT_21, + FIGURINE_DEVICE, + EYE_SWITCH, + OBJECT_24, + BIG_BARREL, + OBJECT_26, + PUSHABLE_STATUE, + OBJECT_28, + OBJECT_29, + OBJECT_2A, + OBJECT_2B, + BEANSTALK, + SMOKE, + PUSHABLE_ROCK, + HITTABLE_LEVER, + OBJECT_30, + OBJECT_31, + PULLABLE_MUSHROOM, + BOLLARD, + WARP_POINT, + OBJECT_35, + OBJECT_36, + OBJECT_37, + JAR_PORTAL, + BOSS_DOOR, + OBJECT_3A, + PORTAL_MUSHROOM_STALKS, + PORTAL_FALLING_PLAYER, + OBJECT_3D, + OBJECT_3E, + GIANT_LEAF, + FAIRY, + LADDER_UP, + OBJECT_42, + OBJECT_43, + OBJECT_44, + OBJECT_45, + GIANT_BOOK_LADDER, + HEART_CONTAINER, + FILE_SCREEN_OBJECTS, + OBJECT_49, + BACKGROUND_CLOUD, + OBJECT_4B, + PUSHABLE_FURNITURE, + FURNITURE, + MINISH_SIZED_ENTRANCE, + ARCHWAY, + GIANT_ROCK, + OBJECT_51, + OBJECT_52, + OBJECT_53, + PULLABLE_LEVER, + MINECART, + THOUGHT_BUBBLE, + HIDDEN_LADDER_DOWN, + GENTARI_CURTAIN, + LAVA_PLATFORM, + OBJECT_5A, + OBJECT_5B, + MASK, + HOUSE_DOOR_INT, + WHIRLWIND, + OBJECT_BLOCKING_STAIRS, + SWORDSMAN_NEWSLETTER, + OBJECT_61, + GIANT_TWIG, + OBJECT_63, + OBJECT_64, + LADDER_HOLE, + OBJECT_66, + OBJECT_67, + OBJECT_68, + OBJECT_69, + OBJECT_6A, + CRENAL_BEAN_SPROUT, + MINECART_DOOR, + OBJECT_ON_PILLAR, + MINERAL_WATER_SOURCE, + MINISH_SIZED_ARCHWAY, + OBJECT_70, + PUSHABLE_GRAVE, + OBJECT_72, + LILYPAD_SMALL, + OBJECT_74, + OBJECT_75, + OBJECT_76, + BELL, + HUGE_DECORATION, + OBJECT_79, + STEAM, + PUSHABLE_LEVER, + HUGE_SHOES, + OBJECT_ON_BEETLE, + OBJECT_7E, + PICO_BLOOM, + OBJECT_80, + OBJECT_81, + BIG_VORTEX, + BIG_PUSHABLE_LEVER, + SMALL_ICE_BLOCK, + BIG_ICE_BLOCK, + OBJECT_86, + OBJECT_87, + HUGE_BOOK, + OBJECT_89, + OBJECT_8A, + OBJECT_8B, + BOOK, + FIREPLACE, + OBJECT_8E, + FROZEN_WATER_ELEMENT, + OBJECT_90, + OBJECT_91, + BAKER_OVEN, + OBJECT_93, + WIND_TRIBE_FLAG, + BIRD, + OBJECT_96, + OBJECT_97, + OBJECT_98, + OBJECT_99, + HUGE_ACORN, + OBJECT_9B, + TREE_HIDING_PORTAL, + LIGHTABLE_SWITCH, + OBJECT_9E, + FAN, + OBJECT_A0, + PALACE_ARCHWAY, + OBJECT_A2, + CLOUD, + MINISH_LIGHT, + OBJECT_A5, + OBJECT_A6, + OBJECT_A7, + OBJECT_A8, + OBJECT_A9, + WATERFALL_OPENING, + OBJECT_AB, + FOUR_ELEMENTS, + OBJECT_AD, + FLOATING_BLOCK, + OBJECT_AF, + METAL_DOOR, + JAIL_BARS, + OBJECT_B2, + OBJECT_B3, + OBJECT_B4, + OBJECT_B5, + OBJECT_B6, + WELL, + WIND_TRIBE_TELEPORTER, + OBJECT_B9, + OBJECT_BA, + WINDCREST, + LIT_AREA, + OBJECT_BD, + PINWHEEL, + OBJECT_BF, + ENEMY_ITEM, + OBJECT_C1, +} Object; + extern void ItemOnGround(Entity*); extern void DeathFx(Entity*); extern void ItemForSale(Entity*); diff --git a/include/player.h b/include/player.h index f1f08f6f..e9d96665 100644 --- a/include/player.h +++ b/include/player.h @@ -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; diff --git a/linker.ld b/linker.ld index 813ec9b5..7250dafd 100644 --- a/linker.ld +++ b/linker.ld @@ -141,7 +141,7 @@ SECTIONS { . = 0x000354B4; gManagerCount = .; . = 0x000354C0; gUnk_020354C0 = .; . = 0x0003553E; gUnk_0203553E = .; - . = 0x00035540; gUnk_02035540 = .; + . = 0x00035540; gzHeap = .; . = 0x00035542; gUnk_02035542 = .; . = 0x00036540; gUnk_02036540 = .; . = 0x00036570; gScriptExecutionContextArray = .; @@ -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 = .; @@ -627,7 +627,7 @@ SECTIONS { src/npc/mayorHagen.o(.text); src/npc/bigGoron.o(.text); asm/bigGoron.o(.text); - asm/ezloCap.o(.text); + src/ezloCap.o(.text); asm/npc4E.o(.text); src/npc/clothesRack.o(.text); asm/clothesRack.o(.text); @@ -887,7 +887,7 @@ SECTIONS { asm/sub_080A285C.o(.text); src/createObject.o(.text); asm/code_080A29BC.o(.text); - asm/playSFX.o(.text); + asm/soundReq.o(.text); asm/code_080A3480.o(.text); src/sub_080A3B84.o(.text); asm/code_080A3BD0.o(.text); diff --git a/src/arm_proxy.c b/src/arm_proxy.c index a0dc1c24..e18e4a1c 100644 --- a/src/arm_proxy.c +++ b/src/arm_proxy.c @@ -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 sub_08016DF8(); -extern void sub_0804FF98(); +extern void UpdateDisplayControls(); +extern void LoadResources(); +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(); @@ -43,7 +43,7 @@ extern void sub_08078180(void); extern void sub_0807B0C8(void); extern void sub_0807A8D8(Entity*); extern void sub_08077FEC(u32); -extern void sub_080173A4(Entity*); +extern void ItemInit(Entity*); extern void sub_080A2838(Entity*); extern u32 ReadBit(void*, u32); extern void sub_0806EC78(Entity*); @@ -89,7 +89,8 @@ typedef struct { extern LinkedList2 gUnk_03003C70[16]; extern LinkedList2* gUnk_02018EA0; -void sub_08016DF8(void) { +// Load any resources that were requested with LoadResourceAsync +void LoadResources(void) { if (gUnk_03003DE0 != 0) { u8* buf = &gUnk_03000C30; s32 i = gUnk_03003DE0; @@ -112,32 +113,31 @@ void sub_08016DF8(void) { } } -void sub_08016E78(void) { - gUnk_03001000.interruptFlag = 0; +void PrepNextFrame(void) { + gMain.interruptFlag = 0; VBlankIntrWait(); do { - } while (gUnk_03001000.interruptFlag == 0); + // Our VBlankIntr will set this flag + } while (gMain.interruptFlag == 0); sub_080ADD70(); sub_0801C25C(); - sub_08016C3C(); - sub_08016DF8(); + UpdateDisplayControls(); + LoadResources(); if (gUnk_02000070) { gUnk_02000070 = 0; - if (gUnk_02025EB0 != NULL) { + if (gUnk_02025EB0 != NULL) // sizeof(BGBuffer) = 0x800, what are we omitting? DmaCopy32(3, &gBG1Buffer, VRAM + (*gUnk_02025EB0 & 0x1f00) * 8, 0x5C0); - } - if (gUnk_0200B650 != NULL) { + if (gUnk_0200B650 != NULL) DmaCopy32(3, &gBG2Buffer, VRAM + (*gUnk_0200B650 & 0x1f00) * 8, 0x5C0); - } } - sub_0804FF98(); + FadeMain(); } -void sub_08016F28(Entity* this) { - if (gSave.stats.floorType != 0) +void PlayerUpdate(Entity* this) { + if (gSave.stats.effect != 0) gPlayerState.flags.all |= 0x4000; else gPlayerState.flags.all &= ~0x4000; @@ -147,27 +147,27 @@ void sub_08016F28(Entity* this) { sub_08077B20(); if ((gPlayerState.flags.all & 0x200000) != 0) { gPlayerState.playerAction = 0x18; - gPlayerState.flags.all &= 0xfff7ffff; + gPlayerState.flags.all &= ~0x80000; gPlayerState.hurtBlinkSpeed = 0xf0; this->flags |= 0x80; } else { - this->flags &= 0x7f; + this->flags &= ~0x80; gPlayerState.field_0xa8 = 0xf; } } - sub_08016FF4(this); + HandlePlayerLife(this); sub_08070680(this); - if ((this->height.WORD == 0) && (this->action == 1 || this->action == 9)) { + 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; @@ -175,7 +175,7 @@ void sub_08016FF4(Entity* this) { gUnk_0200AF00.filler25[9] = 0; if ((gPlayerEntity.bitfield & 0x80) && (gPlayerEntity.hurtBlinkTime > 0)) - PlaySFX(SFX_86); + SoundReq(SFX_86); gPlayerState.flags.all &= ~(0x2000000 | 0x200); if (gPlayerState.flags.all & 0x400) @@ -213,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; - PlaySFX(SFX_ICE_BLOCK_MELT); + 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; - PlaySFX(SFX_140); - } else if ((gSave.stats.field_0x1e & 0xf) == 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.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); } } @@ -249,7 +248,7 @@ void sub_080171F0(void) { gPlayerEntity.bitfield &= ~0x80; if (gPlayerEntity.action != 0x14) - gPlayerState.flags.all = (gPlayerState.flags.all & ~0x10000) | (0x8000 * (gPlayerState.flags.all & 2)); + gPlayerState.flags.all = (gPlayerState.flags.all & ~0x10000) | (0x10000 * (gPlayerState.flags.all & 2) / 2); gPlayerState.flags.all &= ~2; sub_080028E0(&gPlayerEntity); @@ -264,7 +263,7 @@ void sub_080171F0(void) { gPlayerState.field_0x1a[0] = 0; gPlayerState.field_0x80 = 0; gPlayerState.field_0xaa = 0; - _DmaZero(&gUnk_03003BE0, 0x8c); + MemClear32(&gUnk_03003BE0, 0x8c); gPlayerEntity.spriteOffsetY = gPlayerState.field_0x3f; gPlayerState.field_0x3f = 0; sub_0807B0C8(); @@ -286,12 +285,12 @@ void sub_080171F0(void) { } } -void sub_08017338(Entity* this) { - if (!(this->flags & 1) && !this->action && !this->previousActionFlag) - sub_080173A4(this); +void ItemUpdate(Entity* this) { + if ((this->flags & 1) == 0 && this->action == 0 && this->previousActionFlag == 0) + ItemInit(this); if (!sub_0805E3B0(this)) { - gPlayerItemFunctions[this->entityType.subtype](this); + gPlayerItemFunctions[this->id](this); this->bitfield &= ~0x80; if (this->hurtBlinkTime != 0) { if (this->hurtBlinkTime > 0) @@ -300,14 +299,14 @@ void sub_08017338(Entity* this) { this->hurtBlinkTime++; } } - sub_0800404C(this); + DrawEntity(this); } // tiny regalloc -NONMATCH("asm/non_matching/arm_proxy/sub_080173A4.inc", void sub_080173A4(Entity* this)) { +NONMATCH("asm/non_matching/arm_proxy/ItemInit.inc", void ItemInit(Entity* this)) { ItemFrame* entry; - entry = &gUnk_08126DA8[this->entityType.subtype]; + entry = &gUnk_08126DA8[this->id]; if (entry->unk0 == 0xff) { u32 temp = entry->unk2; ItemFrame* temp2 = gUnk_08126ED8[entry->unk1]; @@ -336,81 +335,75 @@ NONMATCH("asm/non_matching/arm_proxy/sub_080173A4.inc", void sub_080173A4(Entity } END_NONMATCH -void sub_080174A4(Entity* this) { +void ObjectUpdate(Entity* this) { int iVar1; - if (((this->flags & 1) == 0) && (this->action == 0)) { + if (((this->flags & 1) == 0) && (this->action == 0)) sub_080A2838(this); - } - if (this->hurtBlinkTime != 0) { + if (this->hurtBlinkTime != 0) this->hurtBlinkTime++; - } if (!sub_0805E3B0(this)) { - gObjectFunctions[this->entityType.subtype](this); + gObjectFunctions[this->id](this); this->bitfield &= ~0x80; } - sub_0800404C(this); + DrawEntity(this); } void sub_08017508(Entity* this) { if (!sub_0805E3B0(this)) - gManagerFunctions[this->entityType.subtype](this); + gManagerFunctions[this->id](this); } // regalloc -NONMATCH("asm/non_matching/arm_proxy/sub_08017530.inc", void sub_08017530(Entity* this)) { - if ((this->currentHealth & 0x7f) && !ReadBit(&gUnk_020342F8, this->currentHealth - 1)) { +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)) { + if ((this->action == 0) && ((this->flags & 1) == 0)) sub_0806EC78(this); - } - if (!sub_0805E3B0(this)) { - gNPCFunctions[this->entityType.subtype][0](this); - } + if (!sub_0805E3B0(this)) + gNPCFunctions[this->id][0](this); if (this->next != NULL) { - if (gNPCFunctions[this->entityType.subtype][1] != NULL) { - gNPCFunctions[this->entityType.subtype][1](this); - } + if (gNPCFunctions[this->id][1] != NULL) + gNPCFunctions[this->id][1](this); if ((this->currentHealth & 0x7f) != 0) { u32 temp = this->currentHealth & 0x7f; 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) { - _DmaZero(&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; @@ -490,7 +483,7 @@ NONMATCH("asm/non_matching/arm_proxy/sub_080176E4.inc", u32 sub_080176E4(Entity* END_NONMATCH // you guessed it -NONMATCH("asm/non_matching/arm_proxy/sub_08016DF8.inc", void sub_08017744(Entity* this)) { +NONMATCH("asm/non_matching/arm_proxy/sub_08017744.inc", void sub_08017744(Entity* this)) { LinkedList2* i; for (i = &gUnk_03003C70[0]; i < &gUnk_03003C70[16]; ++i) { if (i->node == this) { @@ -514,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 <= @@ -525,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) diff --git a/src/code_080300AC.c b/src/code_080300AC.c index 55d5a080..12564596 100644 --- a/src/code_080300AC.c +++ b/src/code_080300AC.c @@ -13,13 +13,13 @@ typedef struct { extern struct_0300110C gUnk_0300110C; void sub_080300AC(void) { - _DmaZero(&gUnk_0300110C.unk0, 0x44); + MemClear32(&gUnk_0300110C.unk0, 0x44); gUnk_0300110C.unk66 = 0xff; } void sub_080300C4(void) { if (gScreenTransition.field_0xae == 0xff) { gScreenTransition.field_0xac = 0; - _DmaZero(&gScreenTransition.field_0x4c[32], 0x40); + MemClear32(&gScreenTransition.field_0x4c[32], 0x40); } } diff --git a/src/code_08049CD4.c b/src/code_08049CD4.c index d6cf794b..c7012cfa 100644 --- a/src/code_08049CD4.c +++ b/src/code_08049CD4.c @@ -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; } diff --git a/src/code_0804AA84.c b/src/code_0804AA84.c index aa46613c..59485d74 100644 --- a/src/code_0804AA84.c +++ b/src/code_0804AA84.c @@ -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; @@ -37,7 +37,7 @@ void sub_0804AAB8(void) { } void sub_0804AAD4(void) { - _DmaZero((void*)&gUnk_02018EB0, 0x28); + MemClear32((void*)&gUnk_02018EB0, 0x28); gUnk_02018EB0.unk = 0; EraseAllEntities(); CreateObject(0x3d, gArea.field_0x17, 0); diff --git a/src/code_0805436C.c b/src/code_0805436C.c index 41ef9ad2..76a9b18c 100644 --- a/src/code_0805436C.c +++ b/src/code_0805436C.c @@ -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 @@ -250,10 +250,10 @@ u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) { } else { itemEntity->actionDelay = 0; } - if ((arg0->entityType).type == 6) { - if (arg0->entityType.subtype == 99) { + if (arg0->kind == 6) { + if (arg0->id == 99) { arg0->attachedEntity = itemEntity; - } else if (arg0->entityType.subtype == 0x1e) { + } else if (arg0->id == 0x1e) { itemEntity->direction = arg0->animationState << 3 | 0x80; itemEntity->nonPlanarMovement = 0xc0; itemEntity->field_0x20 = 0x18000; diff --git a/src/code_0805F9A0.c b/src/code_0805F9A0.c index 1514df6a..33f037ad 100644 --- a/src/code_0805F9A0.c +++ b/src/code_0805F9A0.c @@ -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; @@ -145,7 +145,7 @@ void sub_0805F918(u32 idx, u32 idx2, void* dest) { idx3++; } } - LoadAssetAsync((const void*)&gUnk_02036AD8, (u32)dest, 0xe0); + LoadResourceAsync((const void*)&gUnk_02036AD8, (u32)dest, 0xe0); } u32 sub_0805F9A0(u32 r0) { diff --git a/src/code_08077B98.c b/src/code_08077B98.c index 83d0089b..c3fbf5dd 100644 --- a/src/code_08077B98.c +++ b/src/code_08077B98.c @@ -69,8 +69,8 @@ void* sub_08077C54(UnkItemStruct* unk) { item = sub_0805E744(); if (item != NULL) { - item->entityType.subtype = gUnk_0811BE48[unk->field_0x1].unk[3]; - item->entityType.type = 8; + item->id = gUnk_0811BE48[unk->field_0x1].unk[3]; + item->kind = 8; item->flags = 0xa0; item->parent = (Entity*)unk; item->field_0x68.HALF.LO = unk->field_0x1; @@ -95,10 +95,10 @@ Entity* CreatePlayerItem(u32 subtype, u32 form, u32 parameter, u32 unk) { ent = GetEmptyEntity(); if (ent != NULL) { ent->flags = 0x80; - (ent->entityType).type = 8; - (ent->entityType).subtype = subtype; - (ent->entityType).form = form; - (ent->entityType).parameter = parameter; + ent->kind = 8; + ent->id = subtype; + ent->type = form; + ent->type2 = parameter; ent->field_0x68.HALF.LO = unk; AppendEntityToList(ent, 2); } @@ -111,10 +111,10 @@ Entity* sub_08077CF8(u32 subtype, u32 form, u32 parameter, u32 unk) { ent = sub_0805E744(); if (ent != NULL) { ent->flags = 0x80; - (ent->entityType).type = 8; - (ent->entityType).subtype = subtype; - (ent->entityType).form = form; - (ent->entityType).parameter = parameter; + ent->kind = 8; + ent->id = subtype; + ent->type = form; + ent->type2 = parameter; ent->field_0x68.HALF.LO = unk; AppendEntityToList(ent, 2); } diff --git a/src/code_08077DF4.c b/src/code_08077DF4.c index f29aa06b..1697ecb0 100644 --- a/src/code_08077DF4.c +++ b/src/code_08077DF4.c @@ -15,7 +15,7 @@ typedef struct { void sub_08077DF4(Entity* ent, u32 arg1) { *(u16*)&ent->flags = arg1; if ((arg1 & 0xff) > 0xb8) { - arg1 += (ent->entityType).form >> 1; + arg1 += ent->type >> 1; } gPlayerEntity.spriteIndex = (short)(arg1 >> 8); InitAnimationForceUpdate(&gPlayerEntity, (u8)arg1); @@ -57,7 +57,7 @@ void sub_08077E78(void* arg0, u32 bits) { not = ~not ; gPlayerState.field_0xa &= not ; gPlayerState.keepFacing &= not ; - _DmaZero(arg0, 0x1c); + MemClear32(arg0, 0x1c); } u32 sub_08077EC8(Unk_struct* arg0) { diff --git a/src/createEnemy.c b/src/createEnemy.c index 3b243e79..5ce7af89 100644 --- a/src/createEnemy.c +++ b/src/createEnemy.c @@ -9,9 +9,9 @@ Entity* CreateEnemy(u32 subtype, u32 form) { enemy = GetEmptyEntity(); if (enemy != NULL) { - (enemy->entityType).type = 3; - (enemy->entityType).subtype = subtype; - (enemy->entityType).form = form; + enemy->kind = 3; + enemy->id = subtype; + enemy->type = form; AppendEntityToList(enemy, 4); } return enemy; diff --git a/src/createEntity.c b/src/createEntity.c index 7feff11b..e83312a1 100644 --- a/src/createEntity.c +++ b/src/createEntity.c @@ -28,7 +28,7 @@ // (entity->entityType).form = param_1->entityform; // RegisterRoomEntity(entity,param_1); // if ((param_1->field_0x1 & 240) != 16) { -// (entity->entityType).parameter = *(u8 *)¶m_1->entityparameter; +// (entity->type2 = *(u8 *)¶m_1->entityparameter; // entity->actionDelay = (u8)((u32)param_1->entityparameter >> 8); // if ((type != 9) && (sub_0804AF0C(entity,param_1), entity->field_0x4 != NULL)) { // if ((param_1->entityType & 16) == 0) { diff --git a/src/createNPC.c b/src/createNPC.c index 3e11ba91..b8a30fdf 100644 --- a/src/createNPC.c +++ b/src/createNPC.c @@ -4,17 +4,15 @@ extern Entity* GetEmptyEntity(); extern void AppendEntityToList(Entity*, u8); -Entity* CreateNPC(u32 subtype, u32 form, u32 parameter) - -{ +Entity* CreateNPC(u32 subtype, u32 form, u32 parameter) { Entity* pEVar1; pEVar1 = GetEmptyEntity(); if (pEVar1 != NULL) { - (pEVar1->entityType).type = 7; - (pEVar1->entityType).subtype = subtype; - (pEVar1->entityType).form = form; - (pEVar1->entityType).parameter = parameter; + pEVar1->kind = 7; + pEVar1->id = subtype; + pEVar1->type = form; + pEVar1->type2 = parameter; AppendEntityToList(pEVar1, 7); } return pEVar1; diff --git a/src/createObject.c b/src/createObject.c index ad852900..62c67062 100644 --- a/src/createObject.c +++ b/src/createObject.c @@ -10,10 +10,10 @@ Entity* CreateObject(u32 subtype, u32 form, u32 parameter) { ent = GetEmptyEntity(); if (ent != NULL) { - ent->entityType.type = 6; - ent->entityType.subtype = subtype; - ent->entityType.form = form; - ent->entityType.parameter = parameter; + ent->kind = 6; + ent->id = subtype; + ent->type = form; + ent->type2 = parameter; AppendEntityToList(ent, 6); } return ent; diff --git a/src/dma.c b/src/dma.c index 37e33254..4c79f72e 100644 --- a/src/dma.c +++ b/src/dma.c @@ -1,26 +1,26 @@ #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); } -void _DmaZero(u8* src, u32 size) { +void MemClear32(u8* src, u32 size) { u32 zero = 0; 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 _DmaZero(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); diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index 73212e2f..3344b5b5 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -47,14 +47,14 @@ void AcroBandit(Entity* this) { } void sub_080318C4(Entity* this) { - gUnk_080CE584[this->entityType.form](this); + gUnk_080CE584[this->type](this); } void sub_080318DC(Entity* this) { Entity* brother; if (this->bitfield != 0x80 && this->bitfield != 0x81) { - if (this->entityType.form == 1) { + if (this->type == 1) { if (this->action < 7 && this->field_0x42) { brother = this->attachedEntity; if (brother) { @@ -85,13 +85,13 @@ void sub_080318DC(Entity* this) { if (this->currentHealth == 0) { this->field_0x3e = ((this->field_0x3e + (7 & Random())) - 4) & 0x1f; - this->field_0x42 += this->entityType.parameter * 3; + this->field_0x42 += this->type2 * 3; sub_08032338(this); } } if (this->field_0x42 && this->frames.all & 0x10) { - if (this->entityType.form == 0) { + if (this->type == 0) { this->action = 8; } else { this->action = 9; @@ -216,35 +216,35 @@ void sub_08031C58(Entity* this) { tmp &= 3; a = CreateEnemy(0x2e, 1); - a->entityType.parameter = 0; + a->type2 = 0; a->parent = NULL; a->field_0x74.HALF.LO = tmp; sub_08031E48(this, a); a->attachedEntity = CreateEnemy(0x2e, 1); b = a->attachedEntity; - b->entityType.parameter = 1; + b->type2 = 1; b->parent = a; b->field_0x74.HALF.LO = tmp; sub_08031E48(this, b); b->attachedEntity = CreateEnemy(0x2e, 1); a = b->attachedEntity; - a->entityType.parameter = 2; + a->type2 = 2; a->parent = b; a->field_0x74.HALF.LO = tmp; sub_08031E48(this, a); a->attachedEntity = CreateEnemy(0x2e, 1); b = a->attachedEntity; - b->entityType.parameter = 3; + b->type2 = 3; b->parent = a; b->field_0x74.HALF.LO = tmp; sub_08031E48(this, b); b->attachedEntity = CreateEnemy(0x2e, 1); a = b->attachedEntity; - a->entityType.parameter = 4; + a->type2 = 4; a->parent = b; a->attachedEntity = NULL; a->field_0x74.HALF.LO = tmp; @@ -327,7 +327,7 @@ void sub_08031EA8(Entity* this) { this->action = 1; this->spritePriority.b1 = 1; this->field_0x20 = 0x40000; - this->height.HALF.HI = (4 - this->entityType.parameter) * 0xe; + this->height.HALF.HI = (4 - this->type2) * 0xe; this->field_0x78.HALF.HI = Random(); InitializeAnimation(this, 4); } @@ -358,11 +358,11 @@ void sub_08031EE8(Entity* this) { } void sub_08031F54(Entity* this) { - sub_08003FC4(this, gUnk_080CE5F0[this->entityType.parameter]); - if (this->entityType.parameter * -0xe <= this->height.HALF.HI) { + sub_08003FC4(this, gUnk_080CE5F0[this->type2]); + if (this->type2 * -0xe <= this->height.HALF.HI) { this->action = 3; this->actionDelay = 20; - this->height.HALF.HI = this->entityType.parameter * -0xe; + this->height.HALF.HI = this->type2 * -0xe; if (this->parent != NULL) this->spritePriority.b1 = 0; InitializeAnimation(this, 6); @@ -445,7 +445,7 @@ void sub_08032160(Entity* this) { if (this->actionDelay == 0) { this->action = 7; - dir = gUnk_080CE5FA[this->field_0x74.HALF.LO * 5 + this->entityType.parameter]; + dir = gUnk_080CE5FA[this->field_0x74.HALF.LO * 5 + this->type2]; this->direction = dir; if (dir >= 0x10) { this->spriteSettings.b.flipX = 1; diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index 9536f297..6f888658 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -52,7 +52,7 @@ void sub_08021780(Entity* this) { } void sub_08021818(Entity* this) { - if (this->entityType.form == 0) { + if (this->type == 0) { sub_0804A7D4(this); } else { Entity* ent = this->parent; @@ -94,7 +94,7 @@ void Beetle_Initialize(Entity* this) { } void sub_080218B4(Entity* this) { - gUnk_080CB5D4[this->entityType.parameter](this); + gUnk_080CB5D4[this->type2](this); } void sub_080218CC(Entity* this) { @@ -222,7 +222,7 @@ void sub_08021B64(Entity* this) { int iVar4 = 1; if (gPlayerState.field_0xa8 != 11 && gPlayerState.field_0xa8 != 20) { if (sub_0807953C()) - iVar4 = this->entityType.form * 3 + 8; + iVar4 = this->type * 3 + 8; iVar4 = this->actionDelay - iVar4; if (iVar4 < 0) diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c index 397afc93..c8ffa9af 100644 --- a/src/enemy/bladeTrap.c +++ b/src/enemy/bladeTrap.c @@ -11,7 +11,7 @@ void BladeTrap(Entity* ent) { u16* puVar3; if (ent->action == 0) { ent->action = 1; - pEVar2 = GetCurrentRoomProperty((u8)(ent->entityType).form); + pEVar2 = GetCurrentRoomProperty((u8)ent->type); ent->attachedEntity = pEVar2; sub_080A2CC0((EntityData*)ent, &ent->attachedEntity, &ent->field_0x74); } diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 938e9af1..b8dc9575 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -32,14 +32,14 @@ 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; - if ((this->entityType.form == 2) && (iVar1 = sub_080012DC(this), iVar1)) { + if ((this->type == 2) && (iVar1 = sub_080012DC(this), iVar1)) { gUnk_080012C8[iVar1](this); } else { gUnk_080CD0F0[GetNextFunction(this)](this); @@ -47,7 +47,7 @@ void BombPeahat(Entity* this) { } void sub_0802A84C(Entity* this) { - switch (this->entityType.form) { + switch (this->type) { default: gUnk_080CD108[this->action](this); sub_0802AD54(this); @@ -64,7 +64,7 @@ void sub_0802A84C(Entity* this) { void sub_0802A8AC(Entity* this) { this->field_0x80.HALF.HI = 0; - if (this->entityType.form < 2) { + if (this->type < 2) { InitializeAnimation(this, 0); } } @@ -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; @@ -118,7 +118,7 @@ void sub_0802A924(Entity* this) { this->spriteOrientation.flipY = 1; this->spriteRendering.b3 = 1; this->spritePriority.b0 = 1; - InitializeAnimation(this, this->entityType.form + 1); + InitializeAnimation(this, this->type + 1); } void sub_0802A9A8(Entity* this) { @@ -245,7 +245,7 @@ void sub_0802AB40(Entity* this) { } else { this->action = 5; this->nonPlanarMovement = 0; - InitializeAnimation(this, this->entityType.form + 1); + InitializeAnimation(this, this->type + 1); } break; } @@ -341,14 +341,14 @@ void sub_0802AD54(Entity* this) { } void sub_0802ADDC(Entity* this) { - Entity* ent = CreateEnemy(0x1b, this->entityType.form + 2); + Entity* ent = CreateEnemy(0x1b, this->type + 2); if (ent != NULL) { - ent->entityType.parameter = !!sub_0802B234(this); + ent->type2 = !!sub_0802B234(this); ent->parent = this; this->attachedEntity = ent; CopyPosition(this, ent); this->field_0x80.HALF.HI = 1; - if (this->entityType.form == 0) { + if (this->type == 0) { this->field_0x7a.HALF.LO++; } } @@ -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; @@ -400,7 +400,7 @@ void sub_0802AED4(Entity* this) { sub_08078930(this); } } - if (this->entityType.parameter != 0 && this->field_0x80.HALF.HI) { + if (this->type2 != 0 && this->field_0x80.HALF.HI) { this->actionDelay = 0; this->field_0xf = 1; } @@ -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 diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 0dbb7dd1..49ba9ea1 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -335,7 +335,7 @@ void sub_08028E84(Entity* this) { bool32 sub_08029198(const struct SalesOffering*); void sub_08028E9C(Entity* this) { - const struct SalesOffering* offer = &gUnk_080CC954[this->entityType.form]; + const struct SalesOffering* offer = &gUnk_080CC954[this->type]; if (sub_08029198(offer) && (offer->field_0x0 & 2)) { offer = &gUnk_080CC954[offer->field_0xa]; } diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index 9b816805..99a9160a 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -49,7 +49,7 @@ void Chuchu(Entity* this) { case 2: this->field_0x3a &= 0xfe; if (index != this->field_0x80.HALF.HI) { - switch (this->entityType.form) { + switch (this->type) { case 0: if (this->flags & 0x80) { this->action = 6; @@ -73,13 +73,13 @@ void Chuchu(Entity* this) { gUnk_080CA21C[GetNextFunction(this)](this); if (*(char*)(*(int*)&this->field_0x68 + 10) == 0x1c) { SetChildOffset(this, 0, 1, -0x10); - } else if (this->entityType.form == 2) { + } else if (this->type == 2) { sub_0801FB34(this); } } void Chuchu_OnTick(Entity* this) { - switch (this->entityType.form) { + switch (this->type) { case 0: sub_0801F3AC(this); gUnk_080CA234[this->action](this); @@ -97,7 +97,7 @@ void Chuchu_OnTick(Entity* this) { void sub_0801EF40(Entity* this) { u8 health; - if (this->entityType.form == 2) { + if (this->type == 2) { if (this->bitfield == 0x8e || this->bitfield == 0x95) { this->flags &= ~0x80; this->currentHealth = 0; @@ -146,9 +146,9 @@ void sub_0801F02C(Entity* this) { void sub_0801F048(Entity* this) { sub_08003FC4(this, 0x1800); GetNextFrame(this); - if (this->entityType.form == 0) { + if (this->type == 0) { sub_0804A7D4(this); - } else if (this->entityType.form == 1) { + } else if (this->type == 1) { CreateDeathFx(this, 0xf2, 0); } else { CreateDeathFx(this, 0xf1, 0); @@ -337,7 +337,7 @@ void sub_0801F428(Entity* this) { this->actionDelay = Random(); this->field_0x80.HALF.LO = this->currentHealth; this->field_0x82.HALF.LO = 0; - if (this->entityType.parameter == 0) + if (this->type2 == 0) return; this->action = 3; @@ -545,7 +545,7 @@ void sub_0801F884(Entity* this) { } else { Entity* ent = sub_0804A9FC(this, 0x1b); if (ent) { - ent->entityType.parameter = 64; + ent->type2 = 64; this->action = 4; this->damageType = 165; EnqueueSFX(0x193); @@ -676,7 +676,7 @@ void sub_0801FB34(Entity* this) { } void sub_0801FB68(Entity* this) { - switch (this->entityType.form) { + switch (this->type) { case 0: this->action = 9; break; diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index ee21e03c..674e8774 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -29,7 +29,7 @@ void ChuchuBoss(Entity* this) { void sub_08025CBC(Entity* this) { sub_08001324(this); - if (this->entityType.form == 0) { + if (this->type == 0) { sub_08027870(this); } } diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c index b0c63e8a..49acb71d 100644 --- a/src/enemy/darkNut.c +++ b/src/enemy/darkNut.c @@ -60,7 +60,7 @@ void sub_08020BB8(Entity* this) { switch (this->bitfield & 0x7f) { case 0x1c: this->action = 11; - this->actionDelay = gUnk_080CAB0C[this->entityType.form]; + this->actionDelay = gUnk_080CAB0C[this->type]; this->damageType = 81; sub_08021218(this, 8, DirectionToAnimationState(this->field_0x3e ^ 0x10)); sub_08021588(this); @@ -68,7 +68,7 @@ void sub_08020BB8(Entity* this) { break; case 0x16: this->action = 11; - this->actionDelay = gUnk_080CAB10[this->entityType.form]; + this->actionDelay = gUnk_080CAB10[this->type]; this->damageType = 81; sub_08021218(this, 8, DirectionToAnimationState(this->field_0x3e ^ 0x10)); sub_08021588(this); @@ -79,10 +79,10 @@ void sub_08020BB8(Entity* this) { break; switch (this->field_0x78.HALF.HI) { case 8 ... 12: - this->field_0x7a.HALF.LO = gUnk_080CAB04[this->entityType.form]; + this->field_0x7a.HALF.LO = gUnk_080CAB04[this->type]; break; case 4 ... 6: - this->field_0x7a.HALF.LO = gUnk_080CAB00[this->entityType.form]; + this->field_0x7a.HALF.LO = gUnk_080CAB00[this->type]; break; default: this->field_0x7a.HALF.LO = 0; @@ -100,7 +100,7 @@ void sub_08020BB8(Entity* this) { bVar3 = this->attachedEntity->bitfield & 0x7f; } if (bVar3 == 2) { - sub_080213D0(this, gUnk_080CAB08[this->entityType.form]); + sub_080213D0(this, gUnk_080CAB08[this->type]); } else { sub_080213D0(this, 0); } @@ -412,7 +412,7 @@ void sub_080212B0(Entity* this) { break; } - if (this->entityType.form < 2 && tmp == 2) + if (this->type < 2 && tmp == 2) tmp = gUnk_080CAB52[Random() & 3]; this->attachedEntity = NULL; @@ -421,7 +421,7 @@ void sub_080212B0(Entity* this) { void sub_08021328(Entity* this) { this->action = 13; - this->field_0x7c.BYTES.byte0 = gUnk_080CAB68[this->entityType.form]; + this->field_0x7c.BYTES.byte0 = gUnk_080CAB68[this->type]; sub_08021218(this, 0xc, this->animationState); } diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index 969868d0..27357c08 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -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->type2][this->frameIndex]; } void sub_08021FDC(Entity* this) { @@ -44,11 +44,11 @@ void sub_08022004(Entity* this) { void sub_08022034(Entity* this) { this->action = 1; - this->entityType.parameter = this->entityType.form & 3; + this->type2 = this->type & 3; this->spritePriority.b0 = 5; - this->field_0x78.HWORD = gUnk_080CB764[this->entityType.parameter * 2 + 0] + this->x.HALF.HI; - this->field_0x7a.HWORD = gUnk_080CB764[this->entityType.parameter * 2 + 1] + this->y.HALF.HI; - InitializeAnimation(this, this->entityType.parameter); + this->field_0x78.HWORD = gUnk_080CB764[this->type2 * 2 + 0] + this->x.HALF.HI; + this->field_0x7a.HWORD = gUnk_080CB764[this->type2 * 2 + 1] + this->y.HALF.HI; + InitializeAnimation(this, this->type2); sub_080221C0(this); } @@ -57,7 +57,7 @@ void sub_0802209C(Entity* this) { if (sub_0806FBFC(this->field_0x78.HWORD, this->field_0x7a.HWORD, 0x10, 0x10)) { this->action = 2; this->actionDelay = 0x12; - InitializeAnimation(this, this->entityType.parameter + 4); + InitializeAnimation(this, this->type2 + 4); } } else { this->actionDelay = this->actionDelay - 1; @@ -78,7 +78,7 @@ void sub_080220F0(Entity* this) { this->action = 4; this->actionDelay = 0x78; this->field_0x44 = 0; - off = gUnk_080CB76C[this->entityType.parameter]; + off = gUnk_080CB76C[this->type2]; for (i = 0; i < 6; i++, off++) { Entity* fx = CreateFx(this, 0x11, 0); if (fx) { @@ -96,7 +96,7 @@ void sub_08022174(Entity* this) { sub_0800445C(this); if (--this->actionDelay == 0) { this->action = 5; - InitializeAnimation(this, this->entityType.parameter + 8); + InitializeAnimation(this, this->type2 + 8); } } @@ -110,10 +110,10 @@ void sub_08022198(Entity* this) { } void sub_080221C0(Entity* this) { - u32 tile = COORD_TO_TILE(this) + gUnk_080B4488[this->entityType.parameter]; + u32 tile = COORD_TO_TILE(this) + gUnk_080B4488[this->type2]; this->field_0x7c.HALF.HI = tile; this->field_0x7c.HALF.LO = sub_080001DA(tile, this->collisionLayer); - SetTile(gUnk_080CB79C[this->entityType.parameter], tile, this->collisionLayer); + SetTile(gUnk_080CB79C[this->type2], tile, this->collisionLayer); } // clang-format off @@ -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, diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c index 24f18515..4b469258 100644 --- a/src/enemy/fallingBoulder.c +++ b/src/enemy/fallingBoulder.c @@ -31,7 +31,7 @@ void sub_0802C258(Entity* this) { this->field_0x20 = 0x20000; this->actionDelay = 2; this->field_0x7a.HWORD = Random() & 0x70; - switch (this->entityType.form) { + switch (this->type) { case 1: this->field_0x7a.HWORD |= 0x100; break; @@ -86,7 +86,7 @@ void sub_0802C334(Entity* this) { this->flags &= ~0x80; break; case 8: - if (this->entityType.parameter != 0 && !sub_08049FA0(this)) { + if (this->type2 != 0 && !sub_08049FA0(this)) { u32 diff = 0; s32 i; for (i = 1; i > -1; i--) { @@ -113,7 +113,7 @@ void sub_0802C334(Entity* this) { if (this->height.HALF.HI - y > 0x38) { sub_0802C62C(this); this->field_0x7a.HWORD = (Random() & 0x7f) | 0x80; - if (this->entityType.form == 3) { + if (this->type == 3) { this->action = 3; } } diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c index f7f51c71..3a4e4148 100644 --- a/src/enemy/fireballGuy.c +++ b/src/enemy/fireballGuy.c @@ -63,13 +63,13 @@ void sub_08045454(Entity* this) { u32 tmp; /* Can we create enough new entities? */ - count = gUnk_080D180C[this->entityType.form]; + count = gUnk_080D180C[this->type]; if (72 - count <= gEntCount) return; /* Create 2-5 new MiniFireballGuy */ for (i = 0; i < count; i++) - entities[i] = CreateEnemy(0x59, this->entityType.form); + entities[i] = CreateEnemy(0x59, this->type); off = gUnk_080D1810; for (i = 0; i < count; i++) { @@ -77,7 +77,7 @@ void sub_08045454(Entity* this) { ent->attachedEntity = entities[(i + 1) % count]; ent->parent = entities[(i + count - 1) % count]; tmp = 0; - ent->entityType.parameter = 1; + ent->type2 = 1; ent->height.HALF.HI = tmp; ent->hurtBlinkTime = -0x10; diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c index 96d6a08a..a1a9833d 100644 --- a/src/enemy/gibdo.c +++ b/src/enemy/gibdo.c @@ -374,7 +374,7 @@ NONMATCH("asm/non_matching/gibdo/sub_08037B48.inc", void sub_08037B48(Entity* th Entity* E; E = CreateObject(0x2a, 3, 0); if (E != 0) { - E->entityType.parameter = this->actionDelay; + E->type2 = this->actionDelay; E->spritePriority.b0 = (E->spritePriority.b0 & 0xf8) | 3; E->spriteOffsetX = 0; E->spriteOffsetY = 0xfc; @@ -383,7 +383,7 @@ NONMATCH("asm/non_matching/gibdo/sub_08037B48.inc", void sub_08037B48(Entity* th *(Entity**)&this->field_0x80.HWORD = E; E = CreateObject(0x2a, 3, 0); if (E != 0) { - E->entityType.parameter = this->actionDelay; + E->type2 = this->actionDelay; E->spritePriority.b0 = (E->spritePriority.b0 & 0xf8) | 3; E->spriteOffsetX = 0xfd; E->spriteOffsetY = 0xf8; @@ -392,7 +392,7 @@ NONMATCH("asm/non_matching/gibdo/sub_08037B48.inc", void sub_08037B48(Entity* th *(Entity**)&this->cutsceneBeh.HWORD = E; E = CreateObject(0x2a, 3, 0); if (E != 0) { - E->entityType.parameter = this->actionDelay; + E->type2 = this->actionDelay; E->spritePriority.b0 = (E->spritePriority.b0 & 0xf8) | 3; E->spriteOffsetX = 0x5; E->spriteOffsetY = 0xf5; diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index 56091980..330e68b8 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -114,7 +114,7 @@ void sub_08046898(Entity* this) { u32 tmp2; if (!tmp) return; - tmp->entityType.form = 1; + tmp->type = 1; tmp->parent = this; this->attachedEntity = tmp; this->action = 1; @@ -141,7 +141,7 @@ void sub_08046910(Entity* this) { } void sub_08046930(Entity* this) { - if (this->entityType.form) { + if (this->type) { this->previousActionFlag = 5; this->direction = 0x20; this->nonPlanarMovement = 0x280; @@ -164,12 +164,12 @@ void sub_0804696C(Entity* this) { this->nonPlanarMovement = 0x100; this->spriteOrientation.flipY = 3; this->spriteRendering.b3 = 3; - PlaySFX(0x2e); + SoundReq(0x2e); } if (this->actionDelay) { if (gRoomControls.roomOriginY + 0x258 > this->y.HALF.HI) { this->actionDelay = 0; - PlaySFX(0xf7); + SoundReq(0xf7); } } } @@ -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; } } } @@ -806,8 +806,8 @@ void sub_08047914(Entity* this) { } else { 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); + this->field_0x7c.HALF.HI = ((this->type * 0xF) << 2) + 0x78; + sub_080A1D70(((Entity*)this->myHeap)->prev, this->animationState); } } @@ -816,7 +816,7 @@ void sub_08047978(Entity* this) { if (this->currentHealth != 0) { if (--this->field_0x70.HALF_U.LO == 0) { this->field_0x70.HALF.HI = 1; - if (this->entityType.form == 0) { + if (this->type == 0) { this->field_0x70.HALF.LO = 0xB4; } else { this->field_0x70.HALF.LO = 0x168; @@ -849,8 +849,8 @@ void sub_08047978(Entity* this) { if (this->attachedEntity->action != 1) return; this->previousActionFlag = 4; - if (this->entityType.form == 0) { - if ((((Entity*)this->otherEntity)->next->animationState >> 6) == 1) { + if (this->type == 0) { + if ((((Entity*)this->myHeap)->next->animationState >> 6) == 1) { this->field_0x80.HWORD = gRoomControls.roomOriginX + 0x1C0; this->field_0x82.HWORD = gRoomControls.roomOriginY + 0x250; } else { @@ -880,7 +880,7 @@ void sub_08047B08(Entity* this) { sub_08047E58(this); if (!sub_0806FCB8(this, this->field_0x80.HWORD, this->field_0x82.HWORD, 4)) return; - if (this->entityType.form == 0) { + if (this->type == 0) { this->action = 7; this->previousActionFlag = 0; this->direction ^= 0x80; @@ -909,7 +909,7 @@ void sub_08047BA4(Entity* this) { } else { this->field_0x76.HWORD = 0x88; } - PlaySFX(0x1B5); + SoundReq(0x1B5); sub_08047BF0(this); } @@ -939,7 +939,7 @@ void sub_08047BF0(Entity* this) { if (this->y.HALF.HI > gRoomControls.roomOriginY + 0x270) { this->previousActionFlag = 2; this->field_0x7c.HALF.HI = 0xAA; - PlaySFX(0x12D); + SoundReq(0x12D); InitAnimationForceUpdate(this, 1); } } else { @@ -968,12 +968,12 @@ void sub_08047BF0(Entity* this) { 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; + if (this->type == 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; } diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c index 7ca8808a..fc09db31 100644 --- a/src/enemy/hangingSeed.c +++ b/src/enemy/hangingSeed.c @@ -26,7 +26,7 @@ void nullsub_7(Entity* this) { void HangingSeed_Initialize(Entity* this) { this->action = 1; this->spriteSettings.b.draw = 1; - this->frameIndex = this->entityType.form; + this->frameIndex = this->type; this->spriteRendering.b3 = 1; this->spritePriority.b0 = 3; } diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index a9a4cda1..64a97b39 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -27,7 +27,7 @@ extern const s8 gUnk_080CD45C[]; extern const s8 gUnk_080CD464[]; void Helmasaur(Entity* this) { - if (this->entityType.form == 0) { + if (this->type == 0) { EnemyFunctionHandler(this, gUnk_080CD3E4); SetChildOffset(this, 0, 1, -0x10); } else { @@ -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; diff --git a/src/enemy/keese.c b/src/enemy/keese.c index 0b9890c0..0462b254 100644 --- a/src/enemy/keese.c +++ b/src/enemy/keese.c @@ -63,7 +63,7 @@ void sub_08021DDC(Entity* this) { void Keese_Initialize(Entity* this) { sub_0804A720(this); - if (this->entityType.form != 0) { + if (this->type != 0) { this->spritePriority.b1 = 1; this->height.HALF.HI = -0x10; } diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c index 4ee9063b..80679029 100644 --- a/src/enemy/lakituCloud.c +++ b/src/enemy/lakituCloud.c @@ -75,7 +75,7 @@ void sub_0803CD6C(Entity* this) { this->height.HALF.HI = -2; // Set parent to lakitu - lakitu = GetCurrentRoomProperty(this->entityType.form); + lakitu = GetCurrentRoomProperty(this->type); this->attachedEntity = lakitu; this->parent = lakitu; diff --git a/src/enemy/leever.c b/src/enemy/leever.c index a71c28c0..5ce12ee5 100644 --- a/src/enemy/leever.c +++ b/src/enemy/leever.c @@ -57,7 +57,7 @@ void sub_0801FC40(Entity* this) { } void sub_0801FC7C(Entity* this) { - if (this->entityType.form == LeeverForm_Red) { + if (this->type == LeeverForm_Red) { sub_0804A7D4(this); } else { CreateDeathFx(this, 0xf1, 0); @@ -89,7 +89,7 @@ void Leever_DigUp(Entity* this) { if (this->frames.b.f3 != 0) { this->action = 3; - if (this->entityType.form == LeeverForm_Red) { + if (this->type == LeeverForm_Red) { this->field_0x74.HWORD = 180; } else { this->field_0x74.HWORD = 110; @@ -173,7 +173,7 @@ void Leever_Move(Entity* this) { } this->nonPlanarMovement = (this->frames.all & 0xf) * 0x20; - if (this->entityType.form == LeeverForm_Red) { + if (this->type == LeeverForm_Red) { if ((this->field_0xf++ & 0xf) == 0) { sub_08004596(this, sub_0800132C(this, gUnk_020000B0)); } diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c index 64207c30..60a7b7b7 100644 --- a/src/enemy/likeLike.c +++ b/src/enemy/likeLike.c @@ -70,7 +70,7 @@ void nullsub_139(Entity* this) { void sub_08027E70(Entity* this) { sub_0804A720(this); - switch (this->entityType.form) { + switch (this->type) { case 0: this->action = 3; this->spriteSettings.b.draw = 0; diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index 69f61aee..cea511b4 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -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*); @@ -27,7 +27,7 @@ extern const u8 gUnk_080CCDC8[]; extern const u16 gUnk_080CCDD4[]; void Madderpillar(Entity* this) { - gUnk_080CCD44[this->entityType.form](this); + gUnk_080CCD44[this->type](this); } void sub_08029870(Entity* this) { @@ -167,7 +167,7 @@ void sub_08029B2C(Entity* this) { } } else { this->flags &= ~0x80; - this->actionDelay = -(this->entityType.form * 15 - 90); + this->actionDelay = -(this->type * 15 - 90); this->field_0x86.HALF.LO = 1; } } else { @@ -179,7 +179,7 @@ void sub_08029B90(Entity* this) { this->action = 1; this->spriteSettings.b.draw = 1; sub_0802A058(this); - if (this->entityType.form < 2) { + if (this->type < 2) { InitializeAnimation(this, 0); } else { InitializeAnimation(this, 4); @@ -195,7 +195,7 @@ void sub_08029BC4(Entity* this) { uVar2 = this->y.HALF.HI; if (sub_08029FE4(this)) { u32 index; - if (this->entityType.form < 2) { + if (this->type < 2) { index = 0; } else { index = 4; @@ -207,7 +207,7 @@ void sub_08029BC4(Entity* this) { void sub_08029C08(Entity* this) { this->action = 3; - this->actionDelay = gUnk_080CCDA0[this->entityType.form]; + this->actionDelay = gUnk_080CCDA0[this->type]; this->damageType = 0x6b; this->attachedEntity->action = 2; } @@ -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); } } diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c index 55af91ab..08c94fa7 100644 --- a/src/enemy/miniSlime.c +++ b/src/enemy/miniSlime.c @@ -52,7 +52,7 @@ void sub_080452A4(Entity* this) { this->nonPlanarMovement = 0x100; sub_0804A720(this); InitializeAnimation(this, 6); - if (this->entityType.parameter) { + if (this->type2) { this->action = 2; this->actionDelay = 1; } else { diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c index 6f86d987..186bee30 100644 --- a/src/enemy/moldorm.c +++ b/src/enemy/moldorm.c @@ -14,7 +14,7 @@ extern u8 gEntCount; extern const s8 gUnk_080CBBC4[]; void Moldorm(Entity* this) { - gUnk_080CBB90[this->entityType.form](this); + gUnk_080CBB90[this->type](this); } void sub_08022BA0(Entity* this) { @@ -133,8 +133,8 @@ void sub_08022DE8(Entity* this) { this->animationState = this->parent->animationState; *(u32*)&this->cutsceneBeh = this->animationState * 0x11111111; - if (this->entityType.form != 3) { - this->frameIndex = this->entityType.form + 7; + if (this->type != 3) { + this->frameIndex = this->type + 7; } else { this->frameIndex = this->animationState + 10; } diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index ffa1dc94..3bf68715 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -31,7 +31,7 @@ void Moldworm(Entity* this) { u16 prevX = this->x.HALF.HI; u16 prevY = this->y.HALF.HI; - if (this->entityType.form == 0) { + if (this->type == 0) { if (this->action != 0) { sub_0802390C(this); } @@ -39,7 +39,7 @@ void Moldworm(Entity* this) { EnemyFunctionHandler(this, gUnk_080CBC38); } else { if (this->parent->next) { - if (this->entityType.form != 8) { + if (this->type != 8) { sub_080235BC(this); } else { sub_08023730(this); @@ -76,10 +76,10 @@ void sub_080230E4(Entity* this) { this->field_0x7c.BYTES.byte3 = 0; this->field_0x7a.HALF.HI = 0; if (this->bitfield == 0x80 || this->bitfield == 0x9e) { - this->entityType.parameter = 0; + this->type2 = 0; this->field_0x80.HALF.LO = 0x14; } else { - this->entityType.parameter = 1; + this->type2 = 1; this->field_0x80.HALF.LO = 8; } } @@ -259,7 +259,7 @@ void sub_080234D8(Entity* this) { } void sub_0802351C(Entity* this) { - if (this->actionDelay != 0 && (this->entityType.parameter == 1 || gPlayerEntity.frameIndex == 0xff)) { + if (this->actionDelay != 0 && (this->type2 == 1 || gPlayerEntity.frameIndex == 0xff)) { this->actionDelay = 0; this->attachedEntity->action = 3; this->attachedEntity->field_0xf = this->field_0x80.HALF.LO; @@ -268,7 +268,7 @@ void sub_0802351C(Entity* this) { } if (this->field_0x7c.BYTES.byte3 == 0) { - if (this->entityType.parameter == 0) { + if (this->type2 == 0) { gPlayerEntity.animationState = this->animationState & 7; gPlayerState.flags.all |= 0x80000; PositionRelative(this, &gPlayerEntity, 0, gUnk_080CBC90[this->animationState & 7] << 0x10); @@ -291,7 +291,7 @@ void sub_080235D4(Entity* this) { this->x.HALF.HI = parent->x.HALF.HI; this->y.HALF.HI = parent->y.HALF.HI; sub_080239F0(this); - if (this->entityType.form == 1) { + if (this->type == 1) { this->animationState = 0x10; } else { this->animationState = 0x12; @@ -404,7 +404,7 @@ void sub_08023894(Entity* this) { this->action = 2; this->parent->field_0x7c.BYTES.byte3 = 1; InitializeAnimation(this, this->animationState); - if ((this->parent->entityType).parameter == 0) { + if (this->parent->type2 == 0) { gPlayerState.flags.all |= 0x200000; gPlayerEntity.x.HALF.HI = this->x.HALF.HI; gPlayerEntity.y.HALF.HI = this->y.HALF.HI; diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c index 7e563ab0..d89e4e65 100644 --- a/src/enemy/octorok.c +++ b/src/enemy/octorok.c @@ -47,7 +47,7 @@ void sub_0801EAE8(Entity* this) { // Death void sub_0801EB0C(Entity* this) { - if (this->entityType.form == 0) { + if (this->type == 0) { sub_0804A7D4(this); } else { CreateDeathFx(this, 241, 0); @@ -97,8 +97,8 @@ void sub_0801EB9C(Entity* this) { // Init void Octorok_Initialize(Entity* this) { sub_0804A720(this); - if (this->entityType.form == 2) { - this->animationState = this->entityType.form; + if (this->type == 2) { + this->animationState = this->type; } else { this->animationState = Random() & 3; } @@ -120,7 +120,7 @@ void Octorok_Move(Entity* this) { ProcessMovement(this); GetNextFrame(this); if (--this->actionDelay == 0) { - if (Octorok_FacesPlayer(this) && gOctorokSpitChanceModifier[this->entityType.form] <= (Random() & 3)) { + if (Octorok_FacesPlayer(this) && gOctorokSpitChanceModifier[this->type] <= (Random() & 3)) { this->action = 3; InitializeAnimation(this, this->animationState + 4); } else { @@ -155,9 +155,9 @@ void Octorok_Pause(Entity* this) { } void Octorok_Turn(Entity* this) { - if (this->entityType.form != 2) { + if (this->type != 2) { if (sub_08049FA0(this)) { - if (this->entityType.form == 1 && (Random() & 3) == 0 && sub_08049FDC(this, 1)) { + if (this->type == 1 && (Random() & 3) == 0 && sub_08049FDC(this, 1)) { this->direction = DirectionRoundUp(GetFacingDirection(this, gUnk_020000B0)); } else { this->direction = DirectionRound(Random()); diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c index 828c2c4d..165bf1eb 100644 --- a/src/enemy/peahat.c +++ b/src/enemy/peahat.c @@ -32,7 +32,7 @@ enum { }; void Peahat(Entity* this) { - if (this->entityType.form == PeahatForm_Torso) { + if (this->type == PeahatForm_Torso) { EnemyFunctionHandler(this, gPeahatFunctions); SetChildOffset(this, 0, 1, -0x10); } else { diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 7a12529a..c3e67cc8 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -137,7 +137,7 @@ void sub_080240B8(Entity* this) { this->x.HALF.HI += (direction & 0x10) ? -0x20 : 0x20; } - switch (this->entityType.form) { + switch (this->type) { case 0: this->field_0x78.HWORD = -0x10; this->height.HALF.HI = -0x10; @@ -164,7 +164,7 @@ void sub_080240B8(Entity* this) { this->direction = direction; sub_080249DC(this); - if (this->entityType.form == 1) { + if (this->type == 1) { Entity* ent; this->field_0x82.HALF.HI = 0; @@ -192,7 +192,7 @@ void sub_080241C0(Entity* this) { break; case 1: if (--this->field_0xf == 0) { - if (this->entityType.form != 0) { + if (this->type != 0) { u8 tmp = this->field_0x82.HALF.HI & 0x80; if (tmp) { sub_08024C94(this); @@ -535,7 +535,7 @@ void sub_08024940(Entity* this) { this->height.HALF.HI += 2; } - if (this->entityType.parameter != 0 || CheckIsDungeon()) { + if (this->type2 != 0 || CheckIsDungeon()) { if (!sub_08049FA0(this)) { this->direction = sub_08049EE4(this); sub_080249F4(this); diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index 881437f5..08908191 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -60,9 +60,9 @@ void sub_08025020(Entity* this) { case 0x1b: sub_0804AA1C(this); - tmp = gUnk_080CBFE8[(*(Entity**)&this->field_0x4c)->entityType.form]; + tmp = gUnk_080CBFE8[(*(Entity**)&this->field_0x4c)->type]; if (tmp < this->field_0x82.HALF.LO) { - this->field_0x82.HALF.LO -= gUnk_080CBFE8[(*(Entity**)&this->field_0x4c)->entityType.form]; + this->field_0x82.HALF.LO -= gUnk_080CBFE8[(*(Entity**)&this->field_0x4c)->type]; } else { this->cutsceneBeh.HWORD = 0x294; this->damageType = 0x83; diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c index 8c4a82f3..01a0c9c7 100644 --- a/src/enemy/rockChuchu.c +++ b/src/enemy/rockChuchu.c @@ -42,7 +42,7 @@ void sub_08022254(Entity* this) { CreateFx(this, 4, 0); ent = CreateEnemy(1, 1); if (ent) { - ent->entityType.parameter = 1; + ent->type2 = 1; ent->hurtBlinkTime = -8; sub_0804A4E4(this, ent); this->action = 2; diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index 1f74db92..74775cab 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -21,12 +21,12 @@ 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; - if (this->entityType.parameter == 0) { + if (this->type2 == 0) { uVar1 = (u8)sub_080043E8(this); if (uVar1 != 0) { if (this->action == 4) { @@ -75,7 +75,7 @@ void sub_08029318(Entity* this) { } void sub_080293B4(Entity* this) { - CreateDeathFx(this, 0xff, gUnk_080CCC34[this->cutsceneBeh.HALF.LO * 3 + this->entityType.form]); + CreateDeathFx(this, 0xff, gUnk_080CCC34[this->cutsceneBeh.HALF.LO * 3 + this->type]); } void nullsub_141() { @@ -91,11 +91,11 @@ void sub_080293DC(Entity* this) { void sub_0802940C(Entity* this) { Entity* ent; - ent = CreateEnemy(0x17, this->entityType.form); + ent = CreateEnemy(0x17, this->type); if (ent != NULL) { sub_0804A720(this); ent->parent = this; - ent->entityType.parameter = 1; + ent->type2 = 1; this->attachedEntity = ent; this->field_0x80.HALF.HI = 0; this->cutsceneBeh.HALF.LO = 0; @@ -172,7 +172,7 @@ void sub_0802953C(Entity* this) { if (--this->field_0x82.HALF.HI == 0) { this->field_0x82.HALF.HI = 0x41; if (gSave.stats.rupees != 0) { - ModRupees(gUnk_080CCC44[this->entityType.form]); + ModRupees(gUnk_080CCC44[this->type]); this->cutsceneBeh.HALF.LO = 1; } } @@ -200,7 +200,7 @@ void sub_08029660(Entity* this) { u32 temp; this->action = 1; this->spriteIndex = 0xd1; - temp = gUnk_080CCC47[this->entityType.form]; + temp = gUnk_080CCC47[this->type]; this->palette.b.b0 = temp; } @@ -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); @@ -275,7 +275,7 @@ void sub_080297F0(Entity* this) { this->damageType = 0x8e; sub_080AE068(this); this->spriteIndex = 0x143; - temp = gUnk_080CCC47[this->entityType.form]; + temp = gUnk_080CCC47[this->type]; this->palette.b.b0 = temp; this->spriteVramOffset = 9; InitializeAnimation(this, 0x54); diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c index a0a049c0..d1bfd125 100644 --- a/src/enemy/sensorBladeTrap.c +++ b/src/enemy/sensorBladeTrap.c @@ -21,7 +21,7 @@ void SensorBladeTrap(Entity* this) { void sub_0802B9EC(Entity* this) { this->action = 1; - this->field_0x78.HWORD = gUnk_080CD3D4[this->entityType.form]; + this->field_0x78.HWORD = gUnk_080CD3D4[this->type]; this->field_0x7c.HALF.LO = this->cutsceneBeh.HWORD; this->field_0x7c.HALF.HI = this->field_0x86.HWORD; } diff --git a/src/enemy/slime.c b/src/enemy/slime.c index 29ec7207..13782f7a 100644 --- a/src/enemy/slime.c +++ b/src/enemy/slime.c @@ -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); @@ -102,20 +102,20 @@ void sub_080450A8(Entity* this) { PosOffset* off; /* Can we create enough new entities? */ - count = gUnk_080D16D0[this->entityType.form]; + count = gUnk_080D16D0[this->type]; if (72 - count <= gEntCount) return; /* Create 2-4 new MiniSlime */ for (i = 0; i < count; i++) - entities[i] = CreateEnemy(0x57, this->entityType.form); + entities[i] = CreateEnemy(0x57, this->type); off = gUnk_080D16D4; for (i = 0; i < count; i++) { ent = entities[i]; ent->attachedEntity = entities[(i + 1) % count]; ent->parent = entities[(i + count - 1) % count]; - ent->entityType.parameter = 1; + ent->type2 = 1; ent->height.HALF.HI = 0; ent->hurtBlinkTime = -0x10; diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c index e11170bb..86b90864 100644 --- a/src/enemy/sluggula.c +++ b/src/enemy/sluggula.c @@ -21,11 +21,11 @@ extern const s8 gUnk_080CBDF7[]; extern const s8 gUnk_080CBDFF[]; void Sluggula(Entity* this) { - if (this->entityType.form == 1) { + if (this->type == 1) { EnemyFunctionHandler(this, gUnk_080CBDBC); SetChildOffset(this, 0, 1, -0x10); - } else if (this->entityType.form == 0) { + } else if (this->type == 0) { if (this->height.HALF.HI == 0) { u32 idx = sub_080012DC(this); if (idx != 0) { @@ -49,7 +49,7 @@ void sub_08023C20(Entity* this) { if (this->field_0x43) sub_0804A9FC(this, 0x1c); - if (this->entityType.form == 1) { + if (this->type == 1) { sub_0804AA30(this, gUnk_080CBDBC); } else { sub_0804AA30(this, gUnk_080CBDD4); @@ -89,7 +89,7 @@ void sub_08023CE0(Entity* this) { switch (this->action) { case 0: sub_0804A720(this); - if (this->entityType.parameter == 1) { + if (this->type2 == 1) { this->action = 2; if (this->actionDelay == 0) { this->actionDelay = 1; diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c index b01daa8d..f1b039f4 100644 --- a/src/enemy/smallPesto.c +++ b/src/enemy/smallPesto.c @@ -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,18 +123,18 @@ 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; } void sub_08031840(Entity* this) { - Entity* enemy = CreateEnemy(0x2d, this->entityType.form); + Entity* enemy = CreateEnemy(0x2d, this->type); if (enemy != NULL) { CopyPosition(this, enemy); enemy->parent = this; this->attachedEntity = enemy; - enemy->entityType.parameter = 1; + enemy->type2 = 1; } } diff --git a/src/enemy/spark.c b/src/enemy/spark.c index 9299c856..210b8431 100644 --- a/src/enemy/spark.c +++ b/src/enemy/spark.c @@ -39,7 +39,7 @@ void nullsub_15(Entity* this) { void sub_0802B33C(Entity* this) { sub_0804A720(this); this->action = 1; - this->direction = (this->entityType).parameter; + this->direction = this->type2; this->field_0xf = 0x78; InitializeAnimation(this, 0); } @@ -49,7 +49,7 @@ void sub_0802B35C(Entity* this) { GetNextFrame(this); ProcessMovement(this); - is_head = this->entityType.form == 0; + is_head = this->type == 0; if (this->collisions == 0) { if (--this->field_0xf == 0) { this->field_0xf = 0x78; diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c index 1a87c131..24009c34 100644 --- a/src/enemy/spearMoblin.c +++ b/src/enemy/spearMoblin.c @@ -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); @@ -84,7 +84,7 @@ void sub_08028314(Entity* this) { this->field_0x82.HALF.LO = 1; if (this->actionDelay) { - this->animationState = this->entityType.parameter << 1; + this->animationState = this->type2 << 1; this->actionDelay = 0x1e; this->nonPlanarMovement = 0x80; this->direction = this->animationState << 2; @@ -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; diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index 273ed695..873962c9 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -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: @@ -122,7 +122,7 @@ void sub_08022654(Entity* this) { if (--this->field_0xf) return; this->previousActionFlag = 1; - PlaySFX(0x12d); + SoundReq(0x12d); InitializeAnimation(this, 0); /* fallthrough */ case 1: @@ -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) { diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index f2eeee55..66d2ca82 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -30,7 +30,7 @@ void sub_0802F150(Entity* this) { case 0x14: this->action = 1; this->previousActionFlag = 0; - if ((this->entityType).form != 0) { + if (this->type != 0) { this->actionDelay = 0xc0; } else { this->actionDelay = gUnk_080CDEF8[Random() & 3]; @@ -76,9 +76,9 @@ void sub_0802F210(Entity* this) { this->field_0xf = 0; *(u8*)&this->field_0x7c = 0; - this->field_0x80.HWORD = this->entityType.form == 0 ? 0x1800 : 0x2800; + this->field_0x80.HWORD = this->type == 0 ? 0x1800 : 0x2800; - this->field_0x82.HWORD = this->entityType.form == 0 ? 0x2800 : 0x3000; + this->field_0x82.HWORD = this->type == 0 ? 0x2800 : 0x3000; InitializeAnimation(this, 0); } @@ -95,7 +95,7 @@ void sub_0802F284(Entity* this) { if ((this->frames.b.f3) != 0) { this->action = 2; this->actionDelay = 0x10; - this->field_0xf = this->entityType.form; + this->field_0xf = this->type; this->field_0x20 = this->field_0x82.HWORD << 4; sub_0802F45C(this); InitializeAnimation(this, 2); @@ -120,7 +120,7 @@ void sub_0802F300(Entity* this) { if (sub_080044EC(this, this->field_0x80.HWORD) == 1) { this->action = 3; this->previousActionFlag = 0; - if (this->entityType.form != 0) { + if (this->type != 0) { rand = 0; } @@ -165,10 +165,10 @@ void sub_0802F3F4(Entity* this) { GetNextFrame(this); if ((this->frames.b.f3) != 0) { - if ((*(u8*)&this->field_0x7c.HALF.LO < 2) && ((this->entityType.form % 2) != 0)) { + if ((*(u8*)&this->field_0x7c.HALF.LO < 2) && ((this->type % 2) != 0)) { this->action = 2; this->actionDelay = 0x10; - this->field_0xf = this->entityType.form; + this->field_0xf = this->type; this->field_0x20 = this->field_0x82.HWORD << 4; (*(u8*)&this->field_0x7c.HALF.LO)++; sub_0802F45C(this); diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index e09309eb..3bf14e34 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -45,9 +45,9 @@ void sub_08037F58(Entity* this) { u32 uVar1; if ((this->field_0x3a & 2) == 0) { - SetGlobalFlag(this->entityType.parameter); + SetGlobalFlag(this->type2); } - if ((this->entityType).form != 0) { + if (this->type != 0) { uVar1 = 0x59; } else { uVar1 = 0x58; @@ -64,7 +64,7 @@ void sub_08037F84(Entity* this) { void sub_08037FA0(Entity* this) { - if (CheckGlobalFlag(this->entityType.parameter)) { + if (CheckGlobalFlag(this->type2)) { DeleteThisEntity(); } sub_0804A720(this); diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c index 38fce4c3..bf541184 100644 --- a/src/enemy/treeItem.c +++ b/src/enemy/treeItem.c @@ -17,7 +17,7 @@ void TreeItem(Entity* this) { if (this->action == 0) { this->action++; - this->field_0x68.HALF.LO = sub_080028F4(gUnk_080D29E0[this->entityType.form]); + this->field_0x68.HALF.LO = sub_080028F4(gUnk_080D29E0[this->type]); if (this->field_0x68.HALF.LO > 8) { DeleteThisEntity(); } diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c index fcbc04f3..02bf4e39 100644 --- a/src/enemy/vaatiBall.c +++ b/src/enemy/vaatiBall.c @@ -38,7 +38,7 @@ void VaatiBall(Entity* this) { this->currentHealth = -1; parent->field_0x80.HALF.LO--; CreateDust(this); - PlaySFX(0x1c3); + SoundReq(0x1c3); } } } @@ -50,7 +50,7 @@ void sub_0804468C(Entity* this) { this->spriteRendering.b3 = 2; this->spritePriority.b0 = 5; this->cutsceneBeh.HALF.LO = 0; - switch (this->entityType.form) { + switch (this->type) { case 0: this->action = 1; this->actionDelay = 1; @@ -183,7 +183,7 @@ void sub_08044868(Entity* this) { if (draw == 1 && this->cutsceneBeh.HALF.LO == 0) { vaati = sub_0804A98C(this, 0x18, 0); if (vaati) { - vaati->entityType.parameter = 1; + vaati->type2 = 1; vaati->parent = this; this->cutsceneBeh.HALF.LO = 1; this->damageType = 0; @@ -369,7 +369,7 @@ void sub_08044B04(Entity* this) { if (this->actionDelay) { if (--this->actionDelay == 0) { this->nonPlanarMovement = 1280; - PlaySFX(0x14f); + SoundReq(0x14f); } } if (this->field_0x78.HALF.HI == 3) diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c index 8f359f31..1ba24a96 100644 --- a/src/enemy/wallMaster.c +++ b/src/enemy/wallMaster.c @@ -58,7 +58,7 @@ void sub_0802A4E4(Entity* this) { this->action = 1; this->collisionLayer = 3; this->field_0x7c.BYTES.byte1 = Random(); - this->field_0x7a.HWORD = this->entityType.parameter * 0x3c; + this->field_0x7a.HWORD = this->type2 * 0x3c; this->field_0x7c.BYTES.byte0 = this->actionDelay; this->field_0x78.HWORD = this->actionDelay * 0x3c; UpdateSpriteForCollisionLayer(this); @@ -184,7 +184,7 @@ void sub_0802A78C(Entity* this) { } } } else { - this->field_0x7a.HWORD = this->entityType.parameter * 0x3c + 1; + this->field_0x7a.HWORD = this->type2 * 0x3c + 1; } } } diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c index 5ef5e685..10463258 100644 --- a/src/enemy/wisp.c +++ b/src/enemy/wisp.c @@ -36,9 +36,9 @@ 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; - if (this->entityType.form == 0) { + gSave.stats.effect = this->type + 1; + gSave.stats.effectTimer = 600; + if (this->type == 0) { break; } DeleteThisEntity(); @@ -90,7 +90,7 @@ void sub_08033674(Entity* this) { this->field_0x80.HWORD = this->x.HALF.HI; this->field_0x82.HWORD = this->y.HALF.HI; sub_08033744(this); - InitializeAnimation(this, this->entityType.parameter); + InitializeAnimation(this, this->type2); } void sub_080336A8(Entity* this) { diff --git a/src/entity.c b/src/entity.c index 0f0835c6..cb81ae21 100644 --- a/src/entity.c +++ b/src/entity.c @@ -61,7 +61,7 @@ typedef void (*Deleter)(void*); void DeleteEntityAny(Entity* ent) { Deleter deleter = NULL; - if (ent->entityType.type == 9) { + if (ent->kind == 9) { deleter = (Deleter)DeleteManager; } else { deleter = (Deleter)DeleteEntity; @@ -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,10 +94,10 @@ void DeleteEntity(Entity* ent) { sub_08017744(ent); sub_0805E92C(ent); UnloadCutsceneData(ent); - UnloadBoundingBox(ent); - sub_0801DA0C(ent->otherEntity); - ent->otherEntity = NULL; - if ((ent->entityType).type == 3) { + UnloadHitbox(ent); + sub_0801DA0C(ent->myHeap); + ent->myHeap = NULL; + if (ent->kind == 3) { sub_0804AA1C(ent); } ent->flags = ent->flags & 0x7f; @@ -132,8 +132,6 @@ void ClearDeletedEntity(Entity* ent) { gEntCount--; } -extern EntityType gUnk_03003DB8; - void DeleteAllEntities(void) { Entity* ent; Entity* next; @@ -163,7 +161,7 @@ OtherEntity* GetEmptyManager(void) { return NULL; } -extern void _DmaZero(void*, u32); +extern void MemClear32(void*, u32); extern u8 gManagerCount; void DeleteManager(OtherEntity* ent) { @@ -172,7 +170,7 @@ void DeleteManager(OtherEntity* ent) { sub_0805E92C(ent); UnlinkEntity(ent); - _DmaZero(ent, sizeof(OtherEntity)); + MemClear32(ent, sizeof(OtherEntity)); gManagerCount--; } @@ -187,16 +185,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) { @@ -248,7 +246,7 @@ void AppendEntityToList(Entity* ent, int listIndex) { ent->prev = list->last; list->last->next = ent; list->last = ent; - if (ent->entityType.type != 9) { + if (ent->kind != 9) { ent->spritePriority.b0 = 4; gEntCount++; } else { @@ -283,8 +281,7 @@ bool32 DoesSimilarEntityExist(Entity* ent) { list = &gEntityLists[0]; do { for (i = list->first; (u32)i != (u32)list; i = i->next) { - if ((u32)i != (u32)ent && i->entityType.type == ent->entityType.type && - i->entityType.subtype == ent->entityType.subtype) { + if ((u32)i != (u32)ent && i->kind == ent->kind && i->id == ent->id) { return TRUE; } } @@ -299,7 +296,7 @@ Entity* FindEntityInListBySubtype(int type, int subtype, int listIndex) { list = &gEntityLists[listIndex]; for (it = list->first; (u32)it != (u32)list; it = it->next) { - if (type == it->entityType.type && subtype == it->entityType.subtype) + if (type == it->kind && subtype == it->id) return it; } return NULL; @@ -311,8 +308,7 @@ Entity* FindEntityInListByForm(int type, int subtype, int listIndex, int form, i list = &gEntityLists[listIndex]; for (i = list->first; (u32)i != (u32)list; i = i->next) { - if (type == i->entityType.type && subtype == i->entityType.subtype && form == i->entityType.form && - parameter == i->entityType.parameter) + if (type == i->kind && subtype == i->id && form == i->type && parameter == i->type2) return i; } return NULL; @@ -324,7 +320,7 @@ Entity* FindNextEntityOfSameSubtype(Entity* ent, int listIndex) { list = &gEntityLists[listIndex]; for (i = ent->next; (u32)i != (u32)list; i = i->next) { - if (i->entityType.type == ent->entityType.type && i->entityType.subtype == ent->entityType.subtype) + if (i->kind == ent->kind && i->id == ent->id) return i; } return NULL; @@ -337,7 +333,7 @@ Entity* FindEntityBySubtype(int type, int subtype) { list = &gEntityLists[0]; do { for (i = (Entity*)list->first; (u32)i != (u32)list; i = i->next) { - if ((type == (i->entityType).type) && (subtype == (i->entityType).subtype)) + if (type == i->kind && (subtype == i->id)) return i; } } while (++list < &gEntityLists[9]); @@ -354,7 +350,7 @@ void DeleteAllEnemies(void) { do { for (ent = list->first; (u32)ent != (u32)list; ent = next) { next = ent->next; - if (ent->entityType.type == 3) + if (ent->kind == 3) DeleteEntity(ent); } } while (++list < &gEntityLists[9]); diff --git a/src/ezloCap.c b/src/ezloCap.c new file mode 100644 index 00000000..fce6880f --- /dev/null +++ b/src/ezloCap.c @@ -0,0 +1,277 @@ +#include "global.h" +#include "entity.h" +#include "functions.h" +#include "flags.h" +#include "save.h" +#include "script.h" + +extern Hitbox gUnk_080FD170; + +extern u16* gUnk_08114144; + +extern u32 gUnk_081141A4[]; +extern u8 gUnk_081141E4[]; + +extern Hitbox gUnk_08114154; +extern void gUnk_08016030; // Cutscene data type? +extern void gUnk_0801606C; // Cutscene data type? + +extern void gUnk_081141F4; // tiles that are changed? + +extern void sub_0809623C(Entity*); +extern void sub_08096260(Entity*); + +void EzloCap(Entity* this) { + if (this->action == 0) { + this->action += 1; + sub_0805E3A0(this, 2); + sub_0807DD50(this); + } + sub_0807DDAC(this, 0); + sub_0807DDE4(this); + UpdateAnimationSingleFrame(this); +} + +NONMATCH("asm/non_matching/ezloCap/sub_0806D8A0.inc", void sub_0806D8A0(Entity* this, u32 param_2)) { +} +END_NONMATCH + +NONMATCH("asm/non_matching/ezloCap/sub_0806D908.inc", void sub_0806D908(Entity* this)) { +} +END_NONMATCH + +void sub_0806D944(Entity* this) { + this->spriteSettings.b.flipX = 0; + if (this->x.WORD <= gPlayerEntity.x.WORD) { + this->spriteSettings.b.flipX = 1; + } +} + +void sub_0806D96C(Entity* this) { + Entity* fx = CreateFx(this, 0x42, 0); + if (fx != NULL) { + fx->spritePriority.b0 = 1; + PositionRelative(this, fx, 0, 0xFFE80000); + } +} + +void sub_0806D9A4(Entity* this) { + if (this->x.WORD <= gPlayerEntity.x.WORD) { + gPlayerEntity.spriteSettings.b.flipX = 0; + } else { + gPlayerEntity.spriteSettings.b.flipX = 1; + } + gPlayerEntity.animationState = 4; +} + +void NPC4E(Entity* this) { + if (this->action == 0) { + this->action = 1; + this->spriteSettings.b.draw = 4; + this->hitbox = &gUnk_080FD170; + sub_0807DD50(this); + } else { + sub_0807DD94(this, 0); + } +} + +NONMATCH("asm/non_matching/ezloCap/sub_0806DA04.inc", void sub_0806DA04(Entity* this, u32 param_2)) { + u8 direction = + sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, (int)gPlayerEntity.x.HALF.HI, (int)gPlayerEntity.y.HALF.HI); + this->direction = direction; + + this->animationState = + (this->animationState & 0x80) | + gUnk_08114144[(((direction) << 0x18) >> 0x19)]; // somehow the cast from u8 to u32 of direction is an issue here +} +END_NONMATCH + +void sub_0806DA1C(Entity* this, u32* param_2) { + sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[param_2[1]], (u32)(gUnk_081141E4[param_2[1]])); +} + +// Returns the kingstone id? +u8 sub_0806DA3C(Entity* this) { + u32 result; + + switch (this->type) { + default: + result = 0; + break; + case 1: + result = 1; + break; + case 2: + result = 2; + break; + case 3: + result = 3; + break; + case 4: + result = 4; + break; + case 5: + result = 5; + break; + case 11: + result = 9; + break; + case 6: + case 7: + case 8: + case 9: + case 10: + result = sub_0801E99C(this); + break; + } + return result; +} + +// Check whether a kingstone fusion is possible and store the result somewhere in param_2? +void sub_0806DAAC(Entity* this, u32 param_2) { + u32 uVar1; + uVar1 = CheckKinstoneFused(sub_0806DA3C(this)); + *(u32*)(param_2 + 0x14) = uVar1; + gUnk_02033280.unk_07 |= 1; +} + +// maybe actually execute the keystone fusion? +void sub_0806DAD0(Entity* this) { + sub_08078790(this, sub_0806DA3C(this)); +} + +void sub_0806DAE8(Entity* this) { + switch (this->type - 1) { + case 0: + SetLocalFlag(0xee); + break; + case 1: + SetLocalFlag(0xef); + break; + case 2: + SetLocalFlag(0xf0); + break; + case 3: + SetLocalFlag(0xf1); + break; + case 4: + SetLocalFlag(0xf2); + break; + } + + SoundReq(0xcd); +} + +// Unknown param_2 struct +void sub_0806DB44(Entity* this, u32* param_2) { + param_2[5] = 0; + + if (CheckLocalFlag(0xee) != 0 && CheckLocalFlag(0xef) != 0 && CheckLocalFlag(0xf0) != 0 && + CheckLocalFlag(0xf1) != 0 && CheckLocalFlag(0xf2) != 0) { + param_2[5] = 1; + } +} + +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->hitbox = &gUnk_08114154; + ent = CreateObject(0x3e, 4, 0); + if (ent != NULL) { + PositionRelative(this, ent, -0x80000, 0); + *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &gUnk_08016030); + } + ent = CreateObject(0x3e, 5, 0); + if (ent != NULL) { + PositionRelative(this, ent, 0x80000, 0); + *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &gUnk_0801606C); + } +} + +u32 sub_0806DBF4(u32 param_1) { + switch (param_1) { + case 1: + case 2: + case 3: + case 4: + case 6: + param_1 = 1; + if (GetInventoryValue(2) != 0) { + param_1 = 2; + } + if (GetInventoryValue(3) != 0) { + param_1 = 3; + } + if (GetInventoryValue(4) != 0) { + param_1 = 4; + } + if (GetInventoryValue(6) != 0) { + param_1 = 6; + } + break; + } + return param_1; +} + +void sub_0806DC3C(Entity* this) { + this->field_0x68.HALF.LO = gSave.stats.itemOnA; + this->field_0x68.HALF.HI = gSave.stats.itemOnB; +} + +void sub_0806DC58(Entity* this) { + ForceEquipItem(sub_0806DBF4(this->field_0x68.HALF.LO), 0); + ForceEquipItem(sub_0806DBF4(this->field_0x68.HALF.HI), 1); +} + +void sub_0806DC7C() { + u16* tiles = &gUnk_081141F4; + while (*tiles != 0) { + u32 tile = (u32)*tiles; + tiles = tiles + 1; + SetTileType(0x4072, tile, 1); + } +} + +void sub_0806DCA0() { + u16 uVar1; + u16* tiles; + + tiles = &gUnk_081141F4; + while (*tiles != 0) { + u16 tile = *tiles; + tiles = tiles + 1; + sub_0807BA8C((u32)tile, 1); + } +} + +void sub_0806DCC0() { + gScreenTransition.field_0x20 = 0x7c8; + gScreenTransition.field_0x22 = 0xf8; +} + +void NPC4E_Fusion(Entity* this) { + if (this->action == 0) { + this->action += 1; + switch (this->type) { + case 1: + case 2: + case 3: + case 4: + case 5: + sub_0809623C(this); + break; + case 6: + case 7: + case 8: + case 9: + case 10: + sub_08096260(this); + break; + case 11: + sub_0806DB84(this, 0); + this->hitbox = NULL; + break; + } + } +} diff --git a/src/ezloNag.c b/src/ezloNag.c index 8ea91e93..7d537a44 100644 --- a/src/ezloNag.c +++ b/src/ezloNag.c @@ -99,7 +99,7 @@ void sub_0801CF18(Element* arg0) { arg0->unk4 = 2; arg0->unk1 = 8; gUnk_0200AF00.ezloNagFuncIndex = 3; - PlaySFX(0x173); + SoundReq(0x173); } } diff --git a/src/fileScreen.c b/src/fileScreen.c index 0dcd5287..860423b6 100644 --- a/src/fileScreen.c +++ b/src/fileScreen.c @@ -92,20 +92,20 @@ 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); sfx = gUnk_080FC85C[arg0][2]; if (sfx) { - PlaySFX(sfx); + SoundReq(sfx); } gScreen.bg.bg3Control = BGCNT_PRIORITY(1); } void sub_08050384(void) { sub_0801C4A0(0, 0); - _DmaZero(&gBG0Buffer, sizeof(gBG0Buffer)); + MemClear32(&gBG0Buffer, sizeof(gBG0Buffer)); gScreen.bg.bg3Control = BGCNT_PRIORITY(1); } @@ -117,8 +117,8 @@ void sub_080503A8(u32 gfxGroup) { void SetFileSelectState(FileSelectState mode) { gUnk_02032EC0.state = mode; - _DmaZero(&gBG0Buffer, sizeof(gBG0Buffer)); - _DmaZero(&gBG1Buffer, sizeof(gBG1Buffer)); + MemClear32(&gBG0Buffer, sizeof(gBG0Buffer)); + MemClear32(&gBG1Buffer, sizeof(gBG1Buffer)); } void LoadOptionsFromSave(u32 idx) { @@ -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; @@ -159,7 +159,7 @@ void HandleChooseFileScreen(void) { gScreen.bg.bg2xOffset = 0; gScreen.affine.bg2xOffset = 0; gScreen.affine.bg2yOffset = 0; - _DmaZero(&gChooseFileState, sizeof(gChooseFileState)); + MemClear32(&gChooseFileState, sizeof(gChooseFileState)); } HideButtonR(); @@ -184,17 +184,17 @@ static void HandleFileScreenEnter(void) { sub_0801DA90(1); sub_080A3210(); - _DmaZero((void*)VRAM, 0x80); // clear palettes - sub_08056418(); + MemClear32((void*)VRAM, 0x80); // clear palettes + MessageInitialize(); EraseAllEntities(); sub_08080668(); sub_080ADD30(); sub_0801CFA8(0); - _DmaZero(&gUnk_0200AF00, sizeof(gUnk_0200AF00)); - _DmaZero(&gUnk_02019EE0, sizeof(gUnk_02019EE0)); + MemClear32(&gUnk_0200AF00, sizeof(gUnk_0200AF00)); + MemClear32(&gUnk_02019EE0, sizeof(gUnk_02019EE0)); gUnk_02019EE0.unk3 = 7; gUnk_02019EE0.unk6 = gUnk_02000000->gameLanguage > LANGUAGE_EN ? 3 : 0; - _DmaZero(&gUnk_02032EC0, sizeof(gUnk_02032EC0)); + MemClear32(&gUnk_02032EC0, sizeof(gUnk_02032EC0)); gUnk_02032EC0.lastState = 8; SetFileSelectState(STATE_NONE); InitDMA(); @@ -215,8 +215,8 @@ 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; - PlaySFX(0x7); + gMain.funcIndex = 1; + SoundReq(0x7); DoFade(4, 8); } @@ -284,13 +284,13 @@ void sub_0805070C(void) { var0->unk8 = gUnk_02000D00; for (i = 0; i < NUM_SAVE_SLOTS; i++) { var0->unk6 = 0; - _DmaZero(var0->unk8, 0x200); + MemClear32(var0->unk8, 0x200); playerName = &gUnk_02019EE0.saves[i].playerName[0]; for (j = 0; j < FILENAME_LENGTH; j++) { 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); } @@ -438,14 +438,14 @@ void sub_08050940(void) { if (gUnk_02032EC0.lastState != mode) { SetFileSelectState(mode); - PlaySFX(0x6A); + SoundReq(0x6A); } row_idx = (row_idx + num_rows) % num_rows; if (gUnk_02019EE0.unk6 != row_idx) { gUnk_02019EE0.unk6 = row_idx; sub_08050AFC(row_idx); - PlaySFX(0x69); + SoundReq(0x69); } if (gUnk_02019EE0.saveStatus[gUnk_02019EE0.unk6] == SAVE_VALID) { @@ -489,7 +489,7 @@ void sub_08050B3C(u16*); void sub_08050AFC(u32 idx) { SetActiveSave(idx); - _DmaZero(&gBG1Buffer, sizeof(gBG1Buffer)); + MemClear32(&gBG1Buffer, sizeof(gBG1Buffer)); if (gUnk_02019EE0.saveStatus[idx] == SAVE_VALID) { sub_08050B3C(&gBG1Buffer.unk29C); } @@ -589,14 +589,14 @@ void sub_08050C54(void) { case A_BUTTON: case START_BUTTON: if (column_idx == 0) { - PlaySFX(0x80080000); + SoundReq(0x80080000); } gMenu.transitionTimer = 0xf; sub_080A7114(1); - PlaySFX(0x6a); + SoundReq(0x6a); break; case B_BUTTON: - PlaySFX(0x6c); + SoundReq(0x6c); SetFileSelectState(STATE_NONE); break; case DPAD_LEFT: @@ -614,7 +614,7 @@ void sub_08050C54(void) { } if (gMenu.column_idx != column_idx) { gMenu.column_idx = column_idx; - PlaySFX(0x69); + SoundReq(0x69); } } @@ -645,7 +645,7 @@ void HandleFileLanguageSelect(void) { } void sub_08050DB8(void) { - _DmaZero(&gBG2Buffer, sizeof(gBG2Buffer)); + MemClear32(&gBG2Buffer, sizeof(gBG2Buffer)); sub_080503A8(0xc); gMenu.field_0x4 = gUnk_02000000->gameLanguage; sub_080A7114(1); @@ -667,7 +667,7 @@ void sub_08050DE4(void) { break; case A_BUTTON: case START_BUTTON: - PlaySFX(0x6a); + SoundReq(0x6a); if (gMenu.field_0x4 != row_idx) { sub_080A7114(2); CreateDialogBox(8, 0); @@ -678,7 +678,7 @@ void sub_08050DE4(void) { case B_BUTTON: row_idx = gMenu.field_0x4; gUnk_02000000->gameLanguage = gMenu.field_0x4; - PlaySFX(0x6c); + SoundReq(0x6c); SetFileSelectState(STATE_NONE); break; } @@ -692,7 +692,7 @@ void sub_08050DE4(void) { } if (gUnk_02000000->gameLanguage != row_idx) { gUnk_02000000->gameLanguage = row_idx; - PlaySFX(0x69); + SoundReq(0x69); } } @@ -765,13 +765,13 @@ NONMATCH("asm/non_matching/fileScreen/sub_08050EF4.inc", void sub_08050EF4(void) case 3: gUnk_02019EE0.saves[gUnk_02019EE0.unk6].messageSpeed = gUnk_02019EE0.unk4; gUnk_02019EE0.saves[gUnk_02019EE0.unk6].brightnessPref = gUnk_02019EE0.unk5; - PlaySFX(0x6c); + SoundReq(0x6c); sub_080A7114(mode); SetActiveSave(gUnk_02019EE0.unk6); break; case 2: CreateDialogBox(8, 0); - PlaySFX(0x6a); + SoundReq(0x6a); default: case 1: sub_080A7114(mode); @@ -780,11 +780,11 @@ NONMATCH("asm/non_matching/fileScreen/sub_08050EF4.inc", void sub_08050EF4(void) case 0: if (gMenu.column_idx != column_idx) { gMenu.column_idx = column_idx; - PlaySFX(0x69); + SoundReq(0x69); } else if (option != *p_option) { *p_option = option; LoadOptionsFromSave(gUnk_02019EE0.unk6); - PlaySFX(0x69); + SoundReq(0x69); } break; } @@ -842,7 +842,7 @@ void sub_08051358(void) { if (gMenu.focusCoords[0] != 0x0b || gMenu.focusCoords[1] != 0x5) { gMenu.focusCoords[1] = 0x5; gMenu.focusCoords[0] = 0xb; - PlaySFX(0x67); + SoundReq(0x67); } } @@ -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); @@ -994,8 +994,8 @@ u32 sub_080514BC(u32 a1) { } void sub_08051574(u32 sfx) { - PlaySFX(sfx); - _DmaCopy(&gSave, &gUnk_02019EE0.saves[gUnk_02019EE0.unk6], sizeof(gUnk_02019EE0.saves[gUnk_02019EE0.unk6])); + SoundReq(sfx); + MemCopy(&gSave, &gUnk_02019EE0.saves[gUnk_02019EE0.unk6], sizeof(gUnk_02019EE0.saves[gUnk_02019EE0.unk6])); sub_0805070C(); } @@ -1025,10 +1025,10 @@ void sub_080515D4(void) { if (column_idx == 1) { CreateDialogBox(4, 0); sub_080A7114(2); - PlaySFX(0x6a); + SoundReq(0x6a); } else { SetFileSelectState(0); - PlaySFX(0x6c); + SoundReq(0x6c); } break; case DPAD_LEFT: @@ -1041,7 +1041,7 @@ void sub_080515D4(void) { if (gMenu.column_idx != column_idx) { gMenu.column_idx = column_idx; - PlaySFX(0x69); + SoundReq(0x69); } } @@ -1122,20 +1122,20 @@ void sub_080517EC(void) { if (gUnk_02019EE0.unk7 < 3) { CreateDialogBox(2, 0); sub_080A7114(2); - PlaySFX(0x6a); + SoundReq(0x6a); break; } // fallthrough case B_BUTTON: gUnk_02019EE0.unk7 = 4; - PlaySFX(0x6c); + SoundReq(0x6c); SetFileSelectState(0); break; } temp = sub_080517B4(delta); if (temp != gUnk_02019EE0.unk7) { gUnk_02019EE0.unk7 = temp; - PlaySFX(0x69); + SoundReq(0x69); } } @@ -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); } } @@ -1186,7 +1186,7 @@ void sub_0805194C(u32 save_idx) { gUnk_02019EE0.saveStatus[save_idx] = 0; save = &gUnk_02019EE0.saves[save_idx]; - _DmaZero(save, sizeof(*save)); + MemClear32(save, sizeof(*save)); save->messageSpeed = 1; save->brightnessPref = 1; save->stats.health = 24; diff --git a/src/game.c b/src/game.c index 6fcd7af9..b56f4836 100644 --- a/src/game.c +++ b/src/game.c @@ -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--; } } @@ -105,13 +105,13 @@ void sub_080521A0(void) { } gMenu.transitionTimer = 0x3c; sub_080A7114(temp2); - PlaySFX(0x6a); + SoundReq(0x6a); break; } if (gMenu.field_0x3 != temp) { gMenu.field_0x3 = temp; sub_08052418(0, temp); - PlaySFX(0x69); + SoundReq(0x69); } break; } @@ -170,7 +170,7 @@ void sub_080522F4(void) { break; case 0x1: sub_080A7114(2); - PlaySFX(0x6a); + SoundReq(0x6a); if (temp == 0) { DoFade(5, 8); } else { @@ -181,7 +181,7 @@ void sub_080522F4(void) { if (gMenu.field_0x3 != temp) { gMenu.field_0x3 = temp; sub_08052418(1, temp); - PlaySFX(0x69); + SoundReq(0x69); } } break; @@ -219,13 +219,13 @@ NONMATCH("asm/non_matching/game/sub_08052418.inc", void sub_08052418(int param_1 int i; struct_080FCA8C temp; - _DmaZero(&gBG1Buffer, 0x800); + MemClear32(&gBG1Buffer, 0x800); gUnk_020227E8._0[0].WORD = 0xf; gUnk_020227E8._0[2].WORD = 0xf; 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; @@ -238,12 +238,12 @@ void InitializePlayer(void) { Entity* pl; sub_080784C8(); - _DmaZero((void*)&gUnk_03000B80, 0x70); - _DmaZero((void*)&gPlayerState, 0xb0); + MemClear32((void*)&gUnk_03000B80, 0x70); + MemClear32((void*)&gPlayerState, 0xb0); - _DmaFill32(0xffffffff, &gPlayerState.field_0x40, 0x40); + MemFill32(0xffffffff, &gPlayerState.field_0x40, 0x40); pl = &gPlayerEntity; - _DmaZero((void*)pl, 0x88); + MemClear32((void*)pl, 0x88); gRoomControls.cameraTarget = pl; gPlayerState.playerAction = gUnk_080FCAC8[gScreenTransition.field_0xf]; if (!CheckGlobalFlag(0x14)) { @@ -274,7 +274,7 @@ void InitializePlayer(void) { case 0xc: gPlayerState.field_0x34[4] = 4; } - pl->entityType.type = 1; + pl->kind = 1; pl->flags |= 0xa0; pl->spritePriority.b0 = 4; pl->currentHealth = gSave.stats.health; @@ -284,7 +284,7 @@ void InitializePlayer(void) { pl->collisionLayer = gScreenTransition.playerLayer; UpdateSpriteForCollisionLayer(pl); AppendEntityToList(pl, 1); - sub_08017640(); + RegisterPlayerHitbox(); } bool32 sub_08052620(u32 r0) { diff --git a/src/intro.c b/src/intro.c index b0e75a85..800b9435 100644 --- a/src/intro.c +++ b/src/intro.c @@ -54,17 +54,17 @@ static const u16 sLightRaysAlphaBlends[] = { static u32 AdvanceIntroSequence(u32 transition) { gUnk_02032EC0.lastState = transition; - gUnk_03001000.funcIndex = 2; - _DmaZero(&gIntroState, sizeof(gIntroState)); + gMain.funcIndex = 2; + MemClear32(&gIntroState, sizeof(gIntroState)); DoFade(7, 8); } void HandleIntroScreen(void) { FlushSprites(); - switch (gUnk_03001000.funcIndex) { + switch (gMain.funcIndex) { case 0: - sub_08056418(); - _DmaZero(&gUnk_02032EC0, sizeof(gUnk_02032EC0)); + MessageInitialize(); + MemClear32(&gUnk_02032EC0, sizeof(gUnk_02032EC0)); AdvanceIntroSequence(0); break; case 1: @@ -75,7 +75,7 @@ void HandleIntroScreen(void) { return; } sub_0801DA90(1); - gUnk_03001000.funcIndex = 1; + gMain.funcIndex = 1; break; } sub_080AD918(); @@ -158,7 +158,7 @@ static void HandleTitlescreen(void) { UpdateSwordBgAffineData(); } sub_080A3210(); - PlaySFX(3); // fanfare + SoundReq(3); // fanfare DoFade(6, 8); break; case 1: @@ -182,12 +182,12 @@ static void HandleTitlescreen(void) { advance = GetAdvanceState(); if (advance != ADVANCE_NONE) { if (advance == ADVANCE_KEY_PRESSED) { - PlaySFX(0x6a); + SoundReq(0x6a); } else { advance = ADVANCE_NONE; } AdvanceIntroSequence(advance); - PlaySFX(0x80080000); + SoundReq(0x80080000); } UpdatePressStartIcon(); if ((gIntroState.timer & 0x20) == 0) { @@ -242,7 +242,7 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) { gScreen.bg.bg1xOffset = 0xc09; gFadeControl.field_0x4 = 0x40; DoFade(6, 0x10); - PlaySFX(0xf8); + SoundReq(0xf8); } } break; @@ -272,7 +272,7 @@ static void HandleTitlescreenAnimationIntro(void) { if (!gFadeControl.active) { gIntroState.subState = 1; gScreen.lcd.displayControl |= DISPCNT_BG2_ON; - PlaySFX(0xF6); + SoundReq(0xF6); } break; case 1: @@ -291,7 +291,7 @@ static void HandleTitlescreenAnimationIntro(void) { gIntroState.subState++; CreateObject(0xBD, 0, 0); DoFade(6, 16); - PlaySFX(0xF8); + SoundReq(0xF8); } break; default: diff --git a/src/item.c b/src/item.c index 3561ba36..ad7a419b 100644 --- a/src/item.c +++ b/src/item.c @@ -11,7 +11,7 @@ void (*const gItemFunctions[])(ItemBehavior*, u32) = { }; extern void sub_08077E78(ItemBehavior*, u32); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void sub_08078F60(void); extern void sub_08077D38(ItemBehavior*, u32); extern void sub_0805E544(void); @@ -56,7 +56,7 @@ void OcarinaUse(ItemBehavior *beh, u32 arg1) gPlayerState.keepFacing |= bVar1; sub_08078F60(); sub_08077D38(beh, arg1); - PlaySFX(0x216); + SoundReq(0x216); sub_0805E544(); } } @@ -104,7 +104,7 @@ void sub_08076D34(ItemBehavior* beh, u32 arg1) { beh->stateID++; beh->field_0xf = 0; gPlayerState.field_0xa &= ~(u8)(8 >> arg1); - PlaySFX(0x15d); + SoundReq(0x15d); } } else { gPlayerState.field_0x3[0] = 0; diff --git a/src/item11.c b/src/item11.c index d83333f0..5821d0b5 100644 --- a/src/item11.c +++ b/src/item11.c @@ -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 { @@ -55,15 +55,15 @@ void sub_08018CBC(Entity* this) { this->spriteIndex = 0xa6; this->palette.raw = 0x33; this->spriteVramOffset = 0; - (this->entityType).form = gPlayerState.field_0x1d[0] - 1; - this->actionDelay = gUnk_080B3DE0[(this->entityType).form * 2]; - this->field_0x44 = gUnk_080B3DE0[(this->entityType).form * 2 + 1]; + this->type = gPlayerState.field_0x1d[0] - 1; + this->actionDelay = gUnk_080B3DE0[this->type * 2]; + this->field_0x44 = gUnk_080B3DE0[this->type * 2 + 1]; this->field_0x40 = 0x1b; - this->boundingBox = gUnk_080B3DE8[(this->entityType).form]; + this->hitbox = gUnk_080B3DE8[this->type]; (u32*)gPlayerEntity.field_0x70.WORD = this; sub_08078CD0(&gPlayerEntity); (u32*)gPlayerEntity.field_0x70.WORD = pEVar3; - InitializeAnimation(this, (this->entityType).form + 10); + InitializeAnimation(this, this->type + 10); sub_08018FA0(this); } sub_0801766C(this); diff --git a/src/item14.c b/src/item14.c index 08b3ec35..7ca56f53 100644 --- a/src/item14.c +++ b/src/item14.c @@ -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,11 +18,11 @@ 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) { - this->entityType.parameter = 1; + this->type2 = 1; } this->direction = this->animationState << 2; *(u32*)&this->field_0x6c = 0x3c; @@ -30,7 +30,7 @@ void sub_0805FBE8(Entity* this) { sub_0801766C(this); sub_0806F69C(this); sub_0805FC74(this); - PlaySFX(0x13f); + SoundReq(0x13f); } void sub_0805FC74(Entity* this) { @@ -40,7 +40,7 @@ void sub_0805FC74(Entity* this) { GetNextFrame(this); sub_0806F69C(this); ++this->actionDelay; - if (this->entityType.parameter == 0) { + if (this->type2 == 0) { sub_0800451C(this); } if (!sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) && diff --git a/src/loadRoom.c b/src/loadRoom.c index f0106fc2..04b8e02c 100644 --- a/src/loadRoom.c +++ b/src/loadRoom.c @@ -37,7 +37,7 @@ void sub_0804B058(EntityData* dat) { if ((uVar2 < 0x20) && ((dat->type) == 3)) { if (sub_08049D1C(uVar2) != 0) { ent = LoadRoomEntity(dat); - if ((ent != NULL) && ((ent->entityType).type == 3)) { + if ((ent != NULL) && (ent->kind == 3)) { ent->field_0x6c.HALF.LO = uVar2 | 0x80; } } diff --git a/src/main.c b/src/main.c index 3d8b1f96..eb0d9df1 100644 --- a/src/main.c +++ b/src/main.c @@ -33,10 +33,10 @@ void MainLoop(void) { sub_0804FFE4(); DmaCopy32(3, BG_PLTT, gPaletteBuffer, BG_PLTT_SIZE); sub_0804FF84(1); - sub_08056418(); + MessageInitialize(); sub_080ADD30(); gRand = 0x1234567; - _DmaZero(&gUnk_03001000, sizeof(gUnk_03001000)); + MemClear32(&gMain, sizeof(gMain)); InitScreen(SCREEN_INTRO); while (1) { ReadKeyInput(); @@ -44,35 +44,34 @@ 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](); - sub_08056458(); + gMain.ticks++; + sScreenHandlers[gMain.screen](); + MessageUpdate(); sub_08050154(); sub_080A3480(); break; } - - sub_08016E78(); + PrepNextFrame(); } } @@ -93,15 +92,15 @@ static void sub_08055F70(void) { *(vu16*)BG_PLTT = 0x7FFF; REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; size = 0x3FFD0; - _DmaZero(gUnk_02000030, size); + 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); @@ -115,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) { @@ -173,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; } @@ -186,7 +185,7 @@ NONMATCH("asm/non_matching/sub_080560B8.inc", void sub_080560B8(void)) { b = 1; } if (b != 0) { - _DmaZero((u8*)&gUnk_02000010.signature, 0x20); + MemClear32((u8*)&gUnk_02000010.signature, 0x20); gUnk_02000010.signature = SIGNATURE; } } @@ -202,7 +201,7 @@ u32 sub_08056134(void) { } void InitDMA() { - PlaySFX(0x80040000); + SoundReq(0x80040000); gScreen._6d = gScreen._6c; gScreen._6c = 0; @@ -215,7 +214,7 @@ void InitDMA() { } void sub_08056208() { - PlaySFX(0x80060000); + SoundReq(0x80060000); gScreen._6c = gScreen._6d; gScreen._6d = 0; } @@ -246,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; } diff --git a/src/manager/manager15.c b/src/manager/manager15.c index 44b38fb4..bde4f0df 100644 --- a/src/manager/manager15.c +++ b/src/manager/manager15.c @@ -80,14 +80,14 @@ void sub_0805A370(Manager15* this) { if (this->manager.unk_0d) { LoadRoomEntityList(&gUnk_080E4C08); this->manager.action = 3; - PlaySFX(0x80100000); + SoundReq(0x80100000); } } void sub_0805A394(Manager15* this) { Entity* ent; if ((ent = FindEntityInListBySubtype(0x3, 0x13, 0x4))) { - if (ent->entityType.form != 4) { + if (ent->type != 4) { return; } } diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c index 96c5b248..19a1dbca 100644 --- a/src/manager/manager1A.c +++ b/src/manager/manager1A.c @@ -71,7 +71,7 @@ void sub_0805B048(Manager1A* this) { struct_08108764* tmp; Entity* obj; sub_0805E3A0(&this->manager, 6); - _DmaZero(&this->unk_20, 0x20); + MemClear32(&this->unk_20, 0x20); this->manager.action = 1; this->unk_3f = gRoomControls.roomID; tmp = &gUnk_08108764[this->manager.unk_0a]; @@ -209,7 +209,7 @@ void sub_0805B328(Manager1A* this) { if (!this->manager.unk_0b) return; tmp = &gUnk_08108764[this->manager.unk_0a]; - LoadAssetAsync(&gGlobalGfxAndPalettes[tmp->unk_0c->unk_00], 0x0600F000, 0x800); + LoadResourceAsync(&gGlobalGfxAndPalettes[tmp->unk_0c->unk_00], 0x0600F000, 0x800); gScreen.affine.bg3Control = 0x1E07; gScreen.lcd.displayControl |= 0x800; gScreen.affine.bg3xOffset = gRoomControls.bg3OffsetX.HALF.HI; diff --git a/src/manager/manager27.c b/src/manager/manager27.c index 36719574..b2e0e15a 100644 --- a/src/manager/manager27.c +++ b/src/manager/manager27.c @@ -18,10 +18,10 @@ const u8 gUnk_08108D20[] = { 0x6F, 0x70, 0x71, 0x72, 0x71, 0x70 }; void Manager27(Entity* this) { gUnk_08108D10[this->action](this); - if (CheckLocalFlagByOffset(0x300, this->entityType.form + 0x67)) { - gScreenTransition.field_0xac |= (1 << (this->entityType).form); + if (CheckLocalFlagByOffset(0x300, this->type + 0x67)) { + gScreenTransition.field_0xac |= (1 << this->type); } else { - gScreenTransition.field_0xac &= ~(1 << (this->entityType).form); + gScreenTransition.field_0xac &= ~(1 << this->type); } } @@ -42,7 +42,7 @@ void sub_0805C894(Entity* this) { if (sub_0805C920(this)) { this->action = 2; this->actionDelay = 1; - PlaySFX(0x11a); + SoundReq(0x11a); } } @@ -58,7 +58,7 @@ void sub_0805C8B4(Entity* this) { } LoadPaletteGroup(gUnk_08108D20[this->field_0xf]); if (this->field_0xf == 0) { - PlaySFX(0x11a); + SoundReq(0x11a); } } if (sub_0805C920(this) == 0) { @@ -75,5 +75,5 @@ void sub_0805C908(Entity* this) { } u32 sub_0805C920(Entity* this) { - return CheckLocalFlagByOffset(0x300, (this->entityType).form + 0x67); + return CheckLocalFlagByOffset(0x300, this->type + 0x67); } diff --git a/src/manager/manager28.c b/src/manager/manager28.c index 9f518f1c..af59e09e 100644 --- a/src/manager/manager28.c +++ b/src/manager/manager28.c @@ -115,8 +115,7 @@ Entity* Manager28_FindMatchingEntity(EntityData* unk1) { y = unk1->yPos + gRoomControls.roomOriginY; tmp = &gUnk_03003D90; for (i = tmp->first; (u32)i != (u32)tmp; i = i->next) { - if (x == i->x.HALF.HI && y == i->y.HALF.HI && unk1->subtype == i->entityType.subtype && - 3 == i->entityType.type && unk1->form == i->entityType.form) { + if (x == i->x.HALF.HI && y == i->y.HALF.HI && unk1->subtype == i->id && 3 == i->kind && unk1->form == i->type) { return i; } } diff --git a/src/manager/manager2E.c b/src/manager/manager2E.c index cc07c980..6dd5ea3e 100644 --- a/src/manager/manager2E.c +++ b/src/manager/manager2E.c @@ -5,7 +5,7 @@ extern void (*const gUnk_08108D3C[])(Entity*); extern void (*const gUnk_08108D44[])(Entity*); void sub_0805D250(Entity* this) { - gUnk_08108D3C[this->entityType.form](this); + gUnk_08108D3C[this->type](this); } void sub_0805D268(Entity* this) { diff --git a/src/manager/manager3.c b/src/manager/manager3.c index 45dce8ea..5234f149 100644 --- a/src/manager/manager3.c +++ b/src/manager/manager3.c @@ -55,7 +55,7 @@ void sub_080576C0(Manager3* this) { this->manager.unk_0e); if (!this->manager.unk_0f) { this->manager.unk_0f = 1; - PlaySFX(0x152); + SoundReq(0x152); } } } diff --git a/src/manager/manager30.c b/src/manager/manager30.c index 9a48d968..8cfde746 100644 --- a/src/manager/manager30.c +++ b/src/manager/manager30.c @@ -48,13 +48,13 @@ void Manager30_Main(Manager30* this) { case 0x317: // stepped on a red tile again this->manager.action = FAILED; - PlaySFX(0x6d); + SoundReq(0x6d); break; case 0x318: // stepped on a blue tile // turn the tile into a red tile sub_0807B7D8(0x317, this->player_current_tile, this->manager.unk_0b); - PlaySFX(0x6b); + SoundReq(0x6b); // decrease the number of remaining tiles and check if we're done if (--this->manager.unk_0e == 0) { this->manager.action = SUCCEEDED; @@ -89,7 +89,7 @@ void Manager30_Main(Manager30* this) { SetFlag(this->flag_succeeded); } } else { - PlaySFX(0x72); + SoundReq(0x72); } } } diff --git a/src/manager/manager39.c b/src/manager/manager39.c index 134e1551..5ef9bcac 100644 --- a/src/manager/manager39.c +++ b/src/manager/manager39.c @@ -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); @@ -68,7 +68,7 @@ void sub_0805E18C(Manager39* this) { } void sub_0805E1D8(Manager39* this) { - _DmaZero(&gUnk_02034DF0, 0x80); + MemClear32(&gUnk_02034DF0, 0x80); gScreen.bg.bg3Control = 1; DeleteThisEntity(); } @@ -81,8 +81,8 @@ void sub_0805E1F8(u32 unk0, u32 unk1) { u8 unk_06[3]; } PACKED tmp; const u8* tmp2; - _DmaZero(&gUnk_02034DF0, 0x80); - _DmaCopy(gUnk_08108E60, &tmp, sizeof(tmp)); + MemClear32(&gUnk_02034DF0, 0x80); + MemCopy(gUnk_08108E60, &tmp, sizeof(tmp)); tmp.unk_04 = unk0 >> 8; tmp.unk_05 = unk0; tmp2 = gUnk_08108E48; diff --git a/src/manager/manager5.c b/src/manager/manager5.c index f90ef1db..ec7ee400 100644 --- a/src/manager/manager5.c +++ b/src/manager/manager5.c @@ -71,14 +71,14 @@ void sub_08057BA4(Manager5* this) { sub_08057CA4(this, this->unk_28, this->unk_2a); sub_0807B7D8(this->unk_30, this->unk_38 | (this->unk_3a << 6), this->unk_3c); this->manager.unk_0f++; - PlaySFX(0x71); + SoundReq(0x71); } else { if (!this->manager.unk_0f) return; sub_0807BA8C(this->unk_38 | (this->unk_3a << 6), this->unk_3c); sub_08057CA4(this, this->unk_2c, this->unk_2e); this->manager.unk_0f--; - PlaySFX(0x71); + SoundReq(0x71); } } @@ -95,10 +95,10 @@ void sub_08057C28(Manager5* this) { sub_08057CA4(this, this->unk_28, this->unk_2a); sub_0807B7D8(this->unk_30, this->unk_38 | (this->unk_3a << 6), this->unk_3c); this->manager.unk_0f++; - PlaySFX(0x71); + SoundReq(0x71); } else { if (this->unk_30 != 0x323) { - PlaySFX(0x72); + SoundReq(0x72); } DeleteManager(&this->manager); } diff --git a/src/manager/manager7.c b/src/manager/manager7.c index 6a0fe97d..3a2cbb1a 100644 --- a/src/manager/manager7.c +++ b/src/manager/manager7.c @@ -64,7 +64,7 @@ void Manager7_Main(Manager7* this) { switch (this->manager.unk_0e) { case 0: gUnk_02034490[0] = 1; - LoadAssetAsync(&gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x1000); + LoadResourceAsync(&gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x1000); LoadPaletteGroup(gUnk_081081E4[tmp]); this->manager.unk_0e++; break; @@ -75,8 +75,8 @@ void Manager7_Main(Manager7* this) { case 5: case 6: case 7: - LoadAssetAsync(&gGlobalGfxAndPalettes[tmp2[(this->manager.unk_0e << 1)]], - tmp2[(this->manager.unk_0e << 1) + 1], 0x1000); + LoadResourceAsync(&gGlobalGfxAndPalettes[tmp2[(this->manager.unk_0e << 1)]], + tmp2[(this->manager.unk_0e << 1) + 1], 0x1000); this->manager.unk_0e++; break; case 8: diff --git a/src/manager/managerB.c b/src/manager/managerB.c index d7bbcee1..e6e43a12 100644 --- a/src/manager/managerB.c +++ b/src/manager/managerB.c @@ -55,7 +55,7 @@ void ManagerB_WaitForFlag(ManagerB* this) { tmp = gRoomVars.field_0x9 ? gRoomVars.field_0x9 : 0x33; this->unk_20 = gArea.musicIndex; gArea.musicIndex = tmp; - PlaySFX(tmp); + SoundReq(tmp); } sub_080186C0(0xB0F); } @@ -73,7 +73,7 @@ void ManagerB_WaitForDone(ManagerB* this) { if (this->unk_3c) { if (!this->unk_35) { gArea.musicIndex = this->unk_20; - PlaySFX(gArea.musicIndex); + SoundReq(gArea.musicIndex); sub_0801855C(); } } @@ -101,7 +101,7 @@ void ManagerB_LoadFight(Manager* this) { if (prop) { while (*((u8*)prop) != 0xFF) { ent = LoadRoomEntity(prop++); - if (ent && (ent->entityType.type == 3)) { + if (ent && (ent->kind == 3)) { ent->field_0x6c.HALF.HI |= 0x40; ManagerBHelper_Monitor(monitor, ent, counter++); } @@ -128,7 +128,7 @@ ManagerBHelper* CreateHelper(Manager* this) { extra->manager.unk_0a = 1; extra->manager.parent = this; this->unk_0e++; - _DmaZero(&extra->enemies, 0x20); + MemClear32(&extra->enemies, 0x20); AppendEntityToList(extra, 8); } return extra; diff --git a/src/manager/managerC.c b/src/manager/managerC.c index 25aed20e..72529c2f 100644 --- a/src/manager/managerC.c +++ b/src/manager/managerC.c @@ -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]; @@ -100,7 +100,7 @@ void sub_080588F8(ManagerC* this) { case 0xf0: this->unk_28 = this->unk_24.HALF.HI; this->manager.unk_0f = 0x2D; - PlaySFX(0x8c); + SoundReq(0x8c); } } } else { @@ -123,7 +123,7 @@ void sub_080588F8(ManagerC* this) { } if (ABS_DIFF_GT(this->unk_2c, this->unk_24.WORD, 0x100000)) { this->unk_2c = this->unk_24.WORD; - PlaySFX(0x8b); + SoundReq(0x8b); } } } @@ -213,7 +213,7 @@ void sub_08058B5C(ManagerC* this, u32 unk1) { gScreenTransition.playerStartPos.HALF.x = gUnk_081082E8[unk1 * 3]; gScreenTransition.playerStartPos.HALF.y = gUnk_081082E8[unk1 * 3 + 1]; gSave.unk7 = gUnk_081082E8[unk1 * 3 + 2]; - PlaySFX(0x121); + SoundReq(0x121); } void sub_08058BC8(ManagerC* this) { @@ -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; diff --git a/src/manager/managerE.c b/src/manager/managerE.c index e096874f..0f5e9328 100644 --- a/src/manager/managerE.c +++ b/src/manager/managerE.c @@ -9,7 +9,7 @@ extern void DeleteThisEntity(void); extern void DeleteManager(Manager*); extern void sub_08078A90(u32); extern void sub_08078B48(void); -extern void PlaySFX(u32); +extern void SoundReq(u32); void sub_08058E60(ManagerE* this) { if (!this->manager.action) { @@ -28,7 +28,7 @@ void sub_08058E60(ManagerE* this) { } if (this->unk_3a == 0) { if (this->unk_38 != 0) { - PlaySFX(this->unk_38); + SoundReq(this->unk_38); } LoadRoomEntityList(GetCurrentRoomProperty(this->manager.unk_0a)); DeleteThisEntity(); diff --git a/src/npc/beedle.c b/src/npc/beedle.c index 98297254..9e7a5755 100644 --- a/src/npc/beedle.c +++ b/src/npc/beedle.c @@ -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*); @@ -99,14 +99,14 @@ void sub_08063410(Entity* this) { return; } this->action++; - if (this->entityType.form != 0) { - this->boundingBox = &gUnk_0810C894; - this->entityType.parameter = 0; + if (this->type != 0) { + this->hitbox = &gUnk_0810C894; + this->type2 = 0; } sub_0807DD64(this); sub_08078778(this); } - if (this->entityType.form != 0) { + if (this->type != 0) { sub_0806346C(this); } sub_0807DDAC(this, NULL); @@ -141,24 +141,24 @@ void sub_0806346C(Entity* this) { iVar2 >>= 4; bVar1 = gUnk_0810C8F0[(gPlayerEntity.animationState >> 1) + iVar3 * 4 + iVar2 * 0x18]; - if (bVar1 != this->entityType.parameter) { + if (bVar1 != this->type2) { gUnk_0810C89C_struct* temp = &gUnk_0810C89C[bVar1]; sub_08078850(this, 1, temp->unk_04, temp); - this->entityType.parameter = bVar1; + this->type2 = bVar1; } } void sub_080634E4(Entity* this, u32* param_1) { - param_1[1] = this->entityType.parameter; + param_1[1] = this->type2; } void sub_080634EC(Entity* this) { - gRoomVars.itemForSaleIndex = gUnk_0810C88C[this->entityType.parameter]; + gRoomVars.itemForSaleIndex = gUnk_0810C88C[this->type2]; } void sub_08063504(Entity* this, u32* param_2) { u32 uVar1; - uVar1 = sub_080544DC(gUnk_0810C88C[this->entityType.parameter]); + uVar1 = sub_080544DC(gUnk_0810C88C[this->type2]); param_2[5] = BOOLCAST(uVar1); } diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index 4b45fe41..2874115f 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -11,12 +11,12 @@ extern u16 gUnk_081140CC[]; extern void sub_0806D0B0(Entity*); extern void sub_0807DD64(Entity*); extern void sub_0807DDE4(Entity*); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void sub_0806D02C(Entity*); extern Entity* FindEntityInListByForm(u32, u32, u32, u32, u32); void BigGoron(Entity* this) { - gUnk_081140D4[this->entityType.form](this); + gUnk_081140D4[this->type](this); } void sub_0806CF30(Entity* this) { @@ -47,7 +47,7 @@ void sub_0806CF30(Entity* this) { case 2: if (--this->actionDelay == 0) { u32 uVar2 = Random(); - PlaySFX(gUnk_081140CC[uVar2 % 4]); + SoundReq(gUnk_081140CC[uVar2 % 4]); this->actionDelay = ((u8)uVar2 & 7) * 16; this->actionDelay += 128; } diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c index 8211ed49..913f30cc 100644 --- a/src/npc/bladeBrothers.c +++ b/src/npc/bladeBrothers.c @@ -48,7 +48,7 @@ void sub_08068A1C(Entity* this) { u8 bVar1; int offset; - (this->entityType).parameter = (this->entityType).form; + this->type2 = this->type; if (gScreenTransition.field_0x24[8] != 0) { offset = 6; bVar1 = 3; @@ -92,13 +92,13 @@ void sub_08068AA4(Entity* this) { u8 bVar1; this->action = 1; - if (this->entityType.form != 0) { - this->entityType.parameter++; - this->entityType.parameter &= 7; - if (this->entityType.parameter == 0) { - this->entityType.parameter += 1; + if (this->type != 0) { + this->type2++; + this->type2 &= 7; + if (this->type2 == 0) { + this->type2 += 1; } - sub_0801D2B4(this, gUnk_081115DC[this->entityType.parameter]); + sub_0801D2B4(this, gUnk_081115DC[this->type2]); } } @@ -167,7 +167,7 @@ void sub_08068BEC(Entity* this, u32 unused) { if (target) { target->spritePriority.b0 = 1; PositionRelative(this, target, 0, -0x100000); - PlaySFX(0xfa); + SoundReq(0xfa); } } @@ -175,8 +175,8 @@ void sub_08068C28(Entity* this) { u8 bVar1; u32 uVar2; - this->actionDelay = gUnk_08111623[(this->entityType).form]; - if ((this->entityType).form == 1) { + this->actionDelay = gUnk_08111623[this->type]; + if (this->type == 1) { if (GetInventoryValue(0x48)) { // spin attack if (!GetInventoryValue(0x4b)) { // rock breaker this->actionDelay = 1; @@ -205,7 +205,7 @@ void sub_08068CA0(Entity* param_1, Entity* param_2) { u8 bVar1; u32 uVar2; - bVar1 = (param_1->entityType).form; + bVar1 = param_1->type; if (bVar1 == 1) { *(u32*)¶m_2->animationState = bVar1; uVar2 = GetInventoryValue(0x48); // spin attack diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c index db160475..f4bdb04a 100644 --- a/src/npc/carpenter.c +++ b/src/npc/carpenter.c @@ -23,7 +23,7 @@ void Carpenter(Entity* this) { } switch (this->action) { case 0: - if (!LoadExtraSpriteData(this, gUnk_08110CA8 + this->entityType.form * 4)) + if (!LoadExtraSpriteData(this, gUnk_08110CA8 + this->type * 4)) break; this->action = 1; this->field_0x68.HALF.HI = 0; @@ -35,8 +35,8 @@ void Carpenter(Entity* this) { this->action = 2; this->interactType = 0; this->field_0x68.HALF.HI = this->animIndex; - InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 4 + - (this->entityType.form * 8)); + InitializeAnimation(this, + sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 4 + (this->type * 8)); sub_0806F118(this); } else { sub_0807DDAC(this, 0); @@ -54,7 +54,7 @@ void Carpenter(Entity* this) { } void Carpenter_Head(Entity* this) { - if ((this->entityType).form < 2) { + if (this->type < 2) { SetExtraSpriteFrame(this, 0, this->frames.all & 0xffffff7f); SetExtraSpriteFrame(this, 1, this->frameIndex); SetExtraSpriteFrame(this, 2, this->frameSpriteSettings & 0x3f); @@ -70,5 +70,5 @@ void Carpenter_Head(Entity* this) { } void sub_080672b0(Entity* this, u32 param_2) { - InitializeAnimation(this, *(u32*)(param_2 + 4) + (this->animationState >> 1) + this->entityType.form * 8); + InitializeAnimation(this, *(u32*)(param_2 + 4) + (this->animationState >> 1) + this->type * 8); } diff --git a/src/npc/cat.c b/src/npc/cat.c index 1ec7df88..c00a41ef 100644 --- a/src/npc/cat.c +++ b/src/npc/cat.c @@ -10,7 +10,7 @@ extern void (*gCat[9])(Entity*); void Cat(Entity* ent) { gCat[ent->action](ent); sub_08067C44(ent); - if (((ent->flags & 128) == 0) && ((ent->entityType).form != 5)) { + if (((ent->flags & 128) == 0) && (ent->type != 5)) { sub_0806ED78(ent); } } diff --git a/src/npc/cow.c b/src/npc/cow.c index edd4a9d3..aeb62982 100644 --- a/src/npc/cow.c +++ b/src/npc/cow.c @@ -14,7 +14,7 @@ extern void sub_080791D0(); extern void (*gUnk_08111914[])(Entity*); extern void (*gUnk_08111928[])(Entity*); extern Dialog gUnk_08111938[]; -extern void PlaySFX(u32); +extern void SoundReq(u32); extern u32 UpdateFuseInteraction(Entity*); extern PlayerState gPlayerState; @@ -28,7 +28,7 @@ void sub_08068FC0(Entity* ent) { u32 r2; ent->action = 1; - ent->animationState = ent->entityType.parameter; + ent->animationState = ent->type2; ent->nonPlanarMovement = 0x40; ent->field_0x6c.HALF.HI = 0xFF; @@ -181,7 +181,7 @@ void sub_080691E0(Entity* ent) { // Show dialogue void Cow_ShowDialogue(Entity* ent) { - ShowNPCDialogue(ent, &gUnk_08111938[ent->entityType.form]); + ShowNPCDialogue(ent, &gUnk_08111938[ent->type]); } void sub_0806920C(Entity* ent) { @@ -216,7 +216,7 @@ void sub_0806924C(Entity* ent) { Cow_ShowDialogue(ent); sub_080791D0(); } - PlaySFX(212); + SoundReq(212); ent->interactType = 0; } } diff --git a/src/npc/epona.c b/src/npc/epona.c index 69368bc3..a79ccd48 100644 --- a/src/npc/epona.c +++ b/src/npc/epona.c @@ -50,7 +50,7 @@ void sub_08065A34(Entity* this) { } void sub_08065A50(Entity* this) { - ShowNPCDialogue(this, &gUnk_08110080[this->entityType.form]); + ShowNPCDialogue(this, &gUnk_08110080[this->type]); } void sub_08065A64(Entity* this) { @@ -83,7 +83,7 @@ void sub_08065AA4(Entity* this) { sub_08065A50(this); sub_080791D0(); } - PlaySFX(0xD3); + SoundReq(0xD3); this->interactType = 0; } } diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c index 66933ef3..ce829a81 100644 --- a/src/npc/forestMinish.c +++ b/src/npc/forestMinish.c @@ -41,7 +41,7 @@ void ForestMinish(Entity* this) { this->field_0x68.HALF.HI = this->animationState = this->actionDelay << 1; this->actionDelay = 0; sub_0805E3A0(this, 2); - StartCutscene(this, (u16*)gUnk_08109D18[this->entityType.parameter]); + StartCutscene(this, (u16*)gUnk_08109D18[this->type2]); sub_0807DD50(this); } break; @@ -161,7 +161,7 @@ void sub_080601D4(Entity* this) { } void sub_08060208(Entity* this) { - ShowNPCDialogue(this, &gUnk_08109DC8[this->entityType.parameter * 0x4]); + ShowNPCDialogue(this, &gUnk_08109DC8[this->type2 * 0x4]); } void sub_0806021C(Entity* this) { @@ -181,11 +181,11 @@ void sub_0806021C(Entity* this) { if (GetInventoryValue(0x13)) { uVar2 = 3; } - ShowNPCDialogue(this, gUnk_08109DC8 + this->entityType.parameter * 0x4 + uVar2); + ShowNPCDialogue(this, gUnk_08109DC8 + this->type2 * 0x4 + uVar2); } void sub_0806025C(Entity* this) { - ShowNPCDialogue(this, &gUnk_08109DC8[this->entityType.parameter * 0x4]); + ShowNPCDialogue(this, &gUnk_08109DC8[this->type2 * 0x4]); } void sub_08060270(Entity* this) { diff --git a/src/npc/goron.c b/src/npc/goron.c index a7d4ee54..0203969c 100644 --- a/src/npc/goron.c +++ b/src/npc/goron.c @@ -112,7 +112,7 @@ void sub_080694B0(Entity* this) { } void sub_080694D8(Entity* this) { - ShowNPCDialogue(this, &gUnk_08111A94[this->entityType.form]); + ShowNPCDialogue(this, &gUnk_08111A94[this->type]); } void sub_080694EC(Entity* this) { diff --git a/src/npc/guard.c b/src/npc/guard.c index e225c33b..782253ee 100644 --- a/src/npc/guard.c +++ b/src/npc/guard.c @@ -66,15 +66,15 @@ void sub_08063D44(Entity* this) { if (gEntCount > 0x46) return; - temp = this->entityType.subtype; + temp = this->id; temp ^= 0x15; idx = BOOLCAST(temp) * 4; if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx])) return; InitializeAnimation(this, 4); - sub_0806EE04(this, gUnk_0810F6BC[this->entityType.form], 0); - switch (this->entityType.form) { + sub_0806EE04(this, gUnk_0810F6BC[this->type], 0); + switch (this->type) { case 0 ... 3: ent = sub_080A7EE0(0xc); ent->parent = this; @@ -85,12 +85,12 @@ void sub_08063D44(Entity* this) { break; } this->action++; - this->entityType.form = 0; + this->type = 0; sub_08063DC8(this); } void sub_08063DC8(Entity* this) { - if ((this->entityType).form == 0xff) { + if (this->type == 0xff) { this->action = 2; this->actionDelay = 0x1e; this->animationState = sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)); @@ -130,7 +130,7 @@ void sub_08063E90(Entity* this) { u32 temp, idx; u32 unk; - temp = this->entityType.subtype; + temp = this->id; temp ^= 0x15; idx = BOOLCAST(temp) * 4; if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx])) @@ -188,7 +188,7 @@ void Guard_Head(Entity* this) { uVar2 = this->frames.all & 0x3f; pbVar5 = (this->frameIndex & 0x3f); uVar4 = this->frameSpriteSettings & 0x3f; - if ((this->entityType).subtype == 0x15) { + if (this->id == 0x15) { if ((this->frameIndex & 0x40) != 0) { pbVar5 = pbVar5 + 0x21; pbVar3 = 0xffffffff; @@ -227,7 +227,7 @@ void sub_08064050(Entity* arg0, struct_08064050* arg1) { u32 unk; arg1->unk2 = 0; - switch (arg0->entityType.parameter) { + switch (arg0->type2) { case 0x11: arg1->unk2 = 1; break; diff --git a/src/npc/melari.c b/src/npc/melari.c index b5101e02..38bc4e54 100644 --- a/src/npc/melari.c +++ b/src/npc/melari.c @@ -72,7 +72,7 @@ void sub_08068780(Entity* this) { } this->action = 1; this->spriteSettings.b.draw = TRUE; - this->animationState = this->entityType.form; + this->animationState = this->type; sub_0805E3A0(this, 2); sub_0807DD50(this); break; @@ -96,7 +96,7 @@ void sub_08068780(Entity* this) { if ((this->frames.b.f2) != 0) { this->frames.all &= 0xbf; if (sub_080040A8(this) == 0) { - PlaySFX(gUnk_0811153E[(s32)Random() % 3]); + SoundReq(gUnk_0811153E[(s32)Random() % 3]); } else { EnqueueSFX(gUnk_08111538[(s32)Random() % 3]); } diff --git a/src/npc/percy.c b/src/npc/percy.c index 484ee13b..a2a8fcd8 100644 --- a/src/npc/percy.c +++ b/src/npc/percy.c @@ -60,7 +60,7 @@ void sub_0806B41C(Entity* this) { if (LoadExtraSpriteData(this, &gUnk_08112E1C)) { this->action = 1; this->spriteSettings.b.draw = 1; - if (this->entityType.parameter == 2) { + if (this->type2 == 2) { CreateFx(this, 0x25, 0); } sub_0807DD50(this); @@ -90,7 +90,7 @@ void sub_0806B41C(Entity* this) { } void sub_0806B4F0(Entity* this) { - ShowNPCDialogue(this, &gUnk_08112E2C[this->entityType.parameter]); + ShowNPCDialogue(this, &gUnk_08112E2C[this->type2]); } void sub_0806B504(Entity* this) { diff --git a/src/npc/postman.c b/src/npc/postman.c index 266c3fb6..532f129f 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -53,8 +53,8 @@ void sub_08060428(Entity* this) { this->actionDelay = 0x5a; this->nonPlanarMovement = 0x180; - if (this->entityType.parameter != 0) { - data = GetCurrentRoomProperty(this->entityType.parameter); + if (this->type2 != 0) { + data = GetCurrentRoomProperty(this->type2); } else { data = NULL; } diff --git a/src/npc/rem.c b/src/npc/rem.c index f81929ad..a0b87267 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -4,7 +4,7 @@ #include "script.h" extern void sub_0807DDE4(Entity*); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void sub_0806A8C8(Entity*); extern void (*gUnk_08112260[])(Entity*); @@ -13,7 +13,7 @@ extern void (*gUnk_08112278[])(Entity*); extern void gUnk_08012F0C; void Rem(Entity* this) { - gUnk_08112260[this->entityType.form](this); + gUnk_08112260[this->type](this); } void sub_0806a370(Entity* this) { @@ -28,11 +28,11 @@ void sub_0806a370(Entity* this) { pbVar1 = &this->frames.all; if (*pbVar1 == 1) { *pbVar1 = 0; - PlaySFX(0x218); + SoundReq(0x218); } if (*pbVar1 == 2) { *pbVar1 = 0; - PlaySFX(0x219); + SoundReq(0x219); } } } diff --git a/src/npc/simon.c b/src/npc/simon.c index ecc57f36..35397e80 100644 --- a/src/npc/simon.c +++ b/src/npc/simon.c @@ -35,7 +35,7 @@ void sub_0806C224(void) { void Simon_CreateChest(Entity* this) { CreateObjectWithParent(this, 0xf, 0x43, 0); SetTileType(0x73, COORD_TO_TILE(this), this->collisionLayer); - PlaySFX(0x73); + SoundReq(0x73); } void sub_0806C280(void) { diff --git a/src/npc/smith.c b/src/npc/smith.c index d06cedfe..3502d8bf 100644 --- a/src/npc/smith.c +++ b/src/npc/smith.c @@ -9,7 +9,7 @@ extern u32 GetFacingDirection(Entity*, Entity*); extern u32 sub_0806F5A4(u32); extern void sub_0806F118(Entity*); extern Entity* CreateFx(Entity*, u32, u32); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void sub_0807000C(Entity*); extern u32 sub_0801E99C(Entity*); extern void sub_0807DD50(Entity*); @@ -53,7 +53,7 @@ void Smith(Entity* this) { if ((this->frames.all & 1) != 0) { this->frames.all &= 0xfe; CreateFx(this, 0x3d, 0x20); - PlaySFX(gUnk_08110380[(Random() & 7)]); + SoundReq(gUnk_08110380[(Random() & 7)]); } } @@ -161,7 +161,7 @@ void nullsub_501(Entity* this) { } void sub_08066258(void) { - PlaySFX(gUnk_081103D0[Random() & 7]); + SoundReq(gUnk_081103D0[Random() & 7]); } void sub_08066274(u32 arg0) { diff --git a/src/npc/syrup.c b/src/npc/syrup.c index 7904ce09..307c75bd 100644 --- a/src/npc/syrup.c +++ b/src/npc/syrup.c @@ -24,7 +24,7 @@ void sub_0806A1F8(Entity* this) { u32 iVar1; SpriteLoadData* paVar2; - (this->entityType).form == 0 ? (paVar2 = &gUnk_081121B4) : (paVar2 = &gUnk_081121C4); + this->type == 0 ? (paVar2 = &gUnk_081121B4) : (paVar2 = &gUnk_081121C4); iVar1 = LoadExtraSpriteData(this, paVar2); if (iVar1) { diff --git a/src/npc/teachers.c b/src/npc/teachers.c index 9a9f0509..eaae979d 100644 --- a/src/npc/teachers.c +++ b/src/npc/teachers.c @@ -19,7 +19,7 @@ extern Dialog gUnk_08113930[]; void Teachers(Entity* this) { switch (this->action) { case 0: - if (LoadExtraSpriteData(this, &gUnk_08113910[this->entityType.form * 4])) { + if (LoadExtraSpriteData(this, &gUnk_08113910[this->type * 4])) { this->action = 1; this->spriteSettings.b.draw = TRUE; this->animationState = this->actionDelay; @@ -61,7 +61,7 @@ void Teachers_Head(Entity* this) { uVar3 = this->frames.all & -0x81; bVar1 = this->frameIndex; bVar2 = this->frameSpriteSettings & 0x3f; - if ((this->entityType).form == 0) { + if (this->type == 0) { SetExtraSpriteFrame(this, 0, (uVar3 + 3)); SetExtraSpriteFrame(this, 1, bVar1); SetSpriteSubEntryOffsetData1(this, 1, 0); @@ -83,12 +83,12 @@ void sub_0806C70C(Entity* this) { if (offset < 0) offset = 0; - ShowNPCDialogue(this, gUnk_08113930 + this->entityType.form * 8 + offset); + ShowNPCDialogue(this, gUnk_08113930 + this->type * 8 + offset); } void Teachers_Fusion(Entity* this) { if (this->action == 0) { - if (LoadExtraSpriteData(this, &gUnk_08113910[this->entityType.form * 4])) { + if (LoadExtraSpriteData(this, &gUnk_08113910[this->type * 4])) { this->action++; this->spriteSettings.b.draw = TRUE; InitializeAnimation(this, 2); diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index 9217fdd7..3f97b540 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -43,7 +43,7 @@ void TownMinish(Entity* this) { } void sub_0806ABFC(Entity* this) { - SpriteLoadData* SpriteLoadData = &gUnk_08112674[this->entityType.form * 4]; + SpriteLoadData* SpriteLoadData = &gUnk_08112674[this->type * 4]; if (!LoadExtraSpriteData(this, SpriteLoadData)) { return; } @@ -93,7 +93,7 @@ void sub_0806ACC4(Entity* this) { u8 delay; switch (this->action) { case 0: - if (LoadExtraSpriteData(this, &gUnk_08112674[this->entityType.form * 4]) == 0) + if (LoadExtraSpriteData(this, &gUnk_08112674[this->type * 4]) == 0) return; this->action = 1; @@ -114,13 +114,13 @@ void sub_0806ACC4(Entity* this) { } else { sub_0807DDAC(this, NULL); sub_0806AEA8(this); - if (this->entityType.parameter == 10 && this->interactType) { + if (this->type2 == 10 && this->interactType) { this->action = 2; this->interactType = 0; InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 8); sub_0806AFE8(this, *(s32**)&this->cutsceneBeh); } - if (this->entityType.form == 1) { + if (this->type == 1) { u8 idx = gPlayerEntity.animationState >> 1; sub_08078850(this, 1, gUnk_081126E4[idx], &gUnk_081126D4[idx]); } @@ -250,12 +250,12 @@ void sub_0806AFBC(Entity* this) { if (idx < 0) idx = 0; - ShowNPCDialogue(this, gUnk_081126F0 + this->entityType.parameter * 8 + idx); + ShowNPCDialogue(this, gUnk_081126F0 + this->type2 * 8 + idx); } void sub_0806AFE8(Entity* this, s32* unk) { unk[5] = 0; - gUnk_08112BF0[this->entityType.parameter](this, unk); + gUnk_08112BF0[this->type2](this, unk); } void sub_0806B004(Entity* this, int* unk) { @@ -304,7 +304,7 @@ void sub_0806B098(Entity* this) { idx = BOOLCAST(f); } } - TextboxNoOverlap(gUnk_08112C50[(this->entityType.parameter - 7) * 3 + idx], this); + TextboxNoOverlap(gUnk_08112C50[(this->type2 - 7) * 3 + idx], this); } void sub_0806B0E0(Entity* this) { @@ -339,7 +339,7 @@ void sub_0806B134(Entity* this) { void TownMinish_Fusion(Entity* this) { if (this->action == 0) { - if (LoadExtraSpriteData(this, &gUnk_08112674[this->entityType.form * 4])) { + if (LoadExtraSpriteData(this, &gUnk_08112674[this->type * 4])) { this->action++; this->spriteSettings.b.draw = 1; InitializeAnimation(this, 6); diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c index a5295f93..dbc50909 100644 --- a/src/npc/townsperson.c +++ b/src/npc/townsperson.c @@ -58,9 +58,9 @@ void Townsperson(Entity* this) { } void sub_08061BC8(Entity* this) { - if (LoadExtraSpriteData(this, gUnk_0810B6EC[this->entityType.form])) { + if (LoadExtraSpriteData(this, gUnk_0810B6EC[this->type])) { this->animationState = 2; - this->field_0xf = this->entityType.form + 1; + this->field_0xf = this->type + 1; this->action++; sub_08061CB4(this, 2); } @@ -84,15 +84,14 @@ void sub_08061C00(Entity* this) { sub_0806ED78(this); if (this->interactType != 0) { this->interactType = 0; - TextboxNoOverlapFollow(this->entityType.parameter + 0xa01); + TextboxNoOverlapFollow(this->type2 + 0xa01); } } #if NON_MATCHING void Townsperson_Head(Entity* this) { - SetExtraSpriteFrame(this, 0, - *(gUnk_0810B78C + (this->animIndex & 3)) + gUnk_0810B680[this->entityType.form].frame1); - SetExtraSpriteFrame(this, 1, this->frameIndex + gUnk_0810B680[this->entityType.form].frame2); + SetExtraSpriteFrame(this, 0, *(gUnk_0810B78C + (this->animIndex & 3)) + gUnk_0810B680[this->type].frame1); + SetExtraSpriteFrame(this, 1, this->frameIndex + gUnk_0810B680[this->type].frame2); SetSpriteSubEntryOffsetData1(this, 1, 0); sub_0807000C(this); } @@ -110,14 +109,14 @@ void sub_08061CB4(Entity* this, u32 arg1) { GetNextFrame(this); } if (this->frameDuration == 0xff) { - this->frameDuration = gUnk_0810B680[this->entityType.form].unk2; + this->frameDuration = gUnk_0810B680[this->type].unk2; } } void sub_08061CEC(Entity* this) { u32 uVar2; - if (LoadExtraSpriteData(this, gUnk_0810B6EC[this->entityType.form])) { + if (LoadExtraSpriteData(this, gUnk_0810B6EC[this->type])) { this->action = 1; this->spriteSettings.b.draw = TRUE; this->animationState = this->actionDelay; @@ -147,7 +146,7 @@ void sub_08061D64(Entity* this) { sub_0807DDAC(this, NULL); sub_0807DDE4(this); if (this->frameDuration == 0xff) { - this->frameDuration = gUnk_0810B680[this->entityType.form].unk2; + this->frameDuration = gUnk_0810B680[this->type].unk2; } GetNextFrame(this); if (this->interactType != 0) { @@ -177,7 +176,7 @@ void sub_08061E50(Entity* this) { } void sub_08061E70(Entity* this) { - if ((this->entityType).subtype == 6) { + if (this->id == 6) { sub_08078784(this, this->field_0x68.HALF.LO); } else { sub_08078778(this); @@ -215,7 +214,7 @@ void sub_08061E90(Entity* this, Entity* arg1) { } this->direction = (u8)animIndex; this->animationState = sub_0806F5B0(animIndex); - this->nonPlanarMovement = gUnk_0810B74A[this->entityType.form]; + this->nonPlanarMovement = gUnk_0810B74A[this->type]; } animIndex = (this->animationState >> 1) + 4; if (animIndex != this->animIndex) { @@ -256,7 +255,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) { @@ -274,7 +273,7 @@ void sub_08061FE4(Entity* this) { } void sub_08061FF4(Entity* this) { - TextboxNoOverlap(gUnk_0810B790[this->entityType.form], this); + TextboxNoOverlap(gUnk_0810B790[this->type], this); } void sub_0806200C(Entity* this) { @@ -296,12 +295,12 @@ void sub_0806200C(Entity* this) { void sub_08062048(Entity* this) { int iVar1; - if ((this->entityType).subtype == 6) { + if (this->id == 6) { iVar1 = gSave.unk8 - 2; if (iVar1 < 0) { iVar1 = 0; } - ShowNPCDialogue(this, gUnk_0810B7C0 + this->entityType.form * 0x8 + iVar1); + ShowNPCDialogue(this, gUnk_0810B7C0 + this->type * 0x8 + iVar1); } else { TextboxNoOverlap(0, this); } @@ -309,7 +308,7 @@ void sub_08062048(Entity* this) { void Townsperson_Fusion(Entity* this) { if (this->action == 0) { - if (LoadExtraSpriteData(this, gUnk_0810B6EC[this->entityType.form]) == 0) { + if (LoadExtraSpriteData(this, gUnk_0810B6EC[this->type]) == 0) { return; } this->action++; diff --git a/src/npc/wheaton.c b/src/npc/wheaton.c index b7003233..2edbc69c 100644 --- a/src/npc/wheaton.c +++ b/src/npc/wheaton.c @@ -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; diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c index 05dca467..9429ccd6 100644 --- a/src/npc/windTribespeople.c +++ b/src/npc/windTribespeople.c @@ -35,7 +35,7 @@ void WindTribespeople(Entity* this) { void sub_0806C798(Entity* this) { s32 iVar1; - iVar1 = LoadExtraSpriteData(this, gUnk_08113A1C + (this->entityType.form * 4)); + iVar1 = LoadExtraSpriteData(this, gUnk_08113A1C + (this->type * 4)); if (iVar1 != 0) { this->action = 1; this->spriteSettings.b.draw = 1; @@ -55,9 +55,8 @@ void sub_0806C7D4(Entity* this) { sub_0806F118(this); } else { sub_0807DD94(this, NULL); - if ((this->entityType.parameter == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(0x63)) && - (CheckRoomFlag(0))) { - (this->entityType).parameter = 7; + if ((this->type2 == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(0x63)) && (CheckRoomFlag(0))) { + this->type2 = 7; sub_0807DD80(this, &gUnk_08014A80); } } @@ -90,7 +89,7 @@ void WindTribespeople_Head(Entity* this) { u8 pbVar3; pbVar3 = (this->frames.all & 0x3F); - if (this->entityType.form == 4) { + if (this->type == 4) { SetExtraSpriteFrame(this, 0, 9); SetExtraSpriteFrame(this, 1, pbVar3); SetExtraSpriteFrame(this, 2, this->frameIndex); @@ -115,7 +114,7 @@ void WindTribespeople_Head(Entity* this) { // body and head entities? void sub_0806C90C(Entity* param_1, Entity* param_2) { *(u32*)¶m_2->animationState = 0; - gUnk_08113A8C[param_1->entityType.parameter](param_1, param_2); + gUnk_08113A8C[param_1->type2](param_1, param_2); } void sub_0806C928(Entity* this) { diff --git a/src/npc/zelda.c b/src/npc/zelda.c index 00c333e6..90a40fc0 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -15,7 +15,7 @@ u32 GetAnimationState(Entity* ent); void DeleteThisEntity(void); extern Entity* GetEntityByType(u32, u32); extern void sub_080686C4(Entity*, Entity*); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void SetTileType(u32, u32, u32); extern Entity gPlayerEntity; @@ -140,7 +140,7 @@ void sub_08066E80(Entity* ent, u8* param_2) { param_2[0x18]++; ent->field_0x20 = 0x20000; ent->frames.all &= 0xFE; - PlaySFX(0x7C); + SoundReq(0x7C); } break; case 2: diff --git a/src/object.c b/src/object.c index e27e6cf2..b5eff460 100644 --- a/src/object.c +++ b/src/object.c @@ -3,198 +3,198 @@ #include "object.h" void (*const gObjectFunctions[])(Entity*) = { - /*0x00*/ ItemOnGround, - /*0x01*/ DeathFx, - /*0x02*/ ItemForSale, - /*0x03*/ Button, - /*0x04*/ Object4, - /*0x05*/ Pot, - /*0x06*/ Object6, - /*0x07*/ BlockPushed, - /*0x08*/ LockedDoor, - /*0x09*/ Object9, - /*0x0a*/ ObjectA, - /*0x0b*/ ObjectB, - /*0x0c*/ ChestSpawner, - /*0x0d*/ ObjectD, - /*0x0e*/ ObjectE, - /*0x0f*/ SpecialFx, - /*0x10*/ Object10, - /*0x11*/ Object11, - /*0x12*/ Object12, - /*0x13*/ Railtrack, - /*0x14*/ LilypadLarge, - /*0x15*/ Object15, - /*0x16*/ FloatingPlatform, - /*0x17*/ Object17, - /*0x18*/ EvilSpirit, - /*0x19*/ HouseDoorExterior, - /*0x1a*/ Object1A, - /*0x1b*/ GreatFairy, - /*0x1c*/ Object1C, - /*0x1d*/ Object1D, - /*0x1e*/ Object1E, - /*0x1f*/ Object1F, - /*0x20*/ Object20, - /*0x21*/ Object21, - /*0x22*/ FigurineDevice, - /*0x23*/ EyeSwitch, - /*0x24*/ Object24, - /*0x25*/ BigBarrel, - /*0x26*/ Object26, - /*0x27*/ PushableStatue, - /*0x28*/ Object28, - /*0x29*/ Object29, - /*0x2a*/ Object2A, - /*0x2b*/ Object2B, - /*0x2c*/ Beanstalk, - /*0x2d*/ Smoke, - /*0x2e*/ PushableRock, - /*0x2f*/ HittableLever, - /*0x30*/ Object30, - /*0x31*/ Object31, - /*0x32*/ PullableMushroom, - /*0x33*/ Bollard, - /*0x34*/ WarpPoint, - /*0x35*/ Object35, - /*0x36*/ Object36, - /*0x37*/ Object37, - /*0x38*/ JarPortal, - /*0x39*/ BossDoor, - /*0x3a*/ Object3A, - /*0x3b*/ MacroMushromStalks, - /*0x3c*/ MacroPlayer, - /*0x3d*/ Object3D, - /*0x3e*/ Object3E, - /*0x3f*/ GiantLeaf, - /*0x40*/ Fairy, - /*0x41*/ LadderUp, - /*0x42*/ Object42, - /*0x43*/ Object43, - /*0x44*/ Object44, - /*0x45*/ Object45, - /*0x46*/ GiantBookLadder, - /*0x47*/ HeartContainer, - /*0x48*/ FileScreenObjects, - /*0x49*/ Object49, - /*0x4a*/ BackgroundCloud, - /*0x4b*/ Object4B, - /*0x4c*/ PushableFurniture, - /*0x4d*/ Furniture, - /*0x4e*/ MinishSizedEntrance, - /*0x4f*/ Archway, - /*0x50*/ GiantRock, - /*0x51*/ Object51, - /*0x52*/ Object52, - /*0x53*/ Object53, - /*0x54*/ PullableLever, - /*0x55*/ Minecart, - /*0x56*/ ThoughtBubble, - /*0x57*/ HiddenLadderDown, - /*0x58*/ GentariCurtain, - /*0x59*/ LavaPlatform, - /*0x5a*/ Object5A, - /*0x5b*/ Object5B, - /*0x5c*/ Mask, - /*0x5d*/ HouseDoorInterior, - /*0x5e*/ Whirlwind, - /*0x5f*/ ObjectBlockingStairs, - /*0x60*/ SwordsmanNewsletter, - /*0x61*/ Object61, - /*0x62*/ GiantTwig, - /*0x63*/ Object63, - /*0x64*/ Object64, - /*0x65*/ LadderHoleInBookshelf, - /*0x66*/ Object66, - /*0x67*/ Object67, - /*0x68*/ Object68, - /*0x69*/ Object69, - /*0x6a*/ Object6A, - /*0x6b*/ CrenalBeanSprout, - /*0x6c*/ MinecartDoor, - /*0x6d*/ ObjectOnPillar, - /*0x6e*/ MineralWaterSource, - /*0x6f*/ MinishSizedArchway, - /*0x70*/ Object70, - /*0x71*/ PushableGrave, - /*0x72*/ Object72, - /*0x73*/ LilypadSmall, - /*0x74*/ Object74, - /*0x75*/ Object75, - /*0x76*/ Object76, - /*0x77*/ Bell, - /*0x78*/ MacroDecoration, - /*0x79*/ Object79, - /*0x7a*/ Steam, - /*0x7b*/ PushableLever, - /*0x7c*/ MacroShoes, - /*0x7d*/ ObjectOnSpinyBeetle, - /*0x7e*/ Object7E, - /*0x7f*/ PicoBloom, - /*0x80*/ Object80, - /*0x81*/ Object81, - /*0x82*/ BigVortex, - /*0x83*/ BigPushableLever, - /*0x84*/ SmallIceBlock, - /*0x85*/ BigIceBlock, - /*0x86*/ Object86, - /*0x87*/ Object87, - /*0x88*/ MacroBook, - /*0x89*/ Object89, - /*0x8a*/ Object8A, - /*0x8b*/ Object8B, - /*0x8c*/ Book, - /*0x8d*/ Fireplace, - /*0x8e*/ Object8E, - /*0x8f*/ FrozenWaterElement, - /*0x90*/ Object90, - /*0x91*/ Object91, - /*0x92*/ BakerOven, - /*0x93*/ Object93, - /*0x94*/ WindTribeFlag, - /*0x95*/ Bird, - /*0x96*/ Object96, - /*0x97*/ Object97, - /*0x98*/ Object98, - /*0x99*/ Object99, - /*0x9a*/ MacroAcorn, - /*0x9b*/ Object9B, - /*0x9c*/ TreeHidingPortal, - /*0x9d*/ LightableSwitch, - /*0x9e*/ Object9E, - /*0x9f*/ Fan, - /*0xa0*/ ObjectA0, - /*0xa1*/ PalaceArchway, - /*0xa2*/ ObjectA2, - /*0xa3*/ Cloud, - /*0xa4*/ MinishLight, - /*0xa5*/ ObjectA5, - /*0xa6*/ ObjectA6, - /*0xa7*/ ObjectA7, - /*0xa8*/ ObjectA8, - /*0xa9*/ ObjectA9, - /*0xaa*/ WaterfallOpening, - /*0xab*/ ObjectAB, - /*0xac*/ FourElements, - /*0xad*/ ObjectAD, - /*0xae*/ FloatingBlock, - /*0xaf*/ ObjectAF, - /*0xb0*/ MetalDoor, - /*0xb1*/ JailBars, - /*0xb2*/ ObjectB2, - /*0xb3*/ ObjectB3, - /*0xb4*/ ObjectB4, - /*0xb5*/ ObjectB5, - /*0xb6*/ ObjectB6, - /*0xb7*/ Well, - /*0xb8*/ WindTribeTeleporter, - /*0xb9*/ ObjectB9, - /*0xba*/ ObjectBA, - /*0xbb*/ Windcrest, - /*0xbc*/ LitArea, - /*0xbd*/ ObjectBD, - /*0xbe*/ Pinwheel, - /*0xbf*/ ObjectBF, - /*0xc0*/ EnemyItem, - /*0xc1*/ ObjectC1 + [GROUND_ITEM] = ItemOnGround, + [DEATH_FX] = DeathFx, + [SHOP_ITEM] = ItemForSale, + [BUTTON] = Button, + [OBJECT_4] = Object4, + [POT] = Pot, + [OBJECT_6] = Object6, + [PUSHED_BLOCK] = BlockPushed, + [LOCKED_DOOR] = LockedDoor, + [OBJECT_9] = Object9, + [OBJECT_A] = ObjectA, + [OBJECT_B] = ObjectB, + [CHEST_SPAWNER] = ChestSpawner, + [OBJECT_D] = ObjectD, + [OBJECT_E] = ObjectE, + [SPECIAL_FX] = SpecialFx, + [OBJECT_10] = Object10, + [OBJECT_11] = Object11, + [OBJECT_12] = Object12, + [RAILTRACK] = Railtrack, + [LILYPAD_LARGE] = LilypadLarge, + [OBJECT_15] = Object15, + [FLOATING_PLATFORM] = FloatingPlatform, + [OBJECT_17] = Object17, + [EVIL_SPIRIT] = EvilSpirit, + [HOUSE_DOOR_EXT] = HouseDoorExterior, + [OBJECT_1A] = Object1A, + [GREAT_FAIRY] = GreatFairy, + [OBJECT_1C] = Object1C, + [OBJECT_1D] = Object1D, + [OBJECT_1E] = Object1E, + [OBJECT_1F] = Object1F, + [OBJECT_20] = Object20, + [OBJECT_21] = Object21, + [FIGURINE_DEVICE] = FigurineDevice, + [EYE_SWITCH] = EyeSwitch, + [OBJECT_24] = Object24, + [BIG_BARREL] = BigBarrel, + [OBJECT_26] = Object26, + [PUSHABLE_STATUE] = PushableStatue, + [OBJECT_28] = Object28, + [OBJECT_29] = Object29, + [OBJECT_2A] = Object2A, + [OBJECT_2B] = Object2B, + [BEANSTALK] = Beanstalk, + [SMOKE] = Smoke, + [PUSHABLE_ROCK] = PushableRock, + [HITTABLE_LEVER] = HittableLever, + [OBJECT_30] = Object30, + [OBJECT_31] = Object31, + [PULLABLE_MUSHROOM] = PullableMushroom, + [BOLLARD] = Bollard, + [WARP_POINT] = WarpPoint, + [OBJECT_35] = Object35, + [OBJECT_36] = Object36, + [OBJECT_37] = Object37, + [JAR_PORTAL] = JarPortal, + [BOSS_DOOR] = BossDoor, + [OBJECT_3A] = Object3A, + [PORTAL_MUSHROOM_STALKS] = MacroMushromStalks, + [PORTAL_FALLING_PLAYER] = MacroPlayer, + [OBJECT_3D] = Object3D, + [OBJECT_3E] = Object3E, + [GIANT_LEAF] = GiantLeaf, + [FAIRY] = Fairy, + [LADDER_UP] = LadderUp, + [OBJECT_42] = Object42, + [OBJECT_43] = Object43, + [OBJECT_44] = Object44, + [OBJECT_45] = Object45, + [GIANT_BOOK_LADDER] = GiantBookLadder, + [HEART_CONTAINER] = HeartContainer, + [FILE_SCREEN_OBJECTS] = FileScreenObjects, + [OBJECT_49] = Object49, + [BACKGROUND_CLOUD] = BackgroundCloud, + [OBJECT_4B] = Object4B, + [PUSHABLE_FURNITURE] = PushableFurniture, + [FURNITURE] = Furniture, + [MINISH_SIZED_ENTRANCE] = MinishSizedEntrance, + [ARCHWAY] = Archway, + [GIANT_ROCK] = GiantRock, + [OBJECT_51] = Object51, + [OBJECT_52] = Object52, + [OBJECT_53] = Object53, + [PULLABLE_LEVER] = PullableLever, + [MINECART] = Minecart, + [THOUGHT_BUBBLE] = ThoughtBubble, + [HIDDEN_LADDER_DOWN] = HiddenLadderDown, + [GENTARI_CURTAIN] = GentariCurtain, + [LAVA_PLATFORM] = LavaPlatform, + [OBJECT_5A] = Object5A, + [OBJECT_5B] = Object5B, + [MASK] = Mask, + [HOUSE_DOOR_INT] = HouseDoorInterior, + [WHIRLWIND] = Whirlwind, + [OBJECT_BLOCKING_STAIRS] = ObjectBlockingStairs, + [SWORDSMAN_NEWSLETTER] = SwordsmanNewsletter, + [OBJECT_61] = Object61, + [GIANT_TWIG] = GiantTwig, + [OBJECT_63] = Object63, + [OBJECT_64] = Object64, + [LADDER_HOLE] = LadderHoleInBookshelf, + [OBJECT_66] = Object66, + [OBJECT_67] = Object67, + [OBJECT_68] = Object68, + [OBJECT_69] = Object69, + [OBJECT_6A] = Object6A, + [CRENAL_BEAN_SPROUT] = CrenalBeanSprout, + [MINECART_DOOR] = MinecartDoor, + [OBJECT_ON_PILLAR] = ObjectOnPillar, + [MINERAL_WATER_SOURCE] = MineralWaterSource, + [MINISH_SIZED_ARCHWAY] = MinishSizedArchway, + [OBJECT_70] = Object70, + [PUSHABLE_GRAVE] = PushableGrave, + [OBJECT_72] = Object72, + [LILYPAD_SMALL] = LilypadSmall, + [OBJECT_74] = Object74, + [OBJECT_75] = Object75, + [OBJECT_76] = Object76, + [BELL] = Bell, + [HUGE_DECORATION] = MacroDecoration, + [OBJECT_79] = Object79, + [STEAM] = Steam, + [PUSHABLE_LEVER] = PushableLever, + [HUGE_SHOES] = MacroShoes, + [OBJECT_ON_BEETLE] = ObjectOnSpinyBeetle, + [OBJECT_7E] = Object7E, + [PICO_BLOOM] = PicoBloom, + [OBJECT_80] = Object80, + [OBJECT_81] = Object81, + [BIG_VORTEX] = BigVortex, + [BIG_PUSHABLE_LEVER] = BigPushableLever, + [SMALL_ICE_BLOCK] = SmallIceBlock, + [BIG_ICE_BLOCK] = BigIceBlock, + [OBJECT_86] = Object86, + [OBJECT_87] = Object87, + [HUGE_BOOK] = MacroBook, + [OBJECT_89] = Object89, + [OBJECT_8A] = Object8A, + [OBJECT_8B] = Object8B, + [BOOK] = Book, + [FIREPLACE] = Fireplace, + [OBJECT_8E] = Object8E, + [FROZEN_WATER_ELEMENT] = FrozenWaterElement, + [OBJECT_90] = Object90, + [OBJECT_91] = Object91, + [BAKER_OVEN] = BakerOven, + [OBJECT_93] = Object93, + [WIND_TRIBE_FLAG] = WindTribeFlag, + [BIRD] = Bird, + [OBJECT_96] = Object96, + [OBJECT_97] = Object97, + [OBJECT_98] = Object98, + [OBJECT_99] = Object99, + [HUGE_ACORN] = MacroAcorn, + [OBJECT_9B] = Object9B, + [TREE_HIDING_PORTAL] = TreeHidingPortal, + [LIGHTABLE_SWITCH] = LightableSwitch, + [OBJECT_9E] = Object9E, + [FAN] = Fan, + [OBJECT_A0] = ObjectA0, + [PALACE_ARCHWAY] = PalaceArchway, + [OBJECT_A2] = ObjectA2, + [CLOUD] = Cloud, + [MINISH_LIGHT] = MinishLight, + [OBJECT_A5] = ObjectA5, + [OBJECT_A6] = ObjectA6, + [OBJECT_A7] = ObjectA7, + [OBJECT_A8] = ObjectA8, + [OBJECT_A9] = ObjectA9, + [WATERFALL_OPENING] = WaterfallOpening, + [OBJECT_AB] = ObjectAB, + [FOUR_ELEMENTS] = FourElements, + [OBJECT_AD] = ObjectAD, + [FLOATING_BLOCK] = FloatingBlock, + [OBJECT_AF] = ObjectAF, + [METAL_DOOR] = MetalDoor, + [JAIL_BARS] = JailBars, + [OBJECT_B2] = ObjectB2, + [OBJECT_B3] = ObjectB3, + [OBJECT_B4] = ObjectB4, + [OBJECT_B5] = ObjectB5, + [OBJECT_B6] = ObjectB6, + [WELL] = Well, + [WIND_TRIBE_TELEPORTER] = WindTribeTeleporter, + [OBJECT_B9] = ObjectB9, + [OBJECT_BA] = ObjectBA, + [WINDCREST] = Windcrest, + [LIT_AREA] = LitArea, + [OBJECT_BD] = ObjectBD, + [PINWHEEL] = Pinwheel, + [OBJECT_BF] = ObjectBF, + [ENEMY_ITEM] = EnemyItem, + [OBJECT_C1] = ObjectC1, }; diff --git a/src/object/archway.c b/src/object/archway.c index b00192db..39975ee7 100644 --- a/src/object/archway.c +++ b/src/object/archway.c @@ -15,7 +15,7 @@ void Archway(Entity* this) { v1 = v1 - 0x5; v1 = v1 & v2; this->spriteSettings.raw = v1 | 1; - this->frameIndex = this->entityType.parameter; + this->frameIndex = this->type2; this->collisionLayer = 2; UpdateSpriteForCollisionLayer(this); v3 = CheckIsDungeon(); diff --git a/src/object/backgroundCloud.c b/src/object/backgroundCloud.c index 909a88a8..ceebf3d7 100644 --- a/src/object/backgroundCloud.c +++ b/src/object/backgroundCloud.c @@ -15,10 +15,10 @@ void sub_0808F658(Entity* this) { this->spriteSettings.b.draw = 1; this->spriteOrientation.flipY = 3; this->spriteRendering.b3 = 3; - this->spritePriority.b0 = this->entityType.form; - this->frameIndex = this->entityType.form; + this->spritePriority.b0 = this->type; + this->frameIndex = this->type; this->direction = 8; - this->nonPlanarMovement = gUnk_08121EB0[(this->entityType).form]; + this->nonPlanarMovement = gUnk_08121EB0[this->type]; this->field_0x78.HWORD = gRoomControls.roomOriginX - 0x60; this->field_0x7a.HWORD = gRoomControls.roomOriginX + gRoomControls.width + 0x60; this->animationState = 0; @@ -45,8 +45,8 @@ void sub_0808F70C(Entity* this) { this->x.HALF.HI = this->field_0x78.HWORD; } - if (this->entityType.form == 2) - this->y.HALF.HI = gUnk_08121EB3[this->entityType.parameter * 2 + (Random() & 1)]; + if (this->type == 2) + this->y.HALF.HI = gUnk_08121EB3[this->type2 * 2 + (Random() & 1)]; } if (this->previousActionFlag == 1) { diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c index 0ddc3132..a64217f1 100644 --- a/src/object/bakerOven.c +++ b/src/object/bakerOven.c @@ -19,7 +19,7 @@ void sub_0809CC74(Entity* this) { this->action = 1; UpdateSpriteForCollisionLayer(this); - if (this->entityType.form == 0) { + if (this->type == 0) { this->spritePriority.b0 = 5; /* Create steam clouds */ for (i = 0; i < 3; i++) { @@ -31,12 +31,12 @@ void sub_0809CC74(Entity* this) { } sub_0809CDF0(this); } else { - if (this->entityType.parameter & 1) { + if (this->type2 & 1) { this->spriteSettings.b.draw = 1; this->actionDelay = 20; } else { this->action = 2; - this->actionDelay = (this->entityType.parameter & 2) ? 20 : 18; + this->actionDelay = (this->type2 & 2) ? 20 : 18; } InitializeAnimation(this, 0); } @@ -45,7 +45,7 @@ void sub_0809CC74(Entity* this) { void sub_0809CD0C(Entity* this) { u8* frames; - if (this->entityType.form) { + if (this->type) { GetNextFrame(this); frames = &this->frames.all; if (*frames & 1) { diff --git a/src/object/bigVortex.c b/src/object/bigVortex.c index 67d69520..fb771024 100644 --- a/src/object/bigVortex.c +++ b/src/object/bigVortex.c @@ -11,7 +11,7 @@ extern void (*const gUnk_0812367C[])(Entity*); extern u16 gUnk_08123690[]; void BigVortex(Entity* this) { - if ((this->entityType).form == 0) { + if (this->type == 0) { gUnk_0812367C[this->action](this); } else { sub_08098E3C(this); @@ -67,9 +67,9 @@ void sub_08098DC4(Entity* this) { ResolveEntityOnTop(this, &gPlayerEntity); gPlayerState.playerAction = 0x1f; gPlayerState.field_0x34[4] = 1; - gPlayerState.field_0x34[5] = this->entityType.parameter; + gPlayerState.field_0x34[5] = this->type2; this->action = 4; - if (this->entityType.parameter == 1) { + if (this->type2 == 1) { SetGlobalFlag(0x23); } sub_08077B20(); @@ -87,9 +87,9 @@ void sub_08098E3C(Entity* this) { if (this->action == 0) { this->action = 1; this->spriteSettings.b.draw = TRUE; - InitAnimationForceUpdate(this, this->entityType.form); + InitAnimationForceUpdate(this, this->type); } - temp = &gUnk_08123690[this->entityType.form & 2]; + temp = &gUnk_08123690[this->type & 2]; sub_0805EC9C(this, temp[0], temp[1], 0); UpdateAnimationSingleFrame(this); } diff --git a/src/object/bird.c b/src/object/bird.c index 47a822c6..2b6f194b 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -11,7 +11,7 @@ extern void (*const gUnk_08123EFC[])(Entity*); extern void (*const gUnk_08123F04[])(Entity*); void Bird(Entity* this) { - gUnk_08123EC0[this->entityType.form](this); + gUnk_08123EC0[this->type](this); } void sub_0809CF3C(Entity* this) { @@ -32,7 +32,7 @@ void sub_0809CF54(Entity* this) { this->direction = 8; this->collisionLayer = 2; this->x.HALF.HI = gRoomControls.roomScrollX; - PlaySFX(0x123); + SoundReq(0x123); UpdateSpriteForCollisionLayer(this); InitAnimationForceUpdate(this, 0); target = CreateObject(0x95, 1, 0); @@ -90,12 +90,12 @@ void sub_0809D0AC(Entity* this) { Entity* fx; if (sub_080044EC(this, 0x1800) < 2) { - (this->entityType).form = 2; + this->type = 2; this->action = 1; this->height.WORD = 0; this->collisionLayer = 1; SetLocalFlag(0x45); - PlaySFX(0x72); + SoundReq(0x72); fx = CreateFx(this, 0x11, 0); if (fx != NULL) { sub_0806FAD8(this, fx); diff --git a/src/object/button.c b/src/object/button.c index 8ba71c8e..23a2ee8d 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -22,7 +22,7 @@ void sub_08081AE0(Entity* this) { this->field_0x74.HWORD = (((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3F) | ((((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3F) << 6); this->field_0x70.HALF.HI = GetTileType(this->field_0x74.HWORD, this->collisionLayer); - if (this->entityType.form == 0 && CheckFlags(this->field_0x86.HWORD)) { + if (this->type == 0 && CheckFlags(this->field_0x86.HWORD)) { this->action = 5; SetTileType(0x7A, this->field_0x74.HWORD, this->collisionLayer); } else { @@ -51,7 +51,7 @@ void sub_08081BAC(Entity* this) { this->actionDelay = 0xA; sub_0805E4E0(this, 0xA); sub_08081FF8(this); - if (this->entityType.form == 1) { + if (this->type == 1) { this->action = 3; } else { this->action = 5; @@ -94,7 +94,7 @@ void sub_08081C30(Entity* this) { this->action = 2; ClearFlag(this->field_0x86.HWORD); SetTileType(0x77, this->field_0x74.HWORD, this->collisionLayer); - PlaySFX(0x10C); + SoundReq(0x10C); } } @@ -211,7 +211,7 @@ void sub_08081E6C(Entity* this) { if (tile < 0x4000) return; r1 = GetLayerByIndex(r5); - r4 = (this->entityType.form == 0 ? 0x7a : 0x78); + r4 = (this->type == 0 ? 0x7a : 0x78); tmp = r1 + 0x3802; r1 += 0x3002 + r4; tmp = tmp + (*r1 << 2); @@ -264,7 +264,7 @@ u32 sub_08081F7C(Entity* this, u32 r7) { SetFlag(this->field_0x86.HWORD); SetTileType(r7, this->field_0x74.HWORD, this->collisionLayer); sub_08081F24(this); - PlaySFX(0x10C); + SoundReq(0x10C); if (this->field_0x70.HALF_U.LO != 0xFFFF) SetTile(this->field_0x70.HALF_U.LO, this->field_0x74.HWORD, this->collisionLayer); return 0; diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index 06782b2e..790d1251 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -12,7 +12,7 @@ extern void (*const gUnk_0811F818[])(Entity*); extern u32 gUnk_0811F8B0; void ChestSpawner(Entity* this) { - gUnk_0811F7E8[this->entityType.form](this); + gUnk_0811F7E8[this->type](this); } void sub_08083DF0(Entity* this) { diff --git a/src/object/cloud.c b/src/object/cloud.c index 631e6605..a2637b6b 100644 --- a/src/object/cloud.c +++ b/src/object/cloud.c @@ -7,7 +7,7 @@ #include "structures.h" extern void sub_0809F7BC(Entity*); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void sub_0809F814(u32); extern void sub_0809F7F4(Entity*); extern void LoadRoomEntityList(); @@ -31,11 +31,11 @@ extern u16 gUnk_081247C8[]; extern u32 gUnk_081247D0; void Cloud(Entity* this) { - gUnk_08124798[(this->entityType).form](this); + gUnk_08124798[this->type](this); } void sub_0809F4DC(Entity* this) { - if ((this->entityType).parameter == 0) { + if (this->type2 == 0) { gUnk_081247A0[this->action](this); } else { gUnk_081247AC[this->action](this); @@ -57,7 +57,7 @@ void sub_0809F548(Entity* this) { if (--this->actionDelay == 0) { this->action = 2; this->actionDelay = 90; - PlaySFX(285); + SoundReq(285); sub_0809F814((((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 63) | (((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 63) << 6); } else { @@ -70,7 +70,7 @@ void sub_0809F548(Entity* this) { void sub_0809F5B0(Entity* this) { if (--this->actionDelay == 0) { - PlaySFX(115); + SoundReq(115); SetGlobalFlag(KUMOTATSUMAKI); LoadRoomEntityList(&gUnk_080DD750); DeleteThisEntity(); @@ -100,12 +100,12 @@ void sub_0809F61C(Entity* this) { if ((gRoomControls.unk6 & 4) == 0) { if (this->actionDelay == 30) { - SetLocalFlag(this->entityType.parameter); + SetLocalFlag(this->type2); } if (--this->actionDelay == 0) { this->action = 3; this->actionDelay = 120; - PlaySFX(285); + SoundReq(285); sub_0809F814((((this->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 63) | (((this->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 63) << 6); } else { @@ -123,7 +123,7 @@ void sub_0809F69C(Entity* this) { this->actionDelay = 30; this->action = 4; gRoomControls.cameraTarget = &gPlayerEntity; - PlaySFX(115); + SoundReq(115); } } @@ -189,7 +189,7 @@ void sub_0809F7BC(Entity* this) { void sub_0809F7F4(Entity* this) { if (--this->field_0x68.HALF.LO == 0) { this->field_0x68.HALF.LO = 12; - PlaySFX(388); + SoundReq(388); } } diff --git a/src/object/fan.c b/src/object/fan.c index 5d8874bf..5d800011 100644 --- a/src/object/fan.c +++ b/src/object/fan.c @@ -16,10 +16,10 @@ void Fan(Entity* this) { } void sub_0809ED30(Entity* this) { - this->direction = (this->entityType.form ^ 2) << 3; + this->direction = (this->type ^ 2) << 3; sub_0809EE34(this); sub_0809EFB0(this); - InitializeAnimation(this, this->entityType.form); + InitializeAnimation(this, this->type); } void sub_0809ED54(Entity* this) { @@ -27,7 +27,7 @@ void sub_0809ED54(Entity* this) { u32 iVar2; if (((this->cutsceneBeh.HWORD == 0) || CheckFlags(this->cutsceneBeh.HWORD)) && - ((this->entityType.parameter != 1 || (--this->field_0x74.HWORD == 0)))) { + ((this->type2 != 1 || (--this->field_0x74.HWORD == 0)))) { sub_0809EE08(this); } } @@ -44,7 +44,7 @@ void sub_0809ED88(Entity* this) { return; } sub_0809EE24(this); - } else if (((this->entityType).parameter == 1) && (--this->field_0x74.HWORD == 0)) { + } else if ((this->type2 == 1) && (--this->field_0x74.HWORD == 0)) { sub_0809EE24(this); } } @@ -60,12 +60,12 @@ void sub_0809EDE4(Entity* this) { void sub_0809EE08(Entity* this) { this->action = 2; this->field_0x74.HWORD = *((u8*)&this->field_0x7c + 3) << 2; - InitializeAnimation(this, this->entityType.form); + InitializeAnimation(this, this->type); } void sub_0809EE24(Entity* this) { this->action = 3; - InitializeAnimation(this, this->entityType.form + 4); + InitializeAnimation(this, this->type + 4); } void sub_0809EE34(Entity* this) { diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index 7bc3f717..51403761 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -51,7 +51,7 @@ void FileScreenObjects(Entity* this) { if (this->currentHealth == 0) { sub_0808EFF0(this); } - gUnk_08121C64[this->entityType.form](this); + gUnk_08121C64[this->type](this); if (this->animIndex < 64) { UpdateAnimationSingleFrame(this); } @@ -65,7 +65,7 @@ void sub_0808E7F0(Entity* this) { sub_080AE008(this, 1, 2); this->palette.b.b0 = 0xF; this->spriteSettings.b.draw = 0; - this->entityType.parameter = 0xFF; + this->type2 = 0xFF; this->action = 1; } @@ -75,15 +75,15 @@ void sub_0808E818(Entity* this) { if (!sub_0808E950()) { int var2 = -1; - this->entityType.parameter = var2; + this->type2 = var2; this->field_0x68.HWORD = var2; this->field_0x6a.HWORD = var2; this->spriteSettings.b.draw = 0; return; } - if (this->entityType.parameter != gUnk_02019EE0.unk6) { - this->entityType.parameter = gUnk_02019EE0.unk6; + if (this->type2 != gUnk_02019EE0.unk6) { + this->type2 = gUnk_02019EE0.unk6; this->field_0x68.HWORD = CheckGlobalFlag(EZERO_1ST) == 0 ? 0x400 : 0x100; this->field_0x70.BYTES.byte0 = 4; this->animationState = 2; @@ -142,7 +142,7 @@ void sub_0808E988(Entity* this) { if (this->action == 0) { this->action = 1; this->spriteIndex = 0x142; - this->entityType.parameter = 0xFF; + this->type2 = 0xFF; sub_080AE008(this, 1, 3); } @@ -155,7 +155,7 @@ void sub_0808E988(Entity* this) { } if (i != 0) { - if (this->entityType.parameter != i) { + if (this->type2 != i) { InitAnimationForceUpdate(this, i); } this->spriteSettings.b.draw = 2; @@ -178,7 +178,7 @@ void sub_0808EA28(Entity* this) { u32 var0; u32 var1; - if (this->entityType.form == 3) { + if (this->type == 3) { if (gUnk_02000000->gameLanguage > LANGUAGE_EN) { this->spriteSettings.b.draw = 2; } else { @@ -186,11 +186,11 @@ void sub_0808EA28(Entity* this) { } } - if (this->entityType.form == gUnk_02019EE0.unk6) { + if (this->type == gUnk_02019EE0.unk6) { var0 = 12; var1 = 1; } else { - if (gUnk_02032EC0.lastState == 5 && this->entityType.form == gUnk_02019EE0.unk7) { + if (gUnk_02032EC0.lastState == 5 && this->type == gUnk_02019EE0.unk7) { var0 = 13; var1 = 2; } else { @@ -207,8 +207,8 @@ void sub_0808EA28(Entity* this) { void sub_0808EABC(Entity* this) { int var0 = -72; - int var1 = this->entityType.form * 32 + 40; - int var2 = gUnk_02019EE0.unk6 == this->entityType.form; + int var1 = this->type * 32 + 40; + int var2 = gUnk_02019EE0.unk6 == this->type; switch (gUnk_02032EC0.lastState) { case 0: var0 = 24; @@ -223,7 +223,7 @@ void sub_0808EABC(Entity* this) { } break; case 5: - switch (gMenu.focusCoords[this->entityType.form]) { + switch (gMenu.focusCoords[this->type]) { case 0: var0 = 42; var1 = 40; @@ -232,7 +232,7 @@ void sub_0808EABC(Entity* this) { case 2: var0 = 20; var1 = 144; - var1 -= (gMenu.unk16 - gMenu.focusCoords[this->entityType.form]) * 32; + var1 -= (gMenu.unk16 - gMenu.focusCoords[this->type]) * 32; break; } break; @@ -326,8 +326,7 @@ static Entity* sub_0808EC80(int form) { Entity* entityA = (Entity*)&gUnk_03003DA0; Entity* entityB = entityA->next; while (entityB != entityA) { - if ((entityB->entityType.type == 0x6 && entityB->entityType.subtype == 0x48) && - form == entityB->entityType.form) { + if ((entityB->kind == 0x6 && entityB->id == 0x48) && form == entityB->type) { return entityB; } entityB = entityB->next; @@ -361,7 +360,7 @@ void sub_0808ECBC(Entity* this) { break; } - var2 = this->entityType.form - 4; + var2 = this->type - 4; var3 = &gUnk_08121CD4[var1][var2]; this->field_0x68.HWORD = var3->unk1; this->field_0x6a.HWORD = var3->unk2; @@ -408,7 +407,7 @@ void sub_0808EE00(Entity* this) { int var0, var1, var2; var0 = ((struct_02000000*)0x2000000)->gameLanguage != 0; - var1 = this->entityType.form - 10; + var1 = this->type - 10; this->frameIndex = gUnk_08121D38[var0][var1]; this->x.HALF.HI = gUnk_08121D18[var0][var1]; this->field_0x68.HWORD = gUnk_08121D18[var0][var1]; @@ -445,7 +444,7 @@ void sub_0808EED8(Entity* this) { this->spriteSettings.b.draw = 0; } else { this->spriteSettings.b.draw = 2; - var0 = this->entityType.form - 19; + var0 = this->type - 19; this->palette.b.b0 = gMenu.column_idx == var0 ? 4 : 3; } } @@ -456,7 +455,7 @@ void sub_0808EF24(Entity* this) { this->spriteSettings.b.draw = 0; } else { this->spriteSettings.b.draw = 2; - if (this->entityType.form == 21) { + if (this->type == 21) { var0 = ((struct_02000000*)0x2000000)->messageSpeed; } else { var0 = ((struct_02000000*)0x2000000)->brightnessPref; @@ -522,7 +521,7 @@ static void sub_0808EFF0(Entity* this) { this->currentHealth = 1; this->frameIndex = 0xFF; this->animIndex = 0xFF; - var0 = &gUnk_08121D54[this->entityType.form]; + var0 = &gUnk_08121D54[this->type]; this->x.HALF.HI = var0->unk2; this->field_0x68.HWORD = var0->unk2; this->y.HALF.HI = var0->unk4; diff --git a/src/object/floatingBlock.c b/src/object/floatingBlock.c index e9bb10e8..661cec72 100644 --- a/src/object/floatingBlock.c +++ b/src/object/floatingBlock.c @@ -5,7 +5,7 @@ void FloatingBlock(Entity* this) { if (this->action == 0) { this->action = 1; - this->frameIndex = this->entityType.form; + this->frameIndex = this->type; this->spritePriority.b0 = 0xe; this->collisionLayer = 1; UpdateSpriteForCollisionLayer(this); diff --git a/src/object/giantLeaf.c b/src/object/giantLeaf.c index 9003f28b..cf2fb1df 100644 --- a/src/object/giantLeaf.c +++ b/src/object/giantLeaf.c @@ -15,7 +15,7 @@ void GiantLeaf(Entity* ent) { ent->spriteSettings.b.draw = 1; ent->spriteRendering.b3 = 3; ent->spritePriority.b0 = 7; - ent->frameIndex = ent->entityType.form; + ent->frameIndex = ent->type; sub_0808D618(ent); } } @@ -25,7 +25,7 @@ void sub_0808D618(Entity* ent) { s16* arr; u32 i; - arr = (ent->entityType.form != 0) ? gUnk_0812176A : gUnk_08121750; + arr = (ent->type != 0) ? gUnk_0812176A : gUnk_08121750; tilePos = (((ent->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3F) | ((((ent->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3F) * 64); diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c index dac1e955..e71ddfc6 100644 --- a/src/object/greatFairy.c +++ b/src/object/greatFairy.c @@ -25,10 +25,10 @@ void GreatFairy(Entity* this) { u8 bVar1; if (this->action == 0) { - bVar1 = __modsi3(this->entityType.form, 11); - this->entityType.parameter = bVar1; + bVar1 = __modsi3(this->type, 11); + this->type2 = bVar1; } - GreatFairy_Main[(this->entityType).parameter](this); + GreatFairy_Main[this->type2](this); } // Behaviors @@ -105,7 +105,7 @@ void GreatFairy_SpawningUpdate(Entity* this) { if (mini != NULL) { CopyPosition(this, mini); DoFade(6, 4); - PlaySFX(325); + SoundReq(325); this->action = 4; this->actionDelay = 0x3c; var = this->spriteSettings.raw & ~0x3; @@ -220,7 +220,7 @@ void GreatFairy_MiniRisingUpdate(Entity* this) { this->height.WORD -= 0x8000; if (this->height.HALF.HI == -20) { this->action = 2; - PlaySFX(321); + SoundReq(321); } else { if (((this->height.HALF.HI == -10) && (this->field_0xf == 0)) && (target = GreatFairy_CreateForm(this, DROPLET, 0), target != NULL)) { @@ -289,7 +289,7 @@ void GreatFairy_DropletInit(Entity* this) { this->spriteSettings.b.draw = 1; this->height.HALF.HI = 0; this->spritePriority.b0 = 5; - PlaySFX(320); + SoundReq(320); } void GreatFairy_DropletUpdate(Entity* this) { @@ -328,7 +328,7 @@ void GreatFairy_BigRippleInit(Entity* this) { this->actionDelay = 120; this->spriteSettings.b.draw = 1; this->spritePriority.b0 = 5; - PlaySFX(249); + SoundReq(249); } void GreatFairy_BigRippleUpdate(Entity* this) { @@ -366,7 +366,7 @@ void GreatFairy_EnergyUpdate(Entity* this) { } void sub_08087114(Entity* this) { - if ((this->entityType).parameter == 0) { + if (this->type2 == 0) { GreatFairy_Form1Behaviors[this->action](this); } else { GreatFairy_Form2Behaviors[this->action](this); @@ -485,10 +485,10 @@ void GreatFairy_InitializeAnimation(Entity* this) { s32 temp; this->action = 1; - temp = this->entityType.form; - this->entityType.parameter = temp % 11; + temp = this->type; + this->type2 = temp % 11; this->collisionLayer = 2; - InitializeAnimation(this, this->entityType.parameter); + InitializeAnimation(this, this->type2); sub_0805E3A0(this, 2); } @@ -496,7 +496,7 @@ Entity* GreatFairy_CreateForm(Entity* this, u32 curForm, u32 parameter) { s32 nextForm; Entity* ent; - nextForm = this->entityType.form; + nextForm = this->type; nextForm /= 11; ent = CreateObject(0x1b, (u8)nextForm * 11 + curForm, parameter); @@ -520,7 +520,7 @@ void sub_080873D0(Entity* this) { void sub_080873FC(void) { Entity* ent; - PlaySFX(0xf7); + SoundReq(0xf7); gRoomControls.cameraTarget = NULL; while (ent = FindEntityInListBySubtype(0x6, 0x1b, 0x6), ent != NULL) { diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c index a2a35887..f6858b50 100644 --- a/src/object/heartContainer.c +++ b/src/object/heartContainer.c @@ -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); @@ -29,9 +29,9 @@ static void sub_0808E6A0(Entity* this) { DeleteThisEntity(); } this->action = 1; - this->entityType.form = 0x62; + this->type = 0x62; this->spriteSettings.b.draw = 0; - this->boundingBox = &gUnk_08121C58; + this->hitbox = &gUnk_08121C58; this->collisionLayer = 3; this->scriptedScene = 3; } @@ -54,7 +54,7 @@ static void sub_0808E714(Entity* this) { this->action = 3; this->field_0x3c |= 0x10; sub_0805EC60(this); - PlaySFX(0x141); + SoundReq(0x141); } sub_08080CB4(this); } diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c index 8ef49de2..d500686c 100644 --- a/src/object/houseDoorExterior.c +++ b/src/object/houseDoorExterior.c @@ -29,10 +29,10 @@ 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); + gUnk_081206B4[this->type2](this); } void sub_080866D8(Entity* 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; @@ -111,7 +111,7 @@ static void sub_0808681C(Entity* this) { this->action++; this->frameIndex = 1; sub_08078AC0(16, 0, 1); - PlaySFX(0x111); + SoundReq(0x111); } break; } @@ -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); @@ -156,7 +156,7 @@ static void sub_080868EC(Entity* entity, unk_80868EC* arg1) { void sub_0808692C(Entity* this) { this->flags &= 0xFD; - this->entityType.parameter = 2; + this->type2 = 2; this->action = this->frameIndex == 0 ? 1 : 2; this->previousActionFlag = 0; this->actionDelay = 8; diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index 6aa09588..409c1d04 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -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]; @@ -75,7 +75,7 @@ void ItemOnGround(Entity* this) { gUnk_0811E7D4[this->action](this); } - if (this->entityType.form == 0x5C) { + if (this->type == 0x5C) { gRoomVars.field_0x4++; } @@ -87,7 +87,7 @@ void sub_08080F20(Entity* this) { DeleteThisEntity(); } - if (this->entityType.form != 0x60) { + if (this->type != 0x60) { this->spriteSettings.b.draw = 1; this->spritePriority.b1 = 3; this->spriteSettings.b.shadow = 0; @@ -95,8 +95,8 @@ void sub_08080F20(Entity* this) { this->field_0x3c = 0x47; this->field_0x40 = 0x44; this->currentHealth = 0xFF; - this->boundingBox = &gUnk_080FD1A8; - switch (this->entityType.form - 0x3F) { + this->hitbox = &gUnk_080FD1A8; + switch (this->type - 0x3F) { case 0: case 21: case 22: @@ -120,14 +120,14 @@ void sub_08080F20(Entity* this) { this->field_0x68.HALF.LO = 0; this->actionDelay = 0; sub_0805E3A0(this, 3); - this->field_0x1c = sub_0808147C(this->entityType.form); + this->field_0x1c = sub_0808147C(this->type); gUnk_0811E7E8[this->field_0x68.HALF.HI](this); } else { Entity* entity = CreateObject(0x40, 0x60, 0); if (entity) { entity->actionDelay = 0; if (this->actionDelay == 1) { - entity->entityType.parameter = 2; + entity->type2 = 2; } CopyPosition(this, entity); @@ -158,7 +158,7 @@ static void sub_080810A8(Entity* this) { } static void sub_080810FC(Entity* this) { - if (this->entityType.form != 0x5F) { + if (this->type != 0x5F) { sub_08081598(this); } else { this->action = 2; @@ -181,7 +181,7 @@ static void sub_08081150(Entity* this) { this->height.HALF.HI = -0x80; this->spriteOrientation.flipY = 1; this->spriteRendering.b3 = 1; - PlaySFX(0x12D); + SoundReq(0x12D); } static void sub_08081188(Entity* this) { @@ -205,7 +205,7 @@ void sub_080811C8(Entity* this) { void sub_080811D8(Entity* this) { sub_08081188(this); - PlaySFX(0x215); + SoundReq(0x215); } void sub_080811EC(Entity* this) { @@ -278,7 +278,7 @@ void nullsub_510(Entity* this) { void sub_08081328(Entity* this) { Entity* other = this->attachedEntity; - if (!(other->entityType.type == 8 && other->entityType.subtype == 3)) { + if (!(other->kind == 8 && other->id == 3)) { sub_08081404(this, 0); } else { CopyPosition(other, this); @@ -334,17 +334,17 @@ void sub_08081404(Entity* this, u32 arg1) { bool32 sub_08081420(Entity* this) { if (CheckShouldPlayItemGetCutscene(this)) { sub_0805E3A0(this, 6); - CreateItemEntity(this->entityType.form, this->entityType.parameter, 0); + CreateItemEntity(this->type, this->type2, 0); return TRUE; } else { - GiveItem(this->entityType.form, this->entityType.parameter); + GiveItem(this->type, this->type2); return FALSE; } } static bool32 CheckShouldPlayItemGetCutscene(Entity* this) { bool32 result = FALSE; - if ((gUnk_080FD5B4[this->entityType.form].unk0[3] & 0x2) || !GetInventoryValue(this->entityType.form)) { + if ((gUnk_080FD5B4[this->type].unk0[3] & 0x2) || !GetInventoryValue(this->type)) { result = TRUE; } return result; @@ -358,7 +358,7 @@ static u8 sub_0808147C(u32 arg0) { void sub_0808148C(u32 arg0) { const Unk_0811E84C* var0 = &gUnk_0811E84C[arg0]; if (var0->sfx) { - PlaySFX(var0->sfx); + SoundReq(var0->sfx); } } @@ -391,7 +391,7 @@ static void sub_08081500(Entity* this) { this->field_0x68.HALF.LO = 1; } else { if (var0 == 1) { - sub_0808148C(this->entityType.form); + sub_0808148C(this->type); UpdateSpriteForCollisionLayer(this); } @@ -408,13 +408,13 @@ static void sub_0808153C(Entity* this) { if (!sub_08003FC4(this, 0x1000) && !sub_0800442E(this)) { this->field_0x68.HALF.LO = 1; this->field_0x20 = 0x1E000; - sub_0808148C(this->entityType.form); + sub_0808148C(this->type); UpdateSpriteForCollisionLayer(this); } } else { if (!sub_08003FC4(this, 0x2800)) { this->field_0x68.HALF.LO = 2; - sub_0808148C(this->entityType.form); + sub_0808148C(this->type); } } } @@ -434,7 +434,7 @@ static void sub_08081598(Entity* this) { this->attachedEntity = &gPlayerEntity; CopyPosition(this->attachedEntity, this); this->height.HALF.HI -= 4; - if (this->entityType.form != 0x5F && sub_08081420(this)) { + if (this->type != 0x5F && sub_08081420(this)) { sub_08081404(this, 1); } } diff --git a/src/object/jailBars.c b/src/object/jailBars.c index aa17aae3..d046c822 100644 --- a/src/object/jailBars.c +++ b/src/object/jailBars.c @@ -4,7 +4,7 @@ #include "room.h" extern void sub_080A0960(Entity*, u32); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void sub_0801AF18(u8*, u32, u32); extern void (*const gUnk_08124950[])(Entity*); @@ -33,7 +33,7 @@ void sub_080A0910(Entity* this) { if (CheckFlags(this->field_0x86.HWORD) != 0) { this->action = 2; sub_080A0960(this, 1); - PlaySFX(0x10b); + SoundReq(0x10b); } } diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index 9b858a4a..cfbf0ba5 100644 --- a/src/object/lightableSwitch.c +++ b/src/object/lightableSwitch.c @@ -16,10 +16,10 @@ 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); + gUnk_081243B4[this->type](this); sub_0809EB30(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); @@ -69,9 +69,9 @@ void sub_0809EAD8(Entity* this) { u8 bVar1; Entity* pEVar2; - if (this->entityType.parameter != 0) { + if (this->type2 != 0) { - this->attachedEntity = GetCurrentRoomProperty(this->entityType.parameter); + this->attachedEntity = GetCurrentRoomProperty(this->type2); sub_080A2CC0(this, &this->attachedEntity, &this->field_0x74.HWORD); } else { @@ -83,7 +83,7 @@ void sub_0809EB30(Entity* this) { u16 uVar1; u16* puVar2; - if (this->entityType.parameter != 0) { + if (this->type2 != 0) { if ((this->direction & 0x80) == 0) { sub_0806F69C(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) { diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c index 7dc35ae2..a96c49ad 100644 --- a/src/object/lilypadSmall.c +++ b/src/object/lilypadSmall.c @@ -19,7 +19,7 @@ void LilypadSmall(Entity* this) { this->frameIndex = (rand >> 0x10) & 3; this->spriteSettings.b.draw = TRUE; this->spritePriority.b0 = 7; - this->attachedEntity = GetCurrentRoomProperty(this->entityType.parameter); + this->attachedEntity = GetCurrentRoomProperty(this->type2); sub_080A2CC0(this, &this->attachedEntity, &this->field_0x70.HALF.LO); } sub_080A2BE4(this, sub_08097ADC(this)); diff --git a/src/object/mask.c b/src/object/mask.c index 03dceea7..e405df5f 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -29,11 +29,11 @@ void Mask(Entity* this) { } void sub_080929A4(Entity* this) { - if (this->entityType.parameter & 0xC0) { + if (this->type2 & 0xC0) { if (CheckFlags(this->field_0x86.HWORD)) { s32 field_0x0a; - switch (this->entityType.parameter & 0xC0) { + switch (this->type2 & 0xC0) { case 0x40: field_0x0a = gScreenTransition[0x5]; @@ -62,7 +62,7 @@ void sub_080929A4(Entity* this) { this->field_0xf = this->actionDelay >> 1; this->actionDelay = 0; - this->frameIndex = this->entityType.parameter & 0x3f; + this->frameIndex = this->type2 & 0x3f; this->field_0x7c.HALF.HI = COORD_TO_TILE(this); this->field_0x7c.HALF.LO = sub_080001DA(this->field_0x7c.HALF.HI, 1); @@ -112,7 +112,7 @@ void sub_08092B0C(Entity* this) { this->action = 3; this->actionDelay = 0; - switch (this->entityType.parameter & 0xC0) { + switch (this->type2 & 0xC0) { case 0x80: EnqueueSFX(0x72); case 0x40: diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index 625cd129..55c8b261 100644 --- a/src/object/metalDoor.c +++ b/src/object/metalDoor.c @@ -8,13 +8,13 @@ extern void sub_080A080C(Entity*); extern void sub_0806F69C(Entity*); extern void EnqueueSFX(u32); extern void sub_080A0870(Entity*); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern u32 sub_080001DA(u32, u32); 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; @@ -79,7 +79,7 @@ void sub_080A07BC(Entity* this) { this->direction = 0x10; this->y.HALF.HI += 2; sub_080A0870(this); - PlaySFX(0x10b); + SoundReq(0x10b); } } diff --git a/src/object/minecart.c b/src/object/minecart.c index 5417e8a7..53d1ff82 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -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[]; @@ -42,9 +42,9 @@ void sub_080916EC(Entity* this) { this->x.HALF.HI = gRoomControls.roomOriginX + ((unk->field_0x0 & 0x3f) << 4) + 8; this->y.HALF.HI = gRoomControls.roomOriginY + ((unk->field_0x0 & 0xfc << 4) >> 2) + 8; this->animationState = unk->field_0x5; - this->entityType.parameter = unk->field_0x6; + this->type2 = unk->field_0x6; this->action = 1; - this->boundingBox = &gUnk_080FD310; + this->hitbox = &gUnk_080FD310; this->flags |= 0x80; this->damageType = 1; this->field_0x3c = 0x47; @@ -53,7 +53,7 @@ void sub_080916EC(Entity* this) { this->direction = DirectionFromAnimationState(this->animationState); this->nonPlanarMovement = 0x700; this->spritePriority.b1 = 3; - InitAnimationForceUpdate(this, this->entityType.parameter + 4 + this->animationState); + InitAnimationForceUpdate(this, this->type2 + 4 + this->animationState); SetTile(0x4022, COORD_TO_TILE(this), this->collisionLayer); } @@ -62,8 +62,8 @@ void sub_080917DC(Entity* this) { if ((this->bitfield & 0x7f) == 0x1d) { this->field_0x20 = 0x2a000; this->action = 7; - InitAnimationForceUpdate(this, this->entityType.parameter + 4 + this->animationState); - PlaySFX(0x13b); + InitAnimationForceUpdate(this, this->type2 + 4 + this->animationState); + SoundReq(0x13b); } else { if (sub_0800445C(this) != 0) { if (((gPlayerState.flags.all & 0x40080) == 0) && (gPlayerState.field_0x1c == 0) && @@ -75,7 +75,7 @@ void sub_080917DC(Entity* this) { } else { this->actionDelay = 0; } - if ((this->entityType).parameter == 0) { + if (this->type2 == 0) { if (8 < this->actionDelay) { this->action = this->action + 1; gPlayerState.jumpStatus = 0x81; @@ -85,7 +85,7 @@ void sub_080917DC(Entity* this) { gPlayerEntity.flags &= 0x7f; ResetPlayer(); sub_0807A108(); - PlaySFX(0x7c); + SoundReq(0x7c); } } else { this->actionDelay = 0; @@ -113,7 +113,7 @@ void sub_080918A4(Entity* this) { this->field_0x44 = 8; sub_0801766C(this); sub_0807BA8C(COORD_TO_TILE(this), this->collisionLayer); - PlaySFX(0x137); + SoundReq(0x137); } } else { gPlayerEntity.direction = GetFacingDirection(&gPlayerEntity, this); @@ -149,11 +149,11 @@ void sub_080919AC(Entity* this) { gPlayerEntity.spritePriority.b0 = this->spritePriority.b0 - 1; if (!sub_08091DDC(this)) { if ((gScreenTransition.frameCount & 0xf) == 0) { - PlaySFX(0x138); + SoundReq(0x138); } if (--this->field_0xf == 0xff) { - PlaySFX(0x7b); + SoundReq(0x7b); this->field_0xf = 0x3c; } @@ -182,8 +182,8 @@ void sub_080919AC(Entity* this) { gPlayerEntity.flags |= 0x80; sub_08004168(this); InitAnimationForceUpdate(this, this->animationState + 0xc); - PlaySFX(0x78); - PlaySFX(0x139); + SoundReq(0x78); + SoundReq(0x139); return; case 0x67: case 0x68: diff --git a/src/object/mineralWaterSource.c b/src/object/mineralWaterSource.c index 5cffc20a..50212f44 100644 --- a/src/object/mineralWaterSource.c +++ b/src/object/mineralWaterSource.c @@ -12,7 +12,7 @@ typedef struct { extern UnkStruct_MineralWater MineralWaterSourceParameters[]; -extern bool32 sub_0806FBD8(Entity*); +extern bool32 AllocMutableHitbox(Entity*); void MineralWaterSource(Entity* this) { MineralWaterSourceActionFuncs[this->action](this); @@ -21,17 +21,17 @@ void MineralWaterSource(Entity* this) { void MineralWaterSource_Init(Entity* this) { UnkStruct_MineralWater* unknownParameters; - if (!sub_0806FBD8(this)) { + if (!AllocMutableHitbox(this)) { return; } - unknownParameters = &MineralWaterSourceParameters[this->entityType.form]; + unknownParameters = &MineralWaterSourceParameters[this->type]; - this->entityType.parameter = unknownParameters->field_0x00; + this->type2 = 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; diff --git a/src/object/minishLight.c b/src/object/minishLight.c index 21465597..458a0864 100644 --- a/src/object/minishLight.c +++ b/src/object/minishLight.c @@ -13,7 +13,7 @@ void sub_0809F840(Entity* this) { this->actionDelay = 0x20; this->field_0xf = 0; - if (this->entityType.parameter != 0) { + if (this->type2 != 0) { this->spriteSettings.b.flipX = 1; } diff --git a/src/object/minishSizedEntrance.c b/src/object/minishSizedEntrance.c index 59a9294b..78410c6c 100644 --- a/src/object/minishSizedEntrance.c +++ b/src/object/minishSizedEntrance.c @@ -15,7 +15,7 @@ void sub_08090EC0(Entity* this) { this->action = 1; this->spriteRendering.b3 = 3; this->spritePriority.b0 = 7; - this->frameIndex = (this->entityType).parameter; + this->frameIndex = this->type2; if (CheckIsDungeon()) { this->frameIndex += 4; sub_080AE068(this); diff --git a/src/object/object1A.c b/src/object/object1A.c index a8924998..26ece918 100644 --- a/src/object/object1A.c +++ b/src/object/object1A.c @@ -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,9 +18,9 @@ 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); + itemEntity = CreateObject(0, ent->type, 0); if (itemEntity != NULL) { itemEntity->actionDelay = 10; itemEntity->parent = ent; diff --git a/src/object/object1C.c b/src/object/object1C.c index ace54e82..c12a6c1d 100644 --- a/src/object/object1C.c +++ b/src/object/object1C.c @@ -12,7 +12,7 @@ void Object1C(Entity* this) { } iVar1 = CheckRectOnScreen(this->field_0x80.HWORD, this->field_0x82.HWORD, 0x10, 0x10); if (iVar1 == 0) { - this->parent->field_0x20 &= ~(1 << this->entityType.parameter); + this->parent->field_0x20 &= ~(1 << this->type2); DeleteThisEntity(); } } diff --git a/src/object/object2A.c b/src/object/object2A.c index 9844ec72..ffd00460 100644 --- a/src/object/object2A.c +++ b/src/object/object2A.c @@ -12,11 +12,11 @@ void Object2A(Entity* this) { void sub_08089B18(Entity* this) { this->action = 1; this->spriteSettings.b.draw = TRUE; - if (this->entityType.parameter != 0) { - this->actionDelay = this->entityType.parameter; + if (this->type2 != 0) { + this->actionDelay = this->type2; } InitializeAnimation(this, 0); - switch (this->entityType.form) { + switch (this->type) { case 1: this->y.HALF.HI -= 8; this->actionDelay = 0x28; diff --git a/src/object/object49.c b/src/object/object49.c index b2818152..16bf7bb9 100644 --- a/src/object/object49.c +++ b/src/object/object49.c @@ -19,7 +19,7 @@ extern void (*const gUnk_08121E98[])(Entity*); extern const u16 gUnk_08121EA0[]; void Object49(Entity* this) { - gUnk_08121E5C[this->entityType.form](this); + gUnk_08121E5C[this->type](this); } void sub_0808F0B8(Entity* this) { @@ -59,7 +59,7 @@ static void sub_0808F14C(Entity* this) { sub_0808F2B0(this); if (sub_08003FC4(this, 0x2000) == 0) { this->action++; - PlaySFX(0x84); + SoundReq(0x84); } } @@ -179,10 +179,10 @@ void sub_0808F3DC(Entity* this) { this->spriteSettings.b.draw = 1; this->action = 1; this->actionDelay = 120; - InitializeAnimation(this, this->entityType.form + 1); + InitializeAnimation(this, this->type + 1); // TODO: This block of code might supposed to be a switch statement. - if (this->entityType.form != 8) { - if (this->entityType.form == 7) { + if (this->type != 8) { + if (this->type == 7) { sub_0806FAD8(this->attachedEntity, this); return; } @@ -193,13 +193,13 @@ void sub_0808F3DC(Entity* this) { ResolveEntityOnTop(this->attachedEntity, this); } else { if (*(u32*)&this->parent->field_0x74 == 0) { - if (this->entityType.form == 8) { + if (this->type == 8) { this->attachedEntity->damageType = this->damageType; } DeleteThisEntity(); } - if (this->entityType.form == 5 && this->frames.b.f0) { + if (this->type == 5 && this->frames.b.f0) { Entity* entity = CreateObjectWithParent(this->attachedEntity, 0x49, 8, 0); if (entity) { entity->parent = this->parent; @@ -218,7 +218,7 @@ void sub_0808F498(Entity* this) { if (this->action != 0) { if (sub_0806F3E4(this)) { if (gScreenTransition.frameCount % 16 == 0) { - PlaySFX(0xEF); + SoundReq(0xEF); } DeleteThisEntity(); } @@ -233,11 +233,11 @@ void sub_0808F498(Entity* this) { } else { 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); + var0 = this->type2 != 0 ? 44 : 43; + 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); } diff --git a/src/object/object7E.c b/src/object/object7E.c index a8120b22..6c89947e 100644 --- a/src/object/object7E.c +++ b/src/object/object7E.c @@ -11,15 +11,15 @@ void Object7E(Entity* this) { this->action = 1; this->spritePriority.b0 = 7; this->frameIndex = 0x28; - if (this->entityType.form == 0) { + if (this->type == 0) { this->spriteSettings.b.draw = TRUE; - } else if (this->entityType.form == 2) { + } else if (this->type == 2) { this->spriteSettings.b.flipX = TRUE; } } PositionRelative(this->parent, this, 0, 0x80000); this->height.HALF.HI = 0; - if ((this->entityType).form != 0) { + if (this->type != 0) { this->spriteSettings.b.draw = this->attachedEntity->spriteSettings.b.draw; this->frameIndex = this->attachedEntity->frameIndex + 0x1f; } diff --git a/src/object/object9E.c b/src/object/object9E.c index 32786007..858ee01b 100644 --- a/src/object/object9E.c +++ b/src/object/object9E.c @@ -2,7 +2,7 @@ #include "entity.h" #include "room.h" -extern BoundingBox gUnk_080FD168; +extern Hitbox gUnk_080FD168; extern void SetTile(u32, u32, u32); @@ -14,7 +14,7 @@ void Object9E(Entity* this) { if (this->action == 0) { this->action = 1; this->spritePriority.b0 = 6; - if ((this->entityType).form == 0) { + if (this->type == 0) { this->flags = this->flags | 0x80; this->frameIndex = 1; layer = &this->collisionLayer; @@ -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); diff --git a/src/object/objectA.c b/src/object/objectA.c index a95b3f9d..3679e4bb 100644 --- a/src/object/objectA.c +++ b/src/object/objectA.c @@ -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 { diff --git a/src/object/objectA2.c b/src/object/objectA2.c index 5f4d2e55..01fd9fa6 100644 --- a/src/object/objectA2.c +++ b/src/object/objectA2.c @@ -36,7 +36,7 @@ void sub_0809F318(Entity* this) { this->height.HALF.HI = 0xFFB0; this->spriteOrientation.flipY = 2; this->action = 1; - sub_0801D2B4(this, gUnk_08124704[this->entityType.form]); + sub_0801D2B4(this, gUnk_08124704[this->type]); sub_0805E3A0(this, 7); } @@ -47,7 +47,7 @@ void sub_0809F374(Entity* this) { this->height.WORD = 0; this->action = 2; InitializeAnimation(this, 1); - PlaySFX(0x186); + SoundReq(0x186); } else { this->actionDelay++; } @@ -63,7 +63,7 @@ void sub_0809F374(Entity* this) { case 1: this->actionDelay = 0; sub_0809F448(this); - PlaySFX(0x186); + SoundReq(0x186); } } } diff --git a/src/object/objectA8.c b/src/object/objectA8.c index ce298c29..4cca37f2 100644 --- a/src/object/objectA8.c +++ b/src/object/objectA8.c @@ -26,7 +26,7 @@ void ObjectA8(Entity* this) { case 0x1f: this->action = 5; this->attachedEntity = &gPlayerEntity; - CreateItemEntity((this->entityType).form, 0, 0); + CreateItemEntity(this->type, 0, 0); DeleteThisEntity(); } } diff --git a/src/object/objectAF.c b/src/object/objectAF.c index ac8864bb..c1d32b60 100644 --- a/src/object/objectAF.c +++ b/src/object/objectAF.c @@ -10,7 +10,7 @@ void ObjectAF(Entity* this) { } void sub_080A05A4(Entity* this) { - if ((this->entityType).form != 2) { + if (this->type != 2) { this->action = 1; this->spritePriority.b0 = 6; sub_080A0640(this); @@ -45,8 +45,8 @@ void sub_080A0624(Entity* this) { } void sub_080A0640(Entity* this) { - if (this->entityType.form == 0) { - PositionRelative(*(Entity**)(this->parent->otherEntity + 0x4), this, 0, 0x80000); + if (this->type == 0) { + PositionRelative(*(Entity**)(this->parent->myHeap + 0x4), this, 0, 0x80000); } else { CopyPosition(this->parent, this); } diff --git a/src/object/objectB2.c b/src/object/objectB2.c index 7c4073fb..4722d2e9 100644 --- a/src/object/objectB2.c +++ b/src/object/objectB2.c @@ -13,14 +13,14 @@ void ObjectB2(Entity* this) { if (this->action == 0) { this->action = 1; this->actionDelay = 0x10; - this->direction = (this->entityType).form << 3; + this->direction = this->type << 3; if (this->collisionLayer == 2) { pEVar3 = &gUnk_0200D654; } else { pEVar3 = &gUnk_02027EB4; } this->attachedEntity = pEVar3; - InitializeAnimation(this, this->entityType.form); + InitializeAnimation(this, this->type); } this->nonPlanarMovement = this->parent->nonPlanarMovement; sub_0806F69C(this); diff --git a/src/object/palaceArchway.c b/src/object/palaceArchway.c index de1e5297..cec05cbe 100644 --- a/src/object/palaceArchway.c +++ b/src/object/palaceArchway.c @@ -11,7 +11,7 @@ void PalaceArchway(Entity* this) { void sub_0809F2A0(Entity* this) { this->action = 1; - this->frameIndex = this->entityType.parameter; + this->frameIndex = this->type2; this->spriteRendering.b3 = 3; this->spritePriority.b0 = 7; SetTile(0x4069, COORD_TO_TILE(this), this->collisionLayer); diff --git a/src/object/pinwheel.c b/src/object/pinwheel.c index 5862c3ca..d6a24471 100644 --- a/src/object/pinwheel.c +++ b/src/object/pinwheel.c @@ -21,7 +21,7 @@ void Pinwheel(Entity* this) { } void sub_080A23DC(Entity* this) { - this->field_0x68.HWORD = gUnk_08125050[this->entityType.parameter]; + this->field_0x68.HWORD = gUnk_08125050[this->type2]; this->spritePriority.b0 = 7; if (CheckLocalFlag(this->field_0x68.HWORD) != 0) { this->action = 2; diff --git a/src/object/pot.c b/src/object/pot.c index ddce728f..cd73f9a8 100644 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -13,8 +13,8 @@ extern void (*const gUnk_0811F090[])(Entity*); extern void (*const gUnk_0811F0A8[])(Entity*); extern void (*const gUnk_0811F0C4[])(Entity*); -extern BoundingBox gUnk_080FD338; // TODO: should be const -extern BoundingBox gUnk_080FD340; // TODO: should be const +extern Hitbox gUnk_080FD338; // TODO: should be const +extern Hitbox gUnk_080FD340; // TODO: should be const extern u32 sub_08016A30(Entity*); extern u32 sub_080001DA(u32, u32); @@ -28,12 +28,12 @@ void Pot(Entity* this) { } void sub_0808222C(Entity* this) { - if (this->entityType.parameter == 1 && CheckFlags(this->field_0x86.HWORD)) { + if (this->type2 == 1 && CheckFlags(this->field_0x86.HWORD)) { DeleteThisEntity(); } this->action = 1; - this->boundingBox = &gUnk_080FD338; + this->hitbox = &gUnk_080FD338; this->nonPlanarMovement = 0x80; this->y.HALF.HI += 3; this->field_0x16 = 0; @@ -119,7 +119,7 @@ void sub_080824F8(Entity* this) { void sub_08082510(Entity* this) { this->flags |= 0x80; - this->boundingBox = &gUnk_080FD340; + this->hitbox = &gUnk_080FD340; this->field_0x3c = 7; this->damageType = 1; this->flags2 = gPlayerEntity.flags2; @@ -261,13 +261,13 @@ static void sub_08082824(Entity* this) { } static void sub_08082850(Entity* this, Entity* parent) { - u32 parameter = sub_0808288C(this, this->entityType.form, this->field_0x7c.BYTES.byte1, this->entityType.parameter); + u32 parameter = sub_0808288C(this, this->type, this->field_0x7c.BYTES.byte1, this->type2); Entity* fxEntity = CreateFx(this, 5, parameter); if (fxEntity) { fxEntity->parent = parent; } - if (this->entityType.parameter == 1) { + if (this->type2 == 1) { SetFlag(this->field_0x86.HWORD); } diff --git a/src/object/railtrack.c b/src/object/railtrack.c index 57f58f76..2e3a3d66 100644 --- a/src/object/railtrack.c +++ b/src/object/railtrack.c @@ -25,13 +25,13 @@ void sub_080851AC(Entity* this) { this->action = 1; this->spriteSettings.b.draw = 1; this->spritePriority.b0 = 7; - if ((this->entityType.parameter & 1) != 0) { + if ((this->type2 & 1) != 0) { this->field_0x7c.HALF.LO = -1; } else { this->field_0x7c.HALF.LO = 1; } - this->animationState = this->entityType.parameter & 2; - if ((this->entityType).form == 3) { + this->animationState = this->type2 & 2; + if (this->type == 3) { uVar1 = CheckFlags(this->field_0x86.HWORD); this->field_0x7a.HWORD = uVar1; if ((u16)(uVar1 & -1) != 0) { @@ -48,7 +48,7 @@ void sub_08085264(Entity* this) { if (CheckFlags(this->field_0x86.HWORD)) { this->action = 2; this->field_0xf = 8; - if (this->entityType.form == 1) { + if (this->type == 1) { ClearFlag(this->field_0x86.HWORD); } this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3; @@ -72,7 +72,7 @@ void sub_080852B4(Entity* this) { void sub_08085308(Entity* this) { if (sub_080854A8(this) == 0) { - switch (this->entityType.form) { + switch (this->type) { case 0: case 1: break; diff --git a/src/object/smoke.c b/src/object/smoke.c index c8759c7c..5ec708b9 100644 --- a/src/object/smoke.c +++ b/src/object/smoke.c @@ -10,7 +10,7 @@ extern void (*const gUnk_08121070[])(Entity*); extern s8 gUnk_08121068[]; void Smoke(Entity* this) { - gUnk_08121060[this->entityType.form](this); + gUnk_08121060[this->type](this); } void sub_0808A40C(Entity* this) { diff --git a/src/object/swordsmanNewsletter.c b/src/object/swordsmanNewsletter.c index 2cdea24d..e74d2ee1 100644 --- a/src/object/swordsmanNewsletter.c +++ b/src/object/swordsmanNewsletter.c @@ -6,7 +6,7 @@ extern void sub_080787B4(Entity*); extern void (*const gUnk_081228B0[])(Entity*); -extern BoundingBox gUnk_081228A8; +extern Hitbox gUnk_081228A8; extern u16 gUnk_081228B8[]; void SwordsmanNewsletter(Entity* this) { @@ -15,15 +15,15 @@ void SwordsmanNewsletter(Entity* this) { void sub_080933D8(Entity* this) { this->action = 1; - this->frameIndex = this->entityType.form; + this->frameIndex = this->type; UpdateSpriteForCollisionLayer(this); - this->boundingBox = &gUnk_081228A8; + this->hitbox = &gUnk_081228A8; sub_080787B4(this); } void sub_080933FC(Entity* this) { if (this->interactType != 0) { this->interactType = 0; - TextboxNoOverlap(gUnk_081228B8[this->entityType.form], this); + TextboxNoOverlap(gUnk_081228B8[this->type], this); } } diff --git a/src/object/thoughtBubble.c b/src/object/thoughtBubble.c index 1b1b6e47..596cb382 100644 --- a/src/object/thoughtBubble.c +++ b/src/object/thoughtBubble.c @@ -2,7 +2,7 @@ #include "entity.h" extern void InitializeAnimation(Entity*, u32); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void DeleteThisEntity(); extern void GetNextFrame(Entity*); @@ -21,8 +21,8 @@ void ThoughtBubble_Init(Entity* this) { this->actionDelay = 0x2d; } this->spriteOrientation.flipY = 1; - InitializeAnimation(this, this->entityType.parameter); - PlaySFX(ThoughtBubble_SFX[this->entityType.parameter]); + InitializeAnimation(this, this->type2); + SoundReq(ThoughtBubble_SFX[this->type2]); } void ThoughtBubble_Update(Entity* this) { @@ -31,7 +31,7 @@ void ThoughtBubble_Update(Entity* this) { this->y.HALF.HI = this->parent->y.HALF.HI; this->height.HALF.HI = this->parent->height.HALF.HI; } - if ((this->entityType).parameter != 2) { + if (this->type2 != 2) { if (--this->actionDelay == 0) { DeleteThisEntity(); } diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index c11ace77..912003b9 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -10,7 +10,7 @@ extern void CreateSparkle(Entity*); extern u32 sub_0809E9A0(void); extern void sub_08078A90(u32); extern void sub_0809E918(Entity*); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern void CreateMinishEntrance(u32 tile); extern void (*const gUnk_08124354[])(Entity*); @@ -62,7 +62,7 @@ void sub_0809E8EC(Entity* this) { if (--this->actionDelay == 0) { SetFlag(this->field_0x86.HWORD); sub_08078A90(0); - PlaySFX(0x73); + SoundReq(0x73); DeleteThisEntity(); } } diff --git a/src/object/windTribeFlag.c b/src/object/windTribeFlag.c index 01d7e554..9c769808 100644 --- a/src/object/windTribeFlag.c +++ b/src/object/windTribeFlag.c @@ -6,7 +6,7 @@ void WindTribeFlag(Entity* this) { if (this->action == 0) { this->action++; this->collisionLayer = 2; - if ((this->entityType).form == 0) { + if (this->type == 0) { this->spriteSettings.b.flipX = 0; } else { this->spriteSettings.b.flipX = 1; diff --git a/src/object/windcrest.c b/src/object/windcrest.c index a4c4049d..efc11dc4 100644 --- a/src/object/windcrest.c +++ b/src/object/windcrest.c @@ -7,7 +7,7 @@ extern void sub_0807DD64(Entity*); extern void sub_0807DDE4(Entity*); extern void sub_08078850(Entity*, u32, u32, u8*); -extern void PlaySFX(u32); +extern void SoundReq(u32); extern Entity* CreateFx(Entity*, u32, u32); extern u8 gUnk_08125010; @@ -27,7 +27,7 @@ void sub_080A2124(Entity* this) { } void Windcrest_Unlock(Entity* this) { - PlaySFX(0x72); - gSave.windcrests = gSave.windcrests | 1 << (this->entityType.parameter + 0x18); + SoundReq(0x72); + gSave.windcrests = gSave.windcrests | 1 << (this->type2 + 0x18); CreateFx(this, 0x46, 0); } diff --git a/src/player.c b/src/player.c index 8b1c47b0..e3038077 100644 --- a/src/player.c +++ b/src/player.c @@ -21,7 +21,7 @@ extern void sub_080797EC(); extern void sub_08079E08(); extern void sub_08078F60(); -extern BoundingBox gUnk_08114F88; +extern Hitbox gUnk_08114F88; // inject void sub_08070680(Entity* this) { @@ -41,7 +41,7 @@ void sub_08070698(Entity* this) { this->field_0x16 = 0x20; this->flags2 = 8; this->damageType = 0x79; - this->boundingBox = &gUnk_08114F88; + this->hitbox = &gUnk_08114F88; this->spriteIndex = 1; gPlayerState.field_0x8 = 0x100; sub_0806FDA0(this); @@ -116,8 +116,8 @@ void sub_08070C3C(Entity* this) { this->spritePriority.b1 = 0; ResetPlayer(); sub_0807A108(); - PlaySFX(0x7b); - PlaySFX(0x85); + SoundReq(0x7b); + SoundReq(0x85); } void sub_08070CB4(Entity* this) { @@ -159,7 +159,7 @@ void sub_08070D38(Entity* this) { } gPlayerState.jumpStatus = 0x80; - PlaySFX(0x14c); + SoundReq(0x14c); ResetPlayer(); sub_08078F60(); } @@ -355,8 +355,8 @@ void sub_080710A8(Entity* this) { this->nonPlanarMovement = 0x100; sub_0807A108(); - PlaySFX(0x7c); - PlaySFX(0x78); + SoundReq(0x7c); + SoundReq(0x78); } void sub_08071130(Entity* this) { @@ -412,7 +412,7 @@ void sub_08071130(Entity* this) { this->previousActionFlag++; sub_08078F60(); this->field_0x42 = 0; - PlaySFX(0x7d); + SoundReq(0x7d); } void sub_08071208(Entity* this) { @@ -442,7 +442,7 @@ void sub_0807127C(Entity* this) { if ((gPlayerState.flags.all & 0x80) != 0) { this->actionDelay = 0x3c; gPlayerState.field_0x8 = 0xc19; - PlaySFX(0x84); + SoundReq(0x84); } else { if ((gPlayerState.flags.all & 0x10000) == 0) { sub_08004168(this); @@ -504,7 +504,7 @@ void sub_08071380(Entity* this) { this->previousActionFlag = 7; this->actionDelay = 30; DoFade(7, 16); - PlaySFX(0xf8); + SoundReq(0xf8); } else { sub_0804ACF8(); } diff --git a/src/room.c b/src/room.c index d306eb6b..f400ce7f 100644 --- a/src/room.c +++ b/src/room.c @@ -977,7 +977,7 @@ void sub_0804BF38(u32 arg0, struct_0804BF38* arg1) } sub_08080964(gUnk_080D8E50[iVar3].shakeTime, gUnk_080D8E50[iVar3].shakeMag); - PlaySFX(gUnk_080D8E50[iVar2].sfx); + SoundReq(gUnk_080D8E50[iVar2].sfx); } #else NAKED @@ -1026,7 +1026,7 @@ void sub_0804C018(void) { if (CheckGlobalFlag(MAZE_CLEAR)) if (gScreenTransition.playerStartPos.WORD == 0x2780078) // todo: wtf - PlaySFX(0x72); + SoundReq(0x72); ClearGlobalFlag(MAZE_CLEAR); } @@ -1739,8 +1739,8 @@ typedef struct { extern struct_086D4460 gUnk_086D4460; void sub_0804C918(void) { - LoadAssetAsync(&gUnk_086D4460.LO, 0x6000000, 0x4000); - LoadAssetAsync(&gUnk_086D4460.HI, 0x6008000, 0x4000); + LoadResourceAsync(&gUnk_086D4460.LO, 0x6000000, 0x4000); + LoadResourceAsync(&gUnk_086D4460.HI, 0x6008000, 0x4000); LoadPaletteGroup(0x19); } @@ -2240,7 +2240,7 @@ void sub_0804CD48(void) { if (CheckGlobalFlag(LV1_CLEAR)) { LoadRoomEntityList(&gUnk_080DF94C); } else { - PlaySFX(0x80100000); + SoundReq(0x80100000); gArea.musicIndex = gArea.pMusicIndex; } } @@ -2259,7 +2259,7 @@ u32 sub_0804CDD0() { void sub_0804CDD4(void) { sub_08058D34(); gArea.areaMetadata |= 0x40; - gUnk_03001000.transition = 5; + gMain.transition = 5; } u32 sub_0804CDF4() { @@ -2428,7 +2428,7 @@ void sub_0804CED8(void) { sub_0807AABC(&gPlayerEntity); LoadRoomEntityList(&gUnk_080E1814); } else { - PlaySFX(0x80100000); + SoundReq(0x80100000); gArea.musicIndex = gArea.pMusicIndex; } } @@ -2522,10 +2522,10 @@ void sub_0804CFB0(void) { if (!CheckFlags(0x31)) { if (gScreenTransition.field_0x38 == 0) { - PlaySFX(0x80100000); + SoundReq(0x80100000); } else { if (gScreenTransition.field_0x39 == 0) { - PlaySFX(0x80050000); + SoundReq(0x80050000); sub_08078A90(3); } } @@ -2761,7 +2761,7 @@ void sub_0804D140(void) { if (CheckGlobalFlag(LV4_CLEAR)) { LoadRoomEntityList(&gUnk_080E49F4); } else { - PlaySFX(0x80100000); + SoundReq(0x80100000); gArea.musicIndex = gArea.pMusicIndex; } } @@ -3090,7 +3090,7 @@ void sub_0804D384(void) { sub_08078A90(3); LoadRoomEntityList(&gUnk_080E72E4); gArea.musicIndex = gArea.pMusicIndex; - PlaySFX(0x80100000); + SoundReq(0x80100000); } } } @@ -3498,7 +3498,7 @@ u32 sub_0804D6C4() { } void sub_0804D6C8(void) { - PlaySFX(0x80100000); + SoundReq(0x80100000); gArea.musicIndex = gArea.pMusicIndex; } @@ -4508,7 +4508,7 @@ void sub_0804E3C4() { index = 0xE; } sub_0804B3C4(&gUnk_080F0E1C[index]); - PlaySFX(0x80100000); + SoundReq(0x80100000); } u32 sub_0804E45C() { @@ -4716,7 +4716,7 @@ extern EntityData gUnk_080F2E2C; void sub_0804E6E8(void) { if (!CheckGlobalFlag(OUTDOOR)) { gArea.musicIndex = gArea.pMusicIndex; - PlaySFX(0x800b0036); + SoundReq(0x800b0036); } if (!CheckGlobalFlag(START)) { LoadRoomEntityList(&gUnk_080F2E2C); @@ -4733,7 +4733,7 @@ extern EntityData gUnk_080F2EC4; void sub_0804E72C(void) { if (!CheckGlobalFlag(OUTDOOR)) { gArea.musicIndex = gArea.pMusicIndex; - PlaySFX(0x800b0036); + SoundReq(0x800b0036); } if (!CheckGlobalFlag(START)) { LoadRoomEntityList(&gUnk_080F2E94); @@ -4786,7 +4786,7 @@ void sub_0804E7DC(void) { } if (!CheckGlobalFlag(OUTDOOR)) { gArea.musicIndex = gArea.pMusicIndex; - PlaySFX(0x800b0036); + SoundReq(0x800b0036); } if ((gPlayerState.flags.all & 8) == 0) { LoadRoomEntityList(&gUnk_080F31D8); diff --git a/src/screenDebug.c b/src/screenDebug.c index 5efe9713..ccef8f72 100644 --- a/src/screenDebug.c +++ b/src/screenDebug.c @@ -18,13 +18,13 @@ extern u8 gBG3Buffer[]; extern void (*const gUnk_08109A30[])(); void HandleDebugTextScreen() { - gUnk_08109A30[gUnk_03001000.funcIndex](); + gUnk_08109A30[gMain.funcIndex](); } void sub_0805FA04(void) { sub_0801DA90(1); - _DmaZero((void*)&gBG0Buffer, sizeof(BGBuffer)); - _DmaZero((void*)&gBG3Buffer, 0x1000); + MemClear32((void*)&gBG0Buffer, sizeof(BGBuffer)); + MemClear32((void*)&gBG3Buffer, 0x1000); gScreen.lcd.displayControl = 0x940; gScreen.bg.bg1Control = 0; gScreen.bg.bg2Control = 0; @@ -32,13 +32,13 @@ void sub_0805FA04(void) { gScreen.affine.bg3yOffset = 0; gScreen.affine.bg3Control = 0x1e0f; gScreen.affine.unk4 = 1; - sub_08056418(); - _DmaZero((void*)&gUnk_02032EC0, sizeof(UI)); - _DmaZero((void*)&gMenu, sizeof(Menu)); + MessageInitialize(); + MemClear32((void*)&gUnk_02032EC0, sizeof(UI)); + MemClear32((void*)&gMenu, sizeof(Menu)); gMenu.unk16 = gUnk_02000000->gameLanguage; sub_08053320(); sub_0801D79C(0, 0x1144); - gUnk_03001000.funcIndex = 1; + gMain.funcIndex = 1; sub_080A3210(); sub_08050008(); } @@ -68,7 +68,7 @@ void sub_0805FA98(void) { TextboxNoOverlapFollow(gMenu.unk14 * 0x100 + gMenu.unk15); break; case 0x2: - sub_08056418(); + MessageInitialize(); break; default: switch (gInput.unk4) { diff --git a/src/script.c b/src/script.c index c5284391..494e0ae5 100644 --- a/src/script.c +++ b/src/script.c @@ -187,9 +187,9 @@ extern ScriptExecutionContext gPlayerScriptExecutionContext; extern ScriptExecutionContext gScriptExecutionContextArray[0x20]; void sub_0807DA70(void) { - _DmaZero(&gUnk_02033280, sizeof(gUnk_02033280)); - _DmaZero(&gScriptExecutionContextArray, sizeof(gScriptExecutionContextArray)); - _DmaZero(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext)); + MemClear32(&gUnk_02033280, sizeof(gUnk_02033280)); + MemClear32(&gScriptExecutionContextArray, sizeof(gScriptExecutionContextArray)); + MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext)); gUnk_02033280.unk_08 = 8; } @@ -207,7 +207,7 @@ ScriptExecutionContext* CreateScriptExecutionContext(void) { } void DestroyScriptExecutionContext(ScriptExecutionContext* context) { - _DmaZero(context, sizeof(ScriptExecutionContext)); + MemClear32(context, sizeof(ScriptExecutionContext)); } ScriptExecutionContext* StartCutscene(Entity* entity, u16* unk_2) { @@ -237,7 +237,7 @@ void UnloadCutsceneData(Entity* entity) { void StartPlayerScript(u16* unk1) { Entity* player; - _DmaZero(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext)); + MemClear32(&gPlayerScriptExecutionContext, sizeof(gPlayerScriptExecutionContext)); gPlayerScriptExecutionContext.unk_00 = unk1; player = &gPlayerEntity; *(ScriptExecutionContext**)&player->cutsceneBeh = &gPlayerScriptExecutionContext; @@ -260,7 +260,7 @@ ScriptExecutionContext* sub_0807DB68(Entity* entity, u16* unk1) { } void sub_0807DB88(ScriptExecutionContext* context, u16* unk1) { - _DmaZero(context, sizeof(ScriptExecutionContext)); + MemClear32(context, sizeof(ScriptExecutionContext)); context->unk_00 = unk1; } @@ -389,7 +389,7 @@ void sub_0807DDE4(Entity* entity) { loopVar = loopVar ^ switchVar; switch (switchVar) { case 2: - if (entity->entityType.type == 7) { + if (entity->kind == 7) { sub_0806ED78(entity); } else { sub_0800445C(entity); @@ -1321,23 +1321,23 @@ void sub_0807EF90(Entity* unk1, ScriptExecutionContext* unk2) { } void sub_0807EFA0(Entity* unk1, ScriptExecutionContext* unk2) { - PlaySFX(unk2->unk_00[1]); + SoundReq(unk2->unk_00[1]); } void sub_0807EFAC(Entity* unk1, ScriptExecutionContext* unk2) { if (unk2->unk_00[1] >= 100) { - PlaySFX(gArea.musicIndex); + SoundReq(gArea.musicIndex); } else { - PlaySFX(unk2->unk_00[1]); + SoundReq(unk2->unk_00[1]); } } void sub_0807EFD4(Entity* unk1, ScriptExecutionContext* unk2) { - PlaySFX(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00)); + SoundReq(GetNextScriptCommandWordAfterCommandMetadata(unk2->unk_00)); } void sub_0807EFE4(Entity* unk1, ScriptExecutionContext* unk2) { - PlaySFX(0x80100000); + SoundReq(0x80100000); } void sub_0807EFF4(Entity* unk1, ScriptExecutionContext* unk2) { diff --git a/src/sub_08050008.c b/src/sub_08050008.c index 263baef1..4fe0e197 100644 --- a/src/sub_08050008.c +++ b/src/sub_08050008.c @@ -2,12 +2,12 @@ extern u32 gUnk_020354C0; extern s32 gFadeControl; -extern void _DmaZero(u32, u32, u32); +extern void MemClear32(u32, u32, u32); void sub_08050008(u32 param_1, u32 param_2, u32 param_3) { s32* unk; - _DmaZero((u32)&gUnk_020354C0, 128, param_3); + MemClear32((u32)&gUnk_020354C0, 128, param_3); unk = &gFadeControl; *(unk + 1) = -1; diff --git a/src/sub_0805E374.c b/src/sub_0805E374.c index ebad1b0e..5767e6da 100644 --- a/src/sub_0805E374.c +++ b/src/sub_0805E374.c @@ -10,5 +10,5 @@ Entity* sub_0805E374(Entity* param_1) { if (r3 != '\x02') { array = gUnk_081091EE; } - return sub_0805E3A0(param_1, array[(param_1->entityType).type]); + return sub_0805E3A0(param_1, array[param_1->kind]); } diff --git a/src/textbox.c b/src/textbox.c index a4f921ee..8e962960 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -83,7 +83,7 @@ void TextboxAtPosition(u32 index, u32 x, u32 y) { } void ShowTextbox(u32 index) { - _DmaZero(&gTextBox, 32); + MemClear32(&gTextBox, 32); gTextBox.textIndex = index; gTextBox.textSpeed = 99; gTextBox.textWindowWidth = 26; @@ -93,19 +93,19 @@ void ShowTextbox(u32 index) { gTextBox.doTextBox = 1; } -void sub_08056418(void) { - _DmaZero(&gTextBox, 32); - _DmaZero(&gUnk_02022780, 168); - _DmaZero(&gUnk_02036A40, 8); - _DmaZero(&gUnk_02036A38, 8); - _DmaZero(&gUnk_02000040, 4); +void MessageInitialize(void) { + MemClear32(&gTextBox, 32); + MemClear32(&gUnk_02022780, 168); + MemClear32(&gUnk_02036A40, 8); + MemClear32(&gUnk_02036A38, 8); + MemClear32(&gUnk_02000040, 4); } -void sub_08056458(void) { +void MessageUpdate(void) { int iVar1; if (gTextBox.doTextBox == 1) { - _DmaZero((u32*)&gUnk_02022780, sizeof(gUnk_02022780)); + MemClear32((u32*)&gUnk_02022780, sizeof(gUnk_02022780)); sub_080564C8(1); } @@ -120,8 +120,8 @@ void sub_08056458(void) { gUnk_02022780._9d = 0; sub_08056F70(); } - sub_08056C68(); - sub_08056D70(); + DeleteWindow(); + CreateWindow(); } void sub_080564C8(u32 a1) { @@ -141,10 +141,10 @@ NONMATCH("asm/non_matching/textbox/sub_080564EC.inc", u32 sub_080564EC(void)) { u32 i; char c; - _DmaZero((void*)&gUnk_02036A40, 8); - _DmaZero((void*)&gUnk_02024030, 0x18); - _DmaZero((void*)&gUnk_02022780, 0xa8); - _DmaCopy(&gTextBox, &gUnk_02022780, 32); + MemClear32((void*)&gUnk_02036A40, 8); + MemClear32((void*)&gUnk_02024030, 0x18); + MemClear32((void*)&gUnk_02022780, 0xa8); + MemCopy(&gTextBox, &gUnk_02022780, 32); if (gUnk_02022780._2 == 0x63) { gUnk_02022780._2 = gUnk_02000000->messageSpeed; } @@ -180,7 +180,7 @@ u32 sub_080565B4(void) { gUnk_02022780._89 = 1; gUnk_02022780._99 = 1; sub_08056F88(gUnk_02022780._3[0], gUnk_02022780._53); - PlaySFX(0x65); + SoundReq(0x65); } if (sub_08056CC0(1)) { @@ -195,7 +195,7 @@ u32 sub_080565F8(void) { gUnk_02022780._89 = 1; gUnk_02022780._99 = 3; sub_08056BDC(0); - PlaySFX(0x66); + SoundReq(0x66); } if (sub_08056CC0(-1)) {