pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

removing extra lines / formatting

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-21 21:43:08 -04:00
parent 5c049a9f22
commit 69a29dc8fc
77 changed files with 14 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/common_structs.h
View File

@ -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;

1
src/world/area_flo/flo_07/CAC5D0.c
View File

@ -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);

1
src/world/area_flo/flo_08/CAFAC0.c
View File

@ -26,4 +26,3 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241BCC_CB090C);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_flo/flo_09/CB50E0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_flo/flo_10/CBA430.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_flo/flo_12/CC0E70.c
View File

@ -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"

1
src/world/area_flo/flo_18/CDCC30.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_flo/flo_22/CEC290.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_flo/flo_24/CF0980.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_flo/flo_25/CF4BC0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_hos/hos_03/A1BB70.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_iwa/iwa_10/91FB20.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_00/B21EA0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_01/B291C0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_02/B2EB50.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_03/B37C20.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_04/B44F10.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_04/B451F0.c
View File

@ -10,4 +10,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D0C_B4547C);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_05/B4AF10.c
View File

@ -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);

1
src/world/area_jan/jan_05/B4B260.c
View File

@ -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);

1
src/world/area_jan/jan_06/B52D30.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_06/B52F70.c
View File

@ -40,4 +40,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802420EC_B5491C);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_07/B5A610.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_07/B5A850.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_08/B5E5C0.c
View File

@ -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);

1
src/world/area_jan/jan_08/B604A0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_09/B660A0.c
View File

@ -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);

1
src/world/area_jan/jan_09/B67190.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_10/B6D610.c
View File

@ -3,5 +3,4 @@
#include "world/common/SomeMatrixOperations.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_802414BC_B6D84C);

1
src/world/area_jan/jan_10/B6D890.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_12/B730B0.c
View File

@ -10,4 +10,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_802401CC_B7327C);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_13/B767B0.c
View File

@ -10,4 +10,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_13/B767B0", func_802402B8_B76A68);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_14/B7A050.c
View File

@ -10,4 +10,3 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_802401CC_B7A21C);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_15/B7D9E0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_16/B80300.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_jan/jan_22/B851A0.c
View File

@ -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);

1
src/world/area_jan/jan_22/B858A0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_kmr/kmr_02/8B37D0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_kmr/kmr_03/8C83A0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_kmr/kmr_04/8CA960.c
View File

@ -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);

1
src/world/area_kmr/kmr_05/8CF570.c
View File

@ -3,5 +3,4 @@
#include "world/common/SomeMatrixOperations.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_8024173C_8CF7AC);

1
src/world/area_kmr/kmr_10/8D88A0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_kmr/kmr_11/8DA100.c
View File

@ -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);

1
src/world/area_kmr/kmr_11/8DB020.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_kmr/kmr_20/8EBE50.c
View File

@ -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);

1
src/world/area_kmr/kmr_20/8ECC40.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_kmr/kmr_20/8ECE80.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_kmr/kmr_20/8ED5A0.c
View File

@ -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);

1
src/world/area_mac/mac_01/806D10.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_mac/mac_02/823970.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_mac/mac_03/833500.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_mac/mac_04/842DF0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_mim/mim_11/BB79F0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_nok/nok_01/9C7D10.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_nok/nok_02/9DB380.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_nok/nok_11/9F4A40.c
View File

@ -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);

1
src/world/area_nok/nok_12/9FAB20.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_nok/nok_15/A09440.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sam/sam_02/D05730.c
View File

@ -18,4 +18,3 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240404_D05B34);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sam/sam_04/D135D0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sam/sam_06/D1FE90.c
View File

@ -6,4 +6,3 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D1FE90", func_80240124_D1FFB4);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sam/sam_11/D3A610.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_16/9375B0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_24/93AC70.c
View File

@ -4,4 +4,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_25/93C2C0.c
View File

@ -4,4 +4,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_26/93DE30.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_30/93F5B0.c
View File

@ -54,4 +54,3 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802415A4_940B54);
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_34/946670.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_35/9486F0.c
View File

@ -4,4 +4,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_36/949EA0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_46/94EB00.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_55/952AB0.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_56/954D80.c
View File

@ -2,4 +2,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

1
src/world/area_sbk/sbk_66/958CF0.c
View File

@ -4,4 +4,3 @@
#include "world/common/SomeMatrixOperations.inc.c"

4
src/world/common/Bandit_DropCoin.inc.c
View File

@ -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;

2
src/world/common/SomeMatrixOperations.inc.c
View File

@ -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;
}

2
src/world/common/SomeXYZFuncTodoRename.inc.c
View File

@ -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++;