diff --git a/include/common_structs.h b/include/common_structs.h index ef4414b63d..4b5f63a4cd 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -234,17 +234,17 @@ typedef struct ScriptInstance { /* 0x140 */ s32* flagArray; /* 0x144 */ ScriptID id; /* 0x148 */ union { - s32 enemyID; - s32 actorID; - struct Enemy* enemy; ///< For overworld scripts owned by an Npc - struct Actor* actor; ///< For battle scripts - } owner1; ///< Initially -1 + s32 enemyID; + s32 actorID; + struct Enemy* enemy; ///< For overworld scripts owned by an Npc + struct Actor* actor; ///< For battle scripts + } owner1; ///< Initially -1 /* 0x14C */ union { - NpcId npcID; - s32 triggerID; - struct Npc* npc; ///< For overworld scripts owned by an Npc - struct Trigger* trigger; - } owner2; ///< Initially -1 + NpcId npcID; + s32 triggerID; + struct Npc* npc; ///< For overworld scripts owned by an Npc + struct Trigger* trigger; + } owner2; ///< Initially -1 /* 0x150 */ f32 timeScale; /* 0x154 */ f32 frameCounter; /* 0x158 */ s32 unk_158; diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index 0c4fddbcac..a31817bf86 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -3,7 +3,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_8024061C_CAC80C); INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_802406D0_CAC8C0); diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index b96349f3a1..f07fda7f7b 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -26,4 +26,3 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241BCC_CB090C); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_flo/flo_10/CBA430.c b/src/world/area_flo/flo_10/CBA430.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_flo/flo_10/CBA430.c +++ b/src/world/area_flo/flo_10/CBA430.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 70a0e79900..4ffdcfcd81 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -3,7 +3,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024027C_CC10AC); #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_flo/flo_18/CDCC30.c b/src/world/area_flo/flo_18/CDCC30.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_flo/flo_18/CDCC30.c +++ b/src/world/area_flo/flo_18/CDCC30.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_flo/flo_22/CEC290.c b/src/world/area_flo/flo_22/CEC290.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_flo/flo_22/CEC290.c +++ b/src/world/area_flo/flo_22/CEC290.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_flo/flo_24/CF0980.c b/src/world/area_flo/flo_24/CF0980.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_flo/flo_24/CF0980.c +++ b/src/world/area_flo/flo_24/CF0980.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_flo/flo_25/CF4BC0.c b/src/world/area_flo/flo_25/CF4BC0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_flo/flo_25/CF4BC0.c +++ b/src/world/area_flo/flo_25/CF4BC0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_hos/hos_03/A1BB70.c b/src/world/area_hos/hos_03/A1BB70.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_hos/hos_03/A1BB70.c +++ b/src/world/area_hos/hos_03/A1BB70.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_iwa/iwa_10/91FB20.c b/src/world/area_iwa/iwa_10/91FB20.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_iwa/iwa_10/91FB20.c +++ b/src/world/area_iwa/iwa_10/91FB20.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_00/B21EA0.c b/src/world/area_jan/jan_00/B21EA0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_00/B21EA0.c +++ b/src/world/area_jan/jan_00/B21EA0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_01/B291C0.c b/src/world/area_jan/jan_01/B291C0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_01/B291C0.c +++ b/src/world/area_jan/jan_01/B291C0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_02/B2EB50.c b/src/world/area_jan/jan_02/B2EB50.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_02/B2EB50.c +++ b/src/world/area_jan/jan_02/B2EB50.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_03/B37C20.c b/src/world/area_jan/jan_03/B37C20.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_03/B37C20.c +++ b/src/world/area_jan/jan_03/B37C20.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_04/B44F10.c b/src/world/area_jan/jan_04/B44F10.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_04/B44F10.c +++ b/src/world/area_jan/jan_04/B44F10.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_04/B451F0.c b/src/world/area_jan/jan_04/B451F0.c index 3ceb497f81..f8d3e7736f 100644 --- a/src/world/area_jan/jan_04/B451F0.c +++ b/src/world/area_jan/jan_04/B451F0.c @@ -10,4 +10,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D0C_B4547C); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_05/B4AF10.c b/src/world/area_jan/jan_05/B4AF10.c index ea159c5821..321b2da4a8 100644 --- a/src/world/area_jan/jan_05/B4AF10.c +++ b/src/world/area_jan/jan_05/B4AF10.c @@ -3,7 +3,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_802406DC_B4B14C); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_80240738_B4B1A8); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index f38ea2e773..0b720e2b9a 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -41,5 +41,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024219C_B4CC0C); #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024268C_B4D0FC); diff --git a/src/world/area_jan/jan_06/B52D30.c b/src/world/area_jan/jan_06/B52D30.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_06/B52D30.c +++ b/src/world/area_jan/jan_06/B52D30.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index ef39aaa90a..616b225124 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -40,4 +40,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802420EC_B5491C); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_07/B5A610.c b/src/world/area_jan/jan_07/B5A610.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_07/B5A610.c +++ b/src/world/area_jan/jan_07/B5A610.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_07/B5A850.c b/src/world/area_jan/jan_07/B5A850.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_07/B5A850.c +++ b/src/world/area_jan/jan_07/B5A850.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_08/B5E5C0.c b/src/world/area_jan/jan_08/B5E5C0.c index 7cfce175e9..16f05cc45d 100644 --- a/src/world/area_jan/jan_08/B5E5C0.c +++ b/src/world/area_jan/jan_08/B5E5C0.c @@ -3,7 +3,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_8024054C_B5E7FC); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_802405A8_B5E858); diff --git a/src/world/area_jan/jan_08/B604A0.c b/src/world/area_jan/jan_08/B604A0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_08/B604A0.c +++ b/src/world/area_jan/jan_08/B604A0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_09/B660A0.c b/src/world/area_jan/jan_09/B660A0.c index 9ca0ca2f09..20cdd5291e 100644 --- a/src/world/area_jan/jan_09/B660A0.c +++ b/src/world/area_jan/jan_09/B660A0.c @@ -3,7 +3,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_09/B660A0", func_8024082C_B662DC); INCLUDE_ASM(s32, "world/area_jan/jan_09/B660A0", func_80240888_B66338); diff --git a/src/world/area_jan/jan_09/B67190.c b/src/world/area_jan/jan_09/B67190.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_09/B67190.c +++ b/src/world/area_jan/jan_09/B67190.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_10/B6D610.c b/src/world/area_jan/jan_10/B6D610.c index 6c7734ee74..4fb54c9495 100644 --- a/src/world/area_jan/jan_10/B6D610.c +++ b/src/world/area_jan/jan_10/B6D610.c @@ -3,5 +3,4 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_802414BC_B6D84C); diff --git a/src/world/area_jan/jan_10/B6D890.c b/src/world/area_jan/jan_10/B6D890.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_10/B6D890.c +++ b/src/world/area_jan/jan_10/B6D890.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_12/B730B0.c b/src/world/area_jan/jan_12/B730B0.c index 1a6886166a..1b598fda4f 100644 --- a/src/world/area_jan/jan_12/B730B0.c +++ b/src/world/area_jan/jan_12/B730B0.c @@ -10,4 +10,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_802401CC_B7327C); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_13/B767B0.c b/src/world/area_jan/jan_13/B767B0.c index 6ab1b08484..1338c8bb68 100644 --- a/src/world/area_jan/jan_13/B767B0.c +++ b/src/world/area_jan/jan_13/B767B0.c @@ -10,4 +10,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_802402B8_B76A68); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_14/B7A050.c b/src/world/area_jan/jan_14/B7A050.c index f4ae6c8824..12afc1d073 100644 --- a/src/world/area_jan/jan_14/B7A050.c +++ b/src/world/area_jan/jan_14/B7A050.c @@ -10,4 +10,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_802401CC_B7A21C); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_15/B7D9E0.c b/src/world/area_jan/jan_15/B7D9E0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_15/B7D9E0.c +++ b/src/world/area_jan/jan_15/B7D9E0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_16/B80300.c b/src/world/area_jan/jan_16/B80300.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_16/B80300.c +++ b/src/world/area_jan/jan_16/B80300.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_jan/jan_22/B851A0.c b/src/world/area_jan/jan_22/B851A0.c index 362252a74d..eac5708a7c 100644 --- a/src/world/area_jan/jan_22/B851A0.c +++ b/src/world/area_jan/jan_22/B851A0.c @@ -11,7 +11,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802412E0_B85460); #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_8024160C_B8578C); INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241668_B857E8); diff --git a/src/world/area_jan/jan_22/B858A0.c b/src/world/area_jan/jan_22/B858A0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_jan/jan_22/B858A0.c +++ b/src/world/area_jan/jan_22/B858A0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_kmr/kmr_02/8B37D0.c b/src/world/area_kmr/kmr_02/8B37D0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_kmr/kmr_02/8B37D0.c +++ b/src/world/area_kmr/kmr_02/8B37D0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_kmr/kmr_03/8C83A0.c +++ b/src/world/area_kmr/kmr_03/8C83A0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index 37d4463aec..d187bcdeeb 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -3,7 +3,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_8024029C_8CAB9C); INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8); diff --git a/src/world/area_kmr/kmr_05/8CF570.c b/src/world/area_kmr/kmr_05/8CF570.c index fce331cbd9..ecff5faf6c 100644 --- a/src/world/area_kmr/kmr_05/8CF570.c +++ b/src/world/area_kmr/kmr_05/8CF570.c @@ -3,5 +3,4 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_8024173C_8CF7AC); diff --git a/src/world/area_kmr/kmr_10/8D88A0.c b/src/world/area_kmr/kmr_10/8D88A0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_kmr/kmr_10/8D88A0.c +++ b/src/world/area_kmr/kmr_10/8D88A0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_kmr/kmr_11/8DA100.c b/src/world/area_kmr/kmr_11/8DA100.c index e2a0a2242a..79df79d533 100644 --- a/src/world/area_kmr/kmr_11/8DA100.c +++ b/src/world/area_kmr/kmr_11/8DA100.c @@ -3,7 +3,6 @@ #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024023C_8DA33C); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024027C_8DA37C); diff --git a/src/world/area_kmr/kmr_11/8DB020.c b/src/world/area_kmr/kmr_11/8DB020.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_kmr/kmr_11/8DB020.c +++ b/src/world/area_kmr/kmr_11/8DB020.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index b98f8e0c01..7c9eac111c 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -21,7 +21,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240358_8EC178); #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802405BC_8EC3DC); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406BC_8EC4DC); diff --git a/src/world/area_kmr/kmr_20/8ECC40.c b/src/world/area_kmr/kmr_20/8ECC40.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_kmr/kmr_20/8ECC40.c +++ b/src/world/area_kmr/kmr_20/8ECC40.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_kmr/kmr_20/8ECE80.c b/src/world/area_kmr/kmr_20/8ECE80.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_kmr/kmr_20/8ECE80.c +++ b/src/world/area_kmr/kmr_20/8ECE80.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index 5d78734829..652d4c1cf5 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -15,7 +15,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802419BC_8ED7DC); #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241C9C_8EDABC); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241CF0_8EDB10); diff --git a/src/world/area_mac/mac_01/806D10.c b/src/world/area_mac/mac_01/806D10.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_mac/mac_01/806D10.c +++ b/src/world/area_mac/mac_01/806D10.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_mac/mac_02/823970.c b/src/world/area_mac/mac_02/823970.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_mac/mac_02/823970.c +++ b/src/world/area_mac/mac_02/823970.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_mac/mac_03/833500.c b/src/world/area_mac/mac_03/833500.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_mac/mac_03/833500.c +++ b/src/world/area_mac/mac_03/833500.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_mac/mac_04/842DF0.c b/src/world/area_mac/mac_04/842DF0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_mac/mac_04/842DF0.c +++ b/src/world/area_mac/mac_04/842DF0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_mim/mim_11/BB79F0.c b/src/world/area_mim/mim_11/BB79F0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_mim/mim_11/BB79F0.c +++ b/src/world/area_mim/mim_11/BB79F0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_nok/nok_01/9C7D10.c b/src/world/area_nok/nok_01/9C7D10.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_nok/nok_01/9C7D10.c +++ b/src/world/area_nok/nok_01/9C7D10.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_nok/nok_02/9DB380.c b/src/world/area_nok/nok_02/9DB380.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_nok/nok_02/9DB380.c +++ b/src/world/area_nok/nok_02/9DB380.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 2717d97187..2b00571d9a 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -35,7 +35,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241AE0_9F6520); #include "world/common/SomeMatrixOperations.inc.c" - INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241F08_9F6948); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241F30_9F6970); diff --git a/src/world/area_nok/nok_12/9FAB20.c b/src/world/area_nok/nok_12/9FAB20.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_nok/nok_12/9FAB20.c +++ b/src/world/area_nok/nok_12/9FAB20.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_nok/nok_15/A09440.c b/src/world/area_nok/nok_15/A09440.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_nok/nok_15/A09440.c +++ b/src/world/area_nok/nok_15/A09440.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index c60e2f97c7..0e70b5e850 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -18,4 +18,3 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240404_D05B34); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sam/sam_04/D135D0.c b/src/world/area_sam/sam_04/D135D0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sam/sam_04/D135D0.c +++ b/src/world/area_sam/sam_04/D135D0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sam/sam_06/D1FE90.c b/src/world/area_sam/sam_06/D1FE90.c index 1a9859c409..8cce76f1c1 100644 --- a/src/world/area_sam/sam_06/D1FE90.c +++ b/src/world/area_sam/sam_06/D1FE90.c @@ -6,4 +6,3 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D1FE90", func_80240124_D1FFB4); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sam/sam_11/D3A610.c b/src/world/area_sam/sam_11/D3A610.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sam/sam_11/D3A610.c +++ b/src/world/area_sam/sam_11/D3A610.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_16/9375B0.c b/src/world/area_sbk/sbk_16/9375B0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sbk/sbk_16/9375B0.c +++ b/src/world/area_sbk/sbk_16/9375B0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_24/93AC70.c b/src/world/area_sbk/sbk_24/93AC70.c index a67970ef4b..c2a1f18c7c 100644 --- a/src/world/area_sbk/sbk_24/93AC70.c +++ b/src/world/area_sbk/sbk_24/93AC70.c @@ -4,4 +4,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_25/93C2C0.c b/src/world/area_sbk/sbk_25/93C2C0.c index a67970ef4b..c2a1f18c7c 100644 --- a/src/world/area_sbk/sbk_25/93C2C0.c +++ b/src/world/area_sbk/sbk_25/93C2C0.c @@ -4,4 +4,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_26/93DE30.c b/src/world/area_sbk/sbk_26/93DE30.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sbk/sbk_26/93DE30.c +++ b/src/world/area_sbk/sbk_26/93DE30.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 3916286b1e..5a9c0cc701 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -54,4 +54,3 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802415A4_940B54); #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_34/946670.c b/src/world/area_sbk/sbk_34/946670.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sbk/sbk_34/946670.c +++ b/src/world/area_sbk/sbk_34/946670.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_35/9486F0.c b/src/world/area_sbk/sbk_35/9486F0.c index a67970ef4b..c2a1f18c7c 100644 --- a/src/world/area_sbk/sbk_35/9486F0.c +++ b/src/world/area_sbk/sbk_35/9486F0.c @@ -4,4 +4,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_36/949EA0.c b/src/world/area_sbk/sbk_36/949EA0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sbk/sbk_36/949EA0.c +++ b/src/world/area_sbk/sbk_36/949EA0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_46/94EB00.c b/src/world/area_sbk/sbk_46/94EB00.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sbk/sbk_46/94EB00.c +++ b/src/world/area_sbk/sbk_46/94EB00.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_55/952AB0.c b/src/world/area_sbk/sbk_55/952AB0.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sbk/sbk_55/952AB0.c +++ b/src/world/area_sbk/sbk_55/952AB0.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_56/954D80.c b/src/world/area_sbk/sbk_56/954D80.c index 4e9b4ce7c8..2c886f489c 100644 --- a/src/world/area_sbk/sbk_56/954D80.c +++ b/src/world/area_sbk/sbk_56/954D80.c @@ -2,4 +2,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/area_sbk/sbk_66/958CF0.c b/src/world/area_sbk/sbk_66/958CF0.c index a67970ef4b..c2a1f18c7c 100644 --- a/src/world/area_sbk/sbk_66/958CF0.c +++ b/src/world/area_sbk/sbk_66/958CF0.c @@ -4,4 +4,3 @@ #include "world/common/SomeMatrixOperations.inc.c" - diff --git a/src/world/common/Bandit_DropCoin.inc.c b/src/world/common/Bandit_DropCoin.inc.c index 1c32f835cf..ae524d9218 100644 --- a/src/world/common/Bandit_DropCoin.inc.c +++ b/src/world/common/Bandit_DropCoin.inc.c @@ -1,6 +1,6 @@ #include "common.h" -static ApiStatus Bandit_DropCoin(ScriptInstance *script, s32 isInitialCall) { +static ApiStatus Bandit_DropCoin(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; NpcId npcID; Npc* npc; @@ -19,7 +19,7 @@ static ApiStatus Bandit_DropCoin(ScriptInstance *script, s32 isInitialCall) { } else { npc = npcID; } - + script->functionTemp[0] = npc; script->functionTemp[1] = itemEntityIndex; script->functionTemp[2] = areaFlag; diff --git a/src/world/common/SomeMatrixOperations.inc.c b/src/world/common/SomeMatrixOperations.inc.c index 3e0b59cc7a..3a2d381ca4 100644 --- a/src/world/common/SomeMatrixOperations.inc.c +++ b/src/world/common/SomeMatrixOperations.inc.c @@ -32,6 +32,6 @@ static ApiStatus SomeMatrixOperation2(ScriptInstance* script, s32 isInitialCall) guTranslateF(&mtx, 0.0f, -temp_f22, 0.0f); guMtxCatF(&mtx, &model->transformMatrix, &model->transformMatrix); } - + return ApiStatus_DONE2; } diff --git a/src/world/common/SomeXYZFuncTodoRename.inc.c b/src/world/common/SomeXYZFuncTodoRename.inc.c index a9276c6c94..1cf8fb947c 100644 --- a/src/world/common/SomeXYZFuncTodoRename.inc.c +++ b/src/world/common/SomeXYZFuncTodoRename.inc.c @@ -1,6 +1,6 @@ #include "common.h" -static ApiStatus SomeXYZFuncTodoRename(ScriptInstance *script) { +static ApiStatus SomeXYZFuncTodoRename(ScriptInstance* script) { PlayerStatus* playerStatus = PLAYER_STATUS; Bytecode* args = script->ptrReadPos; s32 xVar = *args++;