From 4c3b7644617a389f0cb664b63c257f90eb88fdc4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Mar 2020 01:31:03 -0400 Subject: [PATCH 01/16] Almost done --- .../ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s | 16 --- .../ovl_Bg_Haka_Megane/BgHakaMegane_Init.s | 57 ---------- .../ovl_Bg_Haka_Megane/BgHakaMegane_Update.s | 12 --- .../actors/ovl_Bg_Haka_Megane/func_8087DBF0.s | 34 ------ .../actors/ovl_Bg_Haka_Megane/func_8087DC64.s | 6 -- .../actors/ovl_Bg_Haka_Megane/func_8087DC94.s | 47 -------- spec | 1 - .../ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 102 ++++++++++++++++-- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.h | 7 +- undefined_syms.txt | 3 + 10 files changed, 101 insertions(+), 184 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s deleted file mode 100644 index 6e38aca86..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgHakaMegane_Destroy -/* 000B4 8087DAF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000B8 8087DAF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 000BC 8087DAFC 8FAE0018 */ lw $t6, 0x0018($sp) -/* 000C0 8087DB00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C4 8087DB04 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000C8 8087DB08 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 000CC 8087DB0C 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 000D0 8087DB10 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 000D4 8087DB14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000D8 8087DB18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000DC 8087DB1C 03E00008 */ jr $ra -/* 000E0 8087DB20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s deleted file mode 100644 index 1845ff85c..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel BgHakaMegane_Init -/* 00000 8087DA40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 8087DA44 AFA50024 */ sw $a1, 0x0024($sp) -/* 00008 8087DA48 AFBF001C */ sw $ra, 0x001C($sp) -/* 0000C 8087DA4C AFB00018 */ sw $s0, 0x0018($sp) -/* 00010 8087DA50 3C058088 */ lui $a1, %hi(D_8087DD50) ## $a1 = 80880000 -/* 00014 8087DA54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 8087DA58 0C01E037 */ jal Actor_ProcessInitChain - -/* 0001C 8087DA5C 24A5DD50 */ addiu $a1, $a1, %lo(D_8087DD50) ## $a1 = 8087DD50 -/* 00020 8087DA60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00024 8087DA64 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00028 8087DA68 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0002C 8087DA6C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00030 8087DA70 8FA40024 */ lw $a0, 0x0024($sp) -/* 00034 8087DA74 24050069 */ addiu $a1, $zero, 0x0069 ## $a1 = 00000069 -/* 00038 8087DA78 29C10003 */ slti $at, $t6, 0x0003 -/* 0003C 8087DA7C 5020000A */ beql $at, $zero, .L8087DAA8 -/* 00040 8087DA80 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00044 8087DA84 8FA40024 */ lw $a0, 0x0024($sp) -/* 00048 8087DA88 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0004C 8087DA8C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00050 8087DA90 2405008D */ addiu $a1, $zero, 0x008D ## $a1 = 0000008D -/* 00054 8087DA94 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00058 8087DA98 00812021 */ addu $a0, $a0, $at -/* 0005C 8087DA9C 10000006 */ beq $zero, $zero, .L8087DAB8 -/* 00060 8087DAA0 A2020169 */ sb $v0, 0x0169($s0) ## 00000169 -/* 00064 8087DAA4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L8087DAA8: -/* 00068 8087DAA8 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0006C 8087DAAC 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00070 8087DAB0 00812021 */ addu $a0, $a0, $at -/* 00074 8087DAB4 A2020169 */ sb $v0, 0x0169($s0) ## 00000169 -.L8087DAB8: -/* 00078 8087DAB8 820F0169 */ lb $t7, 0x0169($s0) ## 00000169 -/* 0007C 8087DABC 3C188088 */ lui $t8, %hi(func_8087DB24) ## $t8 = 80880000 -/* 00080 8087DAC0 2718DB24 */ addiu $t8, $t8, %lo(func_8087DB24) ## $t8 = 8087DB24 -/* 00084 8087DAC4 05E30006 */ bgezl $t7, .L8087DAE0 -/* 00088 8087DAC8 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 0008C 8087DACC 0C00B55C */ jal Actor_Kill - -/* 00090 8087DAD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00094 8087DAD4 10000003 */ beq $zero, $zero, .L8087DAE4 -/* 00098 8087DAD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0009C 8087DADC AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -.L8087DAE0: -/* 000A0 8087DAE0 8FBF001C */ lw $ra, 0x001C($sp) -.L8087DAE4: -/* 000A4 8087DAE4 8FB00018 */ lw $s0, 0x0018($sp) -/* 000A8 8087DAE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 000AC 8087DAEC 03E00008 */ jr $ra -/* 000B0 8087DAF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s deleted file mode 100644 index e2ad034ac..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel BgHakaMegane_Update -/* 00230 8087DC70 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00234 8087DC74 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00238 8087DC78 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 0023C 8087DC7C 0320F809 */ jalr $ra, $t9 -/* 00240 8087DC80 00000000 */ nop -/* 00244 8087DC84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00248 8087DC88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0024C 8087DC8C 03E00008 */ jr $ra -/* 00250 8087DC90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s deleted file mode 100644 index 23e2a2b08..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8087DBF0 -/* 001B0 8087DBF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001B4 8087DBF4 AFBF001C */ sw $ra, 0x001C($sp) -/* 001B8 8087DBF8 AFB00018 */ sw $s0, 0x0018($sp) -/* 001BC 8087DBFC 90AE1C27 */ lbu $t6, 0x1C27($a1) ## 00001C27 -/* 001C0 8087DC00 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 001C4 8087DC04 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 001C8 8087DC08 11C0000A */ beq $t6, $zero, .L8087DC34 -/* 001CC 8087DC0C 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 001D0 8087DC10 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 001D4 8087DC14 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 -/* 001D8 8087DC18 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 001DC 8087DC1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001E0 8087DC20 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 001E4 8087DC24 0C00FAFE */ jal func_8003EBF8 -/* 001E8 8087DC28 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -/* 001EC 8087DC2C 10000009 */ beq $zero, $zero, .L8087DC54 -/* 001F0 8087DC30 8FBF001C */ lw $ra, 0x001C($sp) -.L8087DC34: -/* 001F4 8087DC34 8CF90004 */ lw $t9, 0x0004($a3) ## 00000004 -/* 001F8 8087DC38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001FC 8087DC3C 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -/* 00200 8087DC40 03214024 */ and $t0, $t9, $at -/* 00204 8087DC44 ACE80004 */ sw $t0, 0x0004($a3) ## 00000004 -/* 00208 8087DC48 0C00FB14 */ jal func_8003EC50 -/* 0020C 8087DC4C 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -/* 00210 8087DC50 8FBF001C */ lw $ra, 0x001C($sp) -.L8087DC54: -/* 00214 8087DC54 8FB00018 */ lw $s0, 0x0018($sp) -/* 00218 8087DC58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0021C 8087DC5C 03E00008 */ jr $ra -/* 00220 8087DC60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s deleted file mode 100644 index 3f17a97c6..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8087DC64 -/* 00224 8087DC64 AFA40000 */ sw $a0, 0x0000($sp) -/* 00228 8087DC68 03E00008 */ jr $ra -/* 0022C 8087DC6C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s deleted file mode 100644 index 3f612a4b8..000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_8087DC94 -/* 00254 8087DC94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00258 8087DC98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0025C 8087DC9C AFA5001C */ sw $a1, 0x001C($sp) -/* 00260 8087DCA0 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00264 8087DCA4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00268 8087DCA8 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 0026C 8087DCAC 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 -/* 00270 8087DCB0 15E1000B */ bne $t7, $at, .L8087DCE0 -/* 00274 8087DCB4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00278 8087DCB8 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C -/* 0027C 8087DCBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00280 8087DCC0 3C058088 */ lui $a1, %hi(D_8087DD88) ## $a1 = 80880000 -/* 00284 8087DCC4 0018C880 */ sll $t9, $t8, 2 -/* 00288 8087DCC8 00B92821 */ addu $a1, $a1, $t9 -/* 0028C 8087DCCC 8CA5DD88 */ lw $a1, %lo(D_8087DD88)($a1) -/* 00290 8087DCD0 0C00D4C9 */ jal Draw_DListXlu - -/* 00294 8087DCD4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00298 8087DCD8 10000009 */ beq $zero, $zero, .L8087DD00 -/* 0029C 8087DCDC 8FAA0018 */ lw $t2, 0x0018($sp) -.L8087DCE0: -/* 002A0 8087DCE0 84C8001C */ lh $t0, 0x001C($a2) ## 0000001C -/* 002A4 8087DCE4 3C058088 */ lui $a1, %hi(D_8087DD88) ## $a1 = 80880000 -/* 002A8 8087DCE8 AFA60018 */ sw $a2, 0x0018($sp) -/* 002AC 8087DCEC 00084880 */ sll $t1, $t0, 2 -/* 002B0 8087DCF0 00A92821 */ addu $a1, $a1, $t1 -/* 002B4 8087DCF4 0C00D498 */ jal Draw_DListOpa - -/* 002B8 8087DCF8 8CA5DD88 */ lw $a1, %lo(D_8087DD88)($a1) -/* 002BC 8087DCFC 8FAA0018 */ lw $t2, 0x0018($sp) -.L8087DD00: -/* 002C0 8087DD00 8FA4001C */ lw $a0, 0x001C($sp) -/* 002C4 8087DD04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002C8 8087DD08 854B001C */ lh $t3, 0x001C($t2) ## 0000001C -/* 002CC 8087DD0C 55600004 */ bnel $t3, $zero, .L8087DD20 -/* 002D0 8087DD10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002D4 8087DD14 0C00D4C9 */ jal Draw_DListXlu - -/* 002D8 8087DD18 24A51250 */ addiu $a1, $a1, 0x1250 ## $a1 = 06001250 -/* 002DC 8087DD1C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8087DD20: -/* 002E0 8087DD20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002E4 8087DD24 03E00008 */ jr $ra -/* 002E8 8087DD28 00000000 */ nop -/* 002EC 8087DD2C 00000000 */ nop - diff --git a/spec b/spec index 1c5e4ba70..7b5f072fc 100644 --- a/spec +++ b/spec @@ -866,7 +866,6 @@ endseg beginseg name "ovl_Bg_Haka_Megane" include "build/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.o" - include "build/data/overlays/actors/z_bg_haka_megane.data.o" include "build/data/overlays/actors/z_bg_haka_megane.reloc.o" endseg diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index 2454dc22e..980d584f1 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -7,7 +7,11 @@ void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx); void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); -/* +void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx); +void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); +void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); +void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); + const ActorInit Bg_Haka_Megane_InitVars = { ACTOR_BG_HAKA_MEGANE, @@ -21,17 +25,97 @@ const ActorInit Bg_Haka_Megane_InitVars = (ActorFunc)BgHakaMegane_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s") +InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DB24.s") +UNK_TYPE D_8087DD54[] = { + 0x06001830, 0x06001AB8, 0x00000000, 0x06004330, 0x060044D0, 0x00000000, 0x06004780, + 0x06004940, 0x00000000, 0x06004B00, 0x00000000, 0x06004CC0, 0x00000000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s") +UNK_TYPE D_8087DD88[] = { + 0x06001060, 0x06001920, 0x060003F0, 0x060040F0, 0x060043B0, 0x06001120, 0x060045A0, + 0x060047F0, 0x060018F0, 0x060049B0, 0x06003CF0, 0x06004B70, 0x06002ED0, 0x00000000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s") +extern UNK_TYPE D_06001250; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s") +void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s") + Actor_ProcessInitChain(thisx, initChain); + DynaPolyInfo_SetActorMove(thisx, 0); + + if (thisx->params < 3) { + this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_HAKACH_OBJECTS); + } else { + this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_HAKA_OBJECTS); + } + + if (this->objBankIndex < 0) { + Actor_Kill(thisx); + } else { + this->actionFunc = (ActorFunc)func_8087DB24; + } +} + +void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + s32 local_c; + u32 collision; + + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { + thisx->draw = (ActorFunc)func_8087DC94; + thisx->objBankIndex = this->objBankIndex; + Actor_SetObjectDependency(globalCtx, thisx); + if (globalCtx->roomCtx.curRoom.showInvisActors) { + this->actionFunc = (ActorFunc)func_8087DBF0; + collision = D_8087DD54[thisx->params]; + if (collision != 0) { + DynaPolyInfo_Alloc(&collision, &local_c); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); + } + } else { + this->actionFunc = (ActorFunc)func_8087DC64; + } + } +} + +void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + if (globalCtx->actorCtx.unk_03 != 0) { + thisx->flags |= 0x80; + func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } else { + thisx->flags &= -0x81; + func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } +} + +void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) { + +} + +void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) { + this->actionFunc(this, globalCtx); +} + +void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + + if ((thisx->flags & 0x80) == 0x80) { + Draw_DListXlu(globalCtx, D_8087DD88[thisx->params]); + } else { + Draw_DListOpa(globalCtx, D_8087DD88[thisx->params]); + } + + if (thisx->params == 0) { + Draw_DListXlu(globalCtx, &D_06001250); + } +} diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h index 06fb457b6..18d029aeb 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h @@ -5,8 +5,11 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x1]; + /* 0x0169 */ s8 objBankIndex; + /* 0x016A */ char unk_16A[0x2]; } BgHakaMegane; // size = 0x016C extern const ActorInit Bg_Haka_Megane_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 7980357d0..120d605fb 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -258,6 +258,9 @@ D_060003C0 = 0x060003C0; D_060030A0 = 0x060030A0; D_06003158 = 0x06003158; +// z_bg_haka_megane +D_06001250 = 0x06001250; + // z_bg_haka_meganebg D_06005334 = 0x06005334; D_06009168 = 0x06009168; From 1042a72fd2439e6c0f02bb37bb221572caa4d157 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Mar 2020 15:23:50 -0400 Subject: [PATCH 02/16] Done --- data/overlays/actors/z_bg_haka_megane.data.s | 22 ------- data/overlays/actors/z_bg_haka_megane.reloc.s | 11 ---- spec | 2 +- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 64 ++++++++++--------- 4 files changed, 36 insertions(+), 63 deletions(-) delete mode 100644 data/overlays/actors/z_bg_haka_megane.data.s delete mode 100644 data/overlays/actors/z_bg_haka_megane.reloc.s diff --git a/data/overlays/actors/z_bg_haka_megane.data.s b/data/overlays/actors/z_bg_haka_megane.data.s deleted file mode 100644 index 549be9431..000000000 --- a/data/overlays/actors/z_bg_haka_megane.data.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel Bg_Haka_Megane_InitVars - .word 0x00AE0600, 0x000000B0, 0x00010000, 0x0000016C -.word BgHakaMegane_Init -.word BgHakaMegane_Destroy -.word BgHakaMegane_Update -.word 0x00000000 -glabel D_8087DD50 - .word 0x48500064 -glabel D_8087DD54 - .word 0x06001830, 0x06001AB8, 0x00000000, 0x06004330, 0x060044D0, 0x00000000, 0x06004780, 0x06004940, 0x00000000, 0x06004B00, 0x00000000, 0x06004CC0, 0x00000000 -glabel D_8087DD88 - .word 0x06001060, 0x06001920, 0x060003F0, 0x060040F0, 0x060043B0, 0x06001120, 0x060045A0, 0x060047F0, 0x060018F0, 0x060049B0, 0x06003CF0, 0x06004B70, 0x06002ED0, 0x00000000 - diff --git a/data/overlays/actors/z_bg_haka_megane.reloc.s b/data/overlays/actors/z_bg_haka_megane.reloc.s deleted file mode 100644 index 93d77a13c..000000000 --- a/data/overlays/actors/z_bg_haka_megane.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_8087DDC0 - -.incbin "baserom/ovl_Bg_Haka_Megane", 0x380, 0x00000070 diff --git a/spec b/spec index 7b5f072fc..f640e16ab 100644 --- a/spec +++ b/spec @@ -866,7 +866,7 @@ endseg beginseg name "ovl_Bg_Haka_Megane" include "build/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.o" - include "build/data/overlays/actors/z_bg_haka_megane.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index 980d584f1..a3d30e082 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -1,16 +1,22 @@ +/* + * File: z_bg_haka_megane.c + * Overlay: ovl_Bg_Haka_Megane + * Description: + */ + #include "z_bg_haka_megane.h" #define ROOM 0x00 #define FLAGS 0x000000B0 -void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx); -void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); -void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); +static void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx); +static void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); +static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); -void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx); -void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); -void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); -void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); +static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx); +static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); +static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); +static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); const ActorInit Bg_Haka_Megane_InitVars = { @@ -26,23 +32,23 @@ const ActorInit Bg_Haka_Megane_InitVars = NULL, }; -InitChainEntry initChain[] = { +static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -UNK_TYPE D_8087DD54[] = { +static UNK_TYPE collisions[] = { 0x06001830, 0x06001AB8, 0x00000000, 0x06004330, 0x060044D0, 0x00000000, 0x06004780, 0x06004940, 0x00000000, 0x06004B00, 0x00000000, 0x06004CC0, 0x00000000, }; -UNK_TYPE D_8087DD88[] = { +static UNK_TYPE dlists[] = { 0x06001060, 0x06001920, 0x060003F0, 0x060040F0, 0x060043B0, 0x06001120, 0x060045A0, - 0x060047F0, 0x060018F0, 0x060049B0, 0x06003CF0, 0x06004B70, 0x06002ED0, 0x00000000, + 0x060047F0, 0x060018F0, 0x060049B0, 0x06003CF0, 0x06004B70, 0x06002ED0, }; extern UNK_TYPE D_06001250; -void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) { +static void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; Actor_ProcessInitChain(thisx, initChain); @@ -61,25 +67,25 @@ void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) { } } -void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx) { +static void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { - Actor* thisx = &this->dyna.actor; - s32 local_c; - u32 collision; +static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { + s32 localC; + UNK_TYPE collision; if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { - thisx->draw = (ActorFunc)func_8087DC94; - thisx->objBankIndex = this->objBankIndex; - Actor_SetObjectDependency(globalCtx, thisx); + this->dyna.actor.objBankIndex = this->objBankIndex; + this->dyna.actor.draw = (ActorFunc)func_8087DC94; + Actor_SetObjectDependency(globalCtx, &this->dyna.actor); if (globalCtx->roomCtx.curRoom.showInvisActors) { this->actionFunc = (ActorFunc)func_8087DBF0; - collision = D_8087DD54[thisx->params]; + collision = collisions[this->dyna.actor.params]; if (collision != 0) { - DynaPolyInfo_Alloc(&collision, &local_c); - this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); + DynaPolyInfo_Alloc(collision, &localC); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, + &this->dyna.actor, localC); } } else { this->actionFunc = (ActorFunc)func_8087DC64; @@ -87,7 +93,7 @@ void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { } } -void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { +static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (globalCtx->actorCtx.unk_03 != 0) { thisx->flags |= 0x80; @@ -98,21 +104,21 @@ void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { } } -void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) { +static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) { } -void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) { +static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) { +static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if ((thisx->flags & 0x80) == 0x80) { - Draw_DListXlu(globalCtx, D_8087DD88[thisx->params]); + Draw_DListXlu(globalCtx, dlists[thisx->params]); } else { - Draw_DListOpa(globalCtx, D_8087DD88[thisx->params]); + Draw_DListOpa(globalCtx, dlists[thisx->params]); } if (thisx->params == 0) { From ea3f70cd68885187b7b910b658240b7ad9c62a89 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Mar 2020 15:25:23 -0400 Subject: [PATCH 03/16] Formatting --- src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index a3d30e082..b0ac30bc0 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -18,8 +18,7 @@ static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); -const ActorInit Bg_Haka_Megane_InitVars = -{ +const ActorInit Bg_Haka_Megane_InitVars = { ACTOR_BG_HAKA_MEGANE, ACTORTYPE_PROP, ROOM, @@ -84,8 +83,8 @@ static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { collision = collisions[this->dyna.actor.params]; if (collision != 0) { DynaPolyInfo_Alloc(collision, &localC); - this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, - &this->dyna.actor, localC); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, localC); } } else { this->actionFunc = (ActorFunc)func_8087DC64; @@ -105,7 +104,6 @@ static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { } static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) { - } static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) { From d2729f9d88b8bdb63397338e4979d619304a2b1e Mon Sep 17 00:00:00 2001 From: Roman971 Date: Mon, 23 Mar 2020 21:18:53 +0100 Subject: [PATCH 04/16] Split z_path.c and Rename some small files and functions --- .../{code_80026B00 => z_effect}/Effect_Add.s | 0 .../func_80026B0C.s | 0 .../func_80026C2C.s | 0 .../func_80026E74.s | 0 .../func_80026F70.s | 0 .../func_8002709C.s | 0 .../func_800271A8.s | 0 .../code/z_path/Path_CopyLastPoint.s | 39 ++++++++++ .../code/z_path/Path_GetByIndex.s | 18 +++++ .../code/z_path/Path_OrientAndGetDistSq.s} | 75 ++----------------- .../actors/ovl_En_Ani/func_809B064C.s | 2 +- .../overlays/actors/ovl_En_Cs/func_809E1CB8.s | 2 +- .../ovl_En_Daiku_Kakariko/func_809E47EC.s | 2 +- .../actors/ovl_En_Diving_Game/func_809EDD4C.s | 4 +- .../overlays/actors/ovl_En_Du/func_809FDC38.s | 2 +- .../overlays/actors/ovl_En_Fu/func_80A1DA9C.s | 2 +- .../actors/ovl_En_Ge1/func_80A3118C.s | 2 +- .../actors/ovl_En_Ge1/func_80A31880.s | 2 +- .../overlays/actors/ovl_En_Go2/EnGo2_Init.s | 6 +- .../actors/ovl_En_Go2/func_80A44534.s | 2 +- .../actors/ovl_En_Go2/func_80A44CE4.s | 2 +- .../actors/ovl_En_Go2/func_80A44D84.s | 2 +- .../actors/ovl_En_Go2/func_80A462D8.s | 2 +- .../actors/ovl_En_Heishi2/func_80A53278.s | 4 +- .../actors/ovl_En_Heishi2/func_80A5399C.s | 4 +- .../actors/ovl_En_Heishi2/func_80A53AD4.s | 4 +- .../actors/ovl_En_Heishi2/func_80A5475C.s | 2 +- .../actors/ovl_En_Heishi4/func_80A563BC.s | 4 +- .../actors/ovl_En_Heishi4/func_80A56614.s | 4 +- .../actors/ovl_En_Heishi4/func_80A56B40.s | 2 +- .../actors/ovl_En_Hs2/func_80A6F1A4.s | 2 +- .../overlays/actors/ovl_En_Hy/func_80A6F810.s | 2 +- .../overlays/actors/ovl_En_Hy/func_80A70E34.s | 2 +- .../overlays/actors/ovl_En_Hy/func_80A711B4.s | 2 +- .../overlays/actors/ovl_En_Hy/func_80A7134C.s | 2 +- .../overlays/actors/ovl_En_In/func_80A79010.s | 2 +- .../overlays/actors/ovl_En_In/func_80A79168.s | 2 +- .../overlays/actors/ovl_En_Ko/func_80A97610.s | 6 +- .../overlays/actors/ovl_En_Ko/func_80A99048.s | 4 +- .../overlays/actors/ovl_En_Kz/func_80A9C658.s | 2 +- .../actors/ovl_En_Ma1/func_80AA0690.s | 2 +- .../actors/ovl_En_Ma2/func_80AA19A0.s | 2 +- .../overlays/actors/ovl_En_Md/func_80AAACF8.s | 2 +- .../overlays/actors/ovl_En_Mk/func_80AAD080.s | 2 +- .../overlays/actors/ovl_En_Mm/func_80AADC34.s | 2 +- .../overlays/actors/ovl_En_Mu/func_80AB0584.s | 2 +- .../overlays/actors/ovl_En_Nb/func_80AB3B04.s | 2 +- .../actors/ovl_En_Niw_Lady/func_80AB9D60.s | 2 +- .../actors/ovl_En_Niw_Lady/func_80ABA244.s | 6 +- .../actors/ovl_En_Niw_Lady/func_80ABAD7C.s | 4 +- .../actors/ovl_En_Ru1/func_80AEFDC0.s | 2 +- .../overlays/actors/ovl_En_Sa/func_80AF55E0.s | 2 +- .../actors/ovl_En_Skj/func_80AFF7D8.s | 4 +- .../actors/ovl_En_Ssh/func_80B03A00.s | 2 +- .../overlays/actors/ovl_En_Ta/func_80B13AAC.s | 2 +- .../overlays/actors/ovl_En_Ta/func_80B16504.s | 2 +- .../overlays/actors/ovl_En_Tg/func_80B18360.s | 2 +- .../actors/ovl_En_Toryo/func_80B206A0.s | 2 +- .../actors/ovl_En_Zl4/func_80B5B90C.s | 2 +- .../overlays/actors/ovl_En_Zo/func_80B61024.s | 2 +- asm/{code_80092500.s => z_quake.s} | 0 data/code_8008E4E0.rodata.s | 11 --- data/{code_80026B00.bss.s => z_effect.bss.s} | 0 .../{code_80026B00.data.s => z_effect.data.s} | 0 data/{code_80092500.bss.s => z_quake.bss.s} | 0 data/{code_80092500.data.s => z_quake.data.s} | 0 ...ode_80092500.rodata.s => z_quake.rodata.s} | 0 include/functions.h | 6 +- include/z64scene.h | 4 +- spec | 19 +++-- src/code/code_80026B00.c | 26 ------- src/code/z_effect.c | 26 +++++++ .../{code_8006C360.c => z_face_reaction.c} | 8 +- src/code/z_path.c | 8 ++ src/overlays/actors/ovl_En_Dog/z_en_dog.c | 4 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 6 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 4 +- 77 files changed, 187 insertions(+), 197 deletions(-) rename asm/non_matchings/code/{code_80026B00 => z_effect}/Effect_Add.s (100%) rename asm/non_matchings/code/{code_80026B00 => z_effect}/func_80026B0C.s (100%) rename asm/non_matchings/code/{code_80026B00 => z_effect}/func_80026C2C.s (100%) rename asm/non_matchings/code/{code_80026B00 => z_effect}/func_80026E74.s (100%) rename asm/non_matchings/code/{code_80026B00 => z_effect}/func_80026F70.s (100%) rename asm/non_matchings/code/{code_80026B00 => z_effect}/func_8002709C.s (100%) rename asm/non_matchings/code/{code_80026B00 => z_effect}/func_800271A8.s (100%) create mode 100644 asm/non_matchings/code/z_path/Path_CopyLastPoint.s create mode 100644 asm/non_matchings/code/z_path/Path_GetByIndex.s rename asm/{code_8008E4E0.s => non_matchings/code/z_path/Path_OrientAndGetDistSq.s} (50%) rename asm/{code_80092500.s => z_quake.s} (100%) delete mode 100644 data/code_8008E4E0.rodata.s rename data/{code_80026B00.bss.s => z_effect.bss.s} (100%) rename data/{code_80026B00.data.s => z_effect.data.s} (100%) rename data/{code_80092500.bss.s => z_quake.bss.s} (100%) rename data/{code_80092500.data.s => z_quake.data.s} (100%) rename data/{code_80092500.rodata.s => z_quake.rodata.s} (100%) delete mode 100644 src/code/code_80026B00.c create mode 100644 src/code/z_effect.c rename src/code/{code_8006C360.c => z_face_reaction.c} (95%) create mode 100644 src/code/z_path.c diff --git a/asm/non_matchings/code/code_80026B00/Effect_Add.s b/asm/non_matchings/code/z_effect/Effect_Add.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/Effect_Add.s rename to asm/non_matchings/code/z_effect/Effect_Add.s diff --git a/asm/non_matchings/code/code_80026B00/func_80026B0C.s b/asm/non_matchings/code/z_effect/func_80026B0C.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_80026B0C.s rename to asm/non_matchings/code/z_effect/func_80026B0C.s diff --git a/asm/non_matchings/code/code_80026B00/func_80026C2C.s b/asm/non_matchings/code/z_effect/func_80026C2C.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_80026C2C.s rename to asm/non_matchings/code/z_effect/func_80026C2C.s diff --git a/asm/non_matchings/code/code_80026B00/func_80026E74.s b/asm/non_matchings/code/z_effect/func_80026E74.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_80026E74.s rename to asm/non_matchings/code/z_effect/func_80026E74.s diff --git a/asm/non_matchings/code/code_80026B00/func_80026F70.s b/asm/non_matchings/code/z_effect/func_80026F70.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_80026F70.s rename to asm/non_matchings/code/z_effect/func_80026F70.s diff --git a/asm/non_matchings/code/code_80026B00/func_8002709C.s b/asm/non_matchings/code/z_effect/func_8002709C.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_8002709C.s rename to asm/non_matchings/code/z_effect/func_8002709C.s diff --git a/asm/non_matchings/code/code_80026B00/func_800271A8.s b/asm/non_matchings/code/z_effect/func_800271A8.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_800271A8.s rename to asm/non_matchings/code/z_effect/func_800271A8.s diff --git a/asm/non_matchings/code/z_path/Path_CopyLastPoint.s b/asm/non_matchings/code/z_path/Path_CopyLastPoint.s new file mode 100644 index 000000000..f0a71fac3 --- /dev/null +++ b/asm/non_matchings/code/z_path/Path_CopyLastPoint.s @@ -0,0 +1,39 @@ +glabel Path_CopyLastPoint +/* B057AC 8008E60C 10800022 */ beqz $a0, .L8008E698 +/* B057B0 8008E610 3C198016 */ lui $t9, %hi(gSegments) +/* B057B4 8008E614 8C830004 */ lw $v1, 4($a0) +/* B057B8 8008E618 908A0000 */ lbu $t2, ($a0) +/* B057BC 8008E61C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff +/* B057C0 8008E620 00037100 */ sll $t6, $v1, 4 +/* B057C4 8008E624 000E7F02 */ srl $t7, $t6, 0x1c +/* B057C8 8008E628 000FC080 */ sll $t8, $t7, 2 +/* B057CC 8008E62C 0338C821 */ addu $t9, $t9, $t8 +/* B057D0 8008E630 8F396FA8 */ lw $t9, %lo(gSegments)($t9) +/* B057D4 8008E634 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff +/* B057D8 8008E638 00614024 */ and $t0, $v1, $at +/* B057DC 8008E63C 000A5880 */ sll $t3, $t2, 2 +/* B057E0 8008E640 016A5823 */ subu $t3, $t3, $t2 +/* B057E4 8008E644 000B5840 */ sll $t3, $t3, 1 +/* B057E8 8008E648 3C017FFF */ lui $at, (0x7FFFFFFA >> 16) # lui $at, 0x7fff +/* B057EC 8008E64C 03284821 */ addu $t1, $t9, $t0 +/* B057F0 8008E650 012B1021 */ addu $v0, $t1, $t3 +/* B057F4 8008E654 3421FFFA */ ori $at, (0x7FFFFFFA & 0xFFFF) # ori $at, $at, 0xfffa +/* B057F8 8008E658 00411021 */ addu $v0, $v0, $at +/* B057FC 8008E65C 844C0000 */ lh $t4, ($v0) +/* B05800 8008E660 448C2000 */ mtc1 $t4, $f4 +/* B05804 8008E664 00000000 */ nop +/* B05808 8008E668 468021A0 */ cvt.s.w $f6, $f4 +/* B0580C 8008E66C E4A60000 */ swc1 $f6, ($a1) +/* B05810 8008E670 844D0002 */ lh $t5, 2($v0) +/* B05814 8008E674 448D4000 */ mtc1 $t5, $f8 +/* B05818 8008E678 00000000 */ nop +/* B0581C 8008E67C 468042A0 */ cvt.s.w $f10, $f8 +/* B05820 8008E680 E4AA0004 */ swc1 $f10, 4($a1) +/* B05824 8008E684 844E0004 */ lh $t6, 4($v0) +/* B05828 8008E688 448E8000 */ mtc1 $t6, $f16 +/* B0582C 8008E68C 00000000 */ nop +/* B05830 8008E690 468084A0 */ cvt.s.w $f18, $f16 +/* B05834 8008E694 E4B20008 */ swc1 $f18, 8($a1) +.L8008E698: +/* B05838 8008E698 03E00008 */ jr $ra +/* B0583C 8008E69C 00000000 */ nop diff --git a/asm/non_matchings/code/z_path/Path_GetByIndex.s b/asm/non_matchings/code/z_path/Path_GetByIndex.s new file mode 100644 index 000000000..8e04fac54 --- /dev/null +++ b/asm/non_matchings/code/z_path/Path_GetByIndex.s @@ -0,0 +1,18 @@ +glabel Path_GetByIndex +/* B05680 8008E4E0 AFA50004 */ sw $a1, 4($sp) +/* B05684 8008E4E4 AFA60008 */ sw $a2, 8($sp) +/* B05688 8008E4E8 00063400 */ sll $a2, $a2, 0x10 +/* B0568C 8008E4EC 00052C00 */ sll $a1, $a1, 0x10 +/* B05690 8008E4F0 00052C03 */ sra $a1, $a1, 0x10 +/* B05694 8008E4F4 00063403 */ sra $a2, $a2, 0x10 +/* B05698 8008E4F8 10A60007 */ beq $a1, $a2, .L8008E518 +/* B0569C 8008E4FC 00001825 */ move $v1, $zero +/* B056A0 8008E500 3C0E0001 */ lui $t6, 1 +/* B056A4 8008E504 01C47021 */ addu $t6, $t6, $a0 +/* B056A8 8008E508 8DCE1E08 */ lw $t6, 0x1e08($t6) +/* B056AC 8008E50C 000578C0 */ sll $t7, $a1, 3 +/* B056B0 8008E510 03E00008 */ jr $ra +/* B056B4 8008E514 01CF1021 */ addu $v0, $t6, $t7 +.L8008E518: +/* B056B8 8008E518 03E00008 */ jr $ra +/* B056BC 8008E51C 00601025 */ move $v0, $v1 diff --git a/asm/code_8008E4E0.s b/asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s similarity index 50% rename from asm/code_8008E4E0.s rename to asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s index 4cc763e5b..4120be226 100644 --- a/asm/code_8008E4E0.s +++ b/asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s @@ -1,34 +1,9 @@ -.include "macro.inc" +.late_rodata +glabel D_8013E760 + .float 10430.378 # 32768 / M_PI -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .text - -.align 4 - -glabel func_8008E4E0 -/* B05680 8008E4E0 AFA50004 */ sw $a1, 4($sp) -/* B05684 8008E4E4 AFA60008 */ sw $a2, 8($sp) -/* B05688 8008E4E8 00063400 */ sll $a2, $a2, 0x10 -/* B0568C 8008E4EC 00052C00 */ sll $a1, $a1, 0x10 -/* B05690 8008E4F0 00052C03 */ sra $a1, $a1, 0x10 -/* B05694 8008E4F4 00063403 */ sra $a2, $a2, 0x10 -/* B05698 8008E4F8 10A60007 */ beq $a1, $a2, .L8008E518 -/* B0569C 8008E4FC 00001825 */ move $v1, $zero -/* B056A0 8008E500 3C0E0001 */ lui $t6, 1 -/* B056A4 8008E504 01C47021 */ addu $t6, $t6, $a0 -/* B056A8 8008E508 8DCE1E08 */ lw $t6, 0x1e08($t6) -/* B056AC 8008E50C 000578C0 */ sll $t7, $a1, 3 -/* B056B0 8008E510 03E00008 */ jr $ra -/* B056B4 8008E514 01CF1021 */ addu $v0, $t6, $t7 -.L8008E518: -/* B056B8 8008E518 03E00008 */ jr $ra -/* B056BC 8008E51C 00601025 */ move $v0, $v1 - -glabel func_8008E520 +.text +glabel Path_OrientAndGetDistSq /* B056C0 8008E520 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B056C4 8008E524 AFA60028 */ sw $a2, 0x28($sp) /* B056C8 8008E528 00063400 */ sll $a2, $a2, 0x10 @@ -90,43 +65,3 @@ glabel func_8008E520 /* B057A0 8008E600 27BD0020 */ addiu $sp, $sp, 0x20 /* B057A4 8008E604 03E00008 */ jr $ra /* B057A8 8008E608 00000000 */ nop - -glabel func_8008E60C -/* B057AC 8008E60C 10800022 */ beqz $a0, .L8008E698 -/* B057B0 8008E610 3C198016 */ lui $t9, %hi(gSegments) -/* B057B4 8008E614 8C830004 */ lw $v1, 4($a0) -/* B057B8 8008E618 908A0000 */ lbu $t2, ($a0) -/* B057BC 8008E61C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B057C0 8008E620 00037100 */ sll $t6, $v1, 4 -/* B057C4 8008E624 000E7F02 */ srl $t7, $t6, 0x1c -/* B057C8 8008E628 000FC080 */ sll $t8, $t7, 2 -/* B057CC 8008E62C 0338C821 */ addu $t9, $t9, $t8 -/* B057D0 8008E630 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B057D4 8008E634 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B057D8 8008E638 00614024 */ and $t0, $v1, $at -/* B057DC 8008E63C 000A5880 */ sll $t3, $t2, 2 -/* B057E0 8008E640 016A5823 */ subu $t3, $t3, $t2 -/* B057E4 8008E644 000B5840 */ sll $t3, $t3, 1 -/* B057E8 8008E648 3C017FFF */ lui $at, (0x7FFFFFFA >> 16) # lui $at, 0x7fff -/* B057EC 8008E64C 03284821 */ addu $t1, $t9, $t0 -/* B057F0 8008E650 012B1021 */ addu $v0, $t1, $t3 -/* B057F4 8008E654 3421FFFA */ ori $at, (0x7FFFFFFA & 0xFFFF) # ori $at, $at, 0xfffa -/* B057F8 8008E658 00411021 */ addu $v0, $v0, $at -/* B057FC 8008E65C 844C0000 */ lh $t4, ($v0) -/* B05800 8008E660 448C2000 */ mtc1 $t4, $f4 -/* B05804 8008E664 00000000 */ nop -/* B05808 8008E668 468021A0 */ cvt.s.w $f6, $f4 -/* B0580C 8008E66C E4A60000 */ swc1 $f6, ($a1) -/* B05810 8008E670 844D0002 */ lh $t5, 2($v0) -/* B05814 8008E674 448D4000 */ mtc1 $t5, $f8 -/* B05818 8008E678 00000000 */ nop -/* B0581C 8008E67C 468042A0 */ cvt.s.w $f10, $f8 -/* B05820 8008E680 E4AA0004 */ swc1 $f10, 4($a1) -/* B05824 8008E684 844E0004 */ lh $t6, 4($v0) -/* B05828 8008E688 448E8000 */ mtc1 $t6, $f16 -/* B0582C 8008E68C 00000000 */ nop -/* B05830 8008E690 468084A0 */ cvt.s.w $f18, $f16 -/* B05834 8008E694 E4B20008 */ swc1 $f18, 8($a1) -.L8008E698: -/* B05838 8008E698 03E00008 */ jr $ra -/* B0583C 8008E69C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s index 8fdaaa796..60bf27aa8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s @@ -5,7 +5,7 @@ glabel func_809B064C /* 002E8 809B0658 AFA50024 */ sw $a1, 0x0024($sp) /* 002EC 809B065C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 002F0 809B0660 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 002F4 809B0664 0C01B0D8 */ jal func_8006C360 +/* 002F4 809B0664 0C01B0D8 */ jal Text_GetFaceReaction /* 002F8 809B0668 AFA70020 */ sw $a3, 0x0020($sp) /* 002FC 809B066C 8FA50024 */ lw $a1, 0x0024($sp) /* 00300 809B0670 8FA70020 */ lw $a3, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s index 7e0ecfb29..608e7d477 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s @@ -5,7 +5,7 @@ glabel func_809E1CB8 /* 00414 809E1CC4 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00418 809E1CC8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0041C 809E1CCC 2405000F */ addiu $a1, $zero, 0x000F ## $a1 = 0000000F -/* 00420 809E1CD0 0C01B0D8 */ jal func_8006C360 +/* 00420 809E1CD0 0C01B0D8 */ jal Text_GetFaceReaction /* 00424 809E1CD4 AFAE001C */ sw $t6, 0x001C($sp) /* 00428 809E1CD8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 0042C 809E1CDC 95EFF556 */ lhu $t7, -0x0AAA($t7) ## 8015F556 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s index 67dc9a437..85ed73e02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s @@ -50,7 +50,7 @@ glabel func_809E47EC /* 00584 809E48A4 33280003 */ andi $t0, $t9, 0x0003 ## $t0 = 00000000 /* 00588 809E48A8 00084880 */ sll $t1, $t0, 2 /* 0058C 809E48AC 00A92821 */ addu $a1, $a1, $t1 -/* 00590 809E48B0 0C01B0D8 */ jal func_8006C360 +/* 00590 809E48B0 0C01B0D8 */ jal Text_GetFaceReaction /* 00594 809E48B4 8CA55570 */ lw $a1, %lo(D_809E5570)($a1) /* 00598 809E48B8 304AFFFF */ andi $t2, $v0, 0xFFFF ## $t2 = 00000000 /* 0059C 809E48BC 15400035 */ bne $t2, $zero, .L809E4994 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s index ae1e3eaf8..66f336ea7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s @@ -53,11 +53,11 @@ glabel func_809EDD4C /* 00594 809EDE04 10000030 */ beq $zero, $zero, .L809EDEC8 /* 00598 809EDE08 AE080280 */ sw $t0, 0x0280($s0) ## 00000280 .L809EDE0C: -/* 0059C 809EDE0C 0C01B0D8 */ jal func_8006C360 +/* 0059C 809EDE0C 0C01B0D8 */ jal Text_GetFaceReaction /* 005A0 809EDE10 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D /* 005A4 809EDE14 10400007 */ beq $v0, $zero, .L809EDE34 /* 005A8 809EDE18 8FA40024 */ lw $a0, 0x0024($sp) -/* 005AC 809EDE1C 0C01B0D8 */ jal func_8006C360 +/* 005AC 809EDE1C 0C01B0D8 */ jal Text_GetFaceReaction /* 005B0 809EDE20 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D /* 005B4 809EDE24 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 005B8 809EDE28 A602010E */ sh $v0, 0x010E($s0) ## 0000010E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s index 40c29089d..d95340901 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s @@ -2,7 +2,7 @@ glabel func_809FDC38 /* 00008 809FDC38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0000C 809FDC3C AFBF0014 */ sw $ra, 0x0014($sp) /* 00010 809FDC40 AFA5001C */ sw $a1, 0x001C($sp) -/* 00014 809FDC44 0C01B0D8 */ jal func_8006C360 +/* 00014 809FDC44 0C01B0D8 */ jal Text_GetFaceReaction /* 00018 809FDC48 24050021 */ addiu $a1, $zero, 0x0021 ## $a1 = 00000021 /* 0001C 809FDC4C 10400003 */ beq $v0, $zero, .L809FDC5C /* 00020 809FDC50 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s index 49bbe7224..dc2c2577f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s @@ -4,7 +4,7 @@ glabel func_80A1DA9C /* 00294 80A1DAA4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00298 80A1DAA8 AFA50034 */ sw $a1, 0x0034($sp) /* 0029C 80A1DAAC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A0 80A1DAB0 0C01B0D8 */ jal func_8006C360 +/* 002A0 80A1DAB0 0C01B0D8 */ jal Text_GetFaceReaction /* 002A4 80A1DAB4 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B /* 002A8 80A1DAB8 14400009 */ bne $v0, $zero, .L80A1DAE0 /* 002AC 80A1DABC 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s index ed4f5fbcb..e0bed1afa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s @@ -4,7 +4,7 @@ glabel func_80A3118C /* 00824 80A31194 AFBF001C */ sw $ra, 0x001C($sp) /* 00828 80A31198 AFA50024 */ sw $a1, 0x0024($sp) /* 0082C 80A3119C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00830 80A311A0 0C01B0D8 */ jal func_8006C360 +/* 00830 80A311A0 0C01B0D8 */ jal Text_GetFaceReaction /* 00834 80A311A4 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 /* 00838 80A311A8 14400002 */ bne $v0, $zero, .L80A311B4 /* 0083C 80A311AC 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s index f55101192..74ce2f7c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s @@ -4,7 +4,7 @@ glabel func_80A31880 /* 00F18 80A31888 AFBF0024 */ sw $ra, 0x0024($sp) /* 00F1C 80A3188C AFA5002C */ sw $a1, 0x002C($sp) /* 00F20 80A31890 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00F24 80A31894 0C01B0D8 */ jal func_8006C360 +/* 00F24 80A31894 0C01B0D8 */ jal Text_GetFaceReaction /* 00F28 80A31898 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 /* 00F2C 80A3189C 14400002 */ bne $v0, $zero, .L80A318A8 /* 00F30 80A318A0 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s index d97761a76..f54c2a9fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s @@ -99,7 +99,7 @@ glabel L80A46594 /* 03908 80A46638 A20F0216 */ sb $t7, 0x0216($s0) ## 00000216 /* 0390C 80A4663C 8FA40044 */ lw $a0, 0x0044($sp) /* 03910 80A46640 00052C03 */ sra $a1, $a1, 16 -/* 03914 80A46644 0C023938 */ jal func_8008E4E0 +/* 03914 80A46644 0C023938 */ jal Path_GetByIndex /* 03918 80A46648 2406001F */ addiu $a2, $zero, 0x001F ## $a2 = 0000001F /* 0391C 80A4664C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 03920 80A46650 AE020208 */ sw $v0, 0x0208($s0) ## 00000208 @@ -163,7 +163,7 @@ glabel L80A46704 /* 039E8 80A46718 53200024 */ beql $t9, $zero, .L80A467AC /* 039EC 80A4671C 3059EFFF */ andi $t9, $v0, 0xEFFF ## $t9 = 00000000 /* 039F0 80A46720 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 039F4 80A46724 0C023983 */ jal func_8008E60C +/* 039F4 80A46724 0C023983 */ jal Path_CopyLastPoint /* 039F8 80A46728 AFA50030 */ sw $a1, 0x0030($sp) /* 039FC 80A4672C 8FA50030 */ lw $a1, 0x0030($sp) /* 03A00 80A46730 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 @@ -299,7 +299,7 @@ glabel L80A468FC /* 03BE0 80A46910 1120000B */ beq $t1, $zero, .L80A46940 /* 03BE4 80A46914 00000000 */ nop /* 03BE8 80A46918 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 03BEC 80A4691C 0C023983 */ jal func_8008E60C +/* 03BEC 80A4691C 0C023983 */ jal Path_CopyLastPoint /* 03BF0 80A46920 AFA50030 */ sw $a1, 0x0030($sp) /* 03BF4 80A46924 8FA50030 */ lw $a1, 0x0030($sp) /* 03BF8 80A46928 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s index ef1c64467..5ea320631 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s @@ -4,7 +4,7 @@ glabel func_80A44534 /* 0180C 80A4453C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01810 80A44540 AFA6001C */ sw $a2, 0x001C($sp) /* 01814 80A44544 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 01818 80A44548 0C01B0D8 */ jal func_8006C360 +/* 01818 80A44548 0C01B0D8 */ jal Text_GetFaceReaction /* 0181C 80A4454C AFA40018 */ sw $a0, 0x0018($sp) /* 01820 80A44550 8FA40018 */ lw $a0, 0x0018($sp) /* 01824 80A44554 8FA6001C */ lw $a2, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s index d96f5c0c8..9d49909f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s @@ -6,7 +6,7 @@ glabel func_80A44CE4 /* 01FC4 80A44CF4 AFA50034 */ sw $a1, 0x0034($sp) /* 01FC8 80A44CF8 82060210 */ lb $a2, 0x0210($s0) ## 00000210 /* 01FCC 80A44CFC 8E050208 */ lw $a1, 0x0208($s0) ## 00000208 -/* 01FD0 80A44D00 0C023948 */ jal func_8008E520 +/* 01FD0 80A44D00 0C023948 */ jal Path_OrientAndGetDistSq /* 01FD4 80A44D04 27A7002E */ addiu $a3, $sp, 0x002E ## $a3 = FFFFFFFE /* 01FD8 80A44D08 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01FDC 80A44D0C AFAE0010 */ sw $t6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s index 052d64944..beeb0ef6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s @@ -4,7 +4,7 @@ glabel func_80A44D84 /* 0205C 80A44D8C 80860210 */ lb $a2, 0x0210($a0) ## 00000210 /* 02060 80A44D90 8C850208 */ lw $a1, 0x0208($a0) ## 00000208 /* 02064 80A44D94 AFA40020 */ sw $a0, 0x0020($sp) -/* 02068 80A44D98 0C023948 */ jal func_8008E520 +/* 02068 80A44D98 0C023948 */ jal Path_OrientAndGetDistSq /* 0206C 80A44D9C 27A7001E */ addiu $a3, $sp, 0x001E ## $a3 = FFFFFFFE /* 02070 80A44DA0 8FA40020 */ lw $a0, 0x0020($sp) /* 02074 80A44DA4 87AE001E */ lh $t6, 0x001E($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s index 103d1fe5c..3446757b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s @@ -17,7 +17,7 @@ glabel func_80A462D8 /* 035E4 80A46314 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 035E8 80A46318 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 /* 035EC 80A4631C 260504AC */ addiu $a1, $s0, 0x04AC ## $a1 = 000004AC -/* 035F0 80A46320 0C023983 */ jal func_8008E60C +/* 035F0 80A46320 0C023983 */ jal Path_CopyLastPoint /* 035F4 80A46324 AFA50020 */ sw $a1, 0x0020($sp) /* 035F8 80A46328 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 035FC 80A4632C 0C01E01A */ jal Math_Vec3f_Yaw diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s index 574b2e5d7..22bed0070 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s @@ -7,11 +7,11 @@ glabel func_80A53278 /* 003EC 80A5328C A080030B */ sb $zero, 0x030B($a0) ## 0000030B /* 003F0 80A53290 A480030E */ sh $zero, 0x030E($a0) ## 0000030E /* 003F4 80A53294 8FA40024 */ lw $a0, 0x0024($sp) -/* 003F8 80A53298 0C01B0D8 */ jal func_8006C360 +/* 003F8 80A53298 0C01B0D8 */ jal Text_GetFaceReaction /* 003FC 80A5329C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00400 80A532A0 1040000C */ beq $v0, $zero, .L80A532D4 /* 00404 80A532A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00408 80A532A8 0C01B0D8 */ jal func_8006C360 +/* 00408 80A532A8 0C01B0D8 */ jal Text_GetFaceReaction /* 0040C 80A532AC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00410 80A532B0 3C1880A5 */ lui $t8, %hi(func_80A5475C) ## $t8 = 80A50000 /* 00414 80A532B4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s index 48be10da9..a15946161 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s @@ -50,7 +50,7 @@ glabel func_80A5399C /* 00BA8 80A53A48 8FA40024 */ lw $a0, 0x0024($sp) /* 00BAC 80A53A4C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00BB0 80A53A50 A7A3001E */ sh $v1, 0x001E($sp) -/* 00BB4 80A53A54 0C01B0D8 */ jal func_8006C360 +/* 00BB4 80A53A54 0C01B0D8 */ jal Text_GetFaceReaction /* 00BB8 80A53A58 AFA60020 */ sw $a2, 0x0020($sp) /* 00BBC 80A53A5C 87A3001E */ lh $v1, 0x001E($sp) /* 00BC0 80A53A60 1040000D */ beq $v0, $zero, .L80A53A98 @@ -58,7 +58,7 @@ glabel func_80A5399C /* 00BC8 80A53A68 1460000B */ bne $v1, $zero, .L80A53A98 /* 00BCC 80A53A6C 8FA40024 */ lw $a0, 0x0024($sp) /* 00BD0 80A53A70 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00BD4 80A53A74 0C01B0D8 */ jal func_8006C360 +/* 00BD4 80A53A74 0C01B0D8 */ jal Text_GetFaceReaction /* 00BD8 80A53A78 AFA60020 */ sw $a2, 0x0020($sp) /* 00BDC 80A53A7C 8FA60020 */ lw $a2, 0x0020($sp) /* 00BE0 80A53A80 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s index 5d62254ca..a38ad8bf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s @@ -10,12 +10,12 @@ glabel func_80A53AD4 /* 00C54 80A53AF4 AFAF0024 */ sw $t7, 0x0024($sp) /* 00C58 80A53AF8 8FA4002C */ lw $a0, 0x002C($sp) -/* 00C5C 80A53AFC 0C01B0D8 */ jal func_8006C360 +/* 00C5C 80A53AFC 0C01B0D8 */ jal Text_GetFaceReaction /* 00C60 80A53B00 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00C64 80A53B04 10400006 */ beq $v0, $zero, .L80A53B20 /* 00C68 80A53B08 2418200E */ addiu $t8, $zero, 0x200E ## $t8 = 0000200E /* 00C6C 80A53B0C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00C70 80A53B10 0C01B0D8 */ jal func_8006C360 +/* 00C70 80A53B10 0C01B0D8 */ jal Text_GetFaceReaction /* 00C74 80A53B14 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00C78 80A53B18 10000002 */ beq $zero, $zero, .L80A53B24 /* 00C7C 80A53B1C A602010E */ sh $v0, 0x010E($s0) ## 0000010E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s index 27e18d209..e8317b099 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s @@ -8,7 +8,7 @@ glabel func_80A5475C /* 018D4 80A54774 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 018D8 80A54778 8FA4001C */ lw $a0, 0x001C($sp) -/* 018DC 80A5477C 0C01B0D8 */ jal func_8006C360 +/* 018DC 80A5477C 0C01B0D8 */ jal Text_GetFaceReaction /* 018E0 80A54780 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 018E4 80A54784 10400011 */ beq $v0, $zero, .L80A547CC /* 018E8 80A54788 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s index 88e37ab2e..961f8bc7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s @@ -22,14 +22,14 @@ glabel func_80A563BC /* 00334 80A56404 01CF1821 */ addu $v1, $t6, $t7 /* 00338 80A56408 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 0033C 80A5640C AFA30018 */ sw $v1, 0x0018($sp) -/* 00340 80A56410 0C01B0D8 */ jal func_8006C360 +/* 00340 80A56410 0C01B0D8 */ jal Text_GetFaceReaction /* 00344 80A56414 AFA60020 */ sw $a2, 0x0020($sp) /* 00348 80A56418 8FA30018 */ lw $v1, 0x0018($sp) /* 0034C 80A5641C 1040000D */ beq $v0, $zero, .L80A56454 /* 00350 80A56420 8FA60020 */ lw $a2, 0x0020($sp) /* 00354 80A56424 8FA40024 */ lw $a0, 0x0024($sp) /* 00358 80A56428 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 0035C 80A5642C 0C01B0D8 */ jal func_8006C360 +/* 0035C 80A5642C 0C01B0D8 */ jal Text_GetFaceReaction /* 00360 80A56430 AFA60020 */ sw $a2, 0x0020($sp) /* 00364 80A56434 8FA60020 */ lw $a2, 0x0020($sp) /* 00368 80A56438 3C1980A5 */ lui $t9, %hi(func_80A56B40) ## $t9 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s index 66cff601e..01e1132e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s @@ -23,7 +23,7 @@ glabel func_80A56614 /* 00590 80A56660 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 00594 80A56664 AFA30018 */ sw $v1, 0x0018($sp) /* 00598 80A56668 AFA60020 */ sw $a2, 0x0020($sp) -/* 0059C 80A5666C 0C01B0D8 */ jal func_8006C360 +/* 0059C 80A5666C 0C01B0D8 */ jal Text_GetFaceReaction /* 005A0 80A56670 AFA70024 */ sw $a3, 0x0024($sp) /* 005A4 80A56674 8FA30018 */ lw $v1, 0x0018($sp) /* 005A8 80A56678 8FA60020 */ lw $a2, 0x0020($sp) @@ -31,7 +31,7 @@ glabel func_80A56614 /* 005B0 80A56680 8FA70024 */ lw $a3, 0x0024($sp) /* 005B4 80A56684 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 005B8 80A56688 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 005BC 80A5668C 0C01B0D8 */ jal func_8006C360 +/* 005BC 80A5668C 0C01B0D8 */ jal Text_GetFaceReaction /* 005C0 80A56690 AFA60020 */ sw $a2, 0x0020($sp) /* 005C4 80A56694 8FA60020 */ lw $a2, 0x0020($sp) /* 005C8 80A56698 3C1980A5 */ lui $t9, %hi(func_80A56B40) ## $t9 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s index 7a71cf710..bc71e115a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s @@ -26,7 +26,7 @@ glabel func_80A56B40 .L80A56B98: /* 00AC8 80A56B98 00AE2821 */ addu $a1, $a1, $t6 /* 00ACC 80A56B9C 8CA56EF0 */ lw $a1, %lo(D_80A56EF0)($a1) -/* 00AD0 80A56BA0 0C01B0D8 */ jal func_8006C360 +/* 00AD0 80A56BA0 0C01B0D8 */ jal Text_GetFaceReaction /* 00AD4 80A56BA4 AFA60018 */ sw $a2, 0x0018($sp) /* 00AD8 80A56BA8 10400013 */ beq $v0, $zero, .L80A56BF8 /* 00ADC 80A56BAC 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s index 02af3b7c8..8f629cddd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s @@ -4,7 +4,7 @@ glabel func_80A6F1A4 /* 0020C 80A6F1AC AFBF0014 */ sw $ra, 0x0014($sp) /* 00210 80A6F1B0 AFA5001C */ sw $a1, 0x001C($sp) /* 00214 80A6F1B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00218 80A6F1B8 0C01B0D8 */ jal func_8006C360 +/* 00218 80A6F1B8 0C01B0D8 */ jal Text_GetFaceReaction /* 0021C 80A6F1BC 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 /* 00220 80A6F1C0 14400002 */ bne $v0, $zero, .L80A6F1CC /* 00224 80A6F1C4 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s index 3e7a33b93..1b13d710e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s @@ -8,7 +8,7 @@ glabel func_80A6F810 /* 00278 80A6F828 30A5007F */ andi $a1, $a1, 0x007F ## $a1 = 00000000 /* 0027C 80A6F82C 24A50025 */ addiu $a1, $a1, 0x0025 ## $a1 = 00000025 /* 00280 80A6F830 AFA40020 */ sw $a0, 0x0020($sp) -/* 00284 80A6F834 0C01B0D8 */ jal func_8006C360 +/* 00284 80A6F834 0C01B0D8 */ jal Text_GetFaceReaction /* 00288 80A6F838 AFA3001C */ sw $v1, 0x001C($sp) /* 0028C 80A6F83C 8FA3001C */ lw $v1, 0x001C($sp) /* 00290 80A6F840 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s index 26e46582d..2576bd29f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s @@ -130,7 +130,7 @@ glabel func_80A70E34 /* 01A6C 80A7101C 30A50780 */ andi $a1, $a1, 0x0780 ## $a1 = 00000000 /* 01A70 80A71020 000529C3 */ sra $a1, $a1, 7 /* 01A74 80A71024 00052C00 */ sll $a1, $a1, 16 -/* 01A78 80A71028 0C023938 */ jal func_8008E4E0 +/* 01A78 80A71028 0C023938 */ jal Path_GetByIndex /* 01A7C 80A7102C 00052C03 */ sra $a1, $a1, 16 /* 01A80 80A71030 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 01A84 80A71034 AE020210 */ sw $v0, 0x0210($s0) ## 00000210 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s index a72d348fd..458b26e1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s @@ -6,7 +6,7 @@ glabel func_80A711B4 /* 01C14 80A711C4 AFA50034 */ sw $a1, 0x0034($sp) /* 01C18 80A711C8 82060214 */ lb $a2, 0x0214($s0) ## 00000214 /* 01C1C 80A711CC 8E050210 */ lw $a1, 0x0210($s0) ## 00000210 -/* 01C20 80A711D0 0C023948 */ jal func_8008E520 +/* 01C20 80A711D0 0C023948 */ jal Path_OrientAndGetDistSq /* 01C24 80A711D4 27A7002E */ addiu $a3, $sp, 0x002E ## $a3 = FFFFFFFE /* 01C28 80A711D8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01C2C 80A711DC AFAE0010 */ sw $t6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s index fd3f3a8a6..52189d995 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s @@ -35,7 +35,7 @@ glabel func_80A7134C /* 01E18 80A713C8 8E050210 */ lw $a1, 0x0210($s0) ## 00000210 /* 01E1C 80A713CC 82060214 */ lb $a2, 0x0214($s0) ## 00000214 /* 01E20 80A713D0 27A70036 */ addiu $a3, $sp, 0x0036 ## $a3 = FFFFFFFE -/* 01E24 80A713D4 0C023948 */ jal func_8008E520 +/* 01E24 80A713D4 0C023948 */ jal Path_OrientAndGetDistSq /* 01E28 80A713D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 01E2C 80A713DC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 01E30 80A713E0 AFA80010 */ sw $t0, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s index 1f1432af8..35be65abe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s @@ -3,7 +3,7 @@ glabel func_80A79010 /* 00064 80A79014 AFBF0014 */ sw $ra, 0x0014($sp) /* 00068 80A79018 8C8E1C44 */ lw $t6, 0x1C44($a0) ## 00001C44 /* 0006C 80A7901C 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 00070 80A79020 0C01B0D8 */ jal func_8006C360 +/* 00070 80A79020 0C01B0D8 */ jal Text_GetFaceReaction /* 00074 80A79024 AFAE001C */ sw $t6, 0x001C($sp) /* 00078 80A79028 10400003 */ beq $v0, $zero, .L80A79038 /* 0007C 80A7902C 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s index 3faff96b9..e15f2dc77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s @@ -3,7 +3,7 @@ glabel func_80A79168 /* 001BC 80A7916C AFBF0014 */ sw $ra, 0x0014($sp) /* 001C0 80A79170 AFA5001C */ sw $a1, 0x001C($sp) /* 001C4 80A79174 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 001C8 80A79178 0C01B0D8 */ jal func_8006C360 +/* 001C8 80A79178 0C01B0D8 */ jal Text_GetFaceReaction /* 001CC 80A7917C AFA40018 */ sw $a0, 0x0018($sp) /* 001D0 80A79180 8FA40018 */ lw $a0, 0x0018($sp) /* 001D4 80A79184 10400003 */ beq $v0, $zero, .L80A79194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s index 3d8f7199d..c5b77ad81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s @@ -21,7 +21,7 @@ glabel func_80A97610 /* 008AC 80A9765C 14610007 */ bne $v1, $at, .L80A9767C .L80A97660: /* 008B0 80A97660 24050013 */ addiu $a1, $zero, 0x0013 ## $a1 = 00000013 -/* 008B4 80A97664 0C01B0D8 */ jal func_8006C360 +/* 008B4 80A97664 0C01B0D8 */ jal Text_GetFaceReaction /* 008B8 80A97668 AFA60024 */ sw $a2, 0x0024($sp) /* 008BC 80A9766C 8FA60024 */ lw $a2, 0x0024($sp) /* 008C0 80A97670 84C3001C */ lh $v1, 0x001C($a2) ## 0000001C @@ -43,7 +43,7 @@ glabel func_80A97610 .L80A976AC: /* 008FC 80A976AC 8FA40020 */ lw $a0, 0x0020($sp) /* 00900 80A976B0 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 00904 80A976B4 0C01B0D8 */ jal func_8006C360 +/* 00904 80A976B4 0C01B0D8 */ jal Text_GetFaceReaction /* 00908 80A976B8 AFA60024 */ sw $a2, 0x0024($sp) /* 0090C 80A976BC 8FA60024 */ lw $a2, 0x0024($sp) /* 00910 80A976C0 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000000 @@ -54,7 +54,7 @@ glabel func_80A97610 /* 00920 80A976D0 14610006 */ bne $v1, $at, .L80A976EC /* 00924 80A976D4 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012 /* 00928 80A976D8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0092C 80A976DC 0C01B0D8 */ jal func_8006C360 +/* 0092C 80A976DC 0C01B0D8 */ jal Text_GetFaceReaction /* 00930 80A976E0 AFA60024 */ sw $a2, 0x0024($sp) /* 00934 80A976E4 8FA60024 */ lw $a2, 0x0024($sp) /* 00938 80A976E8 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s index 3fbfa68fe..12f0f4454 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s @@ -169,7 +169,7 @@ glabel func_80A99048 /* 02508 80A992B8 00052C00 */ sll $a1, $a1, 16 /* 0250C 80A992BC 00052C03 */ sra $a1, $a1, 16 /* 02510 80A992C0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02514 80A992C4 0C023938 */ jal func_8008E4E0 +/* 02514 80A992C4 0C023938 */ jal Path_GetByIndex /* 02518 80A992C8 E6040220 */ swc1 $f4, 0x0220($s0) ## 00000220 /* 0251C 80A992CC C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 02520 80A992D0 AE0201E4 */ sw $v0, 0x01E4($s0) ## 000001E4 @@ -209,7 +209,7 @@ glabel func_80A99048 /* 025A4 80A99354 10000006 */ beq $zero, $zero, .L80A99370 /* 025A8 80A99358 A60901DA */ sh $t1, 0x01DA($s0) ## 000001DA .L80A9935C: -/* 025AC 80A9935C 0C023983 */ jal func_8008E60C +/* 025AC 80A9935C 0C023983 */ jal Path_CopyLastPoint /* 025B0 80A99360 8E0401E4 */ lw $a0, 0x01E4($s0) ## 000001E4 .L80A99364: /* 025B4 80A99364 3C0B80AA */ lui $t3, %hi(func_80A99384) ## $t3 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s index 8673ccd1d..e0419cfb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s @@ -3,7 +3,7 @@ glabel func_80A9C658 /* 0010C 80A9C65C AFBF0014 */ sw $ra, 0x0014($sp) /* 00110 80A9C660 AFA5001C */ sw $a1, 0x001C($sp) /* 00114 80A9C664 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00118 80A9C668 0C01B0D8 */ jal func_8006C360 +/* 00118 80A9C668 0C01B0D8 */ jal Text_GetFaceReaction /* 0011C 80A9C66C AFA40018 */ sw $a0, 0x0018($sp) /* 00120 80A9C670 8FA40018 */ lw $a0, 0x0018($sp) /* 00124 80A9C674 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s index 5a0029e35..c89dc68b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s @@ -2,7 +2,7 @@ glabel func_80AA0690 /* 00000 80AA0690 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80AA0694 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 80AA0698 AFA5001C */ sw $a1, 0x001C($sp) -/* 0000C 80AA069C 0C01B0D8 */ jal func_8006C360 +/* 0000C 80AA069C 0C01B0D8 */ jal Text_GetFaceReaction /* 00010 80AA06A0 24050017 */ addiu $a1, $zero, 0x0017 ## $a1 = 00000017 /* 00014 80AA06A4 10400003 */ beq $v0, $zero, .L80AA06B4 /* 00018 80AA06A8 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s index f6e577250..937efa5d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s @@ -2,7 +2,7 @@ glabel func_80AA19A0 /* 00000 80AA19A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80AA19A4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 80AA19A8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0000C 80AA19AC 0C01B0D8 */ jal func_8006C360 +/* 0000C 80AA19AC 0C01B0D8 */ jal Text_GetFaceReaction /* 00010 80AA19B0 24050017 */ addiu $a1, $zero, 0x0017 ## $a1 = 00000017 /* 00014 80AA19B4 10400003 */ beq $v0, $zero, .L80AA19C4 /* 00018 80AA19B8 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s index d5a8f5b45..625b86f07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s @@ -2,7 +2,7 @@ glabel func_80AAACF8 /* 00AA8 80AAACF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00AAC 80AAACFC AFBF0014 */ sw $ra, 0x0014($sp) /* 00AB0 80AAAD00 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AB4 80AAAD04 0C01B0D8 */ jal func_8006C360 +/* 00AB4 80AAAD04 0C01B0D8 */ jal Text_GetFaceReaction /* 00AB8 80AAAD08 24050011 */ addiu $a1, $zero, 0x0011 ## $a1 = 00000011 /* 00ABC 80AAAD0C 8FA4001C */ lw $a0, 0x001C($sp) /* 00AC0 80AAAD10 10400003 */ beq $v0, $zero, .L80AAAD20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s index dd83d1275..262029e13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s @@ -119,7 +119,7 @@ glabel func_80AAD080 /* 00930 80AAD230 8FBF002C */ lw $ra, 0x002C($sp) .L80AAD234: /* 00934 80AAD234 8FA40044 */ lw $a0, 0x0044($sp) -/* 00938 80AAD238 0C01B0D8 */ jal func_8006C360 +/* 00938 80AAD238 0C01B0D8 */ jal Text_GetFaceReaction /* 0093C 80AAD23C 2405001A */ addiu $a1, $zero, 0x001A ## $a1 = 0000001A /* 00940 80AAD240 3059FFFF */ andi $t9, $v0, 0xFFFF ## $t9 = 00000000 /* 00944 80AAD244 17200003 */ bne $t9, $zero, .L80AAD254 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s index f474c7f0b..d735dd3d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s @@ -5,7 +5,7 @@ glabel func_80AADC34 /* 004D0 80AADC40 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 004D4 80AADC44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 004D8 80AADC48 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 004DC 80AADC4C 0C01B0D8 */ jal func_8006C360 +/* 004DC 80AADC4C 0C01B0D8 */ jal Text_GetFaceReaction /* 004E0 80AADC50 AFAE001C */ sw $t6, 0x001C($sp) /* 004E4 80AADC54 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 004E8 80AADC58 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s index c5d06efff..50515fcfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s @@ -3,7 +3,7 @@ glabel func_80AB0584 /* 00168 80AB0588 AFBF0014 */ sw $ra, 0x0014($sp) /* 0016C 80AB058C AFA5001C */ sw $a1, 0x001C($sp) /* 00170 80AB0590 84A5001C */ lh $a1, 0x001C($a1) ## 0000001C -/* 00174 80AB0594 0C01B0D8 */ jal func_8006C360 +/* 00174 80AB0594 0C01B0D8 */ jal Text_GetFaceReaction /* 00178 80AB0598 24A5003A */ addiu $a1, $a1, 0x003A ## $a1 = 0000003A /* 0017C 80AB059C 10400003 */ beq $v0, $zero, .L80AB05AC /* 00180 80AB05A0 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s index 85e137154..77c9bb9cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s @@ -15,7 +15,7 @@ glabel func_80AB3B04 /* 02DA4 80AB3B34 35F80009 */ ori $t8, $t7, 0x0009 ## $t8 = 00000009 /* 02DA8 80AB3B38 ACD80004 */ sw $t8, 0x0004($a2) ## 00000004 /* 02DAC 80AB3B3C AFA60018 */ sw $a2, 0x0018($sp) -/* 02DB0 80AB3B40 0C01B0D8 */ jal func_8006C360 +/* 02DB0 80AB3B40 0C01B0D8 */ jal Text_GetFaceReaction /* 02DB4 80AB3B44 8FA4001C */ lw $a0, 0x001C($sp) /* 02DB8 80AB3B48 8FA60018 */ lw $a2, 0x0018($sp) /* 02DBC 80AB3B4C 3059FFFF */ andi $t9, $v0, 0xFFFF ## $t9 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s index 20e44fe6a..65d5e748d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s @@ -4,7 +4,7 @@ glabel func_80AB9D60 /* 00128 80AB9D68 AFBF0024 */ sw $ra, 0x0024($sp) /* 0012C 80AB9D6C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00130 80AB9D70 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00134 80AB9D74 0C01B0D8 */ jal func_8006C360 +/* 00134 80AB9D74 0C01B0D8 */ jal Text_GetFaceReaction /* 00138 80AB9D78 AFA60030 */ sw $a2, 0x0030($sp) /* 0013C 80AB9D7C 8FA30028 */ lw $v1, 0x0028($sp) /* 00140 80AB9D80 10400002 */ beq $v0, $zero, .L80AB9D8C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s index f275914b0..0edd79ef9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s @@ -137,11 +137,11 @@ glabel func_80ABA244 /* 007F0 80ABA430 85ADB3A0 */ lh $t5, %lo(D_80ABB3A0)($t5) /* 007F4 80ABA434 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 007F8 80ABA438 A64D010E */ sh $t5, 0x010E($s2) ## 0000010E -/* 007FC 80ABA43C 0C01B0D8 */ jal func_8006C360 +/* 007FC 80ABA43C 0C01B0D8 */ jal Text_GetFaceReaction /* 00800 80ABA440 8FA4002C */ lw $a0, 0x002C($sp) /* 00804 80ABA444 10400006 */ beq $v0, $zero, .L80ABA460 /* 00808 80ABA448 8FA4002C */ lw $a0, 0x002C($sp) -/* 0080C 80ABA44C 0C01B0D8 */ jal func_8006C360 +/* 0080C 80ABA44C 0C01B0D8 */ jal Text_GetFaceReaction /* 00810 80ABA450 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 00814 80ABA454 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 00818 80ABA458 A642010E */ sh $v0, 0x010E($s2) ## 0000010E @@ -200,7 +200,7 @@ glabel func_80ABA244 /* 008C8 80ABA508 2484B5C0 */ addiu $a0, $a0, %lo(D_80ABB5C0) ## $a0 = 80ABB5C0 /* 008CC 80ABA50C 8FA4002C */ lw $a0, 0x002C($sp) -/* 008D0 80ABA510 0C01B0D8 */ jal func_8006C360 +/* 008D0 80ABA510 0C01B0D8 */ jal Text_GetFaceReaction /* 008D4 80ABA514 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 008D8 80ABA518 54400048 */ bnel $v0, $zero, .L80ABA63C /* 008DC 80ABA51C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s index 9247cd820..b9f933cd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s @@ -8,11 +8,11 @@ glabel func_80ABAD7C /* 01154 80ABAD94 A48E010E */ sh $t6, 0x010E($a0) ## 0000010E /* 01158 80ABAD98 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0115C 80ABAD9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01160 80ABADA0 0C01B0D8 */ jal func_8006C360 +/* 01160 80ABADA0 0C01B0D8 */ jal Text_GetFaceReaction /* 01164 80ABADA4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 01168 80ABADA8 10400004 */ beq $v0, $zero, .L80ABADBC /* 0116C 80ABADAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01170 80ABADB0 0C01B0D8 */ jal func_8006C360 +/* 01170 80ABADB0 0C01B0D8 */ jal Text_GetFaceReaction /* 01174 80ABADB4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 01178 80ABADB8 A602010E */ sh $v0, 0x010E($s0) ## 0000010E .L80ABADBC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s index c8b4e256b..e74e673e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s @@ -11,7 +11,7 @@ glabel func_80AEFDC0 /* 051D4 80AEFDE4 35CF0009 */ ori $t7, $t6, 0x0009 ## $t7 = 00000009 /* 051D8 80AEFDE8 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 /* 051DC 80AEFDEC AFA60018 */ sw $a2, 0x0018($sp) -/* 051E0 80AEFDF0 0C01B0D8 */ jal func_8006C360 +/* 051E0 80AEFDF0 0C01B0D8 */ jal Text_GetFaceReaction /* 051E4 80AEFDF4 8FA4001C */ lw $a0, 0x001C($sp) /* 051E8 80AEFDF8 8FA60018 */ lw $a2, 0x0018($sp) /* 051EC 80AEFDFC 3058FFFF */ andi $t8, $v0, 0xFFFF ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s index b9f77478f..ee0d850ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s @@ -3,7 +3,7 @@ glabel func_80AF55E0 /* 00084 80AF55E4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00088 80AF55E8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 0008C 80AF55EC AFA6001C */ sw $a2, 0x001C($sp) -/* 00090 80AF55F0 0C01B0D8 */ jal func_8006C360 +/* 00090 80AF55F0 0C01B0D8 */ jal Text_GetFaceReaction /* 00094 80AF55F4 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 00098 80AF55F8 8FA6001C */ lw $a2, 0x001C($sp) /* 0009C 80AF55FC 10400003 */ beq $v0, $zero, .L80AF560C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s index 1fd3d98a7..145cdbc16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s @@ -99,7 +99,7 @@ glabel func_80AFF7D8 /* 0169C 80AFF94C 316C0200 */ andi $t4, $t3, 0x0200 ## $t4 = 00000000 /* 016A0 80AFF950 11800009 */ beq $t4, $zero, .L80AFF978 /* 016A4 80AFF954 00000000 */ nop -/* 016A8 80AFF958 0C01B0D8 */ jal func_8006C360 +/* 016A8 80AFF958 0C01B0D8 */ jal Text_GetFaceReaction /* 016AC 80AFF95C 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 /* 016B0 80AFF960 304DFFFF */ andi $t5, $v0, 0xFFFF ## $t5 = 00000000 /* 016B4 80AFF964 15A00015 */ bne $t5, $zero, .L80AFF9BC @@ -124,7 +124,7 @@ glabel func_80AFF7D8 /* 016F8 80AFF9A8 10000004 */ beq $zero, $zero, .L80AFF9BC /* 016FC 80AFF9AC A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4 .L80AFF9B0: -/* 01700 80AFF9B0 0C01B0D8 */ jal func_8006C360 +/* 01700 80AFF9B0 0C01B0D8 */ jal Text_GetFaceReaction /* 01704 80AFF9B4 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 /* 01708 80AFF9B8 A60202C4 */ sh $v0, 0x02C4($s0) ## 000002C4 .L80AFF9BC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s index 4eeb70101..9eac25106 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s @@ -129,7 +129,7 @@ glabel func_80B03A00 /* 01944 80B03BB4 2405000D */ addiu $a1, $zero, 0x000D ## $a1 = 0000000D /* 01948 80B03BB8 57200031 */ bnel $t9, $zero, .L80B03C80 /* 0194C 80B03BBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01950 80B03BC0 0C01B0D8 */ jal func_8006C360 +/* 01950 80B03BC0 0C01B0D8 */ jal Text_GetFaceReaction /* 01954 80B03BC4 AFA70018 */ sw $a3, 0x0018($sp) /* 01958 80B03BC8 8FA70018 */ lw $a3, 0x0018($sp) /* 0195C 80B03BCC 3048FFFF */ andi $t0, $v0, 0xFFFF ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s index db40bdd0a..1ccab7a8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s @@ -4,7 +4,7 @@ glabel func_80B13AAC /* 00014 80B13AB4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00018 80B13AB8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0001C 80B13ABC 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 -/* 00020 80B13AC0 0C01B0D8 */ jal func_8006C360 +/* 00020 80B13AC0 0C01B0D8 */ jal Text_GetFaceReaction /* 00024 80B13AC4 AFA60018 */ sw $a2, 0x0018($sp) /* 00028 80B13AC8 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 0002C 80B13ACC 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s index fdc3fce91..3f54dcf38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s @@ -5,7 +5,7 @@ glabel func_80B16504 /* 02A70 80B16510 AFBF001C */ sw $ra, 0x001C($sp) /* 02A74 80B16514 AFA5002C */ sw $a1, 0x002C($sp) /* 02A78 80B16518 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02A7C 80B1651C 0C01B0D8 */ jal func_8006C360 +/* 02A7C 80B1651C 0C01B0D8 */ jal Text_GetFaceReaction /* 02A80 80B16520 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 /* 02A84 80B16524 A7A20026 */ sh $v0, 0x0026($sp) /* 02A88 80B16528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s index 312c39a5f..1c76f2b0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s @@ -3,7 +3,7 @@ glabel func_80B18360 /* 00004 80B18364 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 80B18368 AFA5001C */ sw $a1, 0x001C($sp) /* 0000C 80B1836C AFA40018 */ sw $a0, 0x0018($sp) -/* 00010 80B18370 0C01B0D8 */ jal func_8006C360 +/* 00010 80B18370 0C01B0D8 */ jal Text_GetFaceReaction /* 00014 80B18374 24050024 */ addiu $a1, $zero, 0x0024 ## $a1 = 00000024 /* 00018 80B18378 8FA4001C */ lw $a0, 0x001C($sp) /* 0001C 80B1837C 10400003 */ beq $v0, $zero, .L80B1838C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s index 6ddc98644..dc518ab80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s @@ -3,7 +3,7 @@ glabel func_80B206A0 /* 00534 80B206A4 AFA40018 */ sw $a0, 0x0018($sp) /* 00538 80B206A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0053C 80B206AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00540 80B206B0 0C01B0D8 */ jal func_8006C360 +/* 00540 80B206B0 0C01B0D8 */ jal Text_GetFaceReaction /* 00544 80B206B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00548 80B206B8 14400026 */ bne $v0, $zero, .L80B20754 /* 0054C 80B206BC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s index fb81e087a..82e742e2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s @@ -2,7 +2,7 @@ glabel func_80B5B90C /* 0015C 80B5B90C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00160 80B5B910 AFBF0014 */ sw $ra, 0x0014($sp) /* 00164 80B5B914 AFA5001C */ sw $a1, 0x001C($sp) -/* 00168 80B5B918 0C01B0D8 */ jal func_8006C360 +/* 00168 80B5B918 0C01B0D8 */ jal Text_GetFaceReaction /* 0016C 80B5B91C 24050016 */ addiu $a1, $zero, 0x0016 ## $a1 = 00000016 /* 00170 80B5B920 10400003 */ beq $v0, $zero, .L80B5B930 /* 00174 80B5B924 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s index 858ae5b7f..510c68759 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s @@ -2,7 +2,7 @@ glabel func_80B61024 /* 00E04 80B61024 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00E08 80B61028 AFBF0014 */ sw $ra, 0x0014($sp) /* 00E0C 80B6102C AFA5001C */ sw $a1, 0x001C($sp) -/* 00E10 80B61030 0C01B0D8 */ jal func_8006C360 +/* 00E10 80B61030 0C01B0D8 */ jal Text_GetFaceReaction /* 00E14 80B61034 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D /* 00E18 80B61038 10400003 */ beq $v0, $zero, .L80B61048 /* 00E1C 80B6103C 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/code_80092500.s b/asm/z_quake.s similarity index 100% rename from asm/code_80092500.s rename to asm/z_quake.s diff --git a/data/code_8008E4E0.rodata.s b/data/code_8008E4E0.rodata.s deleted file mode 100644 index f1b5ddce6..000000000 --- a/data/code_8008E4E0.rodata.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_8013E760 - .incbin "baserom.z64", 0xBB5900, 0x10 diff --git a/data/code_80026B00.bss.s b/data/z_effect.bss.s similarity index 100% rename from data/code_80026B00.bss.s rename to data/z_effect.bss.s diff --git a/data/code_80026B00.data.s b/data/z_effect.data.s similarity index 100% rename from data/code_80026B00.data.s rename to data/z_effect.data.s diff --git a/data/code_80092500.bss.s b/data/z_quake.bss.s similarity index 100% rename from data/code_80092500.bss.s rename to data/z_quake.bss.s diff --git a/data/code_80092500.data.s b/data/z_quake.data.s similarity index 100% rename from data/code_80092500.data.s rename to data/z_quake.data.s diff --git a/data/code_80092500.rodata.s b/data/z_quake.rodata.s similarity index 100% rename from data/code_80092500.rodata.s rename to data/z_quake.rodata.s diff --git a/include/functions.h b/include/functions.h index 62e85912a..3e1113a3b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -800,7 +800,7 @@ void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos2, s32 radius // ? func_8006BE88(?); // ? func_8006BF1C(?); // ? func_8006C0FC(?); -u16 func_8006C360(GlobalContext*, u32); +u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet); // ? func_8006C3A0(?); // ? func_8006C3D0(?); void func_8006C438(GlobalContext* globalCtx, s16 arg1); @@ -1005,7 +1005,9 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2); void func_80088B34(s16 arg0); void Interface_Draw(GlobalContext* globalCtx); void Interface_Update(GlobalContext* globalCtx); -f32 func_8008E520(Actor* actor, Path* path, s16, s16*); +Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max); +f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw); +void Path_CopyLastPoint(Path* path, Vec3f* dest); // ? func_8008E6A0(?); // ? func_8008E6AC(?); // ? func_8008E750(?); diff --git a/include/z64scene.h b/include/z64scene.h index d6b87447d..28db2047e 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -328,8 +328,8 @@ typedef struct { } WaterBoxHeader; typedef struct { - /* 0x00 */ u8 count; // Total number of points in the path for the actor to follow - /* 0x04 */ Vec3s* path; // Segment Address of the start of the path list + /* 0x00 */ u8 count; // number of points in the path + /* 0x04 */ Vec3s* points; // Segment Address to the array of points } Path; // size = 0x8 typedef union { diff --git a/spec b/spec index 1c5e4ba70..009b22d5c 100644 --- a/spec +++ b/spec @@ -280,9 +280,9 @@ beginseg include "build/data/z_eff_shield_particle.data.o" include "build/src/code/z_eff_spark.o" include "build/src/code/z_eff_ss_dead.o" - include "build/src/code/code_80026B00.o" - include "build/data/code_80026B00.data.o" - include "build/data/code_80026B00.bss.o" + include "build/src/code/z_effect.o" + include "build/data/z_effect.data.o" + include "build/data/z_effect.bss.o" include "build/src/code/z_effect_soft_sprite.o" include "build/data/z_effect_soft_sprite.data.o" include "build/src/code/z_effect_soft_sprite_old_init.o" @@ -315,7 +315,7 @@ beginseg include "build/asm/code_8006BA00.o" include "build/src/code/z_elf_message.o" include "build/data/z_elf_message.data.o" - include "build/src/code/code_8006C360.o" + include "build/src/code/z_face_reaction.o" include "build/src/code/code_8006C3A0.o" include "build/src/code/code_8006C510.o" include "build/src/code/z_fcurve_data_skelanime.o" @@ -348,17 +348,16 @@ beginseg include "build/data/z_map_exp.data.o" include "build/data/z_map_exp.bss.o" include "build/src/code/z_parameter.o" - include "build/asm/code_8008E4E0.o" - include "build/data/code_8008E4E0.rodata.o" + include "build/src/code/z_path.o" include "build/asm/code_8008E6A0.o" include "build/src/code/z_player_lib.o" include "build/data/z_player_lib.data.o" include "build/data/z_player_lib.bss.o" include "build/src/code/z_prenmi.o" - include "build/asm/code_80092500.o" - include "build/data/code_80092500.data.o" - include "build/data/code_80092500.rodata.o" - include "build/data/code_80092500.bss.o" + include "build/asm/z_quake.o" + include "build/data/z_quake.data.o" + include "build/data/z_quake.rodata.o" + include "build/data/z_quake.bss.o" include "build/src/code/z_rcp.o" include "build/data/z_rcp.data.o" include "build/src/code/z_room.o" diff --git a/src/code/code_80026B00.c b/src/code/code_80026B00.c deleted file mode 100644 index beb5006ee..000000000 --- a/src/code/code_80026B00.c +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include - -GlobalContext* func_80026B00(void) { - return D_80157DA0; -} - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026B0C.s") - -void func_80026C1C(u8* arg0) { - arg0[0] = 0; - arg0[1] = 0; - arg0[2] = 0; -} - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026C2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/Effect_Add.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026E74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026F70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_8002709C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_800271A8.s") diff --git a/src/code/z_effect.c b/src/code/z_effect.c new file mode 100644 index 000000000..dfe367d13 --- /dev/null +++ b/src/code/z_effect.c @@ -0,0 +1,26 @@ +#include +#include + +GlobalContext* func_80026B00(void) { + return D_80157DA0; +} + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026B0C.s") + +void func_80026C1C(u8* arg0) { + arg0[0] = 0; + arg0[1] = 0; + arg0[2] = 0; +} + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026C2C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/Effect_Add.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026E74.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026F70.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_8002709C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_800271A8.s") diff --git a/src/code/code_8006C360.c b/src/code/z_face_reaction.c similarity index 95% rename from src/code/code_8006C360.c rename to src/code/z_face_reaction.c index 01cf89b4d..1bfe18b7c 100644 --- a/src/code/code_8006C360.c +++ b/src/code/z_face_reaction.c @@ -1,7 +1,7 @@ #include #include -u16 D_8011F3F0[60][9] = { +u16 sReactionTextIds[60][9] = { { 0x0000, 0x7124, 0x7127, 0x7126, 0x7125, 0x7127, 0x7124, 0x7125, 0x7127 }, { 0x0000, 0x7128, 0x7129, 0x7128, 0x7128, 0x7128, 0x7128, 0x712A, 0x712B }, { 0x0000, 0x7128, 0x712B, 0x7128, 0x7128, 0x7129, 0x7128, 0x712B, 0x7128 }, @@ -64,7 +64,7 @@ u16 D_8011F3F0[60][9] = { { 0x0000, 0x7104, 0x7105, 0x7107, 0x7105, 0x710C, 0x7105, 0x7107, 0x7107 }, }; -u16 func_8006C360(GlobalContext* globalCtx, u32 idx) { - u8 mask = func_8008F080(globalCtx); - return D_8011F3F0[idx][mask]; +u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet) { + u8 currentMask = func_8008F080(globalCtx); + return sReactionTextIds[reactionSet][currentMask]; } diff --git a/src/code/z_path.c b/src/code/z_path.c new file mode 100644 index 000000000..7b54d58c2 --- /dev/null +++ b/src/code/z_path.c @@ -0,0 +1,8 @@ +#include +#include + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_path/Path_GetByIndex.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_path/Path_CopyLastPoint.s") diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index c9e1d06c2..c1f3ac053 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -224,7 +224,7 @@ static s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) { s16 targetYaw; f32 waypointDistSq; - waypointDistSq = func_8008E520(&this->actor, this->path, this->waypoint, &targetYaw); + waypointDistSq = Path_OrientAndGetDistSq(&this->actor, this->path, this->waypoint, &targetYaw); Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, targetYaw, 10, 1000, 1); if ((waypointDistSq > 0.0f) && (waypointDistSq < 1000.0f)) { @@ -261,7 +261,7 @@ static void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.0075f); this->waypoint = 0; this->actor.gravity = -1.0f; - this->path = func_8008E4E0(globalCtx, (s16)((this->actor.params & 0x00F0) >> 4), 0xF); + this->path = Path_GetByIndex(globalCtx, (this->actor.params & 0x00F0) >> 4, 0xF); switch (globalCtx->sceneNum) { case SCENE_MARKET_NIGHT: diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index b8c98d055..fece576dd 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -67,13 +67,13 @@ extern D_060005EC; extern D_06003DC0; static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) { - this->actor.textId = func_8006C360(globalCtx, 0x1B); + this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1B); if (this->actor.textId == 0) { if (BEANS_BOUGHT >= 10) { this->actor.textId = 0x406B; - return; + } else { + this->actor.textId = offerTextIds[BEANS_BOUGHT]; } - this->actor.textId = offerTextIds[BEANS_BOUGHT]; } } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 954447e62..836c6a85d 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -335,7 +335,7 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) { } path = &globalCtx->setupPathList[0]; - point = SEGMENTED_TO_VIRTUAL(path->path); + point = SEGMENTED_TO_VIRTUAL(path->points); point += this->currentWaypoint; dx = point->x - this->actor.posRot.pos.x; @@ -359,7 +359,7 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) { u16 func_80B1C54C(GlobalContext* globalCtx, Actor* a1) { u16 ret; - ret = func_8006C360(globalCtx, 14); + ret = Text_GetFaceReaction(globalCtx, 14); if (ret != 0) { return ret; } From a9d4fec1134990b3df70fe82e68013af07927d84 Mon Sep 17 00:00:00 2001 From: Roman971 Date: Mon, 23 Mar 2020 21:19:24 +0100 Subject: [PATCH 05/16] Decompile Path_GetByIndex --- .../code/z_path/Path_GetByIndex.s | 18 ------------------ src/code/z_path.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 asm/non_matchings/code/z_path/Path_GetByIndex.s diff --git a/asm/non_matchings/code/z_path/Path_GetByIndex.s b/asm/non_matchings/code/z_path/Path_GetByIndex.s deleted file mode 100644 index 8e04fac54..000000000 --- a/asm/non_matchings/code/z_path/Path_GetByIndex.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel Path_GetByIndex -/* B05680 8008E4E0 AFA50004 */ sw $a1, 4($sp) -/* B05684 8008E4E4 AFA60008 */ sw $a2, 8($sp) -/* B05688 8008E4E8 00063400 */ sll $a2, $a2, 0x10 -/* B0568C 8008E4EC 00052C00 */ sll $a1, $a1, 0x10 -/* B05690 8008E4F0 00052C03 */ sra $a1, $a1, 0x10 -/* B05694 8008E4F4 00063403 */ sra $a2, $a2, 0x10 -/* B05698 8008E4F8 10A60007 */ beq $a1, $a2, .L8008E518 -/* B0569C 8008E4FC 00001825 */ move $v1, $zero -/* B056A0 8008E500 3C0E0001 */ lui $t6, 1 -/* B056A4 8008E504 01C47021 */ addu $t6, $t6, $a0 -/* B056A8 8008E508 8DCE1E08 */ lw $t6, 0x1e08($t6) -/* B056AC 8008E50C 000578C0 */ sll $t7, $a1, 3 -/* B056B0 8008E510 03E00008 */ jr $ra -/* B056B4 8008E514 01CF1021 */ addu $v0, $t6, $t7 -.L8008E518: -/* B056B8 8008E518 03E00008 */ jr $ra -/* B056BC 8008E51C 00601025 */ move $v0, $v1 diff --git a/src/code/z_path.c b/src/code/z_path.c index 7b54d58c2..011421bd6 100644 --- a/src/code/z_path.c +++ b/src/code/z_path.c @@ -1,7 +1,17 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_path/Path_GetByIndex.s") +Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max) { + Path* path; + + if (index != max) { + path = &globalCtx->setupPathList[index]; + } else { + path = NULL; + } + + return path; +} #pragma GLOBAL_ASM("asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s") From e88ea64835d97a4ead14ec0b8028e1ecff211471 Mon Sep 17 00:00:00 2001 From: Roman971 Date: Mon, 23 Mar 2020 21:19:54 +0100 Subject: [PATCH 06/16] Decompile Path_OrientAndGetDistSq --- .../code/z_path/Path_OrientAndGetDistSq.s | 67 ------------------- src/code/z_path.c | 20 +++++- 2 files changed, 19 insertions(+), 68 deletions(-) delete mode 100644 asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s diff --git a/asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s b/asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s deleted file mode 100644 index 4120be226..000000000 --- a/asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s +++ /dev/null @@ -1,67 +0,0 @@ -.late_rodata -glabel D_8013E760 - .float 10430.378 # 32768 / M_PI - -.text -glabel Path_OrientAndGetDistSq -/* B056C0 8008E520 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B056C4 8008E524 AFA60028 */ sw $a2, 0x28($sp) -/* B056C8 8008E528 00063400 */ sll $a2, $a2, 0x10 -/* B056CC 8008E52C 00063403 */ sra $a2, $a2, 0x10 -/* B056D0 8008E530 AFBF0014 */ sw $ra, 0x14($sp) -/* B056D4 8008E534 14A00005 */ bnez $a1, .L8008E54C -/* B056D8 8008E538 AFA7002C */ sw $a3, 0x2c($sp) -/* B056DC 8008E53C 3C01BF80 */ li $at, 0xBF800000 # 0.000000 -/* B056E0 8008E540 44810000 */ mtc1 $at, $f0 -/* B056E4 8008E544 1000002E */ b .L8008E600 -/* B056E8 8008E548 8FBF0014 */ lw $ra, 0x14($sp) -.L8008E54C: -/* B056EC 8008E54C 8CA30004 */ lw $v1, 4($a1) -/* B056F0 8008E550 3C198016 */ lui $t9, %hi(gSegments) -/* B056F4 8008E554 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B056F8 8008E558 00037100 */ sll $t6, $v1, 4 -/* B056FC 8008E55C 000E7F02 */ srl $t7, $t6, 0x1c -/* B05700 8008E560 000FC080 */ sll $t8, $t7, 2 -/* B05704 8008E564 0338C821 */ addu $t9, $t9, $t8 -/* B05708 8008E568 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B0570C 8008E56C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B05710 8008E570 00614024 */ and $t0, $v1, $at -/* B05714 8008E574 00064880 */ sll $t1, $a2, 2 -/* B05718 8008E578 3C018000 */ lui $at, 0x8000 -/* B0571C 8008E57C 01264823 */ subu $t1, $t1, $a2 -/* B05720 8008E580 03281021 */ addu $v0, $t9, $t0 -/* B05724 8008E584 00411021 */ addu $v0, $v0, $at -/* B05728 8008E588 00094840 */ sll $t1, $t1, 1 -/* B0572C 8008E58C 01221021 */ addu $v0, $t1, $v0 -/* B05730 8008E590 844A0000 */ lh $t2, ($v0) -/* B05734 8008E594 844B0004 */ lh $t3, 4($v0) -/* B05738 8008E598 C4880024 */ lwc1 $f8, 0x24($a0) -/* B0573C 8008E59C 448A2000 */ mtc1 $t2, $f4 -/* B05740 8008E5A0 448B5000 */ mtc1 $t3, $f10 -/* B05744 8008E5A4 C492002C */ lwc1 $f18, 0x2c($a0) -/* B05748 8008E5A8 468021A0 */ cvt.s.w $f6, $f4 -/* B0574C 8008E5AC 46805420 */ cvt.s.w $f16, $f10 -/* B05750 8008E5B0 46083301 */ sub.s $f12, $f6, $f8 -/* B05754 8008E5B4 46128381 */ sub.s $f14, $f16, $f18 -/* B05758 8008E5B8 E7AC001C */ swc1 $f12, 0x1c($sp) -/* B0575C 8008E5BC 0C03F494 */ jal Math_atan2f -/* B05760 8008E5C0 E7AE0018 */ swc1 $f14, 0x18($sp) -/* B05764 8008E5C4 3C018014 */ lui $at, %hi(D_8013E760) -/* B05768 8008E5C8 C424E760 */ lwc1 $f4, %lo(D_8013E760)($at) -/* B0576C 8008E5CC C7AC001C */ lwc1 $f12, 0x1c($sp) -/* B05770 8008E5D0 C7AE0018 */ lwc1 $f14, 0x18($sp) -/* B05774 8008E5D4 46040182 */ mul.s $f6, $f0, $f4 -/* B05778 8008E5D8 8FAE002C */ lw $t6, 0x2c($sp) -/* B0577C 8008E5DC 460C6282 */ mul.s $f10, $f12, $f12 -/* B05780 8008E5E0 00000000 */ nop -/* B05784 8008E5E4 460E7402 */ mul.s $f16, $f14, $f14 -/* B05788 8008E5E8 4600320D */ trunc.w.s $f8, $f6 -/* B0578C 8008E5EC 46105000 */ add.s $f0, $f10, $f16 -/* B05790 8008E5F0 440D4000 */ mfc1 $t5, $f8 -/* B05794 8008E5F4 00000000 */ nop -/* B05798 8008E5F8 A5CD0000 */ sh $t5, ($t6) -/* B0579C 8008E5FC 8FBF0014 */ lw $ra, 0x14($sp) -.L8008E600: -/* B057A0 8008E600 27BD0020 */ addiu $sp, $sp, 0x20 -/* B057A4 8008E604 03E00008 */ jr $ra -/* B057A8 8008E608 00000000 */ nop diff --git a/src/code/z_path.c b/src/code/z_path.c index 011421bd6..d1d81286d 100644 --- a/src/code/z_path.c +++ b/src/code/z_path.c @@ -13,6 +13,24 @@ Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max) { return path; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s") +f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw) { + f32 dx; + f32 dz; + Vec3s* pointPos; + + if (path == NULL) { + return -1.0; + } + + pointPos = SEGMENTED_TO_VIRTUAL(path->points); + pointPos = &pointPos[waypoint]; + + dx = pointPos->x - actor->posRot.pos.x; + dz = pointPos->z - actor->posRot.pos.z; + + *yaw = Math_atan2f(dx, dz) * (32768 / M_PI); + + return SQ(dx) + SQ(dz); +} #pragma GLOBAL_ASM("asm/non_matchings/code/z_path/Path_CopyLastPoint.s") From 7fcc79fc4d506693c0da71c4c8a4bbf00f8dfb33 Mon Sep 17 00:00:00 2001 From: Roman971 Date: Mon, 23 Mar 2020 21:20:30 +0100 Subject: [PATCH 07/16] Decompile Path_CopyLastPoint --- .../code/z_path/Path_CopyLastPoint.s | 39 ------------------- src/code/z_path.c | 12 +++++- 2 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 asm/non_matchings/code/z_path/Path_CopyLastPoint.s diff --git a/asm/non_matchings/code/z_path/Path_CopyLastPoint.s b/asm/non_matchings/code/z_path/Path_CopyLastPoint.s deleted file mode 100644 index f0a71fac3..000000000 --- a/asm/non_matchings/code/z_path/Path_CopyLastPoint.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel Path_CopyLastPoint -/* B057AC 8008E60C 10800022 */ beqz $a0, .L8008E698 -/* B057B0 8008E610 3C198016 */ lui $t9, %hi(gSegments) -/* B057B4 8008E614 8C830004 */ lw $v1, 4($a0) -/* B057B8 8008E618 908A0000 */ lbu $t2, ($a0) -/* B057BC 8008E61C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B057C0 8008E620 00037100 */ sll $t6, $v1, 4 -/* B057C4 8008E624 000E7F02 */ srl $t7, $t6, 0x1c -/* B057C8 8008E628 000FC080 */ sll $t8, $t7, 2 -/* B057CC 8008E62C 0338C821 */ addu $t9, $t9, $t8 -/* B057D0 8008E630 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B057D4 8008E634 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B057D8 8008E638 00614024 */ and $t0, $v1, $at -/* B057DC 8008E63C 000A5880 */ sll $t3, $t2, 2 -/* B057E0 8008E640 016A5823 */ subu $t3, $t3, $t2 -/* B057E4 8008E644 000B5840 */ sll $t3, $t3, 1 -/* B057E8 8008E648 3C017FFF */ lui $at, (0x7FFFFFFA >> 16) # lui $at, 0x7fff -/* B057EC 8008E64C 03284821 */ addu $t1, $t9, $t0 -/* B057F0 8008E650 012B1021 */ addu $v0, $t1, $t3 -/* B057F4 8008E654 3421FFFA */ ori $at, (0x7FFFFFFA & 0xFFFF) # ori $at, $at, 0xfffa -/* B057F8 8008E658 00411021 */ addu $v0, $v0, $at -/* B057FC 8008E65C 844C0000 */ lh $t4, ($v0) -/* B05800 8008E660 448C2000 */ mtc1 $t4, $f4 -/* B05804 8008E664 00000000 */ nop -/* B05808 8008E668 468021A0 */ cvt.s.w $f6, $f4 -/* B0580C 8008E66C E4A60000 */ swc1 $f6, ($a1) -/* B05810 8008E670 844D0002 */ lh $t5, 2($v0) -/* B05814 8008E674 448D4000 */ mtc1 $t5, $f8 -/* B05818 8008E678 00000000 */ nop -/* B0581C 8008E67C 468042A0 */ cvt.s.w $f10, $f8 -/* B05820 8008E680 E4AA0004 */ swc1 $f10, 4($a1) -/* B05824 8008E684 844E0004 */ lh $t6, 4($v0) -/* B05828 8008E688 448E8000 */ mtc1 $t6, $f16 -/* B0582C 8008E68C 00000000 */ nop -/* B05830 8008E690 468084A0 */ cvt.s.w $f18, $f16 -/* B05834 8008E694 E4B20008 */ swc1 $f18, 8($a1) -.L8008E698: -/* B05838 8008E698 03E00008 */ jr $ra -/* B0583C 8008E69C 00000000 */ nop diff --git a/src/code/z_path.c b/src/code/z_path.c index d1d81286d..03dc6d6f6 100644 --- a/src/code/z_path.c +++ b/src/code/z_path.c @@ -33,4 +33,14 @@ f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw) { return SQ(dx) + SQ(dz); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_path/Path_CopyLastPoint.s") +void Path_CopyLastPoint(Path* path, Vec3f* dest) { + Vec3s* pointPos; + + if (path != NULL) { + pointPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[path->count - 1]; + + dest->x = pointPos->x; + dest->y = pointPos->y; + dest->z = pointPos->z; + } +} From 82b155529585a3abde70213c7d2bc9b82e3bfc08 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Mar 2020 17:37:40 -0400 Subject: [PATCH 08/16] PR fix --- src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index b0ac30bc0..5865fb196 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -14,7 +14,7 @@ static void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx); -static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); + void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); @@ -92,13 +92,13 @@ static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { } } -static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { +void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (globalCtx->actorCtx.unk_03 != 0) { thisx->flags |= 0x80; func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } else { - thisx->flags &= -0x81; + thisx->flags &= ~0x80; func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } } From 1abc15910fe86f90c1839d3587239fb3bd5156be Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 23 Mar 2020 17:38:22 -0400 Subject: [PATCH 09/16] oopz --- src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index 5865fb196..3264890c5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -14,7 +14,7 @@ static void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx); - void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); +static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); @@ -92,7 +92,7 @@ static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { } } -void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { +static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if (globalCtx->actorCtx.unk_03 != 0) { thisx->flags |= 0x80; From da151300f74b13c8046e86cebf23112237627e1b Mon Sep 17 00:00:00 2001 From: Roman971 Date: Mon, 23 Mar 2020 23:15:45 +0100 Subject: [PATCH 10/16] Run gcc checks with NON_MATCHING defined --- makefile | 8 ++------ src/code/gfxprint.c | 2 +- src/code/z_sample.c | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/makefile b/makefile index 12d794b44..55ba47356 100644 --- a/makefile +++ b/makefile @@ -26,8 +26,8 @@ OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump CC := $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc CC_OLD := $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc -# Check code syntax with host compiler (TODO: define NON_MATCHING because the non-matching code is utterly broken) -CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -I include -include stdarg.h +# Check code syntax with host compiler +CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -D NON_MATCHING -I include -include stdarg.h CPP := cpp MKLDSCRIPT := tools/mkldscript @@ -157,10 +157,6 @@ build/assets/%.o: assets/%.c # $(CC_CHECK) $^ $(OBJCOPY) -O binary $@ $@.bin -#build/src/boot/%.o: src/boot/%.c -# $(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^ -# @$(OBJDUMP) -d $@ > $(@:.o=.s) - build/src/overlays/%.o: src/overlays/%.c $(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^ $(CC_CHECK) $^ diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c index fbcca3cee..cc2f21e69 100644 --- a/src/code/gfxprint.c +++ b/src/code/gfxprint.c @@ -223,7 +223,7 @@ void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y) { #ifdef NON_MATCHING // regalloc and ordering differences -void GfxPrint_PrintCharImpl(GfxPrint* this, char c) { +void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) { if (this->flag & GFXPRINT_UPDATE_MODE) { this->flag &= ~GFXPRINT_UPDATE_MODE; diff --git a/src/code/z_sample.c b/src/code/z_sample.c index cbd934701..2f4f3fc6f 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -20,8 +20,8 @@ void Sample_Draw(SampleContext* this) { func_800C6AC4(gfxArr, gfxCtx, "../z_sample.c", 62); - gSPSegment(gfxCtx->polyOpa.p++, 0, NULL; - gSPSegment(gfxCtx->polyOpa.p++, 1, this->staticSegment); + gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); + gSPSegment(gfxCtx->polyOpa.p++, 0x01, this->staticSegment); func_80095248(gfxCtx, 0, 0, 0); From bd9dff6b7272082cdad20ba99e5c9ec540070c89 Mon Sep 17 00:00:00 2001 From: Roman971 Date: Mon, 23 Mar 2020 23:16:05 +0100 Subject: [PATCH 11/16] Update progress script to account for boot handwritten asm --- progress.py | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/progress.py b/progress.py index 62d201c85..2da97b2e3 100644 --- a/progress.py +++ b/progress.py @@ -88,28 +88,18 @@ nonMatchingASMBoot = GetNonMatchingSize("asm/non_matchings/boot") nonMatchingASMCode = GetNonMatchingSize("asm/non_matchings/code") + GetNonMatchingSize("asm/non_matchings/libultra_code") nonMatchingASMOvl = GetNonMatchingSize("asm/non_matchings/overlays") -codeSize = 1004128 # 1.00mb -bootSize = 36752 -#ovlSize = 3727584 # 3.727mb -ovlSize = 2812000 # .text section only -libultraSize = 40816 # This is temp -audioSize = 0 # This is temp -handwritten = 0 # This is temp - src -= nonMatchingASM code -= nonMatchingASMCode boot -= nonMatchingASMBoot ovl -= nonMatchingASMOvl asm += nonMatchingASM -#print(nonMatchingASM) -#asm = asm - (libultra_size + audio_size + handwritten - boot_size - code_size - ovl_size) -#asm = asm - (libultra_size + audio_size + handwritten) -#asm = -(libultra_size + audio_size + handwritten - boot_size - code_size - ovl_size) -#asm += codeSize -#asm += bootSize -#asm += ovlSize -#asm -= src +bootSize = 30704 # decompilable code only +codeSize = 1004128 # .text section except rsp bins (1.00mb) +ovlSize = 2812000 # .text sections +handwritten = 5840 # boot only + +asm -= handwritten total = src + asm srcPct = 100 * src / total From 5b42bda4eb4a78a65da6734f0f477a4b209a136d Mon Sep 17 00:00:00 2001 From: Roman971 Date: Mon, 23 Mar 2020 23:47:49 +0100 Subject: [PATCH 12/16] Fix format.sh to run clang-tidy inside NON_MATCHING functions --- format.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/format.sh b/format.sh index 18a1cae68..9967cc6f5 100755 --- a/format.sh +++ b/format.sh @@ -2,7 +2,7 @@ FORMAT_OPTS="-i -style=file" TIDY_OPTS="-p . --fix --fix-errors" -COMPILER_OPTS="-fno-builtin -std=gnu90 -Iinclude -Isrc -D_LANGUAGE_C" +COMPILER_OPTS="-fno-builtin -std=gnu90 -Iinclude -Isrc -D_LANGUAGE_C -DNON_MATCHING" shopt -s globstar From 9a63f1d4d13c39b4f30819489932023e6104d8e4 Mon Sep 17 00:00:00 2001 From: Roman971 Date: Tue, 24 Mar 2020 00:11:21 +0100 Subject: [PATCH 13/16] Run formatter with changes --- src/code/fault.c | 76 ++-- src/code/fault_drawer.c | 5 +- src/code/gfxprint.c | 10 +- src/code/sys_matrix.c | 10 +- src/code/z_actor.c | 44 ++- src/code/z_camera.c | 13 +- src/code/z_construct.c | 47 ++- src/code/z_demo.c | 65 ++-- src/code/z_en_a_keep.c | 6 +- src/code/z_en_item00.c | 29 +- src/code/z_horse.c | 27 +- src/code/z_kaleido_scope_call.c | 3 +- src/code/z_parameter.c | 356 +++++++++++------- src/code/z_room.c | 37 +- src/code/z_scene.c | 6 +- src/code/z_scene_table.c | 5 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 6 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 13 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 12 +- 19 files changed, 489 insertions(+), 281 deletions(-) diff --git a/src/code/fault.c b/src/code/fault.c index 7884c5057..05bee87d5 100644 --- a/src/code/fault.c +++ b/src/code/fault.c @@ -137,8 +137,9 @@ void Fault_AddClient(FaultClient* client, void* callback, void* param0, void* pa end: osSetIntMask(mask); - if (alreadyExists) + if (alreadyExists) { osSyncPrintf(VT_COL(RED, WHITE) "fault_AddClient: %08x は既にリスト中にある\n" VT_RST, client); + } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_AddClient.s") @@ -270,27 +271,34 @@ u32 Fault_WaitForInputImpl() { kDown = curInput->padPressed; - if (kDown == 0x20) + if (kDown == 0x20) { sFaultStructPtr->faultActive = !sFaultStructPtr->faultActive; + } - if (!sFaultStructPtr->faultActive) + if (!sFaultStructPtr->faultActive) { break; + } - if (count-- < 1) + if (count-- < 1) { return false; + } } - if (kDown == 0x8000 || kDown == 0x100) + if (kDown == 0x8000 || kDown == 0x100) { return false; + } - if (kDown == 0x200) + if (kDown == 0x200) { return true; + } - if (kDown == 0x800) + if (kDown == 0x800) { FaultDrawer_SetOsSyncPrintfEnabled(true); + } - if (kDown == 0x400) + if (kDown == 0x400) { FaultDrawer_SetOsSyncPrintfEnabled(false); + } } return false; @@ -555,24 +563,28 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) { s32 off; while (true) { - if (addr < 0x80000000) + if (addr < 0x80000000) { addr = 0x80000000; - if (addr > 0x807fff00) + } + if (addr > 0x807fff00) { addr = 0x807fff00; + } addr &= ~0xF; Fault_DrawMemDumpPage("Dump", (u32*)addr, 0); count = 600; while (sFaultStructPtr->faultActive) { - if (count == 0) + if (count == 0) { return; + } count--; Fault_Sleep(0x10); Fault_UpdatePadImpl(); - if (!~(curInput->padPressed | ~0x20)) + if (!~(curInput->padPressed | ~0x20)) { sFaultStructPtr->faultActive = false; + } } do { @@ -580,31 +592,42 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) { Fault_UpdatePadImpl(); } while (curInput->padPressed == 0); - if (!~(curInput->padPressed | ~0x1000)) + if (!~(curInput->padPressed | ~0x1000)) { return; + } - if (!~(curInput->raw.pad | ~0x8000)) + if (!~(curInput->raw.pad | ~0x8000)) { return; + } off = 0x10; - if (!~(curInput->raw.pad | ~0x2000)) + if (!~(curInput->raw.pad | ~0x2000)) { off = 0x100; - if (!~(curInput->raw.pad | ~0x4000)) + } + if (!~(curInput->raw.pad | ~0x4000)) { off <<= 8; - if (!~(curInput->raw.pad | ~0x800)) + } + if (!~(curInput->raw.pad | ~0x800)) { addr -= off; - if (!~(curInput->raw.pad | ~0x400)) + } + if (!~(curInput->raw.pad | ~0x400)) { addr += off; - if (!~(curInput->raw.pad | ~0x8)) + } + if (!~(curInput->raw.pad | ~0x8)) { addr = pc; - if (!~(curInput->raw.pad | ~0x4)) + } + if (!~(curInput->raw.pad | ~0x4)) { addr = sp; - if (!~(curInput->raw.pad | ~0x2)) + } + if (!~(curInput->raw.pad | ~0x2)) { addr = unk0; - if (!~(curInput->raw.pad | ~0x1)) + } + if (!~(curInput->raw.pad | ~0x1)) { addr = unk1; - if (!~(curInput->raw.pad | ~0x20)) + } + if (!~(curInput->raw.pad | ~0x20)) { break; + } } sFaultStructPtr->faultActive = true; @@ -715,15 +738,16 @@ void Fault_ThreadEntry(void* arg) { __osSetFpcCsr(__osGetFpcCsr() & -0xf81); sFaultStructPtr->faultedThread = faultedThread; - while (!sFaultStructPtr->faultHandlerEnabled) + while (!sFaultStructPtr->faultHandlerEnabled) { Fault_Sleep(1000); + } Fault_Sleep(500); Fault_CommitFB(); - if (sFaultStructPtr->faultActive) + if (sFaultStructPtr->faultActive) { Fault_Wait5Seconds(); - else { + } else { Fault_DrawCornerRec(0xF801); Fault_WaitForButtonCombo(); } diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c index b17679d35..cc8fcd424 100644 --- a/src/code/fault_drawer.c +++ b/src/code/fault_drawer.c @@ -114,10 +114,11 @@ void FaultDrawer_DrawChar(char c) { u32 mask = 0x10000000 << (c % 4); u32 data = *dataPtr; for (x = 0; x < sFaultDrawerStruct.charW; x++) { - if (mask & data) + if (mask & data) { fb[x] = sFaultDrawerStruct.foreColor; - else if (sFaultDrawerStruct.backColor & 1) + } else if (sFaultDrawerStruct.backColor & 1) { fb[x] = sFaultDrawerStruct.backColor; + } mask >>= 4; } fb += sFaultDrawerStruct.w; diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c index cc2f21e69..9b7c6fa0f 100644 --- a/src/code/gfxprint.c +++ b/src/code/gfxprint.c @@ -246,22 +246,24 @@ void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) { if (this->flag & GFXPRINT_FLAG4) { gDPSetPrimColorMod(this->dlist++, 0, 0, 0); - if (this->flag & GFXPRINT_FLAG64) + if (this->flag & GFXPRINT_FLAG64) { gSPTextureRectangle(this->dlist++, (this->posX + 4) << 1, (this->posY + 4) << 1, (this->posX + 4 + 32) << 1, (this->posY + 4 + 32) << 1, c * 2, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 512, 512); - else + } else { gSPTextureRectangle(this->dlist++, this->posX + 4, this->posY + 4, this->posX + 4 + 32, this->posY + 4 + 32, c * 2, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024); + } gDPSetPrimColorMod(this->dlist++, 0, 0, *(u32*)&this->color); } - if (this->flag & GFXPRINT_FLAG64) + if (this->flag & GFXPRINT_FLAG64) { gSPTextureRectangle(this->dlist++, (this->posX) << 1, (this->posY) << 1, (this->posX + 32) << 1, (this->posY + 32) << 1, c * 2, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 512, 512); - else + } else { gSPTextureRectangle(this->dlist++, this->posX, this->posY, this->posX + 32, this->posY + 32, c * 2, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024); + } this->posX += 32; } diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index b300f189d..b0735109a 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -738,12 +738,13 @@ void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) { vec->y = Math_atan2f(mf->zx, mf->zz) * (32768 / M_PI); - if (!flag) + if (!flag) { vec->z = Math_atan2f(mf->xy, mf->yy) * (32768 / M_PI); - else + } else { vec->z = Math_atan2f(mf->xy / sqrtf(SQ(mf->xx) + SQ(mf->xz) + SQ(mf->xy)), mf->yy / sqrtf(SQ(mf->yx) + SQ(mf->yz) + SQ(mf->yy))) * (32768 / M_PI); + } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_800D20CC.s") @@ -762,12 +763,13 @@ void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag) { vec->z = Math_atan2f(mf->xy, mf->xx) * (32768 / M_PI); - if (!flag) + if (!flag) { vec->x = Math_atan2f(mf->yz, mf->zz) * (32768 / M_PI); - else + } else { vec->x = Math_atan2f(mf->yz / sqrtf(SQ(mf->yx) + SQ(mf->yy) + SQ(mf->yz)), mf->zz / sqrtf(SQ(mf->zx) + SQ(mf->zy) + SQ(mf->zz))) * (32768 / M_PI); + } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_800D2264.s") diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 5fa59e19b..30645ee88 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -156,16 +156,19 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa if ((phi_f2 >= -1.0f) && (phi_f2 < 500.0f)) { phi_s0 = lightMapper->lights; - if (phi_f2 <= 0.0f) + if (phi_f2 <= 0.0f) { actor->shape.unk_15++; + } - if (30.0f < phi_f2) + if (30.0f < phi_f2) { phi_f2 = 30.0f; + } temp_f24 = actor->shape.unk_14 * (1.0f - (phi_f2 * (1.0f / 30))); - if (30.0f < phi_f2) + if (30.0f < phi_f2) { phi_f2 = 30.0f; + } temp_f20_2 = 1.0f - (phi_f2 * (1.0f / 70)); temp_f22_2 = (actor->shape.unk_10 * temp_f20_2) * actor->scale.x; @@ -187,8 +190,9 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa if (phi_s0->l.dir[1] > 0) { temp_a3 = (ABS(phi_s0->l.dir[1]) * ((phi_s0->l.col[0] + phi_s0->l.col[1]) + phi_s0->l.col[2])) - (phi_s2 * 8); - if (temp_a3 > 0) + if (temp_a3 > 0) { func_8002B66C(globalCtx, phi_s0, &spE8, temp_a3, temp_f24, temp_f22_2, temp_f20_2); + } } phi_s0++; } @@ -335,18 +339,20 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { spCE = 0xFF; var1 = 1.0f; - if (targetCtx->unk_4B != 0) + if (targetCtx->unk_4B != 0) { spB8 = 1; - else + } else { spB8 = 3; + } if (actor != NULL) { Math_Vec3f_Copy(&targetCtx->targetCenterPos, &actor->posRot2.pos); var1 = (500.0f - targetCtx->unk_44) / 420.0f; } else { targetCtx->unk_48 -= 120; - if (targetCtx->unk_48 < 0) + if (targetCtx->unk_48 < 0) { targetCtx->unk_48 = 0; + } spCE = targetCtx->unk_48; } @@ -361,8 +367,9 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { spBC.z = spBC.z * var1; targetCtx->unk_4C--; - if (targetCtx->unk_4C < 0) + if (targetCtx->unk_4C < 0) { targetCtx->unk_4C = 2; + } func_8002BE64(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z); @@ -373,10 +380,11 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { entry = &targetCtx->arr_50[spAC]; if (entry->unk_0C < 500.0f) { - if (entry->unk_0C <= 120.0f) + if (entry->unk_0C <= 120.0f) { var2 = 0.15f; - else + } else { var2 = ((entry->unk_0C - 120.0f) * 0.001f) + 0.15f; + } Matrix_Translate(entry->pos.x, entry->pos.y, 0.0f, MTXMODE_NEW); Matrix_Scale(var2, 0.15f, 1.0f, MTXMODE_APPLY); @@ -398,8 +406,9 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { } spCE = spCE - (0xFF / 3); - if (spCE < 0) + if (spCE < 0) { spCE = 0; + } spAC = (spAC + 1) % 3; } } @@ -1437,14 +1446,16 @@ f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) { abs_var = ABS(var); if (player->unk_664 != NULL) { - if ((abs_var > 0x4000) || (actor->flags & 0x8000000)) + if ((abs_var > 0x4000) || (actor->flags & 0x8000000)) { return FLT_MAX; - else + } else { return actor->waterSurfaceDist - actor->waterSurfaceDist * 0.8f * ((0x4000 - abs_var) * 3.0517578125e-05f); + } } - if (abs_var > 0x2AAA) + if (abs_var > 0x2AAA) { return FLT_MAX; + } return actor->waterSurfaceDist; } @@ -1822,10 +1833,11 @@ void func_8002FBAC(GlobalContext* globalCtx) { func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5308); if (gSaveContext.respawn[RESPAWN_MODE_TOP].data != 0) { - if (LINK_IS_ADULT) + if (LINK_IS_ADULT) { spD8 = 80.0f; - else + } else { spD8 = 60.0f; + } spD0 = 0xFF; spD4 = 1.0f; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 9dd358ffc..b48b58321 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -224,8 +224,9 @@ s32 func_800443A0(Camera* camera, Vec3f* b, Vec3f* c) { sp34 = NULL; // this is moved to the top when it should be done in the middle of the function args being loaded if (func_8003DD6C(&camera->globalCtx->colCtx, b, c, &sp40, &sp34, 1, 1, 1, 0, &sp38) != 0) { - if (func_80038B7C(sp34, b) < 0.0f) + if (func_80038B7C(sp34, b) < 0.0f) { return 1; + } } return 0; } @@ -461,18 +462,20 @@ s32 func_800458D4(Camera* camera, struct_80045714* b, f32 c, f32* d, s16 e) { sp60.z = 0.0f; temp_s1 = &camera->unk_94; - if (e != 0) + if (e != 0) { sp60.y -= func_80045714(&camera->unk_108, temp_s1->rot.y, b->unk_06, OREG(9)); + } sp48 = temp_s1->pos.y - *d; temp_ret = Math_atan2f(sp48, func_8007C028(&camera->unk_50, &camera->unk_5C)); // f2 and f14 are swapped - if (OREG(32) * (M_PI / 180) < temp_ret) + if (OREG(32) * (M_PI / 180) < temp_ret) { phi_f2 = 1.0f - sinf(temp_ret - OREG(32) * (M_PI / 180)); - else if (OREG(33) * (M_PI / 180) > temp_ret) + } else if (OREG(33) * (M_PI / 180) > temp_ret) { phi_f2 = 1.0f - sinf(OREG(33) * (M_PI / 180) - temp_ret); - else + } else { phi_f2 = 1.0f; + } sp60.y -= sp48 * phi_f2; func_80043A3C(&sp60, &camera->unk_E4, OREG(29) * 0.01f, OREG(30) * 0.01f, 0.1f); diff --git a/src/code/z_construct.c b/src/code/z_construct.c index 59c6e11a4..d14e6ef8c 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -44,8 +44,9 @@ void func_801109B0(GlobalContext* globalCtx) { osSyncPrintf("parameter->parameterSegment=%x", interfaceCtx->parameterSegment); - if (interfaceCtx->parameterSegment == NULL) + if (interfaceCtx->parameterSegment == NULL) { __assert("parameter->parameterSegment != NULL", "../z_construct.c", 161); + } DmaMgr_SendRequest1(interfaceCtx->parameterSegment, parameterStart, parameterSize, "../z_construct.c", 162); @@ -55,27 +56,30 @@ void func_801109B0(GlobalContext* globalCtx) { osSyncPrintf("ＤＯアクション テクスチャ初期=%x\n", 0x480); osSyncPrintf("parameter->do_actionSegment=%x", interfaceCtx->do_actionSegment); - if (interfaceCtx->do_actionSegment == NULL) + if (interfaceCtx->do_actionSegment == NULL) { __assert("parameter->do_actionSegment != NULL", "../z_construct.c", 169); + } do_actionStart = _do_action_staticSegmentRomStart; - if (gSaveContext.language == 0) + if (gSaveContext.language == 0) { do_actionOffset = 0; - else if (gSaveContext.language == 1) + } else if (gSaveContext.language == 1) { do_actionOffset = 0x2B80; - else + } else { do_actionOffset = 0x5700; + } DmaMgr_SendRequest1(interfaceCtx->do_actionSegment, do_actionStart + do_actionOffset, 0x300, "../z_construct.c", 174); - if (gSaveContext.language == 0) + if (gSaveContext.language == 0) { do_actionOffset = 0x480; - else if (gSaveContext.language == 1) + } else if (gSaveContext.language == 1) { do_actionOffset = 0x3000; - else + } else { do_actionOffset = 0x5B80; + } DmaMgr_SendRequest1((void*)((u32)interfaceCtx->do_actionSegment + 0x300), do_actionStart + do_actionOffset, 0x180, "../z_construct.c", 178); @@ -86,36 +90,41 @@ void func_801109B0(GlobalContext* globalCtx) { osSyncPrintf("アイコンアイテム テクスチャ初期=%x\n", 0x4000); osSyncPrintf("parameter->icon_itemSegment=%x\n", interfaceCtx->icon_itemSegment); - if (interfaceCtx->icon_itemSegment == NULL) + if (interfaceCtx->icon_itemSegment == NULL) { __assert("parameter->icon_itemSegment != NULL", "../z_construct.c", 193); + } osSyncPrintf("Register_Item[%x, %x, %x, %x]\n", gSaveContext.equips.button_items[0], gSaveContext.equips.button_items[1], gSaveContext.equips.button_items[2], gSaveContext.equips.button_items[3]); - if (gSaveContext.equips.button_items[0] < 0xF0) + if (gSaveContext.equips.button_items[0] < 0xF0) { DmaMgr_SendRequest1(interfaceCtx->icon_itemSegment, _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[0] * 0x80, 0x1000, "../z_construct.c", 198); - else if (gSaveContext.equips.button_items[0] != 0xFF) + } else if (gSaveContext.equips.button_items[0] != 0xFF) { DmaMgr_SendRequest1(interfaceCtx->icon_itemSegment, _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[0] * 0x80, 0x1000, "../z_construct.c", 203); + } - if (gSaveContext.equips.button_items[1] < 0xF0) + if (gSaveContext.equips.button_items[1] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x1000), _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[1] * 0x80, 0x1000, "../z_construct.c", 209); + } - if (gSaveContext.equips.button_items[2] < 0xF0) + if (gSaveContext.equips.button_items[2] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x2000), _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[2] * 0x80, 0x1000, "../z_construct.c", 214); + } - if (gSaveContext.equips.button_items[3] < 0xF0) + if (gSaveContext.equips.button_items[3] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x3000), _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[3] * 0x80, 0x1000, "../z_construct.c", 219); + } osSyncPrintf("ＥＶＥＮＴ＝%d\n", gSaveContext.timer_1_state); @@ -131,17 +140,19 @@ void func_801109B0(GlobalContext* globalCtx) { } } - if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) + if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) { temp = 0; - else + } else { temp = 1; + } gSaveContext.timer_x[temp] = 26; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[temp] = 54; - else + } else { gSaveContext.timer_y[temp] = 46; + } } if ((gSaveContext.timer_1_state >= 11) && (gSaveContext.timer_1_state < 16)) { diff --git a/src/code/z_demo.c b/src/code/z_demo.c index bbc125e26..dd47227d4 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -114,8 +114,9 @@ void func_800645A0(GlobalContext* globalCtx, CutsceneContext* csCtx) { gSaveContext.cutscene_trigger = 1; } - if ((gSaveContext.cutscene_trigger != 0) && (globalCtx->sceneLoadFlag == 0x14)) + if ((gSaveContext.cutscene_trigger != 0) && (globalCtx->sceneLoadFlag == 0x14)) { gSaveContext.cutscene_trigger = 0; + } if ((gSaveContext.cutscene_trigger != 0) && (csCtx->state == CS_STATE_IDLE)) { // Translates to: "CUTSCENE START REQUEST ANNOUNCEMENT!" @@ -172,13 +173,15 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* sp3F = 0; - if ((csCtx->frames < cmd->startFrame) || (csCtx->frames >= cmd->endFrame) && (cmd->endFrame != cmd->startFrame)) + if ((csCtx->frames < cmd->startFrame) || (csCtx->frames >= cmd->endFrame) && (cmd->endFrame != cmd->startFrame)) { return; + } temp = func_8006F93C(cmd->endFrame - 1, cmd->startFrame, csCtx->frames); - if (csCtx->frames == cmd->startFrame) + if (csCtx->frames == cmd->startFrame) { sp3F = 1; + } switch (cmd->base) { case 1: @@ -198,13 +201,15 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* case 3: if (sp3F != 0) { func_8006C3D0(globalCtx, 0); - if (gSaveContext.entrance_index == 0x0053) + if (gSaveContext.entrance_index == 0x0053) { func_8006C3D0(globalCtx, 2); + } } break; case 6: - if (globalCtx->unk_10AC4 < 0x3200) + if (globalCtx->unk_10AC4 < 0x3200) { globalCtx->unk_10AC4 += 0x23; + } break; case 7: if (sp3F != 0) { @@ -219,8 +224,9 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* } break; case 8: - if (globalCtx->unk_11D30[0] < 0x80) + if (globalCtx->unk_11D30[0] < 0x80) { globalCtx->unk_11D30[0] += 4; + } break; case 9: globalCtx->unk_10B12[3] = 0x10; @@ -229,33 +235,40 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* func_8006C3D0(globalCtx, 1); break; case 11: - if (globalCtx->unk_11D30[0] < 0x672) + if (globalCtx->unk_11D30[0] < 0x672) { globalCtx->unk_11D30[0] += 0x14; - if (csCtx->frames == 0x30F) + } + if (csCtx->frames == 0x30F) { func_80078884(NA_SE_EV_DEKU_DEATH); - else if (csCtx->frames == 0x2CD) + } else if (csCtx->frames == 0x2CD) { globalCtx->unk_11D30[0] = 0; + } break; case 12: if (sp3F != 0) { - if (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC) + if (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC) { csCtx->state = CS_STATE_UNSKIPPABLE_INIT; + } } break; case 13: - if (globalCtx->unk_11D30[1] == 0) + if (globalCtx->unk_11D30[1] == 0) { func_80078884(NA_SE_EV_TRIFORCE_FLASH); - if (globalCtx->unk_11D30[1] < 0xFF) + } + if (globalCtx->unk_11D30[1] < 0xFF) { globalCtx->unk_11D30[1] += 5; + } break; case 14: - if (sp3F != 0) + if (sp3F != 0) { func_800BC490(globalCtx, 1); + } break; case 15: - if (sp3F != 0) + if (sp3F != 0) { TitleCard_InitPlaceName(globalCtx, &globalCtx->actorCtx.titleCtx, player->unk_1B0, 0xA0, 0x78, 0x90, 0x18, 0x14); + } break; case 16: if (sp3F != 0) { @@ -266,14 +279,16 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* } break; case 17: - if (sp3F != 0) + if (sp3F != 0) { func_80092FAC(D_8015FCCA); + } break; case 18: globalCtx->unk_10B12[0] = 0; globalCtx->gloomySkyEvent = 2; - if (gSaveContext.day_time < 0x4AAB) + if (gSaveContext.day_time < 0x4AAB) { gSaveContext.day_time += 30; + } if (globalCtx->unk_10B12[1] == 0) { D_8011FB30 = 0; func_800F6D58(14, 1, 0); @@ -305,17 +320,19 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* break; case 25: gSaveContext.day_time += 30; - if ((gSaveContext.day_time & 0xFFFF) > 0xCAAA) + if ((gSaveContext.day_time & 0xFFFF) > 0xCAAA) { gSaveContext.day_time = 0xCAAA; + } break; case 26: if ((gSaveContext.day_time < 0x3000) || (gSaveContext.day_time >= 0x4555)) { - if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time < 0xAAAB)) + if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time < 0xAAAB)) { globalCtx->unk_10AE3 = 1; - else if ((gSaveContext.day_time >= 0xAAAB) && (gSaveContext.day_time < 0xC556)) + } else if ((gSaveContext.day_time >= 0xAAAB) && (gSaveContext.day_time < 0xC556)) { globalCtx->unk_10AE3 = 2; - else + } else { globalCtx->unk_10AE3 = 3; + } } break; case 27: @@ -346,18 +363,20 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* func_8006C3D0(globalCtx, 4); break; case 32: - if (sp3F != 0) + if (sp3F != 0) { globalCtx->unk_10B0A = 1; + } func_800788CC(0x20C0); break; case 33: gSaveContext.unk_1422 = 1; break; case 34: - if (!gSaveContext.night_flag) + if (!gSaveContext.night_flag) { gSaveContext.day_time -= D_8011FB40; - else + } else { gSaveContext.day_time -= D_8011FB40 * 2; + } break; case 35: func_800EE824(csCtx); diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index ea67ceb05..85cc0e9c2 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -94,8 +94,9 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) { break; } - if (this->actor.params >= 9) + if (this->actor.params >= 9) { sp28 = 12.0f; + } ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, sp28); @@ -154,8 +155,9 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) { break; } - if (this->actor.params < 5) + if (this->actor.params < 5) { this->actor.sub_98.mass = 0xFF; + } if (this->dynaPolyId != -1) { DynaPolyInfo_Alloc(D_8011546C[this->dynaPolyId], &sp34); diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 1945c75ff..348e983ba 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -289,8 +289,9 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) { break; } - if ((sp2C != 0) && !func_8002F410(&this->actor, globalCtx)) + if ((sp2C != 0) && !func_8002F410(&this->actor, globalCtx)) { func_8002F554(&this->actor, globalCtx, sp2C); + } En_Item00_SetNewUpdate(this, (ActorFunc)func_8001E5C8); this->updateFunc(this, globalCtx); @@ -480,11 +481,13 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) { sp3C = 0; sp3A = 0; - if (this->unk_15A > 0) + if (this->unk_15A > 0) { this->unk_15A--; + } - if ((this->unk_15A > 0) && (this->unk_15A < 41) && (this->unk_154 <= 0)) + if ((this->unk_15A > 0) && (this->unk_15A < 41) && (this->unk_154 <= 0)) { this->unk_156 = this->unk_15A; + } this->updateFunc(this, globalCtx); @@ -533,23 +536,28 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) { (this->actor.params == DROP_TUNIC_ZORA) || (this->actor.params == DROP_TUNIC_GORON)) { f32 newUnkBC = Math_Coss(this->actor.shape.rot.x) * 37.0f; this->actor.shape.unk_08 = newUnkBC; - if (newUnkBC >= 0.0f) + if (newUnkBC >= 0.0f) { this->actor.shape.unk_08 = this->actor.shape.unk_08; - else + } else { this->actor.shape.unk_08 = -this->actor.shape.unk_08; + } } - if (this->unk_154 > 0) + if (this->unk_154 > 0) { return; + } // MISMATCH: The first function argument is loaded too early here if (!((this->actor.xzDistanceFromLink <= 30.0f) && (this->actor.yDistanceFromLink >= -50.0f) && - (this->actor.yDistanceFromLink <= 50.0f))) - if (!func_8002F410(&this->actor, globalCtx)) + (this->actor.yDistanceFromLink <= 50.0f))) { + if (!func_8002F410(&this->actor, globalCtx)) { return; + } + } - if (globalCtx->unk_10A20 != 0) + if (globalCtx->unk_10A20 != 0) { return; + } switch (this->actor.params) { case DROP_RUPEE_GREEN: @@ -630,8 +638,9 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) { } // MISMATCH: The first function argument is also loaded too early here - if ((sp3C != 0) && !func_8002F410(&this->actor, globalCtx)) + if ((sp3C != 0) && !func_8002F410(&this->actor, globalCtx)) { func_8002F554(&this->actor, globalCtx, sp3C); + } switch (this->actor.params) { case DROP_HEART_PIECE: diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 13f6382f5..44612269b 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -159,19 +159,21 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { { 0xF6F7, 0x0139, 0x1766 }, }; - if (gSaveContext.entrance_index == 0x028A) + if (gSaveContext.entrance_index == 0x028A) { spawnPos = spawnPositions[0]; - else if (gSaveContext.entrance_index == 0x028E) + } else if (gSaveContext.entrance_index == 0x028E) { spawnPos = spawnPositions[1]; - else if (gSaveContext.entrance_index == 0x0292) + } else if (gSaveContext.entrance_index == 0x0292) { spawnPos = spawnPositions[2]; - else + } else { spawnPos = spawnPositions[3]; + } player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, spawnPos.x, spawnPos.y, spawnPos.z, 0, player->actor.posRot.rot.y, 0, 7); - if (player->rideActor == NULL) + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 561); + } func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); @@ -180,15 +182,17 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { (Flags_GetEventChkInf(0x18) == 0) && (DREG(1) == 0)) { player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 894.0f, 0.0f, -2084.0f, 0, -0x7FFF, 0, 5); - if (player->rideActor == NULL) + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 582); + } func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); gSaveContext.horse_data.scene = globalCtx->sceneNum; - if (globalCtx->sceneNum == SCENE_SPOT12) + if (globalCtx->sceneNum == SCENE_SPOT12) { player->rideActor->room = -1; + } } else { static struct_8011F9B8 D_8011F9B8[] = { { 93, 0xFFF0, 0x0E10, 0x0585, 0x0168, 0x8001, 8 }, { 99, 0xFFF0, 0xFF06, 0x0001, 0xF9D4, 0x4000, 6 }, @@ -210,8 +214,9 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, player->actor.posRot.rot.y, 0, D_8011F9B8[i].type); - if (player->rideActor == NULL) + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 628); + } func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); @@ -221,14 +226,16 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { s32 pad2; temp = 0; - if (((gSaveContext.event_inf[0] & 0x10) >> 4) && D_8011F9B8[i].type == 6) + if (((gSaveContext.event_inf[0] & 0x10) >> 4) && D_8011F9B8[i].type == 6) { temp = 0x8000; + } player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0, D_8011F9B8[i].type | temp); - if (player->rideActor == NULL) + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 667); + } player->actor.posRot.pos.x = D_8011F9B8[i].pos.x; player->actor.posRot.pos.y = D_8011F9B8[i].pos.y; diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index a722beff9..3366c932d 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -75,8 +75,9 @@ void KaleidoScopeCall_Update(GlobalContext* globalCtx) { pauseCtx->state++; } else if (pauseCtx->state == 2 || pauseCtx->state == 9) { osSyncPrintf("R_PAUSE_MENU_MODE=%d\n", R_PAUSE_MENU_MODE); - if (R_PAUSE_MENU_MODE >= 3) + if (R_PAUSE_MENU_MODE >= 3) { pauseCtx->state++; + } } else if (pauseCtx->state != 0) { if (&gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE] != gKaleidoMgrCurOvl) { if (gKaleidoMgrCurOvl) { diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 91c70d609..51de6e08c 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1141,13 +1141,15 @@ void Inventory_SwapAgeEquipment(void) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) { for (i = 0; i < 4; i++) { - if (i != 0) + if (i != 0) { gSaveContext.child_equips.button_items[i] = gSaveContext.equips.button_items[i]; - else + } else { gSaveContext.child_equips.button_items[i] = ITEM_SWORD_KOKIRI; + } - if (i != 0) + if (i != 0) { gSaveContext.child_equips.c_button_slots[i - 1] = gSaveContext.equips.c_button_slots[i - 1]; + } } gSaveContext.child_equips.equipment = gSaveContext.equips.equipment; @@ -1172,8 +1174,9 @@ void Inventory_SwapAgeEquipment(void) { for (i = 0; i < 4; i++) { gSaveContext.equips.button_items[i] = gSaveContext.adult_equips.button_items[i]; - if (i != 0) + if (i != 0) { gSaveContext.equips.c_button_slots[i - 1] = gSaveContext.adult_equips.c_button_slots[i - 1]; + } if (((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && (gSaveContext.equips.button_items[i] <= ITEM_POE)) || @@ -1190,8 +1193,9 @@ void Inventory_SwapAgeEquipment(void) { for (i = 0; i < 4; i++) { gSaveContext.adult_equips.button_items[i] = gSaveContext.equips.button_items[i]; - if (i != 0) + if (i != 0) { gSaveContext.adult_equips.c_button_slots[i - 1] = gSaveContext.equips.c_button_slots[i - 1]; + } } gSaveContext.adult_equips.equipment = gSaveContext.equips.equipment; @@ -1200,8 +1204,9 @@ void Inventory_SwapAgeEquipment(void) { for (i = 0; i < 4; i++) { gSaveContext.equips.button_items[i] = gSaveContext.child_equips.button_items[i]; - if (i != 0) + if (i != 0) { gSaveContext.equips.c_button_slots[i - 1] = gSaveContext.child_equips.c_button_slots[i - 1]; + } if (((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && (gSaveContext.equips.button_items[i] <= ITEM_POE)) || @@ -1221,8 +1226,9 @@ void Inventory_SwapAgeEquipment(void) { temp = gEquipMasks[EQUIP_SHIELD] & gSaveContext.equips.equipment; if (temp != 0) { temp >>= gEquipShifts[EQUIP_SHIELD]; - if (!(gBitFlags[temp + 3] & gSaveContext.equipment)) + if (!(gBitFlags[temp + 3] & gSaveContext.equipment)) { gSaveContext.equips.equipment &= gEquipNegMasks[EQUIP_SHIELD]; + } } } #else @@ -1315,8 +1321,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { s8 bombCount; slot = SLOT(item); - if (item >= ITEM_STICKS_5) + if (item >= ITEM_STICKS_5) { slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]); + } osSyncPrintf(VT_FGCOL(YELLOW)); osSyncPrintf("item_get_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.items[slot]); @@ -1330,8 +1337,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { osSyncPrintf("封印 = %x\n", gSaveContext.quest_items); osSyncPrintf(VT_RST); - if (item == ITEM_MEDALLION_WATER) + if (item == ITEM_MEDALLION_WATER) { func_8006D0AC(globalCtx); + } return ITEM_NONE; } else if ((item >= ITEM_SONG_MINUET) && (item <= ITEM_SONG_STORMS)) { @@ -1423,8 +1431,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return ITEM_NONE; } else { AMMO(ITEM_BOW)++; - if (AMMO(ITEM_BOW) > CUR_CAPACITY(UPG_QUIVER)) + if (AMMO(ITEM_BOW) > CUR_CAPACITY(UPG_QUIVER)) { AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER); + } } } else if (item == ITEM_QUIVER_40) { Inventory_ChangeUpgrade(UPG_QUIVER, 2); @@ -1450,8 +1459,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return ITEM_NONE; } else { AMMO(ITEM_BOMB)++; - if (AMMO(ITEM_BOMB) > CUR_CAPACITY(UPG_BOMB_BAG)) + if (AMMO(ITEM_BOMB) > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); + } } } else if (item == ITEM_BOMB_BAG_30) { Inventory_ChangeUpgrade(UPG_BOMB_BAG, 2); @@ -1483,26 +1493,30 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { Inventory_ChangeUpgrade(UPG_WALLET, 2); return ITEM_NONE; } else if (item == ITEM_STICK_UPGRADE_20) { - if (gSaveContext.items[slot] == ITEM_NONE) + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_STICK) = ITEM_STICK; + } Inventory_ChangeUpgrade(UPG_STICKS, 2); AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 2); return ITEM_NONE; } else if (item == ITEM_STICK_UPGRADE_30) { - if (gSaveContext.items[slot] == ITEM_NONE) + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_STICK) = ITEM_STICK; + } Inventory_ChangeUpgrade(UPG_STICKS, 3); AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 3); return ITEM_NONE; } else if (item == ITEM_NUT_UPGRADE_30) { - if (gSaveContext.items[slot] == ITEM_NONE) + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_NUT) = ITEM_NUT; + } Inventory_ChangeUpgrade(UPG_NUTS, 2); AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 2); return ITEM_NONE; } else if (item == ITEM_NUT_UPGRADE_40) { - if (gSaveContext.items[slot] == ITEM_NONE) + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_NUT) = ITEM_NUT; + } Inventory_ChangeUpgrade(UPG_NUTS, 3); AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 3); return ITEM_NONE; @@ -1521,8 +1535,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { AMMO(ITEM_STICK) = 1; } else { AMMO(ITEM_STICK)++; - if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) + if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) { AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS); + } } } else if ((item == ITEM_STICKS_5) || (item == ITEM_STICKS_10)) { if (gSaveContext.items[slot] == ITEM_NONE) { @@ -1530,8 +1545,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { AMMO(ITEM_STICK) = sAmmoRefillCounts[item - ITEM_STICKS_5]; } else { AMMO(ITEM_STICK) += sAmmoRefillCounts[item - ITEM_STICKS_5]; - if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) + if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) { AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS); + } } item = ITEM_STICK; } else if (item == ITEM_NUT) { @@ -1540,8 +1556,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { AMMO(ITEM_NUT) = ITEM_NUT; } else { AMMO(ITEM_NUT)++; - if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) + if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) { AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS); + } } } else if ((item == ITEM_NUTS_5) || (item == ITEM_NUTS_10)) { if (gSaveContext.items[slot] == ITEM_NONE) { @@ -1552,8 +1569,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { sAmmoRefillCounts[item - ITEM_NUTS_5]); } else { AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5]; - if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) + if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) { AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS); + } } item = ITEM_NUT; } else if (item == ITEM_BOMB) { @@ -1561,14 +1579,16 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { osSyncPrintf(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n"); bombCount = AMMO(ITEM_BOMB) + 1; AMMO(ITEM_BOMB) = bombCount; - if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) + if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); + } return ITEM_NONE; } else if ((item >= ITEM_BOMBS_5) && (item <= ITEM_BOMBS_30)) { bombCount = AMMO(ITEM_BOMB) + sAmmoRefillCounts[item - ITEM_BOMBS_5]; AMMO(ITEM_BOMB) = bombCount; - if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) + if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); + } return ITEM_NONE; } else if (item == ITEM_BOMBCHU) { if (gSaveContext.items[slot] == ITEM_NONE) { @@ -1577,8 +1597,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return ITEM_NONE; } else { AMMO(ITEM_BOMBCHU) += 10; - if (AMMO(ITEM_BOMBCHU) > 50) + if (AMMO(ITEM_BOMBCHU) > 50) { AMMO(ITEM_BOMBCHU) = 50; + } return ITEM_NONE; } } else if ((item == ITEM_BOMBCHUS_5) || (item == ITEM_BOMBCHUS_20)) { @@ -1588,15 +1609,17 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return ITEM_NONE; } else { AMMO(ITEM_BOMBCHU) += sAmmoRefillCounts[item - ITEM_BOMBCHUS_5 + 8]; - if (AMMO(ITEM_BOMBCHU) > 50) + if (AMMO(ITEM_BOMBCHU) > 50) { AMMO(ITEM_BOMBCHU) = 50; + } return ITEM_NONE; } } else if ((item >= ITEM_ARROWS_SMALL) && (item <= ITEM_ARROWS_LARGE)) { AMMO(ITEM_BOW) += sAmmoRefillCounts[item - ITEM_ARROWS_SMALL + 4]; - if ((AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) || (AMMO(ITEM_BOW) < 0)) + if ((AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) || (AMMO(ITEM_BOW) < 0)) { AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER); + } osSyncPrintf("%d本 Item_MaxGet=%d\n", AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER)); @@ -1609,8 +1632,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { } else if (item == ITEM_SEEDS) { AMMO(ITEM_SLINGSHOT) += 5; - if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) + if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) { AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG); + } if (!(gSaveContext.item_get_inf[1] & 8)) { gSaveContext.item_get_inf[1] |= 8; @@ -1621,8 +1645,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { } else if (item == ITEM_SEEDS_30) { AMMO(ITEM_SLINGSHOT) += 30; - if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) + if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) { AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG); + } if (!(gSaveContext.item_get_inf[1] & 8)) { gSaveContext.item_get_inf[1] |= 8; @@ -1665,8 +1690,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { Health_ChangeBy(globalCtx, 0x10); return item; } else if (item == ITEM_MAGIC_SMALL) { - if (gSaveContext.unk_13F0 != 10) + if (gSaveContext.unk_13F0 != 10) { func_80087680(globalCtx); + } func_80087708(globalCtx, 12, 5); @@ -1677,8 +1703,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return item; } else if (item == ITEM_MAGIC_LARGE) { - if (gSaveContext.unk_13F0 != 10) + if (gSaveContext.unk_13F0 != 10) { func_80087680(globalCtx); + } func_80087708(globalCtx, 24, 5); @@ -1741,8 +1768,9 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { } } } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) { - if (item == ITEM_SAW) + if (item == ITEM_SAW) { gSaveContext.item_get_inf[1] |= 0x8000; + } prevTradeItem = INV_CONTENT(item); INV_CONTENT(item) = item; @@ -1990,8 +2018,9 @@ void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 cButton) { // Special case to only empty half of a Lon Lon Milk Bottle if ((gSaveContext.items[gSaveContext.equips.c_button_slots[cButton - 1]] == ITEM_MILK_BOTTLE) && - (item == ITEM_BOTTLE)) + (item == ITEM_BOTTLE)) { item = ITEM_MILK_HALF; + } gSaveContext.items[gSaveContext.equips.c_button_slots[cButton - 1]] = item; gSaveContext.equips.button_items[cButton] = item; @@ -2052,14 +2081,17 @@ u32 sDoActionTextures[] = { 0x07000000, 0x07000180 }; #ifdef NON_MATCHING // 0x80000000 is reused in the 2 *_TO_VIRTUAL macros when it shouldn't void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 arg2) { - if (action >= 0x1D) + if (action >= 0x1D) { action = 0x0A; + } - if (gSaveContext.language != 0) + if (gSaveContext.language != 0) { action += 0x1D; + } - if (gSaveContext.language == 2) + if (gSaveContext.language == 2) { action += 0x1D; + } if ((action != 0x0A) && (action != 0x27) && (action != 0x44)) { osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); @@ -2375,12 +2407,14 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { if (gSaveContext.unk_13F4 != maxMagic) { if (gSaveContext.unk_13F4 < maxMagic) { gSaveContext.unk_13F4 += 8; - if (gSaveContext.unk_13F4 > maxMagic) + if (gSaveContext.unk_13F4 > maxMagic) { gSaveContext.unk_13F4 = maxMagic; + } } else { gSaveContext.unk_13F4 -= 8; - if (gSaveContext.unk_13F4 <= maxMagic) + if (gSaveContext.unk_13F4 <= maxMagic) { gSaveContext.unk_13F4 = maxMagic; + } } } else { gSaveContext.unk_13F0 = 9; @@ -2389,8 +2423,9 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { case 9: gSaveContext.magic += 4; - if (gSaveContext.game_mode == 0 && gSaveContext.scene_setup_index < 4) + if (gSaveContext.game_mode == 0 && gSaveContext.scene_setup_index < 4) { Audio_PlaySoundGeneral(0x401F, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } // Translates to: "Storage MAGIC_NOW=%d (%d)" osSyncPrintf("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.magic, gSaveContext.unk_13F6); @@ -2423,20 +2458,23 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { case 6: color = sMagicBorderColors[sMagicBorderIndexes[sMagicBorderStep]]; - if (sMagicBorderR >= color[0]) + if (sMagicBorderR >= color[0]) { sMagicBorderR -= ABS(sMagicBorderR - color[0]) / sMagicBorderRatio; - else + } else { sMagicBorderR += ABS(sMagicBorderR - color[0]) / sMagicBorderRatio; + } - if (sMagicBorderG >= color[1]) + if (sMagicBorderG >= color[1]) { sMagicBorderG -= ABS(sMagicBorderG - color[1]) / sMagicBorderRatio; - else + } else { sMagicBorderG += ABS(sMagicBorderG - color[1]) / sMagicBorderRatio; + } - if (sMagicBorderB >= color[2]) + if (sMagicBorderB >= color[2]) { sMagicBorderB -= ABS(sMagicBorderB - color[2]) / sMagicBorderRatio; - else + } else { sMagicBorderB += ABS(sMagicBorderB - color[2]) / sMagicBorderRatio; + } sMagicBorderRatio--; if (sMagicBorderRatio == 0) { @@ -2445,8 +2483,9 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { sMagicBorderB = color[2]; sMagicBorderRatio = YREG(40 + sMagicBorderStep); sMagicBorderStep++; - if (sMagicBorderStep >= 4) + if (sMagicBorderStep >= 4) { sMagicBorderStep = 0; + } } break; case 5: @@ -2481,20 +2520,23 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { color = sMagicBorderColors[sMagicBorderIndexes[sMagicBorderStep]]; - if (sMagicBorderR >= color[0]) + if (sMagicBorderR >= color[0]) { sMagicBorderR -= ABS(sMagicBorderR - color[0]) / sMagicBorderRatio; - else + } else { sMagicBorderR += ABS(sMagicBorderR - color[0]) / sMagicBorderRatio; + } - if (sMagicBorderG >= color[1]) + if (sMagicBorderG >= color[1]) { sMagicBorderG -= ABS(sMagicBorderG - color[1]) / sMagicBorderRatio; - else + } else { sMagicBorderG += ABS(sMagicBorderG - color[1]) / sMagicBorderRatio; + } - if (sMagicBorderB >= color[2]) + if (sMagicBorderB >= color[2]) { sMagicBorderB -= ABS(sMagicBorderB - color[2]) / sMagicBorderRatio; - else + } else { sMagicBorderB += ABS(sMagicBorderB - color[2]) / sMagicBorderRatio; + } sMagicBorderRatio--; if (sMagicBorderRatio == 0) { @@ -2503,8 +2545,9 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { sMagicBorderB = color[2]; sMagicBorderRatio = YREG(40 + sMagicBorderStep); sMagicBorderStep++; - if (sMagicBorderStep >= 4) + if (sMagicBorderStep >= 4) { sMagicBorderStep = 0; + } } break; case 10: @@ -2772,13 +2815,14 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { // C-Up Button Texture, Color & Label (Navi Text) gDPPipeSync(gfxCtx->overlay.p++); - if ((gSaveContext.unk_13EA == 1) || (gSaveContext.unk_13EA == 2) || (gSaveContext.unk_13EA == 5)) + if ((gSaveContext.unk_13EA == 1) || (gSaveContext.unk_13EA == 2) || (gSaveContext.unk_13EA == 5)) { cUpAlpha = 0; - else if ((player->stateFlags2 & 0x00200000) || (func_8008F2F8(globalCtx) == 4) || - (player->stateFlags2 & 0x00040000)) + } else if ((player->stateFlags2 & 0x00200000) || (func_8008F2F8(globalCtx) == 4) || + (player->stateFlags2 & 0x00040000)) { cUpAlpha = 0x46; - else + } else { cUpAlpha = interfaceCtx->healthAlpha; + } gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), cUpAlpha); gDPSetCombineLERP(gfxCtx->overlay.p++, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, @@ -2820,15 +2864,16 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { // Empty C Button Arrows for (i = 1; i < 4; i++) { if (gSaveContext.equips.button_items[i] > 0xF0) { - if (i == 1) + if (i == 1) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cLeftAlpha); - else if (i == 2) + } else if (i == 2) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cDownAlpha); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), interfaceCtx->cRightAlpha); + } gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, &D_02000A00[i + 1], 0x20, 0x20, R_ITEM_BTN_X(i), R_ITEM_BTN_Y(i), @@ -3188,12 +3233,13 @@ void Interface_Draw(GlobalContext* globalCtx) { // Rupee Counter gDPPipeSync(gfxCtx->overlay.p++); - if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) + if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x78, 0xFF, 0x00, interfaceCtx->magicAlpha); - else if (gSaveContext.rupees != 0) + } else if (gSaveContext.rupees != 0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->magicAlpha); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x64, 0x64, 0x64, interfaceCtx->magicAlpha); + } gDPSetCombineLERP(gfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); @@ -3201,8 +3247,9 @@ void Interface_Draw(GlobalContext* globalCtx) { interfaceCtx->counterDigits[0] = interfaceCtx->counterDigits[1] = 0; interfaceCtx->counterDigits[2] = gSaveContext.rupees; - if ((interfaceCtx->counterDigits[2] >= 10000) || (interfaceCtx->counterDigits[2] < 0)) + if ((interfaceCtx->counterDigits[2] >= 10000) || (interfaceCtx->counterDigits[2] < 0)) { interfaceCtx->counterDigits[2] &= 0xDDD; + } while (interfaceCtx->counterDigits[2] >= 100) { interfaceCtx->counterDigits[2] -= 100; @@ -3225,8 +3272,9 @@ void Interface_Draw(GlobalContext* globalCtx) { Interface_DrawMagicBar(globalCtx); Interface_DrawMinimap(globalCtx); - if ((R_PAUSE_MENU_MODE != 2) && (R_PAUSE_MENU_MODE != 3)) + if ((R_PAUSE_MENU_MODE != 2) && (R_PAUSE_MENU_MODE != 3)) { func_8002C124(&globalCtx->actorCtx.targetCtx, globalCtx); // Draw Z-Target + } func_80094520(globalCtx->state.gfxCtx); @@ -3343,10 +3391,11 @@ void Interface_Draw(GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPVertex(gfxCtx->overlay.p++, &interfaceCtx->vtx_128[4], 4, 0); - if ((interfaceCtx->unk_1EC < 2) || (interfaceCtx->unk_1EC == 3)) + if ((interfaceCtx->unk_1EC < 2) || (interfaceCtx->unk_1EC == 3)) { Interface_DrawActionLabel(globalCtx->state.gfxCtx, (void*)(u32)interfaceCtx->do_actionSegment); - else + } else { Interface_DrawActionLabel(globalCtx->state.gfxCtx, (void*)((u32)interfaceCtx->do_actionSegment + 0x180)); + } gDPPipeSync(gfxCtx->overlay.p++); @@ -3441,10 +3490,11 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s1 = ZREG(14); for (phi_s3 = 1; phi_s3 < 7; phi_s3++) { // Carrot Color (based on availability) - if ((interfaceCtx->unk_23A == 0) || (interfaceCtx->unk_23A < phi_s3)) + if ((interfaceCtx->unk_23A == 0) || (interfaceCtx->unk_23A < phi_s3)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x00, 0x96, 0xFF, interfaceCtx->aAlpha); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->aAlpha); + } gSPTextureRectangle(gfxCtx->overlay.p++, phi_s1 << 2, ZREG(15) << 2, (phi_s1 + 16) << 2, (ZREG(15) + 16) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); @@ -3507,10 +3557,11 @@ void Interface_Draw(GlobalContext* globalCtx) { (gSaveContext.equips.button_items[0] != ITEM_SWORD_MASTER) && (gSaveContext.equips.button_items[0] != ITEM_SWORD_BGS) && (gSaveContext.equips.button_items[0] != ITEM_SWORD_KNIFE)) { - if (gSaveContext.button_status[0] != BTN_ENABLED) + if (gSaveContext.button_status[0] != BTN_ENABLED) { gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; - else + } else { gSaveContext.equips.button_items[0] = ITEM_NONE; + } } // Revert any spoiling trade quest items @@ -3553,20 +3604,22 @@ void Interface_Draw(GlobalContext* globalCtx) { case 5: case 11: D_8015FFE0 = D_8015FFE2 = 20; - if (gSaveContext.timer_1_state == 5) + if (gSaveContext.timer_1_state == 5) { gSaveContext.timer_1_state = 6; - else + } else { gSaveContext.timer_1_state = 12; + } break; case 6: case 12: D_8015FFE2--; if (D_8015FFE2 == 0) { D_8015FFE2 = 20; - if (gSaveContext.timer_1_state == 6) + if (gSaveContext.timer_1_state == 6) { gSaveContext.timer_1_state = 7; - else + } else { gSaveContext.timer_1_state = 13; + } } break; case 3: @@ -3574,10 +3627,11 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s3 = (gSaveContext.timer_x[0] - 26) / D_8015FFE2; gSaveContext.timer_x[0] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { phi_s3 = (gSaveContext.timer_y[0] - 54) / D_8015FFE2; - else + } else { phi_s3 = (gSaveContext.timer_y[0] - 46) / D_8015FFE2; + } gSaveContext.timer_y[0] -= phi_s3; D_8015FFE2--; @@ -3585,30 +3639,34 @@ void Interface_Draw(GlobalContext* globalCtx) { gSaveContext.timer_x[0] = 26; D_8015FFE2 = 20; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[0] = 54; - else + } else { gSaveContext.timer_y[0] = 46; + } - if (gSaveContext.timer_1_state == 3) + if (gSaveContext.timer_1_state == 3) { gSaveContext.timer_1_state = 4; - else + } else { gSaveContext.timer_1_state = 8; + } } case 4: case 8: if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) { - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[0] = 54; - else + } else { gSaveContext.timer_y[0] = 46; + } } if ((gSaveContext.timer_1_state >= 3) && (msgCtx->unk_E300 == 0)) { D_8015FFE0--; if (D_8015FFE0 == 0) { - if (gSaveContext.timer_1_value != 0) + if (gSaveContext.timer_1_value != 0) { gSaveContext.timer_1_value--; + } D_8015FFE0 = 20; @@ -3620,13 +3678,15 @@ void Interface_Draw(GlobalContext* globalCtx) { } D_80125A5C = 0; } else if (gSaveContext.timer_1_value > 60) { - if (sTimerDigits[4] == 1) + if (sTimerDigits[4] == 1) { Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } } else if (gSaveContext.timer_1_value >= 11) { - if (sTimerDigits[4] & 1) + if (sTimerDigits[4] & 1) { Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } } else { Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); @@ -3638,10 +3698,11 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s3 = (gSaveContext.timer_x[0] - 26) / D_8015FFE2; gSaveContext.timer_x[0] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { phi_s3 = (gSaveContext.timer_y[0] - 54) / D_8015FFE2; - else + } else { phi_s3 = (gSaveContext.timer_y[0] - 46) / D_8015FFE2; + } gSaveContext.timer_y[0] -= phi_s3; D_8015FFE2--; @@ -3649,19 +3710,21 @@ void Interface_Draw(GlobalContext* globalCtx) { gSaveContext.timer_x[0] = 26; D_8015FFE2 = 20; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[0] = 54; - else + } else { gSaveContext.timer_y[0] = 46; + } gSaveContext.timer_1_state = 14; } case 14: if (gSaveContext.timer_1_state == 14) { - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[0] = 54; - else + } else { gSaveContext.timer_y[0] = 46; + } } if (gSaveContext.timer_1_state >= 3) { @@ -3686,10 +3749,11 @@ void Interface_Draw(GlobalContext* globalCtx) { gSaveContext.timer_y[1] = 80; D_8015FFE4 = D_8015FFE6 = 20; - if (gSaveContext.timer_2_state < 7) + if (gSaveContext.timer_2_state < 7) { gSaveContext.timer_2_state = 2; - else + } else { gSaveContext.timer_2_state = 8; + } gSaveContext.timer_1_state = 0; } else { @@ -3706,20 +3770,22 @@ void Interface_Draw(GlobalContext* globalCtx) { gSaveContext.timer_x[1] = 140; gSaveContext.timer_y[1] = 80; D_8015FFE4 = D_8015FFE6 = 20; - if (gSaveContext.timer_2_state == 1) + if (gSaveContext.timer_2_state == 1) { gSaveContext.timer_2_state = 2; - else + } else { gSaveContext.timer_2_state = 8; + } break; case 2: case 8: D_8015FFE6--; if (D_8015FFE6 == 0) { D_8015FFE6 = 20; - if (gSaveContext.timer_2_state == 2) + if (gSaveContext.timer_2_state == 2) { gSaveContext.timer_2_state = 3; - else + } else { gSaveContext.timer_2_state = 9; + } } break; case 3: @@ -3730,10 +3796,11 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s3 = (gSaveContext.timer_x[1] - 26) / D_8015FFE2; gSaveContext.timer_x[1] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { phi_s3 = (gSaveContext.timer_y[1] - 54) / D_8015FFE6; - else + } else { phi_s3 = (gSaveContext.timer_y[1] - 46) / D_8015FFE6; + } gSaveContext.timer_y[1] -= phi_s3; D_8015FFE6--; @@ -3741,23 +3808,26 @@ void Interface_Draw(GlobalContext* globalCtx) { gSaveContext.timer_x[1] = 26; D_8015FFE6 = 20; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[1] = 54; - else + } else { gSaveContext.timer_y[1] = 46; + } - if (gSaveContext.timer_2_state == 3) + if (gSaveContext.timer_2_state == 3) { gSaveContext.timer_2_state = 4; - else + } else { gSaveContext.timer_2_state = 10; + } } case 4: case 10: if ((gSaveContext.timer_2_state == 4) || (gSaveContext.timer_2_state == 10)) { - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[1] = 54; - else + } else { gSaveContext.timer_y[1] = 46; + } } if (gSaveContext.timer_2_state >= 3) { @@ -3785,13 +3855,15 @@ void Interface_Draw(GlobalContext* globalCtx) { } } else { if (gSaveContext.timer_2_value > 60) { - if (sTimerDigits[4] == 1) + if (sTimerDigits[4] == 1) { Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } } else if (gSaveContext.timer_2_value > 10) { - if (sTimerDigits[4] & 1) + if (sTimerDigits[4] & 1) { Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } } else { Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); @@ -3817,8 +3889,9 @@ void Interface_Draw(GlobalContext* globalCtx) { break; case 6: D_8015FFE6--; - if (D_8015FFE6 == 0) + if (D_8015FFE6 == 0) { gSaveContext.timer_2_state = 0; + } break; } } @@ -3828,10 +3901,11 @@ void Interface_Draw(GlobalContext* globalCtx) { sTimerDigits[0] = sTimerDigits[1] = sTimerDigits[3] = 0; sTimerDigits[2] = 10; // digit 10 is used as ':' (colon) - if (gSaveContext.timer_1_state != 0) + if (gSaveContext.timer_1_state != 0) { sTimerDigits[4] = gSaveContext.timer_1_value; - else + } else { sTimerDigits[4] = gSaveContext.timer_2_value; + } while (sTimerDigits[4] >= 60) { sTimerDigits[1]++; @@ -3860,15 +3934,17 @@ void Interface_Draw(GlobalContext* globalCtx) { TEXEL0, 0, PRIMITIVE, 0); if (gSaveContext.timer_1_state != 0) { - if ((gSaveContext.timer_1_value < 10) && (gSaveContext.timer_1_state < 11)) + if ((gSaveContext.timer_1_value < 10) && (gSaveContext.timer_1_state < 11)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0x32, 0x00, 0xFF); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); + } } else { - if ((gSaveContext.timer_2_value < 10) && (gSaveContext.timer_2_state < 6)) + if ((gSaveContext.timer_2_value < 10) && (gSaveContext.timer_2_state < 6)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0x32, 0x00, 0xFF); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0x00, 0xFF); + } } for (phi_s3 = 0; phi_s3 < 5; phi_s3++) { @@ -3881,8 +3957,9 @@ void Interface_Draw(GlobalContext* globalCtx) { } } - if (pauseCtx->flag == 3) + if (pauseCtx->flag == 3) { func_8002AAB0(globalCtx); + } if (interfaceCtx->unk_244 != 0) { gDPPipeSync(gfxCtx->overlay.p++); @@ -3952,32 +4029,38 @@ void Interface_Update(GlobalContext* globalCtx) { case 12: case 13: alpha = 0xFF - (gSaveContext.unk_13EC << 5); - if (alpha < 0) + if (alpha < 0) { alpha = 0; + } func_80082850(globalCtx, alpha); gSaveContext.unk_13EC++; - if (alpha == 0) + if (alpha == 0) { gSaveContext.unk_13E8 = 0; + } break; case 50: alpha = 0xFF - (gSaveContext.unk_13EC << 5); - if (alpha < 0) + if (alpha < 0) { alpha = 0; + } alpha1 = 0xFF - alpha; - if (alpha1 >= 0xFF) + if (alpha1 >= 0xFF) { alpha1 = 0xFF; + } osSyncPrintf("case 50 : alpha=%d alpha1=%d\n", alpha, alpha1); func_80082644(globalCtx, alpha1); - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha1; + } - if (interfaceCtx->magicAlpha != 0xFF) + if (interfaceCtx->magicAlpha != 0xFF) { interfaceCtx->magicAlpha = alpha1; + } switch (globalCtx->sceneNum) { case SCENE_SPOT00: @@ -4000,20 +4083,23 @@ void Interface_Update(GlobalContext* globalCtx) { case SCENE_SPOT18: case SCENE_SPOT20: case SCENE_GANON_TOU: - if (interfaceCtx->minimapAlpha < 0xAA) + if (interfaceCtx->minimapAlpha < 0xAA) { interfaceCtx->minimapAlpha = alpha1; - else + } else { interfaceCtx->minimapAlpha = 0xAA; + } break; default: - if (interfaceCtx->minimapAlpha != 0xFF) + if (interfaceCtx->minimapAlpha != 0xFF) { interfaceCtx->minimapAlpha = alpha1; + } break; } gSaveContext.unk_13EC++; - if (alpha1 == 0xFF) + if (alpha1 == 0xFF) { gSaveContext.unk_13E8 = 0; + } break; case 52: @@ -4030,8 +4116,9 @@ void Interface_Update(GlobalContext* globalCtx) { gSaveContext.health_accumulator -= 4; gSaveContext.health += 4; - if ((gSaveContext.health & 0xF) < 4) + if ((gSaveContext.health & 0xF) < 4) { Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } osSyncPrintf("now_life=%d max_life=%d\n", gSaveContext.health, gSaveContext.health_capacity); @@ -4079,8 +4166,9 @@ void Interface_Update(GlobalContext* globalCtx) { gSaveContext.rupee_accumulator += 10; gSaveContext.rupees -= 10; - if (gSaveContext.rupees < 0) + if (gSaveContext.rupees < 0) { gSaveContext.rupees = 0; + } Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else { @@ -4108,8 +4196,9 @@ void Interface_Update(GlobalContext* globalCtx) { interfaceCtx->unk_1EC = 0; interfaceCtx->unk_1EE = interfaceCtx->unk_1F0; action = interfaceCtx->unk_1EE; - if ((action == 0x1D) || (action == 0x1E)) + if ((action == 0x1D) || (action == 0x1E)) { action = 0xA; + } Interface_LoadActionLabel(interfaceCtx, action, 0); } break; @@ -4127,8 +4216,9 @@ void Interface_Update(GlobalContext* globalCtx) { interfaceCtx->unk_1EC = 0; interfaceCtx->unk_1EE = interfaceCtx->unk_1F0; action = interfaceCtx->unk_1EE; - if ((action == 0x1D) || (action == 0x1E)) + if ((action == 0x1D) || (action == 0x1E)) { action = 0xA; + } Interface_LoadActionLabel(interfaceCtx, action, 0); } break; @@ -4173,11 +4263,13 @@ void Interface_Update(GlobalContext* globalCtx) { interfaceCtx->unk_23C = 0; if (sHBAScoreTier == 0) { - if (gSaveContext.minigame_score >= 1000) + if (gSaveContext.minigame_score >= 1000) { sHBAScoreTier++; + } } else if (sHBAScoreTier == 1) { - if (gSaveContext.minigame_score >= 1500) + if (gSaveContext.minigame_score >= 1500) { sHBAScoreTier++; + } } sHBAScoreDigits[1] = 0; @@ -4202,14 +4294,16 @@ void Interface_Update(GlobalContext* globalCtx) { } if (gSaveContext.unk_1422 != 0) { - if ((msgCtx->unk_E3F0 != 0x31) && (gSaveContext.unk_1422 == 1)) + if ((msgCtx->unk_E3F0 != 0x31) && (gSaveContext.unk_1422 == 1)) { globalCtx->msgCtx.unk_E3EE = 4; + } if (globalCtx->unk_10A26 != 0) { if (gSaveContext.unk_1422 != 2) { D_80125B60 = 0; - if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time <= 0xC001)) + if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time <= 0xC001)) { D_80125B60 = 1; + } gSaveContext.unk_1422 = 2; D_80125B64 = D_8011FB40; diff --git a/src/code/z_room.c b/src/code/z_room.c index f225ef77f..f74888438 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -129,8 +129,9 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { spA4 = &spB8[0]; polygonDlist = SEGMENTED_TO_VIRTUAL(room->mesh->polygon2.start); polygon2 = &room->mesh->polygon2; - if (polygon2->num > SHAPE_SORT_MAX) + if (polygon2->num > SHAPE_SORT_MAX) { __assert("polygon2->num <= SHAPE_SORT_MAX", "../z_room.c", 317); + } sp78 = polygonDlist; for (sp9C = 0; sp9C < polygon2->num; sp9C++) { @@ -152,8 +153,9 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { spA4->unk_08 = NULL; } else { do { - if (spA4->unk_04 < phi_v0->unk_04) + if (spA4->unk_04 < phi_v0->unk_04) { break; + } phi_v0 = phi_v0->unk_0C; } while (phi_v0 != NULL); @@ -165,10 +167,11 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { } else { phi_a0 = phi_v0->unk_08; spA4->unk_08 = phi_a0; - if (phi_a0 == NULL) + if (phi_a0 == NULL) { spB4 = spA4; - else + } else { phi_a0->unk_0C = spA4; + } phi_v0->unk_08 = spA4; spA4->unk_0C = (void*)phi_v0; } @@ -187,25 +190,30 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { if (iREG(86) != 0) { phi_v1 = 0; while (phi_v1 < polygon2->num) { - if (phi_s0 == sp78) + if (phi_s0 == sp78) { break; + } phi_v1++; sp78++; } if (((iREG(86) == 1) && (iREG(89) > sp9C)) || ((iREG(86) == 2) && (iREG(89) == sp9C))) { - if ((flags & 1) && (phi_s0->opa != NULL)) + if ((flags & 1) && (phi_s0->opa != NULL)) { gSPDisplayList(gfxCtx->polyOpa.p++, phi_s0->opa); + } - if ((flags & 2) && (phi_s0->xlu != NULL)) + if ((flags & 2) && (phi_s0->xlu != NULL)) { gSPDisplayList(gfxCtx->polyXlu.p++, phi_s0->xlu); + } } } else { - if ((flags & 1) && (phi_s0->opa != NULL)) + if ((flags & 1) && (phi_s0->opa != NULL)) { gSPDisplayList(gfxCtx->polyOpa.p++, phi_s0->opa); + } - if ((flags & 2) && (phi_s0->xlu != NULL)) + if ((flags & 2) && (phi_s0->xlu != NULL)) { gSPDisplayList(gfxCtx->polyXlu.p++, phi_s0->xlu); + } } spB4 = spB4->unk_0C; @@ -541,8 +549,9 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { for (i = 0; i < globalCtx->nbRooms; i++) { roomSize = roomList[i].vromEnd - roomList[i].vromStart; osSyncPrintf("ROOM%d size=%d\n", i, roomSize); - if (maxRoomSize < roomSize) + if (maxRoomSize < roomSize) { maxRoomSize = roomSize; + } } if (globalCtx->nbTransitionActors != 0) { @@ -559,8 +568,9 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { cumulRoomSize = (frontRoom != backRoom) ? frontRoomSize + backRoomSize : frontRoomSize; osSyncPrintf("DOOR%d=<%d> ROOM1=<%d, %d> ROOM2=<%d, %d>\n", j, cumulRoomSize, frontRoom, frontRoomSize, backRoom, backRoomSize); - if (maxRoomSize < cumulRoomSize) + if (maxRoomSize < cumulRoomSize) { maxRoomSize = cumulRoomSize; + } transitionActor++; } } @@ -578,10 +588,11 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { roomCtx->unk_30 = 0; roomCtx->status = 0; - if (gSaveContext.respawn_flag > 0) + if (gSaveContext.respawn_flag > 0) { nextRoomNum = gSaveContext.respawn[gSaveContext.respawn_flag - 1].room_index; - else + } else { nextRoomNum = globalCtx->setupEntranceList[globalCtx->curSpawn].room; + } func_8009728C(globalCtx, roomCtx, nextRoomNum); return maxRoomSize; diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 949e1e41c..3a7121b04 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -312,13 +312,15 @@ void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) { } } - if (cmd->objectList.num > OBJECT_EXCHANGE_BANK_MAX) + if (cmd->objectList.num > OBJECT_EXCHANGE_BANK_MAX) { __assert("scene_info->object_bank.num <= OBJECT_EXCHANGE_BANK_MAX", "../z_scene.c", 705); + } while (k < cmd->objectList.num) { nextPtr = func_800982FC(&globalCtx->objectCtx, i, *objectEntry); - if (i < OBJECT_EXCHANGE_BANK_MAX - 1) + if (i < OBJECT_EXCHANGE_BANK_MAX - 1) { globalCtx->objectCtx.status[i + 1].segment = nextPtr; + } k++; objectEntry++; status++; diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 86d79168f..1bdfde9e3 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -2271,10 +2271,11 @@ void func_8009FE58(GlobalContext* globalCtx) { D_8012A398 += 0.15f + (globalCtx->unk_11D30[1] * 0.001f); } - if (globalCtx->roomCtx.curRoom.num == 2) + if (globalCtx->roomCtx.curRoom.num == 2) { Matrix_Scale(1, sinf(D_8012A398) * 0.8f, 1, MTXMODE_NEW); - else + } else { Matrix_Scale(1.005f, sinf(D_8012A398) * 0.8f, 1.005f, MTXMODE_NEW); + } gSPSegment(gfxCtx->polyOpa.p++, 0x0D, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_scene_table.c", 7809)); diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 4d0e42b6a..f3c3d9628 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -70,12 +70,10 @@ static void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) { if (this->unk_168 == 1 && !(gSaveContext.inf_table[7] & 0x40)) { this->unk_178 = 2; this->actionFunc = (ActorFunc)func_80878300; - } - else if (this->unk_168 == 2) { + } else if (this->unk_168 == 2) { this->unk_178 = 2; this->actionFunc = (ActorFunc)func_80878300; - } - else if (this->unk_168 < 0) { + } else if (this->unk_168 < 0) { this->unk_178 = 2; this->actionFunc = (ActorFunc)func_808783D4; } diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index b1a828e3c..7d9e0fbb9 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -20,11 +20,18 @@ static void func_808C0CD4(BgZg* this, GlobalContext* globalCtx); static void func_808C0D08(BgZg* this, GlobalContext* globalCtx); static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx); -static const ActorFunc actionFuncs[] = { (ActorFunc)func_808C0CD4, (ActorFunc)func_808C0D08, }; +static const ActorFunc actionFuncs[] = { + (ActorFunc)func_808C0CD4, + (ActorFunc)func_808C0D08, +}; -static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -static const ActorFunc drawFuncs[] = { (ActorFunc)func_808C0EEC, }; +static const ActorFunc drawFuncs[] = { + (ActorFunc)func_808C0EEC, +}; const ActorInit Bg_Zg_InitVars = { ACTOR_BG_ZG, diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 20fa54640..7a782fd49 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -98,12 +98,13 @@ void EnTuboTrap_SpawnFragments(EnTuboTrap* this, GlobalContext* globalCtx) { spC8.z += actorPos->z; rand = Math_Rand_ZeroOne(); - if (rand < 0.2f) + if (rand < 0.2f) { temp = 96; - else if (rand < 0.6f) + } else if (rand < 0.6f) { temp = 64; - else + } else { temp = 32; + } Effect_SpawnFragment(globalCtx, &spC8, &spBC, actorPos, -240, temp, 10, 10, 0, (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 60, -1, 3, addr); @@ -153,10 +154,11 @@ void EnTuboTrap_SpawnWaterFragments(EnTuboTrap* this, GlobalContext* globalCtx) spC8.z += actorPos->z; rand = Math_Rand_ZeroOne(); - if (rand < 0.2f) + if (rand < 0.2f) { temp = 64; - else + } else { temp = 32; + } Effect_SpawnFragment(globalCtx, &spC8, &spBC, actorPos, -180, temp, 30, 30, 0, (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 70, -1, 3, addr); From 3acb30694bdd19ecc29aad35037506687cf2ccd8 Mon Sep 17 00:00:00 2001 From: Roman971 Date: Tue, 24 Mar 2020 00:21:05 +0100 Subject: [PATCH 14/16] Fix actor init vars brace style under bootstrap comments --- src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c | 3 +-- src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c | 3 +-- src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c | 3 +-- src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c | 3 +-- src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 3 +-- src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 3 +-- src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 3 +-- src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 3 +-- src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c | 3 +-- src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 3 +-- src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 3 +-- src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 3 +-- src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 3 +-- src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 3 +-- src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c | 3 +-- src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c | 3 +-- src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 3 +-- src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 3 +-- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c | 3 +-- src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 3 +-- src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c | 3 +-- .../actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c | 3 +-- .../actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 3 +-- .../actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 3 +-- src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 3 +-- src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 3 +-- src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 3 +-- src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c | 3 +-- src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 3 +-- src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 3 +-- .../actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 3 +-- src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 3 +-- .../actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c | 3 +-- src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 3 +-- src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 3 +-- src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c | 3 +-- src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 3 +-- src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 3 +-- src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 3 +-- src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c | 3 +-- src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 3 +-- src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 3 +-- src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 3 +-- src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 3 +-- .../actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c | 3 +-- .../actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c | 3 +-- src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c | 3 +-- src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 3 +-- src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 3 +-- .../actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c | 3 +-- .../actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c | 3 +-- .../actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c | 3 +-- .../actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c | 3 +-- .../actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c | 3 +-- src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c | 3 +-- src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c | 3 +-- .../actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c | 3 +-- src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 3 +-- .../actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c | 3 +-- .../actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c | 3 +-- src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 3 +-- .../actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c | 3 +-- src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 3 +-- src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 3 +-- src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 3 +-- src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 3 +-- .../actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c | 3 +-- .../actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c | 3 +-- .../actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c | 3 +-- src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 3 +-- src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 3 +-- src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 3 +-- .../actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c | 3 +-- src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 3 +-- src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 3 +-- src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 3 +-- src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 3 +-- src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 3 +-- src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 3 +-- src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 3 +-- src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 3 +-- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 3 +-- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 3 +-- src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c | 3 +-- src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 3 +-- src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c | 3 +-- src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c | 3 +-- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 3 +-- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 3 +-- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 3 +-- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 3 +-- src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 3 +-- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 3 +-- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 3 +-- src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c | 3 +-- src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c | 3 +-- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 3 +-- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 3 +-- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 3 +-- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 3 +-- src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 3 +-- src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 3 +-- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 3 +-- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 3 +-- src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 3 +-- src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c | 3 +-- src/overlays/actors/ovl_Door_Killer/z_door_killer.c | 3 +-- src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c | 3 +-- src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c | 3 +-- src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c | 3 +-- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 3 +-- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 3 +-- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 3 +-- src/overlays/actors/ovl_En_Am/z_en_am.c | 3 +-- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 3 +-- src/overlays/actors/ovl_En_Anubice/z_en_anubice.c | 3 +-- src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c | 3 +-- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 3 +-- src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c | 3 +-- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 3 +-- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 3 +-- src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c | 3 +-- src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c | 3 +-- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 3 +-- src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c | 3 +-- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 3 +-- src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 3 +-- src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c | 3 +-- src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 3 +-- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 3 +-- src/overlays/actors/ovl_En_Box/z_en_box.c | 3 +-- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 3 +-- src/overlays/actors/ovl_En_Bubble/z_en_bubble.c | 3 +-- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 3 +-- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 3 +-- src/overlays/actors/ovl_En_Bx/z_en_bx.c | 3 +-- src/overlays/actors/ovl_En_Changer/z_en_changer.c | 3 +-- src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 3 +-- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 3 +-- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 3 +-- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 3 +-- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 3 +-- .../actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c | 3 +-- src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c | 3 +-- src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c | 3 +-- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 3 +-- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 3 +-- src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c | 3 +-- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 3 +-- src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 3 +-- src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 3 +-- src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 3 +-- src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c | 3 +-- src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c | 3 +-- src/overlays/actors/ovl_En_Door/z_en_door.c | 3 +-- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 3 +-- src/overlays/actors/ovl_En_Du/z_en_du.c | 3 +-- src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 3 +-- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 3 +-- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 3 +-- src/overlays/actors/ovl_En_Encount1/z_en_encount1.c | 3 +-- src/overlays/actors/ovl_En_Encount2/z_en_encount2.c | 3 +-- src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c | 3 +-- src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 3 +-- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 3 +-- src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 3 +-- src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 3 +-- src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 3 +-- src/overlays/actors/ovl_En_Firefly/z_en_firefly.c | 3 +-- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 3 +-- src/overlays/actors/ovl_En_Floormas/z_en_floormas.c | 3 +-- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 3 +-- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 3 +-- src/overlays/actors/ovl_En_Fw/z_en_fw.c | 3 +-- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 3 +-- src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c | 3 +-- src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c | 3 +-- src/overlays/actors/ovl_En_Gb/z_en_gb.c | 3 +-- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 3 +-- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 3 +-- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 3 +-- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 3 +-- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 3 +-- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 3 +-- src/overlays/actors/ovl_En_Go/z_en_go.c | 3 +-- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 3 +-- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 3 +-- src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c | 3 +-- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 3 +-- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 3 +-- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 3 +-- src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c | 3 +-- src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c | 3 +-- src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c | 3 +-- src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c | 3 +-- src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c | 3 +-- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 3 +-- src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c | 3 +-- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 3 +-- .../actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c | 3 +-- src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c | 3 +-- .../actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c | 3 +-- src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c | 3 +-- src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c | 3 +-- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 3 +-- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 3 +-- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 3 +-- src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 3 +-- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 3 +-- src/overlays/actors/ovl_En_In/z_en_in.c | 3 +-- src/overlays/actors/ovl_En_Insect/z_en_insect.c | 3 +-- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 3 +-- src/overlays/actors/ovl_En_Jj/z_en_jj.c | 3 +-- src/overlays/actors/ovl_En_Js/z_en_js.c | 3 +-- src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c | 3 +-- src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c | 3 +-- src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c | 3 +-- src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c | 3 +-- src/overlays/actors/ovl_En_Kanban/z_en_kanban.c | 3 +-- src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c | 3 +-- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 3 +-- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 3 +-- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 3 +-- src/overlays/actors/ovl_En_Light/z_en_light.c | 3 +-- src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c | 3 +-- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 3 +-- src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 3 +-- src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 3 +-- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 3 +-- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 3 +-- src/overlays/actors/ovl_En_Md/z_en_md.c | 3 +-- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 3 +-- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 3 +-- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 3 +-- src/overlays/actors/ovl_En_Mu/z_en_mu.c | 3 +-- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 3 +-- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 3 +-- src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 3 +-- src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 3 +-- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 3 +-- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 3 +-- src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c | 3 +-- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 3 +-- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 3 +-- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 3 +-- src/overlays/actors/ovl_En_Part/z_en_part.c | 3 +-- src/overlays/actors/ovl_En_Peehat/z_en_peehat.c | 3 +-- src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c | 3 +-- src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c | 3 +-- src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c | 3 +-- src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c | 3 +-- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 3 +-- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 3 +-- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 3 +-- src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c | 3 +-- src/overlays/actors/ovl_En_Rl/z_en_rl.c | 3 +-- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 3 +-- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 3 +-- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 3 +-- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 3 +-- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 3 +-- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 3 +-- src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c | 3 +-- src/overlays/actors/ovl_En_Si/z_en_si.c | 3 +-- src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c | 3 +-- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 3 +-- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 3 +-- src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c | 3 +-- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 3 +-- src/overlays/actors/ovl_En_St/z_en_st.c | 3 +-- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 3 +-- src/overlays/actors/ovl_En_Stream/z_en_stream.c | 3 +-- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 3 +-- src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c | 3 +-- src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c | 3 +-- src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c | 3 +-- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 3 +-- src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c | 3 +-- src/overlays/actors/ovl_En_Tana/z_en_tana.c | 3 +-- src/overlays/actors/ovl_En_Test/z_en_test.c | 3 +-- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 3 +-- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 3 +-- src/overlays/actors/ovl_En_Torch2/z_en_torch2.c | 3 +-- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 3 +-- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 3 +-- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 3 +-- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 3 +-- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 3 +-- src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 3 +-- src/overlays/actors/ovl_En_Viewer/z_en_viewer.c | 3 +-- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 3 +-- src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 3 +-- src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c | 3 +-- src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c | 3 +-- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 3 +-- src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c | 3 +-- src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c | 3 +-- src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 3 +-- src/overlays/actors/ovl_En_Wood02/z_en_wood02.c | 3 +-- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 3 +-- src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 3 +-- src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c | 3 +-- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 3 +-- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 3 +-- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 3 +-- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 3 +-- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 3 +-- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 3 +-- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 3 +-- src/overlays/actors/ovl_End_Title/z_end_title.c | 3 +-- src/overlays/actors/ovl_Fishing/z_fishing.c | 3 +-- src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c | 3 +-- src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c | 3 +-- src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c | 3 +-- src/overlays/actors/ovl_Item_Shield/z_item_shield.c | 3 +-- src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c | 3 +-- src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c | 3 +-- src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c | 3 +-- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 3 +-- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 3 +-- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 3 +-- src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 3 +-- src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 3 +-- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 3 +-- src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 3 +-- src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 3 +-- src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c | 3 +-- src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 3 +-- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 3 +-- src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c | 3 +-- src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 3 +-- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 3 +-- src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c | 3 +-- src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c | 3 +-- src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 3 +-- src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c | 3 +-- src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 3 +-- src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c | 3 +-- src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 3 +-- src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c | 3 +-- src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c | 3 +-- src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c | 3 +-- src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c | 3 +-- src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 3 +-- src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 3 +-- src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 3 +-- src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 3 +-- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 3 +-- 373 files changed, 373 insertions(+), 746 deletions(-) diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index bf24cb970..2c4c6d6d4 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -9,8 +9,7 @@ void ArmsHook_Update(ArmsHook* this, GlobalContext* globalCtx); void ArmsHook_Draw(ArmsHook* this, GlobalContext* globalCtx); /* -const ActorInit Arms_Hook_InitVars = -{ +const ActorInit Arms_Hook_InitVars = { ACTOR_ARMS_HOOK, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 436e0fd78..391c1798e 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -9,8 +9,7 @@ void ArrowFire_Update(ArrowFire* this, GlobalContext* globalCtx); void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx); /* -const ActorInit Arrow_Fire_InitVars = -{ +const ActorInit Arrow_Fire_InitVars = { ACTOR_ARROW_FIRE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index dcd9b8aca..c13d3f928 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -9,8 +9,7 @@ void ArrowIce_Update(ArrowIce* this, GlobalContext* globalCtx); void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx); /* -const ActorInit Arrow_Ice_InitVars = -{ +const ActorInit Arrow_Ice_InitVars = { ACTOR_ARROW_ICE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 255088a17..508ac2925 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -9,8 +9,7 @@ void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx); void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx); /* -const ActorInit Arrow_Light_InitVars = -{ +const ActorInit Arrow_Light_InitVars = { ACTOR_ARROW_LIGHT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index f288e6ae7..e5d5c0aae 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -9,8 +9,7 @@ void BgBdanObjects_Update(BgBdanObjects* this, GlobalContext* globalCtx); void BgBdanObjects_Draw(BgBdanObjects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Bdan_Objects_InitVars = -{ +const ActorInit Bg_Bdan_Objects_InitVars = { ACTOR_BG_BDAN_OBJECTS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index a9bad9857..f6b861eb0 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -9,8 +9,7 @@ void BgBombwall_Update(BgBombwall* this, GlobalContext* globalCtx); void BgBombwall_Draw(BgBombwall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Bombwall_InitVars = -{ +const ActorInit Bg_Bombwall_InitVars = { ACTOR_BG_BOMBWALL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 9a6e73a48..94caa74c1 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -9,8 +9,7 @@ void BgBowlWall_Update(BgBowlWall* this, GlobalContext* globalCtx); void BgBowlWall_Draw(BgBowlWall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Bowl_Wall_InitVars = -{ +const ActorInit Bg_Bowl_Wall_InitVars = { ACTOR_BG_BOWL_WALL, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index dedd2a7af..9458d03a6 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -8,8 +8,7 @@ void BgBreakwall_Destroy(BgBreakwall* this, GlobalContext* globalCtx); void BgBreakwall_Update(BgBreakwall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Breakwall_InitVars = -{ +const ActorInit Bg_Breakwall_InitVars = { ACTOR_BG_BREAKWALL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index b3ac8a472..fe107255e 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -9,8 +9,7 @@ void BgDdanJd_Update(BgDdanJd* this, GlobalContext* globalCtx); void BgDdanJd_Draw(BgDdanJd* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ddan_Jd_InitVars = -{ +const ActorInit Bg_Ddan_Jd_InitVars = { ACTOR_BG_DDAN_JD, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 1f88d2783..8d397e640 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -9,8 +9,7 @@ void BgDdanKd_Update(BgDdanKd* this, GlobalContext* globalCtx); void BgDdanKd_Draw(BgDdanKd* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ddan_Kd_InitVars = -{ +const ActorInit Bg_Ddan_Kd_InitVars = { ACTOR_BG_DDAN_KD, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 967be1388..e5b649f7b 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -9,8 +9,7 @@ void BgDodoago_Update(BgDodoago* this, GlobalContext* globalCtx); void BgDodoago_Draw(BgDodoago* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Dodoago_InitVars = -{ +const ActorInit Bg_Dodoago_InitVars = { ACTOR_BG_DODOAGO, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 2df2523ee..e1021f9a5 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -8,8 +8,7 @@ void BgDyYoseizo_Destroy(BgDyYoseizo* this, GlobalContext* globalCtx); void BgDyYoseizo_Update(BgDyYoseizo* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Dy_Yoseizo_InitVars = -{ +const ActorInit Bg_Dy_Yoseizo_InitVars = { ACTOR_BG_DY_YOSEIZO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index e9a53f1d7..6b65fa52c 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -9,8 +9,7 @@ void BgGanonOtyuka_Update(BgGanonOtyuka* this, GlobalContext* globalCtx); void BgGanonOtyuka_Draw(BgGanonOtyuka* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ganon_Otyuka_InitVars = -{ +const ActorInit Bg_Ganon_Otyuka_InitVars = { ACTOR_BG_GANON_OTYUKA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 79ee9d72f..c9e781a47 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -9,8 +9,7 @@ void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx); void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gjyo_Bridge_InitVars = -{ +const ActorInit Bg_Gjyo_Bridge_InitVars = { ACTOR_BG_GJYO_BRIDGE, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 82514de7e..e4f20e07e 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -8,8 +8,7 @@ void BgGndDarkmeiro_Destroy(BgGndDarkmeiro* this, GlobalContext* globalCtx); void BgGndDarkmeiro_Update(BgGndDarkmeiro* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gnd_Darkmeiro_InitVars = -{ +const ActorInit Bg_Gnd_Darkmeiro_InitVars = { ACTOR_BG_GND_DARKMEIRO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 8db58c43d..80cb6139f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -9,8 +9,7 @@ void BgGndFiremeiro_Update(BgGndFiremeiro* this, GlobalContext* globalCtx); void BgGndFiremeiro_Draw(BgGndFiremeiro* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gnd_Firemeiro_InitVars = -{ +const ActorInit Bg_Gnd_Firemeiro_InitVars = { ACTOR_BG_GND_FIREMEIRO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index 2075d3960..f3411be9c 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -9,8 +9,7 @@ void BgGndIceblock_Update(BgGndIceblock* this, GlobalContext* globalCtx); void BgGndIceblock_Draw(BgGndIceblock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gnd_Iceblock_InitVars = -{ +const ActorInit Bg_Gnd_Iceblock_InitVars = { ACTOR_BG_GND_ICEBLOCK, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 40238ba7d..c4e647712 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -9,8 +9,7 @@ void BgGndSoulmeiro_Update(BgGndSoulmeiro* this, GlobalContext* globalCtx); void BgGndSoulmeiro_Draw(BgGndSoulmeiro* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gnd_Soulmeiro_InitVars = -{ +const ActorInit Bg_Gnd_Soulmeiro_InitVars = { ACTOR_BG_GND_SOULMEIRO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 6941e4288..056676cb6 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -9,8 +9,7 @@ void BgHaka_Update(BgHaka* this, GlobalContext* globalCtx); void BgHaka_Draw(BgHaka* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_InitVars = -{ +const ActorInit Bg_Haka_InitVars = { ACTOR_BG_HAKA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 02264be14..f5f8b7cb7 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -9,8 +9,7 @@ void BgHakaGate_Update(BgHakaGate* this, GlobalContext* globalCtx); void BgHakaGate_Draw(BgHakaGate* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Gate_InitVars = -{ +const ActorInit Bg_Haka_Gate_InitVars = { ACTOR_BG_HAKA_GATE, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index 1dc6221a2..803382600 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -9,8 +9,7 @@ void BgHakaHuta_Update(BgHakaHuta* this, GlobalContext* globalCtx); void BgHakaHuta_Draw(BgHakaHuta* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Huta_InitVars = -{ +const ActorInit Bg_Haka_Huta_InitVars = { ACTOR_BG_HAKA_HUTA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 53cd70fa9..a60362a98 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -9,8 +9,7 @@ void BgHakaMeganeBG_Update(BgHakaMeganeBG* this, GlobalContext* globalCtx); void BgHakaMeganeBG_Draw(BgHakaMeganeBG* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_MeganeBG_InitVars = -{ +const ActorInit Bg_Haka_MeganeBG_InitVars = { ACTOR_BG_HAKA_MEGANEBG, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index 7fd5c9492..d85c5dbf8 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -8,8 +8,7 @@ void BgHakaSgami_Destroy(BgHakaSgami* this, GlobalContext* globalCtx); void BgHakaSgami_Update(BgHakaSgami* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Sgami_InitVars = -{ +const ActorInit Bg_Haka_Sgami_InitVars = { ACTOR_BG_HAKA_SGAMI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 2201dcb92..db2dd668c 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -9,8 +9,7 @@ void BgHakaShip_Update(BgHakaShip* this, GlobalContext* globalCtx); void BgHakaShip_Draw(BgHakaShip* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Ship_InitVars = -{ +const ActorInit Bg_Haka_Ship_InitVars = { ACTOR_BG_HAKA_SHIP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 94684d9f8..4961c344b 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -9,8 +9,7 @@ void BgHakaTrap_Update(BgHakaTrap* this, GlobalContext* globalCtx); void BgHakaTrap_Draw(BgHakaTrap* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Trap_InitVars = -{ +const ActorInit Bg_Haka_Trap_InitVars = { ACTOR_BG_HAKA_TRAP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index c6e50f9ce..7d644832a 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -9,8 +9,7 @@ void BgHakaTubo_Update(BgHakaTubo* this, GlobalContext* globalCtx); void BgHakaTubo_Draw(BgHakaTubo* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Tubo_InitVars = -{ +const ActorInit Bg_Haka_Tubo_InitVars = { ACTOR_BG_HAKA_TUBO, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index e059e992e..348a26231 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -9,8 +9,7 @@ void BgHakaWater_Update(BgHakaWater* this, GlobalContext* globalCtx); void BgHakaWater_Draw(BgHakaWater* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Water_InitVars = -{ +const ActorInit Bg_Haka_Water_InitVars = { ACTOR_BG_HAKA_WATER, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 0b426a1c0..e43e56bc4 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -8,8 +8,7 @@ void BgHakaZou_Destroy(BgHakaZou* this, GlobalContext* globalCtx); void BgHakaZou_Update(BgHakaZou* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Zou_InitVars = -{ +const ActorInit Bg_Haka_Zou_InitVars = { ACTOR_BG_HAKA_ZOU, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 7d17f584b..10b8ffff0 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -9,8 +9,7 @@ void BgHeavyBlock_Update(BgHeavyBlock* this, GlobalContext* globalCtx); void BgHeavyBlock_Draw(BgHeavyBlock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Heavy_Block_InitVars = -{ +const ActorInit Bg_Heavy_Block_InitVars = { ACTOR_BG_HEAVY_BLOCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 351fe7ebf..a23d1c899 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -9,8 +9,7 @@ void BgHidanCurtain_Update(BgHidanCurtain* this, GlobalContext* globalCtx); void BgHidanCurtain_Draw(BgHidanCurtain* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Curtain_InitVars = -{ +const ActorInit Bg_Hidan_Curtain_InitVars = { ACTOR_BG_HIDAN_CURTAIN, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 3dc9b1725..95dc82183 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -9,8 +9,7 @@ void BgHidanDalm_Update(BgHidanDalm* this, GlobalContext* globalCtx); void BgHidanDalm_Draw(BgHidanDalm* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Dalm_InitVars = -{ +const ActorInit Bg_Hidan_Dalm_InitVars = { ACTOR_BG_HIDAN_DALM, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 0b17a2d99..e6a9c201d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -8,8 +8,7 @@ void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx); void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Firewall_InitVars = -{ +const ActorInit Bg_Hidan_Firewall_InitVars = { ACTOR_BG_HIDAN_FIREWALL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 9cd91b63d..81767dc57 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -9,8 +9,7 @@ void BgHidanFwbig_Update(BgHidanFwbig* this, GlobalContext* globalCtx); void BgHidanFwbig_Draw(BgHidanFwbig* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Fwbig_InitVars = -{ +const ActorInit Bg_Hidan_Fwbig_InitVars = { ACTOR_BG_HIDAN_FWBIG, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 97aba0e1e..b64ae73c9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -9,8 +9,7 @@ void BgHidanHamstep_Update(BgHidanHamstep* this, GlobalContext* globalCtx); void BgHidanHamstep_Draw(BgHidanHamstep* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Hamstep_InitVars = -{ +const ActorInit Bg_Hidan_Hamstep_InitVars = { ACTOR_BG_HIDAN_HAMSTEP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index cb4d60140..b455d36ca 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -9,8 +9,7 @@ void BgHidanHrock_Update(BgHidanHrock* this, GlobalContext* globalCtx); void BgHidanHrock_Draw(BgHidanHrock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Hrock_InitVars = -{ +const ActorInit Bg_Hidan_Hrock_InitVars = { ACTOR_BG_HIDAN_HROCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 48e065a68..582c3eca4 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -9,8 +9,7 @@ void BgHidanKousi_Update(BgHidanKousi* this, GlobalContext* globalCtx); void BgHidanKousi_Draw(BgHidanKousi* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Kousi_InitVars = -{ +const ActorInit Bg_Hidan_Kousi_InitVars = { ACTOR_BG_HIDAN_KOUSI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 64980bbda..0182fe234 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -9,8 +9,7 @@ void BgHidanKowarerukabe_Update(BgHidanKowarerukabe* this, GlobalContext* global void BgHidanKowarerukabe_Draw(BgHidanKowarerukabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Kowarerukabe_InitVars = -{ +const ActorInit Bg_Hidan_Kowarerukabe_InitVars = { ACTOR_BG_HIDAN_KOWARERUKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 06ad32f3c..5a04973c1 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -9,8 +9,7 @@ void BgHidanRock_Update(BgHidanRock* this, GlobalContext* globalCtx); void BgHidanRock_Draw(BgHidanRock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Rock_InitVars = -{ +const ActorInit Bg_Hidan_Rock_InitVars = { ACTOR_BG_HIDAN_ROCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 792245642..322b09641 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -9,8 +9,7 @@ void BgHidanRsekizou_Update(BgHidanRsekizou* this, GlobalContext* globalCtx); void BgHidanRsekizou_Draw(BgHidanRsekizou* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Rsekizou_InitVars = -{ +const ActorInit Bg_Hidan_Rsekizou_InitVars = { ACTOR_BG_HIDAN_RSEKIZOU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index c2ec2c2cb..e2db894cd 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -9,8 +9,7 @@ void BgHidanSekizou_Update(BgHidanSekizou* this, GlobalContext* globalCtx); void BgHidanSekizou_Draw(BgHidanSekizou* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Sekizou_InitVars = -{ +const ActorInit Bg_Hidan_Sekizou_InitVars = { ACTOR_BG_HIDAN_SEKIZOU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index e81f25b7f..6e94db470 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -9,8 +9,7 @@ void BgHidanSima_Update(BgHidanSima* this, GlobalContext* globalCtx); void BgHidanSima_Draw(BgHidanSima* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Sima_InitVars = -{ +const ActorInit Bg_Hidan_Sima_InitVars = { ACTOR_BG_HIDAN_SIMA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 6be01a595..f41597a14 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -9,8 +9,7 @@ void BgIceObjects_Update(BgIceObjects* this, GlobalContext* globalCtx); void BgIceObjects_Draw(BgIceObjects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ice_Objects_InitVars = -{ +const ActorInit Bg_Ice_Objects_InitVars = { ACTOR_BG_ICE_OBJECTS, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 811445fa3..436f9eafd 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -9,8 +9,7 @@ void BgIceShelter_Update(BgIceShelter* this, GlobalContext* globalCtx); void BgIceShelter_Draw(BgIceShelter* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ice_Shelter_InitVars = -{ +const ActorInit Bg_Ice_Shelter_InitVars = { ACTOR_BG_ICE_SHELTER, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index cd411fac6..1e295d584 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -9,8 +9,7 @@ void BgIceShutter_Update(BgIceShutter* this, GlobalContext* globalCtx); void BgIceShutter_Draw(BgIceShutter* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ice_Shutter_InitVars = -{ +const ActorInit Bg_Ice_Shutter_InitVars = { ACTOR_BG_ICE_SHUTTER, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 14e159c07..1b269d0fc 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -9,8 +9,7 @@ void BgIceTurara_Update(BgIceTurara* this, GlobalContext* globalCtx); void BgIceTurara_Draw(BgIceTurara* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ice_Turara_InitVars = -{ +const ActorInit Bg_Ice_Turara_InitVars = { ACTOR_BG_ICE_TURARA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index d7302e07b..1e0d352ef 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -9,8 +9,7 @@ void BgIngate_Update(BgIngate* this, GlobalContext* globalCtx); void BgIngate_Draw(BgIngate* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ingate_InitVars = -{ +const ActorInit Bg_Ingate_InitVars = { ACTOR_BG_INGATE, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index ad957055a..cc58fdae7 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -9,8 +9,7 @@ void BgJya1flift_Update(BgJya1flift* this, GlobalContext* globalCtx); void BgJya1flift_Draw(BgJya1flift* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_1flift_InitVars = -{ +const ActorInit Bg_Jya_1flift_InitVars = { ACTOR_BG_JYA_1FLIFT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index bef3b84a7..dfd6a817b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -9,8 +9,7 @@ void BgJyaBigmirror_Update(BgJyaBigmirror* this, GlobalContext* globalCtx); void BgJyaBigmirror_Draw(BgJyaBigmirror* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Bigmirror_InitVars = -{ +const ActorInit Bg_Jya_Bigmirror_InitVars = { ACTOR_BG_JYA_BIGMIRROR, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index 6fa60832b..f149e3e01 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -9,8 +9,7 @@ void BgJyaBlock_Update(BgJyaBlock* this, GlobalContext* globalCtx); void BgJyaBlock_Draw(BgJyaBlock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Block_InitVars = -{ +const ActorInit Bg_Jya_Block_InitVars = { ACTOR_BG_JYA_BLOCK, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 6e6f9c829..c9b3362d8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -9,8 +9,7 @@ void BgJyaBombchuiwa_Update(BgJyaBombchuiwa* this, GlobalContext* globalCtx); void BgJyaBombchuiwa_Draw(BgJyaBombchuiwa* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Bombchuiwa_InitVars = -{ +const ActorInit Bg_Jya_Bombchuiwa_InitVars = { ACTOR_BG_JYA_BOMBCHUIWA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index d9b23ebbe..1b13877d1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -9,8 +9,7 @@ void BgJyaBombiwa_Update(BgJyaBombiwa* this, GlobalContext* globalCtx); void BgJyaBombiwa_Draw(BgJyaBombiwa* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Bombiwa_InitVars = -{ +const ActorInit Bg_Jya_Bombiwa_InitVars = { ACTOR_BG_JYA_BOMBIWA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 66e5b1278..15c138c38 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -9,8 +9,7 @@ void BgJyaCobra_Update(BgJyaCobra* this, GlobalContext* globalCtx); void BgJyaCobra_Draw(BgJyaCobra* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Cobra_InitVars = -{ +const ActorInit Bg_Jya_Cobra_InitVars = { ACTOR_BG_JYA_COBRA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index c8ac65e23..708400e17 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -9,8 +9,7 @@ void BgJyaGoroiwa_Update(BgJyaGoroiwa* this, GlobalContext* globalCtx); void BgJyaGoroiwa_Draw(BgJyaGoroiwa* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Goroiwa_InitVars = -{ +const ActorInit Bg_Jya_Goroiwa_InitVars = { ACTOR_BG_JYA_GOROIWA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 49b78c969..49c5e5a9f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -9,8 +9,7 @@ void BgJyaHaheniron_Update(BgJyaHaheniron* this, GlobalContext* globalCtx); void BgJyaHaheniron_Draw(BgJyaHaheniron* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Haheniron_InitVars = -{ +const ActorInit Bg_Jya_Haheniron_InitVars = { ACTOR_BG_JYA_HAHENIRON, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index 0fb2cebc0..ad9934743 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -9,8 +9,7 @@ void BgJyaIronobj_Update(BgJyaIronobj* this, GlobalContext* globalCtx); void BgJyaIronobj_Draw(BgJyaIronobj* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Ironobj_InitVars = -{ +const ActorInit Bg_Jya_Ironobj_InitVars = { ACTOR_BG_JYA_IRONOBJ, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 2bfb33a52..b2fdf1bfa 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -9,8 +9,7 @@ void BgJyaLift_Update(BgJyaLift* this, GlobalContext* globalCtx); void BgJyaLift_Draw(BgJyaLift* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Lift_InitVars = -{ +const ActorInit Bg_Jya_Lift_InitVars = { ACTOR_BG_JYA_LIFT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index e2285e2e8..027aca3bf 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -9,8 +9,7 @@ void BgJyaMegami_Update(BgJyaMegami* this, GlobalContext* globalCtx); void BgJyaMegami_Draw(BgJyaMegami* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Megami_InitVars = -{ +const ActorInit Bg_Jya_Megami_InitVars = { ACTOR_BG_JYA_MEGAMI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 7f4777624..9ff3088d1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -9,8 +9,7 @@ void BgJyaZurerukabe_Update(BgJyaZurerukabe* this, GlobalContext* globalCtx); void BgJyaZurerukabe_Draw(BgJyaZurerukabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Zurerukabe_InitVars = -{ +const ActorInit Bg_Jya_Zurerukabe_InitVars = { ACTOR_BG_JYA_ZURERUKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index b8a09316d..f3dd3407e 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -9,8 +9,7 @@ void BgMenkuriEye_Update(BgMenkuriEye* this, GlobalContext* globalCtx); void BgMenkuriEye_Draw(BgMenkuriEye* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Menkuri_Eye_InitVars = -{ +const ActorInit Bg_Menkuri_Eye_InitVars = { ACTOR_BG_MENKURI_EYE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 93ec2b84f..924cc04af 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -9,8 +9,7 @@ void BgMizuBwall_Update(BgMizuBwall* this, GlobalContext* globalCtx); void BgMizuBwall_Draw(BgMizuBwall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mizu_Bwall_InitVars = -{ +const ActorInit Bg_Mizu_Bwall_InitVars = { ACTOR_BG_MIZU_BWALL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index de1a472a0..6b0911c0c 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -9,8 +9,7 @@ void BgMizuMovebg_Update(BgMizuMovebg* this, GlobalContext* globalCtx); void BgMizuMovebg_Draw(BgMizuMovebg* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mizu_Movebg_InitVars = -{ +const ActorInit Bg_Mizu_Movebg_InitVars = { ACTOR_BG_MIZU_MOVEBG, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 0b9bfbef4..e2db36f0d 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -9,8 +9,7 @@ void BgMizuShutter_Update(BgMizuShutter* this, GlobalContext* globalCtx); void BgMizuShutter_Draw(BgMizuShutter* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mizu_Shutter_InitVars = -{ +const ActorInit Bg_Mizu_Shutter_InitVars = { ACTOR_BG_MIZU_SHUTTER, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index d5a2ff8b9..542b4fe81 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -9,8 +9,7 @@ void BgMizuWater_Update(BgMizuWater* this, GlobalContext* globalCtx); void BgMizuWater_Draw(BgMizuWater* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mizu_Water_InitVars = -{ +const ActorInit Bg_Mizu_Water_InitVars = { ACTOR_BG_MIZU_WATER, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 52afee4d6..d6e0e2401 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -8,8 +8,7 @@ void BgMoriBigst_Destroy(BgMoriBigst* this, GlobalContext* globalCtx); void BgMoriBigst_Update(BgMoriBigst* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Bigst_InitVars = -{ +const ActorInit Bg_Mori_Bigst_InitVars = { ACTOR_BG_MORI_BIGST, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 0bd8b6831..583d621a1 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -8,8 +8,7 @@ void BgMoriElevator_Destroy(BgMoriElevator* this, GlobalContext* globalCtx); void BgMoriElevator_Update(BgMoriElevator* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Elevator_InitVars = -{ +const ActorInit Bg_Mori_Elevator_InitVars = { ACTOR_BG_MORI_ELEVATOR, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 4798138b3..5bab5345f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -8,8 +8,7 @@ void BgMoriHashigo_Destroy(BgMoriHashigo* this, GlobalContext* globalCtx); void BgMoriHashigo_Update(BgMoriHashigo* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Hashigo_InitVars = -{ +const ActorInit Bg_Mori_Hashigo_InitVars = { ACTOR_BG_MORI_HASHIGO, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index d96560db6..3c6f144ee 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -8,8 +8,7 @@ void BgMoriHashira4_Destroy(BgMoriHashira4* this, GlobalContext* globalCtx); void BgMoriHashira4_Update(BgMoriHashira4* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Hashira4_InitVars = -{ +const ActorInit Bg_Mori_Hashira4_InitVars = { ACTOR_BG_MORI_HASHIRA4, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 660c0b92a..e2e73a086 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -8,8 +8,7 @@ void BgMoriHineri_Destroy(BgMoriHineri* this, GlobalContext* globalCtx); void BgMoriHineri_Update(BgMoriHineri* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Hineri_InitVars = -{ +const ActorInit Bg_Mori_Hineri_InitVars = { ACTOR_BG_MORI_HINERI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index c5fb920e5..483653219 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -8,8 +8,7 @@ void BgMoriIdomizu_Destroy(BgMoriIdomizu* this, GlobalContext* globalCtx); void BgMoriIdomizu_Update(BgMoriIdomizu* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Idomizu_InitVars = -{ +const ActorInit Bg_Mori_Idomizu_InitVars = { ACTOR_BG_MORI_IDOMIZU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index 785455ce9..a8afb4148 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -8,8 +8,7 @@ void BgMoriKaitenkabe_Destroy(BgMoriKaitenkabe* this, GlobalContext* globalCtx); void BgMoriKaitenkabe_Update(BgMoriKaitenkabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Kaitenkabe_InitVars = -{ +const ActorInit Bg_Mori_Kaitenkabe_InitVars = { ACTOR_BG_MORI_KAITENKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 7be6743c6..02b931495 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -8,8 +8,7 @@ void BgMoriRakkatenjo_Destroy(BgMoriRakkatenjo* this, GlobalContext* globalCtx); void BgMoriRakkatenjo_Update(BgMoriRakkatenjo* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Rakkatenjo_InitVars = -{ +const ActorInit Bg_Mori_Rakkatenjo_InitVars = { ACTOR_BG_MORI_RAKKATENJO, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 729034661..7ac4e8e4a 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -9,8 +9,7 @@ void BgPoEvent_Update(BgPoEvent* this, GlobalContext* globalCtx); void BgPoEvent_Draw(BgPoEvent* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Po_Event_InitVars = -{ +const ActorInit Bg_Po_Event_InitVars = { ACTOR_BG_PO_EVENT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index f9fe4197a..2fd1e75f1 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -9,8 +9,7 @@ void BgPoSyokudai_Update(BgPoSyokudai* this, GlobalContext* globalCtx); void BgPoSyokudai_Draw(BgPoSyokudai* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Po_Syokudai_InitVars = -{ +const ActorInit Bg_Po_Syokudai_InitVars = { ACTOR_BG_PO_SYOKUDAI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 5a362160f..19a950888 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -9,8 +9,7 @@ void BgRelayObjects_Update(BgRelayObjects* this, GlobalContext* globalCtx); void BgRelayObjects_Draw(BgRelayObjects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Relay_Objects_InitVars = -{ +const ActorInit Bg_Relay_Objects_InitVars = { ACTOR_BG_RELAY_OBJECTS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index 1d32da9c5..69f4180bb 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -9,8 +9,7 @@ void BgSpot00Hanebasi_Update(BgSpot00Hanebasi* this, GlobalContext* globalCtx); void BgSpot00Hanebasi_Draw(BgSpot00Hanebasi* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot00_Hanebasi_InitVars = -{ +const ActorInit Bg_Spot00_Hanebasi_InitVars = { ACTOR_BG_SPOT00_HANEBASI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 016173178..d1db93f4a 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -9,8 +9,7 @@ void BgSpot01Idohashira_Update(BgSpot01Idohashira* this, GlobalContext* globalCt void BgSpot01Idohashira_Draw(BgSpot01Idohashira* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot01_Idohashira_InitVars = -{ +const ActorInit Bg_Spot01_Idohashira_InitVars = { ACTOR_BG_SPOT01_IDOHASHIRA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index ff77d423a..4c20b3122 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -9,8 +9,7 @@ void BgSpot01Idomizu_Update(BgSpot01Idomizu* this, GlobalContext* globalCtx); void BgSpot01Idomizu_Draw(BgSpot01Idomizu* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot01_Idomizu_InitVars = -{ +const ActorInit Bg_Spot01_Idomizu_InitVars = { ACTOR_BG_SPOT01_IDOMIZU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index e59a1179e..7ca2db2ab 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -8,8 +8,7 @@ void BgSpot01Objects2_Destroy(BgSpot01Objects2* this, GlobalContext* globalCtx); void BgSpot01Objects2_Update(BgSpot01Objects2* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot01_Objects2_InitVars = -{ +const ActorInit Bg_Spot01_Objects2_InitVars = { ACTOR_BG_SPOT01_OBJECTS2, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index c39d81d06..adaf6c8a9 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -9,8 +9,7 @@ void BgSpot02Objects_Update(BgSpot02Objects* this, GlobalContext* globalCtx); void BgSpot02Objects_Draw(BgSpot02Objects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot02_Objects_InitVars = -{ +const ActorInit Bg_Spot02_Objects_InitVars = { ACTOR_BG_SPOT02_OBJECTS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index 5504379eb..141ee2299 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -9,8 +9,7 @@ void BgSpot03Taki_Update(BgSpot03Taki* this, GlobalContext* globalCtx); void BgSpot03Taki_Draw(BgSpot03Taki* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot03_Taki_InitVars = -{ +const ActorInit Bg_Spot03_Taki_InitVars = { ACTOR_BG_SPOT03_TAKI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index 62e45d39e..615532637 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -9,8 +9,7 @@ void BgSpot05Soko_Update(BgSpot05Soko* this, GlobalContext* globalCtx); void BgSpot05Soko_Draw(BgSpot05Soko* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot05_Soko_InitVars = -{ +const ActorInit Bg_Spot05_Soko_InitVars = { ACTOR_BG_SPOT05_SOKO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index a57f4b8d2..afad380c5 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -9,8 +9,7 @@ void BgSpot06Objects_Update(BgSpot06Objects* this, GlobalContext* globalCtx); void BgSpot06Objects_Draw(BgSpot06Objects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot06_Objects_InitVars = -{ +const ActorInit Bg_Spot06_Objects_InitVars = { ACTOR_BG_SPOT06_OBJECTS, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index 9ac3a245b..8e1fdfd64 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -9,8 +9,7 @@ void BgSpot07Taki_Update(BgSpot07Taki* this, GlobalContext* globalCtx); void BgSpot07Taki_Draw(BgSpot07Taki* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot07_Taki_InitVars = -{ +const ActorInit Bg_Spot07_Taki_InitVars = { ACTOR_BG_SPOT07_TAKI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 915a39ba6..c816388be 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -9,8 +9,7 @@ void BgSpot08Bakudankabe_Update(BgSpot08Bakudankabe* this, GlobalContext* global void BgSpot08Bakudankabe_Draw(BgSpot08Bakudankabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot08_Bakudankabe_InitVars = -{ +const ActorInit Bg_Spot08_Bakudankabe_InitVars = { ACTOR_BG_SPOT08_BAKUDANKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 5f1848ddf..6bcf1f8de 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -9,8 +9,7 @@ void BgSpot08Iceblock_Update(BgSpot08Iceblock* this, GlobalContext* globalCtx); void BgSpot08Iceblock_Draw(BgSpot08Iceblock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot08_Iceblock_InitVars = -{ +const ActorInit Bg_Spot08_Iceblock_InitVars = { ACTOR_BG_SPOT08_ICEBLOCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 7518d97c4..342fd326a 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -9,8 +9,7 @@ void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx); void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot09_Obj_InitVars = -{ +const ActorInit Bg_Spot09_Obj_InitVars = { ACTOR_BG_SPOT09_OBJ, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index e15d4658f..484621a61 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -9,8 +9,7 @@ void BgSpot11Bakudankabe_Update(BgSpot11Bakudankabe* this, GlobalContext* global void BgSpot11Bakudankabe_Draw(BgSpot11Bakudankabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot11_Bakudankabe_InitVars = -{ +const ActorInit Bg_Spot11_Bakudankabe_InitVars = { ACTOR_BG_SPOT11_BAKUDANKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 4848c8118..8c56db0ce 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -7,8 +7,7 @@ void BgSpot11Oasis_Init(BgSpot11Oasis* this, GlobalContext* globalCtx); void BgSpot11Oasis_Update(BgSpot11Oasis* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot11_Oasis_InitVars = -{ +const ActorInit Bg_Spot11_Oasis_InitVars = { ACTOR_BG_SPOT11_OASIS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 87aac0132..65f8e8ef0 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -9,8 +9,7 @@ void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx); void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot12_Gate_InitVars = -{ +const ActorInit Bg_Spot12_Gate_InitVars = { ACTOR_BG_SPOT12_GATE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index df1dfd43d..4ce75c6d2 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -9,8 +9,7 @@ void BgSpot12Saku_Update(BgSpot12Saku* this, GlobalContext* globalCtx); void BgSpot12Saku_Draw(BgSpot12Saku* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot12_Saku_InitVars = -{ +const ActorInit Bg_Spot12_Saku_InitVars = { ACTOR_BG_SPOT12_SAKU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 5ef865590..8ee4e80ac 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -9,8 +9,7 @@ void BgSpot15Rrbox_Update(BgSpot15Rrbox* this, GlobalContext* globalCtx); void BgSpot15Rrbox_Draw(BgSpot15Rrbox* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot15_Rrbox_InitVars = -{ +const ActorInit Bg_Spot15_Rrbox_InitVars = { ACTOR_BG_SPOT15_RRBOX, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index fbf7847aa..9c6b04d41 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -9,8 +9,7 @@ void BgSpot16Bombstone_Update(BgSpot16Bombstone* this, GlobalContext* globalCtx) void BgSpot16Bombstone_Draw(BgSpot16Bombstone* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot16_Bombstone_InitVars = -{ +const ActorInit Bg_Spot16_Bombstone_InitVars = { ACTOR_BG_SPOT16_BOMBSTONE, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 5ec81828d..cd9616168 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -9,8 +9,7 @@ void BgSpot16Doughnut_Update(BgSpot16Doughnut* this, GlobalContext* globalCtx); void BgSpot16Doughnut_Draw(BgSpot16Doughnut* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot16_Doughnut_InitVars = -{ +const ActorInit Bg_Spot16_Doughnut_InitVars = { ACTOR_BG_SPOT16_DOUGHNUT, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 5ec76c924..900c932df 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -9,8 +9,7 @@ void BgSpot17Bakudankabe_Update(BgSpot17Bakudankabe* this, GlobalContext* global void BgSpot17Bakudankabe_Draw(BgSpot17Bakudankabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot17_Bakudankabe_InitVars = -{ +const ActorInit Bg_Spot17_Bakudankabe_InitVars = { ACTOR_BG_SPOT17_BAKUDANKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index bc70d2436..5e992d216 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -8,8 +8,7 @@ void BgSpot17Funen_Destroy(BgSpot17Funen* this, GlobalContext* globalCtx); void BgSpot17Funen_Update(BgSpot17Funen* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot17_Funen_InitVars = -{ +const ActorInit Bg_Spot17_Funen_InitVars = { ACTOR_BG_SPOT17_FUNEN, ACTORTYPE_SWITCH, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 774c115b1..bb918f85f 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -9,8 +9,7 @@ void BgSpot18Basket_Update(BgSpot18Basket* this, GlobalContext* globalCtx); void BgSpot18Basket_Draw(BgSpot18Basket* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot18_Basket_InitVars = -{ +const ActorInit Bg_Spot18_Basket_InitVars = { ACTOR_BG_SPOT18_BASKET, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 4f65b2e91..0b3e5d9c0 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -9,8 +9,7 @@ void BgSpot18Obj_Update(BgSpot18Obj* this, GlobalContext* globalCtx); void BgSpot18Obj_Draw(BgSpot18Obj* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot18_Obj_InitVars = -{ +const ActorInit Bg_Spot18_Obj_InitVars = { ACTOR_BG_SPOT18_OBJ, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 58d9ab279..1868bbf98 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -9,8 +9,7 @@ void BgSpot18Shutter_Update(BgSpot18Shutter* this, GlobalContext* globalCtx); void BgSpot18Shutter_Draw(BgSpot18Shutter* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot18_Shutter_InitVars = -{ +const ActorInit Bg_Spot18_Shutter_InitVars = { ACTOR_BG_SPOT18_SHUTTER, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 0283b0a00..e69d3b406 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -9,8 +9,7 @@ void BgSstFloor_Update(BgSstFloor* this, GlobalContext* globalCtx); void BgSstFloor_Draw(BgSstFloor* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Sst_Floor_InitVars = -{ +const ActorInit Bg_Sst_Floor_InitVars = { ACTOR_BG_SST_FLOOR, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index e00e52642..626c95ed1 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -9,8 +9,7 @@ void BgTokiHikari_Update(BgTokiHikari* this, GlobalContext* globalCtx); void BgTokiHikari_Draw(BgTokiHikari* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Toki_Hikari_InitVars = -{ +const ActorInit Bg_Toki_Hikari_InitVars = { ACTOR_BG_TOKI_HIKARI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 29a536898..3ba91b205 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -9,8 +9,7 @@ void BgTreemouth_Update(BgTreemouth* this, GlobalContext* globalCtx); void BgTreemouth_Draw(BgTreemouth* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Treemouth_InitVars = -{ +const ActorInit Bg_Treemouth_InitVars = { ACTOR_BG_TREEMOUTH, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 83882c24f..88fae7052 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -9,8 +9,7 @@ void BgVbSima_Update(BgVbSima* this, GlobalContext* globalCtx); void BgVbSima_Draw(BgVbSima* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Vb_Sima_InitVars = -{ +const ActorInit Bg_Vb_Sima_InitVars = { ACTOR_BG_VB_SIMA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 940a4f77d..57e671fbd 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -9,8 +9,7 @@ void BgYdanHasi_Update(BgYdanHasi* this, GlobalContext* globalCtx); void BgYdanHasi_Draw(BgYdanHasi* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ydan_Hasi_InitVars = -{ +const ActorInit Bg_Ydan_Hasi_InitVars = { ACTOR_BG_YDAN_HASI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index ead7bdff7..653e10c88 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -9,8 +9,7 @@ void BgYdanMaruta_Update(BgYdanMaruta* this, GlobalContext* globalCtx); void BgYdanMaruta_Draw(BgYdanMaruta* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ydan_Maruta_InitVars = -{ +const ActorInit Bg_Ydan_Maruta_InitVars = { ACTOR_BG_YDAN_MARUTA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 82beaa928..5db87323b 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -9,8 +9,7 @@ void BgYdanSp_Update(BgYdanSp* this, GlobalContext* globalCtx); void BgYdanSp_Draw(BgYdanSp* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ydan_Sp_InitVars = -{ +const ActorInit Bg_Ydan_Sp_InitVars = { ACTOR_BG_YDAN_SP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 842acad26..02583c9a6 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -9,8 +9,7 @@ void BossDodongo_Update(BossDodongo* this, GlobalContext* globalCtx); void BossDodongo_Draw(BossDodongo* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Dodongo_InitVars = -{ +const ActorInit Boss_Dodongo_InitVars = { ACTOR_EN_DODONGO, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 0aeb95858..ac7f21165 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -9,8 +9,7 @@ void BossFd_Update(BossFd* this, GlobalContext* globalCtx); void BossFd_Draw(BossFd* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Fd_InitVars = -{ +const ActorInit Boss_Fd_InitVars = { ACTOR_BOSS_FD, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 8bee518ab..9fb62f18d 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -9,8 +9,7 @@ void BossFd2_Update(BossFd2* this, GlobalContext* globalCtx); void BossFd2_Draw(BossFd2* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Fd2_InitVars = -{ +const ActorInit Boss_Fd2_InitVars = { ACTOR_BOSS_FD2, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index ca942353d..a9947929c 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -9,8 +9,7 @@ void BossGanon_Update(BossGanon* this, GlobalContext* globalCtx); void BossGanon_Draw(BossGanon* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Ganon_InitVars = -{ +const ActorInit Boss_Ganon_InitVars = { ACTOR_BOSS_GANON, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 049d4d5b4..2b0158398 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -9,8 +9,7 @@ void BossGanon2_Update(BossGanon2* this, GlobalContext* globalCtx); void BossGanon2_Draw(BossGanon2* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Ganon2_InitVars = -{ +const ActorInit Boss_Ganon2_InitVars = { ACTOR_BOSS_GANON2, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 606e3c571..9be8ee8a5 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -9,8 +9,7 @@ void BossGanondrof_Update(BossGanondrof* this, GlobalContext* globalCtx); void BossGanondrof_Draw(BossGanondrof* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Ganondrof_InitVars = -{ +const ActorInit Boss_Ganondrof_InitVars = { ACTOR_BOSS_GANONDROF, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index dcdadea6b..5292e63a7 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -9,8 +9,7 @@ void BossGoma_Update(BossGoma* this, GlobalContext* globalCtx); void BossGoma_Draw(BossGoma* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Goma_InitVars = -{ +const ActorInit Boss_Goma_InitVars = { ACTOR_BOSS_GOMA, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index be09d229a..96262d320 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -9,8 +9,7 @@ void BossMo_Update(BossMo* this, GlobalContext* globalCtx); void BossMo_Draw(BossMo* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Mo_InitVars = -{ +const ActorInit Boss_Mo_InitVars = { ACTOR_BOSS_MO, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 8ee2afd5a..de391f92f 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -9,8 +9,7 @@ void BossSst_Update(BossSst* this, GlobalContext* globalCtx); void BossSst_Draw(BossSst* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Sst_InitVars = -{ +const ActorInit Boss_Sst_InitVars = { ACTOR_BOSS_SST, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index bf07fc075..2c69d0438 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -9,8 +9,7 @@ void BossTw_Update(BossTw* this, GlobalContext* globalCtx); void BossTw_Draw(BossTw* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Tw_InitVars = -{ +const ActorInit Boss_Tw_InitVars = { ACTOR_BOSS_TW, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 5f5505cea..e96a00d6c 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -9,8 +9,7 @@ void BossVa_Update(BossVa* this, GlobalContext* globalCtx); void BossVa_Draw(BossVa* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Va_InitVars = -{ +const ActorInit Boss_Va_InitVars = { ACTOR_BOSS_VA, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 50e875ccf..3ff8fe0b6 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -8,8 +8,7 @@ void Demo6K_Destroy(Demo6K* this, GlobalContext* globalCtx); void Demo6K_Update(Demo6K* this, GlobalContext* globalCtx); /* -const ActorInit Demo_6K_InitVars = -{ +const ActorInit Demo_6K_InitVars = { ACTOR_DEMO_6K, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 447963c88..7de6e24a5 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -9,8 +9,7 @@ void DemoDu_Update(DemoDu* this, GlobalContext* globalCtx); void DemoDu_Draw(DemoDu* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Du_InitVars = -{ +const ActorInit Demo_Du_InitVars = { ACTOR_DEMO_DU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 905ce14db..a52882a0e 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -9,8 +9,7 @@ void DemoEc_Update(DemoEc* this, GlobalContext* globalCtx); void DemoEc_Draw(DemoEc* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Ec_InitVars = -{ +const ActorInit Demo_Ec_InitVars = { ACTOR_DEMO_EC, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 31285eab9..4c8e87eb4 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -8,8 +8,7 @@ void DemoEffect_Destroy(DemoEffect* this, GlobalContext* globalCtx); void DemoEffect_Update(DemoEffect* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Effect_InitVars = -{ +const ActorInit Demo_Effect_InitVars = { ACTOR_DEMO_EFFECT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 0faec9fb8..5d19fffd4 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -9,8 +9,7 @@ void DemoExt_Update(DemoExt* this, GlobalContext* globalCtx); void DemoExt_Draw(DemoExt* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Ext_InitVars = -{ +const ActorInit Demo_Ext_InitVars = { ACTOR_DEMO_EXT, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 7b9dff5d6..63b636bd5 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -9,8 +9,7 @@ void DemoGj_Update(DemoGj* this, GlobalContext* globalCtx); void DemoGj_Draw(DemoGj* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Gj_InitVars = -{ +const ActorInit Demo_Gj_InitVars = { ACTOR_DEMO_GJ, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 5dd655772..b09a261ff 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -9,8 +9,7 @@ void DemoGt_Update(DemoGt* this, GlobalContext* globalCtx); void DemoGt_Draw(DemoGt* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Gt_InitVars = -{ +const ActorInit Demo_Gt_InitVars = { ACTOR_DEMO_GT, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 568707a99..31c99ae64 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -9,8 +9,7 @@ void DemoIk_Update(DemoIk* this, GlobalContext* globalCtx); void DemoIk_Draw(DemoIk* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Ik_InitVars = -{ +const ActorInit Demo_Ik_InitVars = { ACTOR_DEMO_IK, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index bd79b5722..ea42fdb52 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -9,8 +9,7 @@ void DemoIm_Update(DemoIm* this, GlobalContext* globalCtx); void DemoIm_Draw(DemoIm* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Im_InitVars = -{ +const ActorInit Demo_Im_InitVars = { ACTOR_DEMO_IM, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index ae22ebdc0..35f85bd40 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -9,8 +9,7 @@ void DemoKankyo_Update(DemoKankyo* this, GlobalContext* globalCtx); void DemoKankyo_Draw(DemoKankyo* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Kankyo_InitVars = -{ +const ActorInit Demo_Kankyo_InitVars = { ACTOR_DEMO_KANKYO, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 2f4b63914..4df16f7cd 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -9,8 +9,7 @@ void DemoKekkai_Update(DemoKekkai* this, GlobalContext* globalCtx); void DemoKekkai_Draw(DemoKekkai* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Kekkai_InitVars = -{ +const ActorInit Demo_Kekkai_InitVars = { ACTOR_DEMO_KEKKAI, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 4217d217f..179dee1e8 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -9,8 +9,7 @@ void DemoSa_Update(DemoSa* this, GlobalContext* globalCtx); void DemoSa_Draw(DemoSa* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Sa_InitVars = -{ +const ActorInit Demo_Sa_InitVars = { ACTOR_DEMO_SA, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index ceccbb5be..8c3faa1f5 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -9,8 +9,7 @@ void DemoShd_Update(DemoShd* this, GlobalContext* globalCtx); void DemoShd_Draw(DemoShd* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Shd_InitVars = -{ +const ActorInit Demo_Shd_InitVars = { ACTOR_DEMO_SHD, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index f0718f318..2f8466814 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -9,8 +9,7 @@ void DemoTreLgt_Update(DemoTreLgt* this, GlobalContext* globalCtx); void DemoTreLgt_Draw(DemoTreLgt* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Tre_Lgt_InitVars = -{ +const ActorInit Demo_Tre_Lgt_InitVars = { ACTOR_DEMO_TRE_LGT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index 4cd20660d..81bfd1e10 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -9,8 +9,7 @@ void DoorGerudo_Update(DoorGerudo* this, GlobalContext* globalCtx); void DoorGerudo_Draw(DoorGerudo* this, GlobalContext* globalCtx); /* -const ActorInit Door_Gerudo_InitVars = -{ +const ActorInit Door_Gerudo_InitVars = { ACTOR_DOOR_GERUDO, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 4c2e90d9f..65ee03982 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -8,8 +8,7 @@ void DoorKiller_Destroy(DoorKiller* this, GlobalContext* globalCtx); void DoorKiller_Update(DoorKiller* this, GlobalContext* globalCtx); /* -const ActorInit Door_Killer_InitVars = -{ +const ActorInit Door_Killer_InitVars = { ACTOR_DOOR_KILLER, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index ee6a9e120..7301db73e 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -9,8 +9,7 @@ void DoorShutter_Update(DoorShutter* this, GlobalContext* globalCtx); void DoorShutter_Draw(DoorShutter* this, GlobalContext* globalCtx); /* -const ActorInit Door_Shutter_InitVars = -{ +const ActorInit Door_Shutter_InitVars = { ACTOR_DOOR_SHUTTER, ACTORTYPE_DOOR, ROOM, diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index c7e7db92b..3f8030c73 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -9,8 +9,7 @@ void DoorWarp1_Update(DoorWarp1* this, GlobalContext* globalCtx); void DoorWarp1_Draw(DoorWarp1* this, GlobalContext* globalCtx); /* -const ActorInit Door_Warp1_InitVars = -{ +const ActorInit Door_Warp1_InitVars = { ACTOR_DOOR_WARP1, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 6df8f4173..e7caf7707 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -9,8 +9,7 @@ void EfcErupc_Update(EfcErupc* this, GlobalContext* globalCtx); void EfcErupc_Draw(EfcErupc* this, GlobalContext* globalCtx); /* -const ActorInit Efc_Erupc_InitVars = -{ +const ActorInit Efc_Erupc_InitVars = { ACTOR_EFC_ERUPC, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 6e2ebddd0..18f1856e7 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -9,8 +9,7 @@ void EffDust_Update(EffDust* this, GlobalContext* globalCtx); void EffDust_Draw(EffDust* this, GlobalContext* globalCtx); /* -const ActorInit Eff_Dust_InitVars = -{ +const ActorInit Eff_Dust_InitVars = { ACTOR_EFF_DUST, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index b16bafbb4..9fa507fef 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -9,8 +9,7 @@ void ElfMsg_Update(ElfMsg* this, GlobalContext* globalCtx); void ElfMsg_Draw(ElfMsg* this, GlobalContext* globalCtx); /* -const ActorInit Elf_Msg_InitVars = -{ +const ActorInit Elf_Msg_InitVars = { ACTOR_ELF_MSG, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 3ba001027..3ed1c377e 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -9,8 +9,7 @@ void ElfMsg2_Update(ElfMsg2* this, GlobalContext* globalCtx); void ElfMsg2_Draw(ElfMsg2* this, GlobalContext* globalCtx); /* -const ActorInit Elf_Msg2_InitVars = -{ +const ActorInit Elf_Msg2_InitVars = { ACTOR_ELF_MSG2, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index ab5d63eb3..0939cffe2 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -9,8 +9,7 @@ void EnAm_Update(EnAm* this, GlobalContext* globalCtx); void EnAm_Draw(EnAm* this, GlobalContext* globalCtx); /* -const ActorInit En_Am_InitVars = -{ +const ActorInit En_Am_InitVars = { ACTOR_EN_AM, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 6d9d1bbfb..a71924b89 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -9,8 +9,7 @@ void EnAni_Update(EnAni* this, GlobalContext* globalCtx); void EnAni_Draw(EnAni* this, GlobalContext* globalCtx); /* -const ActorInit En_Ani_InitVars = -{ +const ActorInit En_Ani_InitVars = { ACTOR_EN_ANI, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index d55d4d36e..b089c5f80 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -9,8 +9,7 @@ void EnAnubice_Update(EnAnubice* this, GlobalContext* globalCtx); void EnAnubice_Draw(EnAnubice* this, GlobalContext* globalCtx); /* -const ActorInit En_Anubice_InitVars = -{ +const ActorInit En_Anubice_InitVars = { ACTOR_EN_ANUBICE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 98aeae20e..897bf9d42 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -9,8 +9,7 @@ void EnAnubiceFire_Update(EnAnubiceFire* this, GlobalContext* globalCtx); void EnAnubiceFire_Draw(EnAnubiceFire* this, GlobalContext* globalCtx); /* -const ActorInit En_Anubice_Fire_InitVars = -{ +const ActorInit En_Anubice_Fire_InitVars = { ACTOR_EN_ANUBICE_FIRE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 858c204ba..a4f9ce389 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -9,8 +9,7 @@ void EnArrow_Update(EnArrow* this, GlobalContext* globalCtx); void EnArrow_Draw(EnArrow* this, GlobalContext* globalCtx); /* -const ActorInit En_Arrow_InitVars = -{ +const ActorInit En_Arrow_InitVars = { ACTOR_EN_ARROW, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index a09614155..f7841a75c 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -9,8 +9,7 @@ void EnAttackNiw_Update(EnAttackNiw* this, GlobalContext* globalCtx); void EnAttackNiw_Draw(EnAttackNiw* this, GlobalContext* globalCtx); /* -const ActorInit En_Attack_Niw_InitVars = -{ +const ActorInit En_Attack_Niw_InitVars = { ACTOR_EN_ATTACK_NIW, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 2b0d599c7..1d1df7898 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -9,8 +9,7 @@ void EnBa_Update(EnBa* this, GlobalContext* globalCtx); void EnBa_Draw(EnBa* this, GlobalContext* globalCtx); /* -const ActorInit En_Ba_InitVars = -{ +const ActorInit En_Ba_InitVars = { ACTOR_EN_BA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index c00f0c431..365363811 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -9,8 +9,7 @@ void EnBb_Update(EnBb* this, GlobalContext* globalCtx); void EnBb_Draw(EnBb* this, GlobalContext* globalCtx); /* -const ActorInit En_Bb_InitVars = -{ +const ActorInit En_Bb_InitVars = { ACTOR_EN_BB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index b201d8b10..9df5b6ef1 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -9,8 +9,7 @@ void EnBdfire_Update(EnBdfire* this, GlobalContext* globalCtx); void EnBdfire_Draw(EnBdfire* this, GlobalContext* globalCtx); /* -const ActorInit En_Bdfire_InitVars = -{ +const ActorInit En_Bdfire_InitVars = { ACTOR_PLAYER, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index d7fe07fc9..35797342d 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -9,8 +9,7 @@ void EnBigokuta_Update(EnBigokuta* this, GlobalContext* globalCtx); void EnBigokuta_Draw(EnBigokuta* this, GlobalContext* globalCtx); /* -const ActorInit En_Bigokuta_InitVars = -{ +const ActorInit En_Bigokuta_InitVars = { ACTOR_EN_BIGOKUTA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index d279338ef..1da26efb7 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -9,8 +9,7 @@ void EnBili_Update(EnBili* this, GlobalContext* globalCtx); void EnBili_Draw(EnBili* this, GlobalContext* globalCtx); /* -const ActorInit En_Bili_InitVars = -{ +const ActorInit En_Bili_InitVars = { ACTOR_EN_BILI, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 3d49c0686..99af0e260 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -9,8 +9,7 @@ void EnBlkobj_Update(EnBlkobj* this, GlobalContext* globalCtx); void EnBlkobj_Draw(EnBlkobj* this, GlobalContext* globalCtx); /* -const ActorInit En_Blkobj_InitVars = -{ +const ActorInit En_Blkobj_InitVars = { ACTOR_EN_BLKOBJ, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 9e5e8f147..b51142f9c 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -9,8 +9,7 @@ void EnBom_Update(EnBom* this, GlobalContext* globalCtx); void EnBom_Draw(EnBom* this, GlobalContext* globalCtx); /* -const ActorInit En_Bom_InitVars = -{ +const ActorInit En_Bom_InitVars = { ACTOR_EN_BOM, ACTORTYPE_EXPLOSIVES, ROOM, diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index a1c172338..9387f303d 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -9,8 +9,7 @@ void EnBomBowlMan_Update(EnBomBowlMan* this, GlobalContext* globalCtx); void EnBomBowlMan_Draw(EnBomBowlMan* this, GlobalContext* globalCtx); /* -const ActorInit En_Bom_Bowl_Man_InitVars = -{ +const ActorInit En_Bom_Bowl_Man_InitVars = { ACTOR_EN_BOM_BOWL_MAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index c10655c12..d2ed6e934 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -8,8 +8,7 @@ void EnBomBowlPit_Destroy(EnBomBowlPit* this, GlobalContext* globalCtx); void EnBomBowlPit_Update(EnBomBowlPit* this, GlobalContext* globalCtx); /* -const ActorInit En_Bom_Bowl_Pit_InitVars = -{ +const ActorInit En_Bom_Bowl_Pit_InitVars = { ACTOR_EN_BOM_BOWL_PIT, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 7b59910d7..9347f0686 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -9,8 +9,7 @@ void EnBomChu_Update(EnBomChu* this, GlobalContext* globalCtx); void EnBomChu_Draw(EnBomChu* this, GlobalContext* globalCtx); /* -const ActorInit En_Bom_Chu_InitVars = -{ +const ActorInit En_Bom_Chu_InitVars = { ACTOR_EN_BOM_CHU, ACTORTYPE_EXPLOSIVES, ROOM, diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 7171ed868..9e3e41b1f 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -9,8 +9,7 @@ void EnBombf_Update(EnBombf* this, GlobalContext* globalCtx); void EnBombf_Draw(EnBombf* this, GlobalContext* globalCtx); /* -const ActorInit En_Bombf_InitVars = -{ +const ActorInit En_Bombf_InitVars = { ACTOR_EN_BOMBF, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index a841cf8bd..f1343a303 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -9,8 +9,7 @@ void EnBox_Update(EnBox* this, GlobalContext* globalCtx); void EnBox_Draw(EnBox* this, GlobalContext* globalCtx); /* -const ActorInit En_Box_InitVars = -{ +const ActorInit En_Box_InitVars = { Chest, ACTORTYPE_CHEST, ROOM, diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 42afcfa75..4ac1f7190 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -9,8 +9,7 @@ void EnBrob_Update(EnBrob* this, GlobalContext* globalCtx); void EnBrob_Draw(EnBrob* this, GlobalContext* globalCtx); /* -const ActorInit En_Brob_InitVars = -{ +const ActorInit En_Brob_InitVars = { ACTOR_EN_BROB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index a925f6a46..8297e4680 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -9,8 +9,7 @@ void EnBubble_Update(EnBubble* this, GlobalContext* globalCtx); void EnBubble_Draw(EnBubble* this, GlobalContext* globalCtx); /* -const ActorInit En_Bubble_InitVars = -{ +const ActorInit En_Bubble_InitVars = { ACTOR_EN_BUBBLE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index c34f06f0f..4d5098aa8 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -9,8 +9,7 @@ void EnButte_Update(EnButte* this, GlobalContext* globalCtx); void EnButte_Draw(EnButte* this, GlobalContext* globalCtx); /* -const ActorInit En_Butte_InitVars = -{ +const ActorInit En_Butte_InitVars = { ACTOR_EN_BUTTE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 1a700781a..11403fabc 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -9,8 +9,7 @@ void EnBw_Update(EnBw* this, GlobalContext* globalCtx); void EnBw_Draw(EnBw* this, GlobalContext* globalCtx); /* -const ActorInit En_Bw_InitVars = -{ +const ActorInit En_Bw_InitVars = { ACTOR_EN_BW, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index a65c91b2a..c459e9934 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -9,8 +9,7 @@ void EnBx_Update(EnBx* this, GlobalContext* globalCtx); void EnBx_Draw(EnBx* this, GlobalContext* globalCtx); /* -const ActorInit En_Bx_InitVars = -{ +const ActorInit En_Bx_InitVars = { ACTOR_EN_BX, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index 65e73fd51..50ff45aea 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -8,8 +8,7 @@ void EnChanger_Destroy(EnChanger* this, GlobalContext* globalCtx); void EnChanger_Update(EnChanger* this, GlobalContext* globalCtx); /* -const ActorInit En_Changer_InitVars = -{ +const ActorInit En_Changer_InitVars = { ACTOR_EN_CHANGER, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index cf78c10fe..65764bcdb 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -9,8 +9,7 @@ void EnClearTag_Update(EnClearTag* this, GlobalContext* globalCtx); void EnClearTag_Draw(EnClearTag* this, GlobalContext* globalCtx); /* -const ActorInit En_Clear_Tag_InitVars = -{ +const ActorInit En_Clear_Tag_InitVars = { ACTOR_EN_CLEAR_TAG, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index c9a55ffeb..da5c0d47a 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -9,8 +9,7 @@ void EnCow_Update(EnCow* this, GlobalContext* globalCtx); void EnCow_Draw(EnCow* this, GlobalContext* globalCtx); /* -const ActorInit En_Cow_InitVars = -{ +const ActorInit En_Cow_InitVars = { ACTOR_EN_COW, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 195c6a88a..c32ad4be8 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -9,8 +9,7 @@ void EnCrow_Update(EnCrow* this, GlobalContext* globalCtx); void EnCrow_Draw(EnCrow* this, GlobalContext* globalCtx); /* -const ActorInit En_Crow_InitVars = -{ +const ActorInit En_Crow_InitVars = { ACTOR_EN_CROW, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 0adb43c97..6aeabe7b0 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -9,8 +9,7 @@ void EnCs_Update(EnCs* this, GlobalContext* globalCtx); void EnCs_Draw(EnCs* this, GlobalContext* globalCtx); /* -const ActorInit En_Cs_InitVars = -{ +const ActorInit En_Cs_InitVars = { ACTOR_EN_CS, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index ef886765c..2f6bee036 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -9,8 +9,7 @@ void EnDaiku_Update(EnDaiku* this, GlobalContext* globalCtx); void EnDaiku_Draw(EnDaiku* this, GlobalContext* globalCtx); /* -const ActorInit En_Daiku_InitVars = -{ +const ActorInit En_Daiku_InitVars = { ACTOR_EN_DAIKU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index a5d5cde51..63c836c31 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -9,8 +9,7 @@ void EnDaikuKakariko_Update(EnDaikuKakariko* this, GlobalContext* globalCtx); void EnDaikuKakariko_Draw(EnDaikuKakariko* this, GlobalContext* globalCtx); /* -const ActorInit En_Daiku_Kakariko_InitVars = -{ +const ActorInit En_Daiku_Kakariko_InitVars = { ACTOR_EN_DAIKU_KAKARIKO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 2e46a02fe..cf130f8ac 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -9,8 +9,7 @@ void EnDekubaba_Update(EnDekubaba* this, GlobalContext* globalCtx); void EnDekubaba_Draw(EnDekubaba* this, GlobalContext* globalCtx); /* -const ActorInit En_Dekubaba_InitVars = -{ +const ActorInit En_Dekubaba_InitVars = { ACTOR_EN_DEKUBABA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index d547fc737..58e258432 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -9,8 +9,7 @@ void EnDekunuts_Update(EnDekunuts* this, GlobalContext* globalCtx); void EnDekunuts_Draw(EnDekunuts* this, GlobalContext* globalCtx); /* -const ActorInit En_Dekunuts_InitVars = -{ +const ActorInit En_Dekunuts_InitVars = { ACTOR_EN_DEKUNUTS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 173f96e41..7a78e56c2 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -9,8 +9,7 @@ void EnDh_Update(EnDh* this, GlobalContext* globalCtx); void EnDh_Draw(EnDh* this, GlobalContext* globalCtx); /* -const ActorInit En_Dh_InitVars = -{ +const ActorInit En_Dh_InitVars = { ACTOR_EN_DH, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index e3e36c0e3..4a8e64091 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -9,8 +9,7 @@ void EnDha_Update(EnDha* this, GlobalContext* globalCtx); void EnDha_Draw(EnDha* this, GlobalContext* globalCtx); /* -const ActorInit En_Dha_InitVars = -{ +const ActorInit En_Dha_InitVars = { ACTOR_EN_DHA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index cb1c8d77a..5e3dab74c 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -9,8 +9,7 @@ void EnDivingGame_Update(EnDivingGame* this, GlobalContext* globalCtx); void EnDivingGame_Draw(EnDivingGame* this, GlobalContext* globalCtx); /* -const ActorInit En_Diving_Game_InitVars = -{ +const ActorInit En_Diving_Game_InitVars = { ACTOR_EN_DIVING_GAME, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 4a6b6e71e..a9b31e2c8 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -9,8 +9,7 @@ void EnDns_Update(EnDns* this, GlobalContext* globalCtx); void EnDns_Draw(EnDns* this, GlobalContext* globalCtx); /* -const ActorInit En_Dns_InitVars = -{ +const ActorInit En_Dns_InitVars = { ACTOR_EN_DNS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index b8f150034..1863ff2b2 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -8,8 +8,7 @@ void EnDntDemo_Destroy(EnDntDemo* this, GlobalContext* globalCtx); void EnDntDemo_Update(EnDntDemo* this, GlobalContext* globalCtx); /* -const ActorInit En_Dnt_Demo_InitVars = -{ +const ActorInit En_Dnt_Demo_InitVars = { ACTOR_EN_DNT_DEMO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 659df06f6..1dd9a0a29 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -9,8 +9,7 @@ void EnDntJiji_Update(EnDntJiji* this, GlobalContext* globalCtx); void EnDntJiji_Draw(EnDntJiji* this, GlobalContext* globalCtx); /* -const ActorInit En_Dnt_Jiji_InitVars = -{ +const ActorInit En_Dnt_Jiji_InitVars = { ACTOR_EN_DNT_JIJI, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index c784d2b49..9dc2ff08c 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -8,8 +8,7 @@ void EnDntNomal_Destroy(EnDntNomal* this, GlobalContext* globalCtx); void EnDntNomal_Update(EnDntNomal* this, GlobalContext* globalCtx); /* -const ActorInit En_Dnt_Nomal_InitVars = -{ +const ActorInit En_Dnt_Nomal_InitVars = { ACTOR_EN_DNT_NOMAL, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 96f2578d5..762217367 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -9,8 +9,7 @@ void EnDodojr_Update(EnDodojr* this, GlobalContext* globalCtx); void EnDodojr_Draw(EnDodojr* this, GlobalContext* globalCtx); /* -const ActorInit En_Dodojr_InitVars = -{ +const ActorInit En_Dodojr_InitVars = { ACTOR_EN_DODOJR, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 1bf9689dc..745c49096 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -9,8 +9,7 @@ void EnDodongo_Update(EnDodongo* this, GlobalContext* globalCtx); void EnDodongo_Draw(EnDodongo* this, GlobalContext* globalCtx); /* -const ActorInit En_Dodongo_InitVars = -{ +const ActorInit En_Dodongo_InitVars = { ACTOR_EN_DODONGO, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 1dcf92592..e561236de 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -9,8 +9,7 @@ void EnDoor_Update(EnDoor* this, GlobalContext* globalCtx); void EnDoor_Draw(EnDoor* this, GlobalContext* globalCtx); /* -const ActorInit En_Door_InitVars = -{ +const ActorInit En_Door_InitVars = { ACTOR_EN_DOOR, ACTORTYPE_DOOR, ROOM, diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 514170241..f2656d950 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -9,8 +9,7 @@ void EnDs_Update(EnDs* this, GlobalContext* globalCtx); void EnDs_Draw(EnDs* this, GlobalContext* globalCtx); /* -const ActorInit En_Ds_InitVars = -{ +const ActorInit En_Ds_InitVars = { ACTOR_EN_DS, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index dfe8c4fe0..e2f28f55b 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -9,8 +9,7 @@ void EnDu_Update(EnDu* this, GlobalContext* globalCtx); void EnDu_Draw(EnDu* this, GlobalContext* globalCtx); /* -const ActorInit En_Du_InitVars = -{ +const ActorInit En_Du_InitVars = { ACTOR_EN_DU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 3319b32e4..33ff934ec 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -9,8 +9,7 @@ void EnDyExtra_Update(EnDyExtra* this, GlobalContext* globalCtx); void EnDyExtra_Draw(EnDyExtra* this, GlobalContext* globalCtx); /* -const ActorInit En_Dy_Extra_InitVars = -{ +const ActorInit En_Dy_Extra_InitVars = { ACTOR_EN_DY_EXTRA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index f6a52d1ad..8c305bed0 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -9,8 +9,7 @@ void EnEiyer_Update(EnEiyer* this, GlobalContext* globalCtx); void EnEiyer_Draw(EnEiyer* this, GlobalContext* globalCtx); /* -const ActorInit En_Eiyer_InitVars = -{ +const ActorInit En_Eiyer_InitVars = { ACTOR_EN_EIYER, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index e4fa180b6..30784c6b8 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -9,8 +9,7 @@ void EnElf_Update(EnElf* this, GlobalContext* globalCtx); void EnElf_Draw(EnElf* this, GlobalContext* globalCtx); /* -const ActorInit En_Elf_InitVars = -{ +const ActorInit En_Elf_InitVars = { ACTOR_EN_ELF, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index c0532da41..4a5b99da6 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -7,8 +7,7 @@ void EnEncount1_Init(EnEncount1* this, GlobalContext* globalCtx); void EnEncount1_Update(EnEncount1* this, GlobalContext* globalCtx); /* -const ActorInit En_Encount1_InitVars = -{ +const ActorInit En_Encount1_InitVars = { ACTOR_EN_ENCOUNT1, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 47a101ec5..606d0814d 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -8,8 +8,7 @@ void EnEncount2_Update(EnEncount2* this, GlobalContext* globalCtx); void EnEncount2_Draw(EnEncount2* this, GlobalContext* globalCtx); /* -const ActorInit En_Encount2_InitVars = -{ +const ActorInit En_Encount2_InitVars = { ACTOR_EN_ENCOUNT2, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 00bce1411..e070af772 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -9,8 +9,7 @@ void EnExItem_Update(EnExItem* this, GlobalContext* globalCtx); void EnExItem_Draw(EnExItem* this, GlobalContext* globalCtx); /* -const ActorInit En_Ex_Item_InitVars = -{ +const ActorInit En_Ex_Item_InitVars = { ACTOR_EN_EX_ITEM, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 87c1502e5..a361adf2a 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -9,8 +9,7 @@ void EnExRuppy_Update(EnExRuppy* this, GlobalContext* globalCtx); void EnExRuppy_Draw(EnExRuppy* this, GlobalContext* globalCtx); /* -const ActorInit En_Ex_Ruppy_InitVars = -{ +const ActorInit En_Ex_Ruppy_InitVars = { ACTOR_EN_EX_RUPPY, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 294191595..4466d986f 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -9,8 +9,7 @@ void EnFd_Update(EnFd* this, GlobalContext* globalCtx); void EnFd_Draw(EnFd* this, GlobalContext* globalCtx); /* -const ActorInit En_Fd_InitVars = -{ +const ActorInit En_Fd_InitVars = { ACTOR_EN_FD, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index 5c022a685..38e5aedc6 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -9,8 +9,7 @@ void EnFdFire_Update(EnFdFire* this, GlobalContext* globalCtx); void EnFdFire_Draw(EnFdFire* this, GlobalContext* globalCtx); /* -const ActorInit En_Fd_Fire_InitVars = -{ +const ActorInit En_Fd_Fire_InitVars = { ACTOR_EN_FD_FIRE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 550c91a21..fd5656ea6 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -9,8 +9,7 @@ void EnFhgFire_Update(EnFhgFire* this, GlobalContext* globalCtx); void EnFhgFire_Draw(EnFhgFire* this, GlobalContext* globalCtx); /* -const ActorInit En_Fhg_Fire_InitVars = -{ +const ActorInit En_Fhg_Fire_InitVars = { ACTOR_PLAYER, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 8e7b5e145..65f088718 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -9,8 +9,7 @@ void EnFireRock_Update(EnFireRock* this, GlobalContext* globalCtx); void EnFireRock_Draw(EnFireRock* this, GlobalContext* globalCtx); /* -const ActorInit En_Fire_Rock_InitVars = -{ +const ActorInit En_Fire_Rock_InitVars = { ACTOR_EN_FIRE_ROCK, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index f5b4f92d5..b1244235d 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -9,8 +9,7 @@ void EnFirefly_Update(EnFirefly* this, GlobalContext* globalCtx); void EnFirefly_Draw(EnFirefly* this, GlobalContext* globalCtx); /* -const ActorInit En_Firefly_InitVars = -{ +const ActorInit En_Firefly_InitVars = { ACTOR_EN_FIREFLY, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 481805a07..7308fa8ab 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -9,8 +9,7 @@ void EnFish_Update(EnFish* this, GlobalContext* globalCtx); void EnFish_Draw(EnFish* this, GlobalContext* globalCtx); /* -const ActorInit En_Fish_InitVars = -{ +const ActorInit En_Fish_InitVars = { ACTOR_EN_FISH, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index ab119b44a..adc48b934 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -9,8 +9,7 @@ void EnFloormas_Update(EnFloormas* this, GlobalContext* globalCtx); void EnFloormas_Draw(EnFloormas* this, GlobalContext* globalCtx); /* -const ActorInit En_Floormas_InitVars = -{ +const ActorInit En_Floormas_InitVars = { ACTOR_EN_FLOORMAS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 17049a7d4..ff905fec1 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -8,8 +8,7 @@ void EnFr_Destroy(EnFr* this, GlobalContext* globalCtx); void EnFr_Update(EnFr* this, GlobalContext* globalCtx); /* -const ActorInit En_Fr_InitVars = -{ +const ActorInit En_Fr_InitVars = { ACTOR_EN_FR, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 32bc8091c..afcdcb3a5 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -9,8 +9,7 @@ void EnFu_Update(EnFu* this, GlobalContext* globalCtx); void EnFu_Draw(EnFu* this, GlobalContext* globalCtx); /* -const ActorInit En_Fu_InitVars = -{ +const ActorInit En_Fu_InitVars = { ACTOR_EN_FU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index 2049ba88c..be1295087 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -9,8 +9,7 @@ void EnFw_Update(EnFw* this, GlobalContext* globalCtx); void EnFw_Draw(EnFw* this, GlobalContext* globalCtx); /* -const ActorInit En_Fw_InitVars = -{ +const ActorInit En_Fw_InitVars = { ACTOR_EN_FW, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 6f04d0c95..9978639d7 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -9,8 +9,7 @@ void EnFz_Update(EnFz* this, GlobalContext* globalCtx); void EnFz_Draw(EnFz* this, GlobalContext* globalCtx); /* -const ActorInit En_Fz_InitVars = -{ +const ActorInit En_Fz_InitVars = { ACTOR_EN_FZ, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 275c5d16c..f871217f7 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -8,8 +8,7 @@ void EnGSwitch_Destroy(EnGSwitch* this, GlobalContext* globalCtx); void EnGSwitch_Update(EnGSwitch* this, GlobalContext* globalCtx); /* -const ActorInit En_G_Switch_InitVars = -{ +const ActorInit En_G_Switch_InitVars = { ACTOR_EN_G_SWITCH, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 043109e43..171cd3908 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -9,8 +9,7 @@ void EnGanonMant_Update(EnGanonMant* this, GlobalContext* globalCtx); void EnGanonMant_Draw(EnGanonMant* this, GlobalContext* globalCtx); /* -const ActorInit En_Ganon_Mant_InitVars = -{ +const ActorInit En_Ganon_Mant_InitVars = { ACTOR_EN_GANON_MANT, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 49acb4af0..69ef58ef7 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -9,8 +9,7 @@ void EnGb_Update(EnGb* this, GlobalContext* globalCtx); void EnGb_Draw(EnGb* this, GlobalContext* globalCtx); /* -const ActorInit En_Gb_InitVars = -{ +const ActorInit En_Gb_InitVars = { ACTOR_EN_GB, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index be1515501..9eb5b9390 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -9,8 +9,7 @@ void EnGe1_Update(EnGe1* this, GlobalContext* globalCtx); void EnGe1_Draw(EnGe1* this, GlobalContext* globalCtx); /* -const ActorInit En_Ge1_InitVars = -{ +const ActorInit En_Ge1_InitVars = { ACTOR_EN_GE1, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index ff14a9143..4a9c2e08c 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -9,8 +9,7 @@ void EnGe2_Update(EnGe2* this, GlobalContext* globalCtx); void EnGe2_Draw(EnGe2* this, GlobalContext* globalCtx); /* -const ActorInit En_Ge2_InitVars = -{ +const ActorInit En_Ge2_InitVars = { ACTOR_EN_GE2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 40b8f59ba..739372634 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -9,8 +9,7 @@ void EnGe3_Update(EnGe3* this, GlobalContext* globalCtx); void EnGe3_Draw(EnGe3* this, GlobalContext* globalCtx); /* -const ActorInit En_Ge3_InitVars = -{ +const ActorInit En_Ge3_InitVars = { ACTOR_EN_GE3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index b2defe4f6..adcd4d177 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -9,8 +9,7 @@ void EnGeldB_Update(EnGeldB* this, GlobalContext* globalCtx); void EnGeldB_Draw(EnGeldB* this, GlobalContext* globalCtx); /* -const ActorInit En_GeldB_InitVars = -{ +const ActorInit En_GeldB_InitVars = { ACTOR_EN_GELDB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 9f7cdc9c3..6ada4bc89 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -8,8 +8,7 @@ void EnGirlA_Destroy(EnGirlA* this, GlobalContext* globalCtx); void EnGirlA_Update(EnGirlA* this, GlobalContext* globalCtx); /* -const ActorInit En_GirlA_InitVars = -{ +const ActorInit En_GirlA_InitVars = { ACTOR_EN_GIRLA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index dd3350d39..c6bc1c6a9 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -8,8 +8,7 @@ void EnGm_Destroy(EnGm* this, GlobalContext* globalCtx); void EnGm_Update(EnGm* this, GlobalContext* globalCtx); /* -const ActorInit En_Gm_InitVars = -{ +const ActorInit En_Gm_InitVars = { ACTOR_EN_GM, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 5f95e7406..da3f03123 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -9,8 +9,7 @@ void EnGo_Update(EnGo* this, GlobalContext* globalCtx); void EnGo_Draw(EnGo* this, GlobalContext* globalCtx); /* -const ActorInit En_Go_InitVars = -{ +const ActorInit En_Go_InitVars = { ACTOR_EN_GO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 1e7806536..3023d3564 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -9,8 +9,7 @@ void EnGo2_Update(EnGo2* this, GlobalContext* globalCtx); void EnGo2_Draw(EnGo2* this, GlobalContext* globalCtx); /* -const ActorInit En_Go2_InitVars = -{ +const ActorInit En_Go2_InitVars = { ACTOR_EN_GO2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 9da1accf4..e9352ab07 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -9,8 +9,7 @@ void EnGoma_Update(EnGoma* this, GlobalContext* globalCtx); void EnGoma_Draw(EnGoma* this, GlobalContext* globalCtx); /* -const ActorInit En_Goma_InitVars = -{ +const ActorInit En_Goma_InitVars = { ACTOR_BOSS_GOMA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index acf9dfaa9..cad9e75fb 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -9,8 +9,7 @@ void EnGoroiwa_Update(EnGoroiwa* this, GlobalContext* globalCtx); void EnGoroiwa_Draw(EnGoroiwa* this, GlobalContext* globalCtx); /* -const ActorInit En_Goroiwa_InitVars = -{ +const ActorInit En_Goroiwa_InitVars = { ACTOR_EN_GOROIWA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index fd8eb03de..a77a3fef7 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -9,8 +9,7 @@ void EnGs_Update(EnGs* this, GlobalContext* globalCtx); void EnGs_Draw(EnGs* this, GlobalContext* globalCtx); /* -const ActorInit En_Gs_InitVars = -{ +const ActorInit En_Gs_InitVars = { ACTOR_EN_GS, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 8319cc856..071a83801 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -8,8 +8,7 @@ void EnGuest_Destroy(EnGuest* this, GlobalContext* globalCtx); void EnGuest_Update(EnGuest* this, GlobalContext* globalCtx); /* -const ActorInit En_Guest_InitVars = -{ +const ActorInit En_Guest_InitVars = { ACTOR_EN_GUEST, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 28db90caf..ec66c0888 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -9,8 +9,7 @@ void EnHata_Update(EnHata* this, GlobalContext* globalCtx); void EnHata_Draw(EnHata* this, GlobalContext* globalCtx); /* -const ActorInit En_Hata_InitVars = -{ +const ActorInit En_Hata_InitVars = { ACTOR_EN_HATA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index c91f89d34..b7d547d37 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -9,8 +9,7 @@ void EnHeishi1_Update(EnHeishi1* this, GlobalContext* globalCtx); void EnHeishi1_Draw(EnHeishi1* this, GlobalContext* globalCtx); /* -const ActorInit En_Heishi1_InitVars = -{ +const ActorInit En_Heishi1_InitVars = { ACTOR_PLAYER, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 27320ec95..d62494a2b 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -9,8 +9,7 @@ void EnHeishi2_Update(EnHeishi2* this, GlobalContext* globalCtx); void EnHeishi2_Draw(EnHeishi2* this, GlobalContext* globalCtx); /* -const ActorInit En_Heishi2_InitVars = -{ +const ActorInit En_Heishi2_InitVars = { ACTOR_EN_HEISHI2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index d421db8d4..c47b28b4e 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -9,8 +9,7 @@ void EnHeishi3_Update(EnHeishi3* this, GlobalContext* globalCtx); void EnHeishi3_Draw(EnHeishi3* this, GlobalContext* globalCtx); /* -const ActorInit En_Heishi3_InitVars = -{ +const ActorInit En_Heishi3_InitVars = { ACTOR_EN_HEISHI3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 732c90cee..63ef25296 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -9,8 +9,7 @@ void EnHeishi4_Update(EnHeishi4* this, GlobalContext* globalCtx); void EnHeishi4_Draw(EnHeishi4* this, GlobalContext* globalCtx); /* -const ActorInit En_Heishi4_InitVars = -{ +const ActorInit En_Heishi4_InitVars = { ACTOR_EN_HEISHI4, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index c168d295e..a06cc5273 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -9,8 +9,7 @@ void EnHintnuts_Update(EnHintnuts* this, GlobalContext* globalCtx); void EnHintnuts_Draw(EnHintnuts* this, GlobalContext* globalCtx); /* -const ActorInit En_Hintnuts_InitVars = -{ +const ActorInit En_Hintnuts_InitVars = { ACTOR_EN_HINTNUTS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index f1082366c..3d24d7812 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -9,8 +9,7 @@ void EnHoll_Update(EnHoll* this, GlobalContext* globalCtx); void EnHoll_Draw(EnHoll* this, GlobalContext* globalCtx); /* -const ActorInit En_Holl_InitVars = -{ +const ActorInit En_Holl_InitVars = { ACTOR_EN_HOLL, ACTORTYPE_DOOR, ROOM, diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 718c55f4a..eb9bd021e 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -9,8 +9,7 @@ void EnHonotrap_Update(EnHonotrap* this, GlobalContext* globalCtx); void EnHonotrap_Draw(EnHonotrap* this, GlobalContext* globalCtx); /* -const ActorInit En_Honotrap_InitVars = -{ +const ActorInit En_Honotrap_InitVars = { ACTOR_EN_HONOTRAP, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index de015bcf2..6ec7c4c50 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -9,8 +9,7 @@ void EnHorse_Update(EnHorse* this, GlobalContext* globalCtx); void EnHorse_Draw(EnHorse* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_InitVars = -{ +const ActorInit En_Horse_InitVars = { ACTOR_EN_HORSE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 6426ac04a..a90d34cd5 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -9,8 +9,7 @@ void EnHorseGameCheck_Update(EnHorseGameCheck* this, GlobalContext* globalCtx); void EnHorseGameCheck_Draw(EnHorseGameCheck* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Game_Check_InitVars = -{ +const ActorInit En_Horse_Game_Check_InitVars = { ACTOR_EN_HORSE_GAME_CHECK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index e4b7f9425..5a4f8266f 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -9,8 +9,7 @@ void EnHorseGanon_Update(EnHorseGanon* this, GlobalContext* globalCtx); void EnHorseGanon_Draw(EnHorseGanon* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Ganon_InitVars = -{ +const ActorInit En_Horse_Ganon_InitVars = { ACTOR_EN_HORSE_GANON, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 21ee37502..8e8624209 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -9,8 +9,7 @@ void EnHorseLinkChild_Update(EnHorseLinkChild* this, GlobalContext* globalCtx); void EnHorseLinkChild_Draw(EnHorseLinkChild* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Link_Child_InitVars = -{ +const ActorInit En_Horse_Link_Child_InitVars = { ACTOR_EN_HORSE_LINK_CHILD, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index f329bb0f5..69ced1610 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -9,8 +9,7 @@ void EnHorseNormal_Update(EnHorseNormal* this, GlobalContext* globalCtx); void EnHorseNormal_Draw(EnHorseNormal* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Normal_InitVars = -{ +const ActorInit En_Horse_Normal_InitVars = { ACTOR_EN_HORSE_NORMAL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index 8c077de88..7cc04e543 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -9,8 +9,7 @@ void EnHorseZelda_Update(EnHorseZelda* this, GlobalContext* globalCtx); void EnHorseZelda_Draw(EnHorseZelda* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Zelda_InitVars = -{ +const ActorInit En_Horse_Zelda_InitVars = { ACTOR_EN_HORSE_ZELDA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 87f337d38..a81eee8b8 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -9,8 +9,7 @@ void EnHs_Update(EnHs* this, GlobalContext* globalCtx); void EnHs_Draw(EnHs* this, GlobalContext* globalCtx); /* -const ActorInit En_Hs_InitVars = -{ +const ActorInit En_Hs_InitVars = { ACTOR_EN_HS, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 199528d6a..97fb28ea1 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -9,8 +9,7 @@ void EnHs2_Update(EnHs2* this, GlobalContext* globalCtx); void EnHs2_Draw(EnHs2* this, GlobalContext* globalCtx); /* -const ActorInit En_Hs2_InitVars = -{ +const ActorInit En_Hs2_InitVars = { ACTOR_EN_HS2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 4ea800138..75a6185d8 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -9,8 +9,7 @@ void EnHy_Update(EnHy* this, GlobalContext* globalCtx); void EnHy_Draw(EnHy* this, GlobalContext* globalCtx); /* -const ActorInit En_Hy_InitVars = -{ +const ActorInit En_Hy_InitVars = { ACTOR_EN_HY, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index adc0fc065..2e62e5bc4 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -9,8 +9,7 @@ void EnIceHono_Update(EnIceHono* this, GlobalContext* globalCtx); void EnIceHono_Draw(EnIceHono* this, GlobalContext* globalCtx); /* -const ActorInit En_Ice_Hono_InitVars = -{ +const ActorInit En_Ice_Hono_InitVars = { ACTOR_EN_ICE_HONO, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index b1096c3b6..8233f73d9 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -9,8 +9,7 @@ void EnIk_Update(EnIk* this, GlobalContext* globalCtx); void EnIk_Draw(EnIk* this, GlobalContext* globalCtx); /* -const ActorInit En_Ik_InitVars = -{ +const ActorInit En_Ik_InitVars = { ACTOR_EN_IK, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index f4b2c102b..2617d2aa8 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -9,8 +9,7 @@ void EnIn_Update(EnIn* this, GlobalContext* globalCtx); void EnIn_Draw(EnIn* this, GlobalContext* globalCtx); /* -const ActorInit En_In_InitVars = -{ +const ActorInit En_In_InitVars = { ACTOR_EN_IN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 4b2d4252f..fe931c277 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -9,8 +9,7 @@ void EnInsect_Update(EnInsect* this, GlobalContext* globalCtx); void EnInsect_Draw(EnInsect* this, GlobalContext* globalCtx); /* -const ActorInit En_Insect_InitVars = -{ +const ActorInit En_Insect_InitVars = { ACTOR_EN_INSECT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index a32239046..4b04945ae 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -9,8 +9,7 @@ void EnIshi_Update(EnIshi* this, GlobalContext* globalCtx); void EnIshi_Draw(EnIshi* this, GlobalContext* globalCtx); /* -const ActorInit En_Ishi_InitVars = -{ +const ActorInit En_Ishi_InitVars = { ACTOR_EN_ISHI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 24ee963f2..0e5ea7223 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -9,8 +9,7 @@ void EnJj_Update(EnJj* this, GlobalContext* globalCtx); void EnJj_Draw(EnJj* this, GlobalContext* globalCtx); /* -const ActorInit En_Jj_InitVars = -{ +const ActorInit En_Jj_InitVars = { ACTOR_EN_JJ, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 469d56004..1e6b1681a 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -9,8 +9,7 @@ void EnJs_Update(EnJs* this, GlobalContext* globalCtx); void EnJs_Draw(EnJs* this, GlobalContext* globalCtx); /* -const ActorInit En_Js_InitVars = -{ +const ActorInit En_Js_InitVars = { ACTOR_EN_JS, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 6c2e9abf2..b9c546d2b 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -9,8 +9,7 @@ void EnJsjutan_Update(EnJsjutan* this, GlobalContext* globalCtx); void EnJsjutan_Draw(EnJsjutan* this, GlobalContext* globalCtx); /* -const ActorInit En_Jsjutan_InitVars = -{ +const ActorInit En_Jsjutan_InitVars = { ACTOR_EN_JSJUTAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 99d3201ba..40f2f10dc 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -9,8 +9,7 @@ void EnKakasi_Update(EnKakasi* this, GlobalContext* globalCtx); void EnKakasi_Draw(EnKakasi* this, GlobalContext* globalCtx); /* -const ActorInit En_Kakasi_InitVars = -{ +const ActorInit En_Kakasi_InitVars = { ACTOR_EN_KAKASI, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 9096748d7..63ca13aa1 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -8,8 +8,7 @@ void EnKakasi2_Destroy(EnKakasi2* this, GlobalContext* globalCtx); void EnKakasi2_Update(EnKakasi2* this, GlobalContext* globalCtx); /* -const ActorInit En_Kakasi2_InitVars = -{ +const ActorInit En_Kakasi2_InitVars = { ACTOR_EN_KAKASI2, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index 6c73d2aa8..f20570467 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -9,8 +9,7 @@ void EnKakasi3_Update(EnKakasi3* this, GlobalContext* globalCtx); void EnKakasi3_Draw(EnKakasi3* this, GlobalContext* globalCtx); /* -const ActorInit En_Kakasi3_InitVars = -{ +const ActorInit En_Kakasi3_InitVars = { ACTOR_EN_KAKASI3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 1a7e805b5..080967817 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -9,8 +9,7 @@ void EnKanban_Update(EnKanban* this, GlobalContext* globalCtx); void EnKanban_Draw(EnKanban* this, GlobalContext* globalCtx); /* -const ActorInit En_Kanban_InitVars = -{ +const ActorInit En_Kanban_InitVars = { ACTOR_EN_KANBAN, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 5b6e5ebb2..807cd3c23 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -9,8 +9,7 @@ void EnKarebaba_Update(EnKarebaba* this, GlobalContext* globalCtx); void EnKarebaba_Draw(EnKarebaba* this, GlobalContext* globalCtx); /* -const ActorInit En_Karebaba_InitVars = -{ +const ActorInit En_Karebaba_InitVars = { ACTOR_EN_KAREBABA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 9c4c32421..cb84c7599 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -9,8 +9,7 @@ void EnKo_Update(EnKo* this, GlobalContext* globalCtx); void EnKo_Draw(EnKo* this, GlobalContext* globalCtx); /* -const ActorInit En_Ko_InitVars = -{ +const ActorInit En_Ko_InitVars = { ACTOR_EN_KO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 0c142c954..698334132 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -8,8 +8,7 @@ void EnKusa_Destroy(EnKusa* this, GlobalContext* globalCtx); void EnKusa_Update(EnKusa* this, GlobalContext* globalCtx); /* -const ActorInit En_Kusa_InitVars = -{ +const ActorInit En_Kusa_InitVars = { ACTOR_EN_KUSA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 1050aa7c3..fedd9bfc8 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -9,8 +9,7 @@ void EnKz_Update(EnKz* this, GlobalContext* globalCtx); void EnKz_Draw(EnKz* this, GlobalContext* globalCtx); /* -const ActorInit En_Kz_InitVars = -{ +const ActorInit En_Kz_InitVars = { ACTOR_EN_KZ, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index ac102d44a..cc38ff519 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -9,8 +9,7 @@ void EnLight_Update(EnLight* this, GlobalContext* globalCtx); void EnLight_Draw(EnLight* this, GlobalContext* globalCtx); /* -const ActorInit En_Light_InitVars = -{ +const ActorInit En_Light_InitVars = { ACTOR_EN_LIGHT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 6041bb2ba..b5b66a347 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -9,8 +9,7 @@ void EnMThunder_Update(EnMThunder* this, GlobalContext* globalCtx); void EnMThunder_Draw(EnMThunder* this, GlobalContext* globalCtx); /* -const ActorInit En_M_Thunder_InitVars = -{ +const ActorInit En_M_Thunder_InitVars = { ACTOR_EN_M_THUNDER, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 783150f3b..56fe51267 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -9,8 +9,7 @@ void EnMa1_Update(EnMa1* this, GlobalContext* globalCtx); void EnMa1_Draw(EnMa1* this, GlobalContext* globalCtx); /* -const ActorInit En_Ma1_InitVars = -{ +const ActorInit En_Ma1_InitVars = { ACTOR_EN_MA1, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index bb821761a..6728ff6d3 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -9,8 +9,7 @@ void EnMa2_Update(EnMa2* this, GlobalContext* globalCtx); void EnMa2_Draw(EnMa2* this, GlobalContext* globalCtx); /* -const ActorInit En_Ma2_InitVars = -{ +const ActorInit En_Ma2_InitVars = { ACTOR_EN_MA2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 362e11453..87c01eff4 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -9,8 +9,7 @@ void EnMa3_Update(EnMa3* this, GlobalContext* globalCtx); void EnMa3_Draw(EnMa3* this, GlobalContext* globalCtx); /* -const ActorInit En_Ma3_InitVars = -{ +const ActorInit En_Ma3_InitVars = { ACTOR_EN_MA3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 8398388e0..a763911bf 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -9,8 +9,7 @@ void EnMag_Update(EnMag* this, GlobalContext* globalCtx); void EnMag_Draw(EnMag* this, GlobalContext* globalCtx); /* -const ActorInit En_Mag_InitVars = -{ +const ActorInit En_Mag_InitVars = { ACTOR_EN_MAG, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index b368d395a..94451d199 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -9,8 +9,7 @@ void EnMb_Update(EnMb* this, GlobalContext* globalCtx); void EnMb_Draw(EnMb* this, GlobalContext* globalCtx); /* -const ActorInit En_Mb_InitVars = -{ +const ActorInit En_Mb_InitVars = { ACTOR_EN_MB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 8ed5e9804..1dd9c3cfe 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -9,8 +9,7 @@ void EnMd_Update(EnMd* this, GlobalContext* globalCtx); void EnMd_Draw(EnMd* this, GlobalContext* globalCtx); /* -const ActorInit En_Md_InitVars = -{ +const ActorInit En_Md_InitVars = { ACTOR_EN_MD, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 94225f36b..795f8d1ea 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -9,8 +9,7 @@ void EnMk_Update(EnMk* this, GlobalContext* globalCtx); void EnMk_Draw(EnMk* this, GlobalContext* globalCtx); /* -const ActorInit En_Mk_InitVars = -{ +const ActorInit En_Mk_InitVars = { ACTOR_EN_MK, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 1491d4d2f..7e70419f4 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -9,8 +9,7 @@ void EnMm_Update(EnMm* this, GlobalContext* globalCtx); void EnMm_Draw(EnMm* this, GlobalContext* globalCtx); /* -const ActorInit En_Mm_InitVars = -{ +const ActorInit En_Mm_InitVars = { ACTOR_EN_MM, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 9404ef93c..9f6773a8f 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -9,8 +9,7 @@ void EnMm2_Update(EnMm2* this, GlobalContext* globalCtx); void EnMm2_Draw(EnMm2* this, GlobalContext* globalCtx); /* -const ActorInit En_Mm2_InitVars = -{ +const ActorInit En_Mm2_InitVars = { ACTOR_EN_MM2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 570f85511..cf0a64bc0 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -9,8 +9,7 @@ void EnMu_Update(EnMu* this, GlobalContext* globalCtx); void EnMu_Draw(EnMu* this, GlobalContext* globalCtx); /* -const ActorInit En_Mu_InitVars = -{ +const ActorInit En_Mu_InitVars = { ACTOR_EN_MU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 49b85a5c6..f864f9f25 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -9,8 +9,7 @@ void EnNb_Update(EnNb* this, GlobalContext* globalCtx); void EnNb_Draw(EnNb* this, GlobalContext* globalCtx); /* -const ActorInit En_Nb_InitVars = -{ +const ActorInit En_Nb_InitVars = { ACTOR_EN_NB, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 5b3ef46bb..ceea1510f 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -9,8 +9,7 @@ void EnNiw_Update(EnNiw* this, GlobalContext* globalCtx); void EnNiw_Draw(EnNiw* this, GlobalContext* globalCtx); /* -const ActorInit En_Niw_InitVars = -{ +const ActorInit En_Niw_InitVars = { ACTOR_EN_NIW, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 5ba7d1f2a..a9cfad506 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -9,8 +9,7 @@ void EnNiwGirl_Update(EnNiwGirl* this, GlobalContext* globalCtx); void EnNiwGirl_Draw(EnNiwGirl* this, GlobalContext* globalCtx); /* -const ActorInit En_Niw_Girl_InitVars = -{ +const ActorInit En_Niw_Girl_InitVars = { ACTOR_EN_NIW_GIRL, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 2a240d5f0..c56b05150 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -8,8 +8,7 @@ void EnNiwLady_Destroy(EnNiwLady* this, GlobalContext* globalCtx); void EnNiwLady_Update(EnNiwLady* this, GlobalContext* globalCtx); /* -const ActorInit En_Niw_Lady_InitVars = -{ +const ActorInit En_Niw_Lady_InitVars = { ACTOR_EN_NIW_LADY, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index e2a0b80da..16954fbb8 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -9,8 +9,7 @@ void EnNwc_Update(EnNwc* this, GlobalContext* globalCtx); void EnNwc_Draw(EnNwc* this, GlobalContext* globalCtx); /* -const ActorInit En_Nwc_InitVars = -{ +const ActorInit En_Nwc_InitVars = { ACTOR_EN_NWC, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index a605022c3..811da6c57 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -9,8 +9,7 @@ void EnNy_Update(EnNy* this, GlobalContext* globalCtx); void EnNy_Draw(EnNy* this, GlobalContext* globalCtx); /* -const ActorInit En_Ny_InitVars = -{ +const ActorInit En_Ny_InitVars = { ACTOR_EN_NY, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 74cafda79..0c18b62d4 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -8,8 +8,7 @@ void EnOkarinaTag_Destroy(EnOkarinaTag* this, GlobalContext* globalCtx); void EnOkarinaTag_Update(EnOkarinaTag* this, GlobalContext* globalCtx); /* -const ActorInit En_Okarina_Tag_InitVars = -{ +const ActorInit En_Okarina_Tag_InitVars = { ACTOR_EN_OKARINA_TAG, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index b7387e7b0..468ec54c3 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -9,8 +9,7 @@ void EnOkuta_Update(EnOkuta* this, GlobalContext* globalCtx); void EnOkuta_Draw(EnOkuta* this, GlobalContext* globalCtx); /* -const ActorInit En_Okuta_InitVars = -{ +const ActorInit En_Okuta_InitVars = { ACTOR_EN_OKUTA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index ed35c629d..8e98fcdc4 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -8,8 +8,7 @@ void EnOssan_Destroy(EnOssan* this, GlobalContext* globalCtx); void EnOssan_Update(EnOssan* this, GlobalContext* globalCtx); /* -const ActorInit En_Ossan_InitVars = -{ +const ActorInit En_Ossan_InitVars = { ACTOR_EN_OSSAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 50813c1b5..8c59bdecc 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -9,8 +9,7 @@ void EnOwl_Update(EnOwl* this, GlobalContext* globalCtx); void EnOwl_Draw(EnOwl* this, GlobalContext* globalCtx); /* -const ActorInit En_Owl_InitVars = -{ +const ActorInit En_Owl_InitVars = { ACTOR_EN_OWL, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 36d9a0d4f..e177e3915 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -9,8 +9,7 @@ void EnPart_Update(EnPart* this, GlobalContext* globalCtx); void EnPart_Draw(EnPart* this, GlobalContext* globalCtx); /* -const ActorInit En_Part_InitVars = -{ +const ActorInit En_Part_InitVars = { ACTOR_EN_PART, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index ee711ad05..50e2893d8 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -9,8 +9,7 @@ void EnPeehat_Update(EnPeehat* this, GlobalContext* globalCtx); void EnPeehat_Draw(EnPeehat* this, GlobalContext* globalCtx); /* -const ActorInit En_Peehat_InitVars = -{ +const ActorInit En_Peehat_InitVars = { ACTOR_EN_PEEHAT, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 697e20b59..a1d68a6f2 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -9,8 +9,7 @@ void EnPoDesert_Update(EnPoDesert* this, GlobalContext* globalCtx); void EnPoDesert_Draw(EnPoDesert* this, GlobalContext* globalCtx); /* -const ActorInit En_Po_Desert_InitVars = -{ +const ActorInit En_Po_Desert_InitVars = { ACTOR_EN_PO_DESERT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 33e33057b..f3024f254 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -9,8 +9,7 @@ void EnPoField_Update(EnPoField* this, GlobalContext* globalCtx); void EnPoField_Draw(EnPoField* this, GlobalContext* globalCtx); /* -const ActorInit En_Po_Field_InitVars = -{ +const ActorInit En_Po_Field_InitVars = { ACTOR_EN_PO_FIELD, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 828fbf17b..ec50de4b6 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -9,8 +9,7 @@ void EnPoRelay_Update(EnPoRelay* this, GlobalContext* globalCtx); void EnPoRelay_Draw(EnPoRelay* this, GlobalContext* globalCtx); /* -const ActorInit En_Po_Relay_InitVars = -{ +const ActorInit En_Po_Relay_InitVars = { ACTOR_EN_PO_RELAY, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 9298414a7..5e5c6c7ce 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -9,8 +9,7 @@ void EnPoSisters_Update(EnPoSisters* this, GlobalContext* globalCtx); void EnPoSisters_Draw(EnPoSisters* this, GlobalContext* globalCtx); /* -const ActorInit En_Po_Sisters_InitVars = -{ +const ActorInit En_Po_Sisters_InitVars = { ACTOR_EN_PO_SISTERS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index f6e3162c0..a05d23ce2 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -8,8 +8,7 @@ void EnPoh_Destroy(EnPoh* this, GlobalContext* globalCtx); void EnPoh_Update(EnPoh* this, GlobalContext* globalCtx); /* -const ActorInit En_Poh_InitVars = -{ +const ActorInit En_Poh_InitVars = { ACTOR_EN_POH, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index beb9c70c6..393552557 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -9,8 +9,7 @@ void EnRd_Update(EnRd* this, GlobalContext* globalCtx); void EnRd_Draw(EnRd* this, GlobalContext* globalCtx); /* -const ActorInit En_Rd_InitVars = -{ +const ActorInit En_Rd_InitVars = { ACTOR_EN_RD, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 34183f315..afbc515ca 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -9,8 +9,7 @@ void EnReeba_Update(EnReeba* this, GlobalContext* globalCtx); void EnReeba_Draw(EnReeba* this, GlobalContext* globalCtx); /* -const ActorInit En_Reeba_InitVars = -{ +const ActorInit En_Reeba_InitVars = { ACTOR_EN_REEBA, ACTORTYPE_MISC, ROOM, diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 29d79a0eb..46eddbd72 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -9,8 +9,7 @@ void EnRiverSound_Update(EnRiverSound* this, GlobalContext* globalCtx); void EnRiverSound_Draw(EnRiverSound* this, GlobalContext* globalCtx); /* -const ActorInit En_River_Sound_InitVars = -{ +const ActorInit En_River_Sound_InitVars = { ACTOR_EN_RIVER_SOUND, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 9e1e1d21d..ee90fefb6 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -9,8 +9,7 @@ void EnRl_Update(EnRl* this, GlobalContext* globalCtx); void EnRl_Draw(EnRl* this, GlobalContext* globalCtx); /* -const ActorInit En_Rl_InitVars = -{ +const ActorInit En_Rl_InitVars = { ACTOR_EN_RL, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 41d7d555f..78350277b 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -9,8 +9,7 @@ void EnRr_Update(EnRr* this, GlobalContext* globalCtx); void EnRr_Draw(EnRr* this, GlobalContext* globalCtx); /* -const ActorInit En_Rr_InitVars = -{ +const ActorInit En_Rr_InitVars = { ACTOR_EN_RR, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index c38711e08..52b7571cb 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -9,8 +9,7 @@ void EnRu1_Update(EnRu1* this, GlobalContext* globalCtx); void EnRu1_Draw(EnRu1* this, GlobalContext* globalCtx); /* -const ActorInit En_Ru1_InitVars = -{ +const ActorInit En_Ru1_InitVars = { ACTOR_EN_RU1, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 968fd653b..074787c20 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -9,8 +9,7 @@ void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx); void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx); /* -const ActorInit En_Ru2_InitVars = -{ +const ActorInit En_Ru2_InitVars = { ACTOR_EN_RU2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index deb14890a..1e8c95a2d 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -9,8 +9,7 @@ void EnSa_Update(EnSa* this, GlobalContext* globalCtx); void EnSa_Draw(EnSa* this, GlobalContext* globalCtx); /* -const ActorInit En_Sa_InitVars = -{ +const ActorInit En_Sa_InitVars = { ACTOR_EN_SA, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index a6ee3760f..a396c9d0c 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -9,8 +9,7 @@ void EnSb_Update(EnSb* this, GlobalContext* globalCtx); void EnSb_Draw(EnSb* this, GlobalContext* globalCtx); /* -const ActorInit En_Sb_InitVars = -{ +const ActorInit En_Sb_InitVars = { ACTOR_EN_SB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index a9ed3ec50..b388a0766 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -9,8 +9,7 @@ void EnSda_Update(EnSda* this, GlobalContext* globalCtx); void EnSda_Draw(EnSda* this, GlobalContext* globalCtx); /* -const ActorInit En_Sda_InitVars = -{ +const ActorInit En_Sda_InitVars = { ACTOR_EN_SDA, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index 8e6aaedb8..de318c524 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -9,8 +9,7 @@ void EnShopnuts_Update(EnShopnuts* this, GlobalContext* globalCtx); void EnShopnuts_Draw(EnShopnuts* this, GlobalContext* globalCtx); /* -const ActorInit En_Shopnuts_InitVars = -{ +const ActorInit En_Shopnuts_InitVars = { ACTOR_EN_SHOPNUTS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 5b146510e..54fb3a7b8 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -9,8 +9,7 @@ void EnSi_Update(EnSi* this, GlobalContext* globalCtx); void EnSi_Draw(EnSi* this, GlobalContext* globalCtx); /* -const ActorInit En_Si_InitVars = -{ +const ActorInit En_Si_InitVars = { ACTOR_EN_SI, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 83a2a7d02..72ba9806c 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -9,8 +9,7 @@ void EnSiofuki_Update(EnSiofuki* this, GlobalContext* globalCtx); void EnSiofuki_Draw(EnSiofuki* this, GlobalContext* globalCtx); /* -const ActorInit En_Siofuki_InitVars = -{ +const ActorInit En_Siofuki_InitVars = { ACTOR_EN_SIOFUKI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index b35a77012..e9faac31e 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -9,8 +9,7 @@ void EnSkb_Update(EnSkb* this, GlobalContext* globalCtx); void EnSkb_Draw(EnSkb* this, GlobalContext* globalCtx); /* -const ActorInit En_Skb_InitVars = -{ +const ActorInit En_Skb_InitVars = { ACTOR_EN_SKB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 793440116..930a99cfe 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -9,8 +9,7 @@ void EnSkj_Update(EnSkj* this, GlobalContext* globalCtx); void EnSkj_Draw(EnSkj* this, GlobalContext* globalCtx); /* -const ActorInit En_Skj_InitVars = -{ +const ActorInit En_Skj_InitVars = { ACTOR_EN_SKJ, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 78ebde157..43e50e244 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -9,8 +9,7 @@ void EnSkjneedle_Update(EnSkjneedle* this, GlobalContext* globalCtx); void EnSkjneedle_Draw(EnSkjneedle* this, GlobalContext* globalCtx); /* -const ActorInit En_Skjneedle_InitVars = -{ +const ActorInit En_Skjneedle_InitVars = { ACTOR_EN_SKJNEEDLE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 789d6d9cd..150aeb363 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -9,8 +9,7 @@ void EnSsh_Update(EnSsh* this, GlobalContext* globalCtx); void EnSsh_Draw(EnSsh* this, GlobalContext* globalCtx); /* -const ActorInit En_Ssh_InitVars = -{ +const ActorInit En_Ssh_InitVars = { ACTOR_EN_SSH, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 56bfe637d..5d6d999b2 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -9,8 +9,7 @@ void EnSt_Update(EnSt* this, GlobalContext* globalCtx); void EnSt_Draw(EnSt* this, GlobalContext* globalCtx); /* -const ActorInit En_St_InitVars = -{ +const ActorInit En_St_InitVars = { ACTOR_EN_ST, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 334d9231f..9aef65cc1 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -8,8 +8,7 @@ void EnSth_Destroy(EnSth* this, GlobalContext* globalCtx); void EnSth_Update(EnSth* this, GlobalContext* globalCtx); /* -const ActorInit En_Sth_InitVars = -{ +const ActorInit En_Sth_InitVars = { ACTOR_EN_STH, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 8e1f9b353..99f419894 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -9,8 +9,7 @@ void EnStream_Update(EnStream* this, GlobalContext* globalCtx); void EnStream_Draw(EnStream* this, GlobalContext* globalCtx); /* -const ActorInit En_Stream_InitVars = -{ +const ActorInit En_Stream_InitVars = { ACTOR_EN_STREAM, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 9f4096f1b..826a2b50c 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -9,8 +9,7 @@ void EnSw_Update(EnSw* this, GlobalContext* globalCtx); void EnSw_Draw(EnSw* this, GlobalContext* globalCtx); /* -const ActorInit En_Sw_InitVars = -{ +const ActorInit En_Sw_InitVars = { ACTOR_EN_SW, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 339586fe4..64c884475 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -8,8 +8,7 @@ void EnSyatekiItm_Destroy(EnSyatekiItm* this, GlobalContext* globalCtx); void EnSyatekiItm_Update(EnSyatekiItm* this, GlobalContext* globalCtx); /* -const ActorInit En_Syateki_Itm_InitVars = -{ +const ActorInit En_Syateki_Itm_InitVars = { ACTOR_EN_SYATEKI_ITM, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 49ad897d8..6721a5666 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -9,8 +9,7 @@ void EnSyatekiMan_Update(EnSyatekiMan* this, GlobalContext* globalCtx); void EnSyatekiMan_Draw(EnSyatekiMan* this, GlobalContext* globalCtx); /* -const ActorInit En_Syateki_Man_InitVars = -{ +const ActorInit En_Syateki_Man_InitVars = { ACTOR_EN_SYATEKI_MAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 345068e9b..f27fcd902 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -9,8 +9,7 @@ void EnSyatekiNiw_Update(EnSyatekiNiw* this, GlobalContext* globalCtx); void EnSyatekiNiw_Draw(EnSyatekiNiw* this, GlobalContext* globalCtx); /* -const ActorInit En_Syateki_Niw_InitVars = -{ +const ActorInit En_Syateki_Niw_InitVars = { ACTOR_EN_SYATEKI_NIW, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 1875628d1..e57e4acd0 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -9,8 +9,7 @@ void EnTa_Update(EnTa* this, GlobalContext* globalCtx); void EnTa_Draw(EnTa* this, GlobalContext* globalCtx); /* -const ActorInit En_Ta_InitVars = -{ +const ActorInit En_Ta_InitVars = { ACTOR_EN_TA, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 51273cde1..ed828866c 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -9,8 +9,7 @@ void EnTakaraMan_Update(EnTakaraMan* this, GlobalContext* globalCtx); void EnTakaraMan_Draw(EnTakaraMan* this, GlobalContext* globalCtx); /* -const ActorInit En_Takara_Man_InitVars = -{ +const ActorInit En_Takara_Man_InitVars = { ACTOR_EN_TAKARA_MAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index a03465c1b..1b5e59514 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -8,8 +8,7 @@ void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx); void EnTana_Update(EnTana* this, GlobalContext* globalCtx); /* -const ActorInit En_Tana_InitVars = -{ +const ActorInit En_Tana_InitVars = { ACTOR_EN_TANA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index bc7d141e0..ea5442374 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -9,8 +9,7 @@ void EnTest_Update(EnTest* this, GlobalContext* globalCtx); void EnTest_Draw(EnTest* this, GlobalContext* globalCtx); /* -const ActorInit En_Test_InitVars = -{ +const ActorInit En_Test_InitVars = { ACTOR_EN_TEST, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index dce566fa8..12b02484b 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -9,8 +9,7 @@ void EnTg_Update(EnTg* this, GlobalContext* globalCtx); void EnTg_Draw(EnTg* this, GlobalContext* globalCtx); /* -const ActorInit En_Tg_InitVars = -{ +const ActorInit En_Tg_InitVars = { ACTOR_EN_TG, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index ba6f565b6..ec3c9b19e 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -9,8 +9,7 @@ void EnTite_Update(EnTite* this, GlobalContext* globalCtx); void EnTite_Draw(EnTite* this, GlobalContext* globalCtx); /* -const ActorInit En_Tite_InitVars = -{ +const ActorInit En_Tite_InitVars = { ACTOR_EN_TITE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index e5a3efb08..45d4c1899 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -9,8 +9,7 @@ void EnTorch2_Update(EnTorch2* this, GlobalContext* globalCtx); void EnTorch2_Draw(EnTorch2* this, GlobalContext* globalCtx); /* -const ActorInit En_Torch2_InitVars = -{ +const ActorInit En_Torch2_InitVars = { ACTOR_EN_TORCH2, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 73be3384a..ec322d13c 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -9,8 +9,7 @@ void EnToryo_Update(EnToryo* this, GlobalContext* globalCtx); void EnToryo_Draw(EnToryo* this, GlobalContext* globalCtx); /* -const ActorInit En_Toryo_InitVars = -{ +const ActorInit En_Toryo_InitVars = { ACTOR_EN_TORYO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index ff00b3342..500aa4573 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -9,8 +9,7 @@ void EnTp_Update(EnTp* this, GlobalContext* globalCtx); void EnTp_Draw(EnTp* this, GlobalContext* globalCtx); /* -const ActorInit En_Tp_InitVars = -{ +const ActorInit En_Tp_InitVars = { ACTOR_EN_TP, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 4ebf99e33..ae1160abe 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -9,8 +9,7 @@ void EnTr_Update(EnTr* this, GlobalContext* globalCtx); void EnTr_Draw(EnTr* this, GlobalContext* globalCtx); /* -const ActorInit En_Tr_InitVars = -{ +const ActorInit En_Tr_InitVars = { ACTOR_EN_TR, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 648e2e186..b4dcc2f2f 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -9,8 +9,7 @@ void EnTrap_Update(EnTrap* this, GlobalContext* globalCtx); void EnTrap_Draw(EnTrap* this, GlobalContext* globalCtx); /* -const ActorInit En_Trap_InitVars = -{ +const ActorInit En_Trap_InitVars = { ACTOR_EN_TRAP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index aabb4d512..29cae7a22 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -9,8 +9,7 @@ void EnVali_Update(EnVali* this, GlobalContext* globalCtx); void EnVali_Draw(EnVali* this, GlobalContext* globalCtx); /* -const ActorInit En_Vali_InitVars = -{ +const ActorInit En_Vali_InitVars = { ACTOR_EN_VALI, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 3dc05ae31..36de850e5 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -9,8 +9,7 @@ void EnVbBall_Update(EnVbBall* this, GlobalContext* globalCtx); void EnVbBall_Draw(EnVbBall* this, GlobalContext* globalCtx); /* -const ActorInit En_Vb_Ball_InitVars = -{ +const ActorInit En_Vb_Ball_InitVars = { ACTOR_PLAYER, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 7f5a95a22..cf6fdda26 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -9,8 +9,7 @@ void EnViewer_Update(EnViewer* this, GlobalContext* globalCtx); void EnViewer_Draw(EnViewer* this, GlobalContext* globalCtx); /* -const ActorInit En_Viewer_InitVars = -{ +const ActorInit En_Viewer_InitVars = { ACTOR_EN_VIEWER, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 158afe4cb..188b524f7 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -9,8 +9,7 @@ void EnVm_Update(EnVm* this, GlobalContext* globalCtx); void EnVm_Draw(EnVm* this, GlobalContext* globalCtx); /* -const ActorInit En_Vm_InitVars = -{ +const ActorInit En_Vm_InitVars = { ACTOR_EN_VM, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index c77b52a7b..07df431ae 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -8,8 +8,7 @@ void EnWallTubo_Destroy(EnWallTubo* this, GlobalContext* globalCtx); void EnWallTubo_Update(EnWallTubo* this, GlobalContext* globalCtx); /* -const ActorInit En_Wall_Tubo_InitVars = -{ +const ActorInit En_Wall_Tubo_InitVars = { ACTOR_EN_WALL_TUBO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 36a6f836e..7c1d9bf7b 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -8,8 +8,7 @@ void EnWeatherTag_Destroy(EnWeatherTag* this, GlobalContext* globalCtx); void EnWeatherTag_Update(EnWeatherTag* this, GlobalContext* globalCtx); /* -const ActorInit En_Weather_Tag_InitVars = -{ +const ActorInit En_Weather_Tag_InitVars = { ACTOR_EN_WEATHER_TAG, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 41b2fa062..846409a0b 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -9,8 +9,7 @@ void EnWeiyer_Update(EnWeiyer* this, GlobalContext* globalCtx); void EnWeiyer_Draw(EnWeiyer* this, GlobalContext* globalCtx); /* -const ActorInit En_Weiyer_InitVars = -{ +const ActorInit En_Weiyer_InitVars = { ACTOR_EN_WEIYER, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 935ba04d2..6bbd5ed31 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -9,8 +9,7 @@ void EnWf_Update(EnWf* this, GlobalContext* globalCtx); void EnWf_Draw(EnWf* this, GlobalContext* globalCtx); /* -const ActorInit En_Wf_InitVars = -{ +const ActorInit En_Wf_InitVars = { ACTOR_EN_WF, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index 207907bc0..e8383a72e 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -8,8 +8,7 @@ void EnWonderItem_Destroy(EnWonderItem* this, GlobalContext* globalCtx); void EnWonderItem_Update(EnWonderItem* this, GlobalContext* globalCtx); /* -const ActorInit En_Wonder_Item_InitVars = -{ +const ActorInit En_Wonder_Item_InitVars = { ACTOR_EN_WONDER_ITEM, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index ccb0fed44..8d353b14f 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -8,8 +8,7 @@ void EnWonderTalk_Destroy(EnWonderTalk* this, GlobalContext* globalCtx); void EnWonderTalk_Update(EnWonderTalk* this, GlobalContext* globalCtx); /* -const ActorInit En_Wonder_Talk_InitVars = -{ +const ActorInit En_Wonder_Talk_InitVars = { ACTOR_EN_WONDER_TALK, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index c3799d112..ebcb7b662 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -8,8 +8,7 @@ void EnWonderTalk2_Destroy(EnWonderTalk2* this, GlobalContext* globalCtx); void EnWonderTalk2_Update(EnWonderTalk2* this, GlobalContext* globalCtx); /* -const ActorInit En_Wonder_Talk2_InitVars = -{ +const ActorInit En_Wonder_Talk2_InitVars = { ACTOR_EN_WONDER_TALK2, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 1a49a412a..802c153f1 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -9,8 +9,7 @@ void EnWood02_Update(EnWood02* this, GlobalContext* globalCtx); void EnWood02_Draw(EnWood02* this, GlobalContext* globalCtx); /* -const ActorInit En_Wood02_InitVars = -{ +const ActorInit En_Wood02_InitVars = { ACTOR_EN_WOOD02, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index a6a3f4468..2692a409d 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -9,8 +9,7 @@ void EnXc_Update(EnXc* this, GlobalContext* globalCtx); void EnXc_Draw(EnXc* this, GlobalContext* globalCtx); /* -const ActorInit En_Xc_InitVars = -{ +const ActorInit En_Xc_InitVars = { ACTOR_EN_XC, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index de8b1b2dd..f053a21c2 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -8,8 +8,7 @@ void EnYabusameMark_Destroy(EnYabusameMark* this, GlobalContext* globalCtx); void EnYabusameMark_Update(EnYabusameMark* this, GlobalContext* globalCtx); /* -const ActorInit En_Yabusame_Mark_InitVars = -{ +const ActorInit En_Yabusame_Mark_InitVars = { ACTOR_EN_YABUSAME_MARK, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index b00c46313..693d1801c 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -9,8 +9,7 @@ void EnYukabyun_Update(EnYukabyun* this, GlobalContext* globalCtx); void EnYukabyun_Draw(EnYukabyun* this, GlobalContext* globalCtx); /* -const ActorInit En_Yukabyun_InitVars = -{ +const ActorInit En_Yukabyun_InitVars = { ACTOR_EN_YUKABYUN, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index d98312c4a..6b5c2a645 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -9,8 +9,7 @@ void EnZf_Update(EnZf* this, GlobalContext* globalCtx); void EnZf_Draw(EnZf* this, GlobalContext* globalCtx); /* -const ActorInit En_Zf_InitVars = -{ +const ActorInit En_Zf_InitVars = { ACTOR_EN_ZF, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index db7f3eebf..2cc382efb 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -9,8 +9,7 @@ void EnZl1_Update(EnZl1* this, GlobalContext* globalCtx); void EnZl1_Draw(EnZl1* this, GlobalContext* globalCtx); /* -const ActorInit En_Zl1_InitVars = -{ +const ActorInit En_Zl1_InitVars = { ACTOR_EN_ZL1, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index ab7dfb142..eb67587b4 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -9,8 +9,7 @@ void EnZl2_Update(EnZl2* this, GlobalContext* globalCtx); void EnZl2_Draw(EnZl2* this, GlobalContext* globalCtx); /* -const ActorInit En_Zl2_InitVars = -{ +const ActorInit En_Zl2_InitVars = { ACTOR_EN_ZL2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 348060010..8bc7fd6ff 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -9,8 +9,7 @@ void EnZl3_Update(EnZl3* this, GlobalContext* globalCtx); void EnZl3_Draw(EnZl3* this, GlobalContext* globalCtx); /* -const ActorInit En_Zl3_InitVars = -{ +const ActorInit En_Zl3_InitVars = { ACTOR_EN_ZL3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 82dc4db2d..38a9bef69 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -9,8 +9,7 @@ void EnZl4_Update(EnZl4* this, GlobalContext* globalCtx); void EnZl4_Draw(EnZl4* this, GlobalContext* globalCtx); /* -const ActorInit En_Zl4_InitVars = -{ +const ActorInit En_Zl4_InitVars = { ACTOR_EN_ZL4, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index bee111197..4c806476e 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -9,8 +9,7 @@ void EnZo_Update(EnZo* this, GlobalContext* globalCtx); void EnZo_Draw(EnZo* this, GlobalContext* globalCtx); /* -const ActorInit En_Zo_InitVars = -{ +const ActorInit En_Zo_InitVars = { ACTOR_EN_ZO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 4bb1134fb..1f6fbfbbe 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -9,8 +9,7 @@ void EnfHG_Update(EnfHG* this, GlobalContext* globalCtx); void EnfHG_Draw(EnfHG* this, GlobalContext* globalCtx); /* -const ActorInit En_fHG_InitVars = -{ +const ActorInit En_fHG_InitVars = { ACTOR_EN_FHG, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index f07687b61..8a605455a 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -9,8 +9,7 @@ void EndTitle_Update(EndTitle* this, GlobalContext* globalCtx); void EndTitle_Draw(EndTitle* this, GlobalContext* globalCtx); /* -const ActorInit End_Title_InitVars = -{ +const ActorInit End_Title_InitVars = { ACTOR_END_TITLE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 8835dc919..baa2d3093 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -9,8 +9,7 @@ void Fishing_Update(Fishing* this, GlobalContext* globalCtx); void Fishing_Draw(Fishing* this, GlobalContext* globalCtx); /* -const ActorInit Fishing_InitVars = -{ +const ActorInit Fishing_InitVars = { ACTOR_FISHING, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index 57c59ddd2..d1e9fed3c 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -9,8 +9,7 @@ void ItemBHeart_Update(ItemBHeart* this, GlobalContext* globalCtx); void ItemBHeart_Draw(ItemBHeart* this, GlobalContext* globalCtx); /* -const ActorInit Item_B_Heart_InitVars = -{ +const ActorInit Item_B_Heart_InitVars = { ACTOR_ITEM_B_HEART, ACTORTYPE_MISC, ROOM, diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 36a89bb9c..ee8297b04 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -8,8 +8,7 @@ void ItemEtcetera_Destroy(ItemEtcetera* this, GlobalContext* globalCtx); void ItemEtcetera_Update(ItemEtcetera* this, GlobalContext* globalCtx); /* -const ActorInit Item_Etcetera_InitVars = -{ +const ActorInit Item_Etcetera_InitVars = { ACTOR_ITEM_ETCETERA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index f93f75956..4c62ecb28 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -9,8 +9,7 @@ void ItemOcarina_Update(ItemOcarina* this, GlobalContext* globalCtx); void ItemOcarina_Draw(ItemOcarina* this, GlobalContext* globalCtx); /* -const ActorInit Item_Ocarina_InitVars = -{ +const ActorInit Item_Ocarina_InitVars = { ACTOR_ITEM_OCARINA, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index dd340a666..f4936f70f 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -9,8 +9,7 @@ void ItemShield_Update(ItemShield* this, GlobalContext* globalCtx); void ItemShield_Draw(ItemShield* this, GlobalContext* globalCtx); /* -const ActorInit Item_Shield_InitVars = -{ +const ActorInit Item_Shield_InitVars = { ACTOR_ITEM_SHIELD, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index f373cc3ce..1f57a7bbd 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -9,8 +9,7 @@ void MagicDark_Update(MagicDark* this, GlobalContext* globalCtx); void MagicDark_Draw(MagicDark* this, GlobalContext* globalCtx); /* -const ActorInit Magic_Dark_InitVars = -{ +const ActorInit Magic_Dark_InitVars = { ACTOR_MAGIC_DARK, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 3b8f49505..0f0ad4ea4 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -9,8 +9,7 @@ void MagicFire_Update(MagicFire* this, GlobalContext* globalCtx); void MagicFire_Draw(MagicFire* this, GlobalContext* globalCtx); /* -const ActorInit Magic_Fire_InitVars = -{ +const ActorInit Magic_Fire_InitVars = { ACTOR_MAGIC_FIRE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index e674a0e83..34b89509d 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -9,8 +9,7 @@ void MagicWind_Update(MagicWind* this, GlobalContext* globalCtx); void MagicWind_Draw(MagicWind* this, GlobalContext* globalCtx); /* -const ActorInit Magic_Wind_InitVars = -{ +const ActorInit Magic_Wind_InitVars = { ACTOR_MAGIC_WIND, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index d93987258..4a5c247c5 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -9,8 +9,7 @@ void MirRay_Update(MirRay* this, GlobalContext* globalCtx); void MirRay_Draw(MirRay* this, GlobalContext* globalCtx); /* -const ActorInit Mir_Ray_InitVars = -{ +const ActorInit Mir_Ray_InitVars = { ACTOR_MIR_RAY, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 191105028..ae03298aa 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -9,8 +9,7 @@ void ObjBean_Update(ObjBean* this, GlobalContext* globalCtx); void ObjBean_Draw(ObjBean* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Bean_InitVars = -{ +const ActorInit Obj_Bean_InitVars = { ACTOR_OBJ_BEAN, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 17d126060..38099bca4 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -9,8 +9,7 @@ void ObjComb_Update(ObjComb* this, GlobalContext* globalCtx); void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Comb_InitVars = -{ +const ActorInit Obj_Comb_InitVars = { ACTOR_OBJ_COMB, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index fdd4a085d..0369f30f7 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -9,8 +9,7 @@ void ObjDekujr_Update(ObjDekujr* this, GlobalContext* globalCtx); void ObjDekujr_Draw(ObjDekujr* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Dekujr_InitVars = -{ +const ActorInit Obj_Dekujr_InitVars = { ACTOR_OBJ_DEKUJR, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 4f33e20f8..2b8997990 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -9,8 +9,7 @@ void ObjHamishi_Update(ObjHamishi* this, GlobalContext* globalCtx); void ObjHamishi_Draw(ObjHamishi* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Hamishi_InitVars = -{ +const ActorInit Obj_Hamishi_InitVars = { ACTOR_OBJ_HAMISHI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index e163ac265..dd397901d 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -9,8 +9,7 @@ void ObjHana_Update(ObjHana* this, GlobalContext* globalCtx); void ObjHana_Draw(ObjHana* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Hana_InitVars = -{ +const ActorInit Obj_Hana_InitVars = { ACTOR_OBJ_HANA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 5d16e21e4..75422d0b7 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -9,8 +9,7 @@ void ObjHsblock_Update(ObjHsblock* this, GlobalContext* globalCtx); void ObjHsblock_Draw(ObjHsblock* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Hsblock_InitVars = -{ +const ActorInit Obj_Hsblock_InitVars = { ACTOR_OBJ_HSBLOCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 5292dd1f4..14cbd08e1 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -9,8 +9,7 @@ void ObjIcePoly_Update(ObjIcePoly* this, GlobalContext* globalCtx); void ObjIcePoly_Draw(ObjIcePoly* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Ice_Poly_InitVars = -{ +const ActorInit Obj_Ice_Poly_InitVars = { ACTOR_OBJ_ICE_POLY, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 70b364a9b..8adc1d88e 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -9,8 +9,7 @@ void ObjKibako_Update(ObjKibako* this, GlobalContext* globalCtx); void ObjKibako_Draw(ObjKibako* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Kibako_InitVars = -{ +const ActorInit Obj_Kibako_InitVars = { ACTOR_OBJ_KIBAKO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index af59ebcbe..e9cfeab89 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -9,8 +9,7 @@ void ObjKibako2_Update(ObjKibako2* this, GlobalContext* globalCtx); void ObjKibako2_Draw(ObjKibako2* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Kibako2_InitVars = -{ +const ActorInit Obj_Kibako2_InitVars = { ACTOR_OBJ_KIBAKO2, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 8e59d162e..788056652 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -9,8 +9,7 @@ void ObjLift_Update(ObjLift* this, GlobalContext* globalCtx); void ObjLift_Draw(ObjLift* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Lift_InitVars = -{ +const ActorInit Obj_Lift_InitVars = { ACTOR_OBJ_LIFT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 0f9b525dc..83d2361d4 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -9,8 +9,7 @@ void ObjLightswitch_Update(ObjLightswitch* this, GlobalContext* globalCtx); void ObjLightswitch_Draw(ObjLightswitch* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Lightswitch_InitVars = -{ +const ActorInit Obj_Lightswitch_InitVars = { ACTOR_OBJ_LIGHTSWITCH, ACTORTYPE_SWITCH, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 52e7e6845..1900eb462 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -7,8 +7,7 @@ void ObjMakeoshihiki_Init(ObjMakeoshihiki* this, GlobalContext* globalCtx); void ObjMakeoshihiki_Draw(ObjMakeoshihiki* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Makeoshihiki_InitVars = -{ +const ActorInit Obj_Makeoshihiki_InitVars = { ACTOR_OBJ_MAKEOSHIHIKI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 23541cf9d..67dc8c0b3 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -8,8 +8,7 @@ void ObjMure_Destroy(ObjMure* this, GlobalContext* globalCtx); void ObjMure_Update(ObjMure* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Mure_InitVars = -{ +const ActorInit Obj_Mure_InitVars = { ACTOR_OBJ_MURE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 94e3d7ffd..e8654d841 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -7,8 +7,7 @@ void ObjMure2_Init(ObjMure2* this, GlobalContext* globalCtx); void ObjMure2_Update(ObjMure2* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Mure2_InitVars = -{ +const ActorInit Obj_Mure2_InitVars = { ACTOR_OBJ_MURE2, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index a3587c165..ff6168d25 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -8,8 +8,7 @@ void ObjMure3_Destroy(ObjMure3* this, GlobalContext* globalCtx); void ObjMure3_Update(ObjMure3* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Mure3_InitVars = -{ +const ActorInit Obj_Mure3_InitVars = { ACTOR_OBJ_MURE3, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 2563eb4a5..3f95cbb2c 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -9,8 +9,7 @@ void ObjOshihiki_Update(ObjOshihiki* this, GlobalContext* globalCtx); void ObjOshihiki_Draw(ObjOshihiki* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Oshihiki_InitVars = -{ +const ActorInit Obj_Oshihiki_InitVars = { ACTOR_OBJ_OSHIHIKI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index 43a73f406..bca0894b9 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -9,8 +9,7 @@ void ObjSwitch_Update(ObjSwitch* this, GlobalContext* globalCtx); void ObjSwitch_Draw(ObjSwitch* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Switch_InitVars = -{ +const ActorInit Obj_Switch_InitVars = { ACTOR_OBJ_SWITCH, ACTORTYPE_SWITCH, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index a3255aa52..83fbf3eb7 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -9,8 +9,7 @@ void ObjSyokudai_Update(ObjSyokudai* this, GlobalContext* globalCtx); void ObjSyokudai_Draw(ObjSyokudai* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Syokudai_InitVars = -{ +const ActorInit Obj_Syokudai_InitVars = { ACTOR_OBJ_SYOKUDAI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 30800d54d..4edecb082 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -9,8 +9,7 @@ void ObjTimeblock_Update(ObjTimeblock* this, GlobalContext* globalCtx); void ObjTimeblock_Draw(ObjTimeblock* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Timeblock_InitVars = -{ +const ActorInit Obj_Timeblock_InitVars = { ACTOR_OBJ_TIMEBLOCK, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index ae6919493..6eb47ed98 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -8,8 +8,7 @@ void ObjTsubo_Destroy(ObjTsubo* this, GlobalContext* globalCtx); void ObjTsubo_Update(ObjTsubo* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Tsubo_InitVars = -{ +const ActorInit Obj_Tsubo_InitVars = { ACTOR_OBJ_TSUBO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index e19145bff..fb3a372c2 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -9,8 +9,7 @@ void ObjWarp2block_Update(ObjWarp2block* this, GlobalContext* globalCtx); void ObjWarp2block_Draw(ObjWarp2block* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Warp2block_InitVars = -{ +const ActorInit Obj_Warp2block_InitVars = { ACTOR_OBJ_WARP2BLOCK, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index 96eebcf90..4da1a9575 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -9,8 +9,7 @@ void ObjectKankyo_Update(ObjectKankyo* this, GlobalContext* globalCtx); void ObjectKankyo_Draw(ObjectKankyo* this, GlobalContext* globalCtx); /* -const ActorInit Object_Kankyo_InitVars = -{ +const ActorInit Object_Kankyo_InitVars = { ACTOR_OBJECT_KANKYO, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 6699af88f..f8c5b83e2 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -9,8 +9,7 @@ void OceffSpot_Update(OceffSpot* this, GlobalContext* globalCtx); void OceffSpot_Draw(OceffSpot* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Spot_InitVars = -{ +const ActorInit Oceff_Spot_InitVars = { ACTOR_OCEFF_SPOT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 25609fa4d..eb81f0a02 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -9,8 +9,7 @@ void OceffStorm_Update(OceffStorm* this, GlobalContext* globalCtx); void OceffStorm_Draw(OceffStorm* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Storm_InitVars = -{ +const ActorInit Oceff_Storm_InitVars = { ACTOR_OCEFF_STORM, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index ceec18a46..cad1ecdbf 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -9,8 +9,7 @@ void OceffWipe_Update(OceffWipe* this, GlobalContext* globalCtx); void OceffWipe_Draw(OceffWipe* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Wipe_InitVars = -{ +const ActorInit Oceff_Wipe_InitVars = { ACTOR_OCEFF_WIPE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 0f5ad2638..f15afc1c5 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -9,8 +9,7 @@ void OceffWipe2_Update(OceffWipe2* this, GlobalContext* globalCtx); void OceffWipe2_Draw(OceffWipe2* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Wipe2_InitVars = -{ +const ActorInit Oceff_Wipe2_InitVars = { ACTOR_OCEFF_WIPE2, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index ed27e7d8d..138bd0486 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -9,8 +9,7 @@ void OceffWipe3_Update(OceffWipe3* this, GlobalContext* globalCtx); void OceffWipe3_Draw(OceffWipe3* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Wipe3_InitVars = -{ +const ActorInit Oceff_Wipe3_InitVars = { ACTOR_OCEFF_WIPE3, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 734b53cbb..df85e2b07 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -9,8 +9,7 @@ void OceffWipe4_Update(OceffWipe4* this, GlobalContext* globalCtx); void OceffWipe4_Draw(OceffWipe4* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Wipe4_InitVars = -{ +const ActorInit Oceff_Wipe4_InitVars = { ACTOR_OCEFF_WIPE4, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index b51bc1ccf..e07455820 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -8,8 +8,7 @@ void ShotSun_Destroy(ShotSun* this, GlobalContext* globalCtx); void ShotSun_Update(ShotSun* this, GlobalContext* globalCtx); /* -const ActorInit Shot_Sun_InitVars = -{ +const ActorInit Shot_Sun_InitVars = { ACTOR_SHOT_SUN, ACTORTYPE_PROP, ROOM, From 94e4c2b91faa0583fdc8c0ac55e301c6c599068c Mon Sep 17 00:00:00 2001 From: dark-samus Date: Mon, 23 Mar 2020 19:44:03 -0400 Subject: [PATCH 15/16] fix final non-matching in fault_drawer.c --- .../code/fault_drawer/FaultDrawer_DrawChar.s | 102 ------------------ src/code/fault_drawer.c | 22 ++-- 2 files changed, 11 insertions(+), 113 deletions(-) delete mode 100644 asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s diff --git a/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s b/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s deleted file mode 100644 index 16994afb6..000000000 --- a/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel FaultDrawer_DrawChar -/* B4DA3C 800D689C AFA40000 */ sw $a0, ($sp) -/* B4DA40 800D68A0 3C0C8017 */ lui $t4, %hi(sFaultDrawerStruct) # $t4, 0x8017 -/* B4DA44 800D68A4 258CB680 */ addiu $t4, %lo(sFaultDrawerStruct) # addiu $t4, $t4, -0x4980 -/* B4DA48 800D68A8 308400FF */ andi $a0, $a0, 0xff -/* B4DA4C 800D68AC 95830016 */ lhu $v1, 0x16($t4) -/* B4DA50 800D68B0 95880004 */ lhu $t0, 4($t4) -/* B4DA54 800D68B4 00802825 */ move $a1, $a0 -/* B4DA58 800D68B8 30B80004 */ andi $t8, $a1, 4 -/* B4DA5C 800D68BC 01030019 */ multu $t0, $v1 -/* B4DA60 800D68C0 0018C883 */ sra $t9, $t8, 2 -/* B4DA64 800D68C4 8D980018 */ lw $t8, 0x18($t4) -/* B4DA68 800D68C8 95820014 */ lhu $v0, 0x14($t4) -/* B4DA6C 800D68CC 04A10003 */ bgez $a1, .L800D68DC -/* B4DA70 800D68D0 000570C3 */ sra $t6, $a1, 3 -/* B4DA74 800D68D4 24A10007 */ addiu $at, $a1, 7 -/* B4DA78 800D68D8 000170C3 */ sra $t6, $at, 3 -.L800D68DC: -/* B4DA7C 800D68DC 000E7900 */ sll $t7, $t6, 4 -/* B4DA80 800D68E0 01F96821 */ addu $t5, $t7, $t9 -/* B4DA84 800D68E4 00007812 */ mflo $t7 -/* B4DA88 800D68E8 000D7080 */ sll $t6, $t5, 2 -/* B4DA8C 800D68EC 000FC840 */ sll $t9, $t7, 1 -/* B4DA90 800D68F0 8D8D0000 */ lw $t5, ($t4) -/* B4DA94 800D68F4 958F000C */ lhu $t7, 0xc($t4) -/* B4DA98 800D68F8 030E3021 */ addu $a2, $t8, $t6 -/* B4DA9C 800D68FC 00027040 */ sll $t6, $v0, 1 -/* B4DAA0 800D6900 032DC021 */ addu $t8, $t9, $t5 -/* B4DAA4 800D6904 004F082A */ slt $at, $v0, $t7 -/* B4DAA8 800D6908 1420003E */ bnez $at, .L800D6A04 -/* B4DAAC 800D690C 030E3821 */ addu $a3, $t8, $t6 -/* B4DAB0 800D6910 9184001C */ lbu $a0, 0x1c($t4) -/* B4DAB4 800D6914 9599000E */ lhu $t9, 0xe($t4) -/* B4DAB8 800D6918 00826821 */ addu $t5, $a0, $v0 -/* B4DABC 800D691C 25B8FFFF */ addiu $t8, $t5, -1 -/* B4DAC0 800D6920 0338082A */ slt $at, $t9, $t8 -/* B4DAC4 800D6924 14200037 */ bnez $at, .L800D6A04 -/* B4DAC8 800D6928 00000000 */ nop -/* B4DACC 800D692C 958E0008 */ lhu $t6, 8($t4) -/* B4DAD0 800D6930 006E082A */ slt $at, $v1, $t6 -/* B4DAD4 800D6934 14200033 */ bnez $at, .L800D6A04 -/* B4DAD8 800D6938 00000000 */ nop -/* B4DADC 800D693C 9182001D */ lbu $v0, 0x1d($t4) -/* B4DAE0 800D6940 958F000A */ lhu $t7, 0xa($t4) -/* B4DAE4 800D6944 00436821 */ addu $t5, $v0, $v1 -/* B4DAE8 800D6948 25B9FFFF */ addiu $t9, $t5, -1 -/* B4DAEC 800D694C 01F9082A */ slt $at, $t7, $t9 -/* B4DAF0 800D6950 1420002C */ bnez $at, .L800D6A04 -/* B4DAF4 800D6954 00000000 */ nop -/* B4DAF8 800D6958 1840002A */ blez $v0, .L800D6A04 -/* B4DAFC 800D695C 00001825 */ move $v1, $zero -/* B4DB00 800D6960 04A10004 */ bgez $a1, .L800D6974 -/* B4DB04 800D6964 30B80003 */ andi $t8, $a1, 3 -/* B4DB08 800D6968 13000002 */ beqz $t8, .L800D6974 -/* B4DB0C 800D696C 00000000 */ nop -/* B4DB10 800D6970 2718FFFC */ addiu $t8, $t8, -4 -.L800D6974: -/* B4DB14 800D6974 3C0E1000 */ lui $t6, 0x1000 -/* B4DB18 800D6978 030E5804 */ sllv $t3, $t6, $t8 -/* B4DB1C 800D697C 01602825 */ move $a1, $t3 -.L800D6980: -/* B4DB20 800D6980 8CC90000 */ lw $t1, ($a2) -/* B4DB24 800D6984 18800018 */ blez $a0, .L800D69E8 -/* B4DB28 800D6988 00005025 */ move $t2, $zero -.L800D698C: -/* B4DB2C 800D698C 00A96824 */ and $t5, $a1, $t1 -/* B4DB30 800D6990 51A00008 */ beql $t5, $zero, .L800D69B4 -/* B4DB34 800D6994 95820012 */ lhu $v0, 0x12($t4) -/* B4DB38 800D6998 958F0010 */ lhu $t7, 0x10($t4) -/* B4DB3C 800D699C 000AC840 */ sll $t9, $t2, 1 -/* B4DB40 800D69A0 00F97021 */ addu $t6, $a3, $t9 -/* B4DB44 800D69A4 A5CF0000 */ sh $t7, ($t6) -/* B4DB48 800D69A8 10000009 */ b .L800D69D0 -/* B4DB4C 800D69AC 9184001C */ lbu $a0, 0x1c($t4) -/* B4DB50 800D69B0 95820012 */ lhu $v0, 0x12($t4) -.L800D69B4: -/* B4DB54 800D69B4 000A6840 */ sll $t5, $t2, 1 -/* B4DB58 800D69B8 00EDC821 */ addu $t9, $a3, $t5 -/* B4DB5C 800D69BC 30580001 */ andi $t8, $v0, 1 -/* B4DB60 800D69C0 53000004 */ beql $t8, $zero, .L800D69D4 -/* B4DB64 800D69C4 254A0001 */ addiu $t2, $t2, 1 -/* B4DB68 800D69C8 A7220000 */ sh $v0, ($t9) -/* B4DB6C 800D69CC 9184001C */ lbu $a0, 0x1c($t4) -.L800D69D0: -/* B4DB70 800D69D0 254A0001 */ addiu $t2, $t2, 1 -.L800D69D4: -/* B4DB74 800D69D4 0144082A */ slt $at, $t2, $a0 -/* B4DB78 800D69D8 1420FFEC */ bnez $at, .L800D698C -/* B4DB7C 800D69DC 00052902 */ srl $a1, $a1, 4 -/* B4DB80 800D69E0 95880004 */ lhu $t0, 4($t4) -/* B4DB84 800D69E4 9182001D */ lbu $v0, 0x1d($t4) -.L800D69E8: -/* B4DB88 800D69E8 00087840 */ sll $t7, $t0, 1 -/* B4DB8C 800D69EC 00EF3821 */ addu $a3, $a3, $t7 -/* B4DB90 800D69F0 24C60008 */ addiu $a2, $a2, 8 -/* B4DB94 800D69F4 24630001 */ addiu $v1, $v1, 1 -/* B4DB98 800D69F8 0062082A */ slt $at, $v1, $v0 -/* B4DB9C 800D69FC 5420FFE0 */ bnezl $at, .L800D6980 -/* B4DBA0 800D6A00 01602825 */ move $a1, $t3 -.L800D6A04: -/* B4DBA4 800D6A04 03E00008 */ jr $ra -/* B4DBA8 800D6A08 00000000 */ nop \ No newline at end of file diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c index b17679d35..cc2195172 100644 --- a/src/code/fault_drawer.c +++ b/src/code/fault_drawer.c @@ -94,30 +94,33 @@ void FaultDrawer_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 col } } -#ifdef NON_MATCHING -// regalloc and minor ordering differences void FaultDrawer_DrawChar(char c) { u16* fb; s32 x, y; + s32 test; u32* dataPtr; + u32 data; s32 cursorX = sFaultDrawerStruct.cursorX; s32 cursorY = sFaultDrawerStruct.cursorY; + u32** temp = &sFaultDrawerStruct.fontData; - dataPtr = &sFaultDrawerStruct.fontData[((c & 4) >> 2) + ((c / 8) * 16)]; - fb = sFaultDrawerStruct.fb + sFaultDrawerStruct.w * cursorY + cursorX; + test = c % 4; + dataPtr = &temp[0][(((c / 8) * 16) + ((c & 4) >> 2))]; + fb = sFaultDrawerStruct.fb + (sFaultDrawerStruct.w * cursorY) + cursorX; if ((sFaultDrawerStruct.xStart <= cursorX) && ((sFaultDrawerStruct.charW + cursorX - 1) <= sFaultDrawerStruct.xEnd) && (sFaultDrawerStruct.yStart <= cursorY) && ((sFaultDrawerStruct.charH + cursorY - 1) <= sFaultDrawerStruct.yEnd)) { for (y = 0; y < sFaultDrawerStruct.charH; y++) { - u32 mask = 0x10000000 << (c % 4); - u32 data = *dataPtr; + u32 mask = 0x10000000 << test; + data = *dataPtr; for (x = 0; x < sFaultDrawerStruct.charW; x++) { - if (mask & data) + if (mask & data) { fb[x] = sFaultDrawerStruct.foreColor; - else if (sFaultDrawerStruct.backColor & 1) + } else if (sFaultDrawerStruct.backColor & 1) { fb[x] = sFaultDrawerStruct.backColor; + } mask >>= 4; } fb += sFaultDrawerStruct.w; @@ -125,9 +128,6 @@ void FaultDrawer_DrawChar(char c) { } } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s") -#endif s32 FaultDrawer_ColorToPrintColor(u16 color) { s32 i; From 4bbbdc39fd5e5a44511d8c21012013692f805ec4 Mon Sep 17 00:00:00 2001 From: dark-samus Date: Mon, 23 Mar 2020 20:01:52 -0400 Subject: [PATCH 16/16] use a better variable name --- src/code/fault_drawer.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c index cc2195172..ef7a784ae 100644 --- a/src/code/fault_drawer.c +++ b/src/code/fault_drawer.c @@ -97,15 +97,14 @@ void FaultDrawer_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 col void FaultDrawer_DrawChar(char c) { u16* fb; s32 x, y; - s32 test; u32* dataPtr; u32 data; s32 cursorX = sFaultDrawerStruct.cursorX; s32 cursorY = sFaultDrawerStruct.cursorY; - u32** temp = &sFaultDrawerStruct.fontData; + u32** fontData = &sFaultDrawerStruct.fontData; + s32 shift = c % 4; - test = c % 4; - dataPtr = &temp[0][(((c / 8) * 16) + ((c & 4) >> 2))]; + dataPtr = &fontData[0][(((c / 8) * 16) + ((c & 4) >> 2))]; fb = sFaultDrawerStruct.fb + (sFaultDrawerStruct.w * cursorY) + cursorX; if ((sFaultDrawerStruct.xStart <= cursorX) && @@ -113,7 +112,7 @@ void FaultDrawer_DrawChar(char c) { (sFaultDrawerStruct.yStart <= cursorY) && ((sFaultDrawerStruct.charH + cursorY - 1) <= sFaultDrawerStruct.yEnd)) { for (y = 0; y < sFaultDrawerStruct.charH; y++) { - u32 mask = 0x10000000 << test; + u32 mask = 0x10000000 << shift; data = *dataPtr; for (x = 0; x < sFaultDrawerStruct.charW; x++) { if (mask & data) {