pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Santas-workshop -- toad houses and push blocks (#681)

Browse Source 
* toad house

* push blocks

* requested cleanup

* clean

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
HailSanta 2022-04-10 04:37:13 -04:00 committed by GitHub
parent 42355f53c2
commit 5f47e1291f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
195 changed files with 660 additions and 1155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/common_structs.h
View File

@ -1539,13 +1539,14 @@ typedef struct PartnerAnimations {
/* 0x00 */ s32 anims[9];
} PartnerAnimations; // size = 0x24
typedef void (*PushBlockFallCallback)(s32 gridSystemID, s32 index);
typedef struct PushBlockGrid {
/* 0x00 */ s8* cells;
/* 0x00 */ u8* cells;
/* 0x04 */ u8 numCellsX;
/* 0x05 */ u8 numCellsZ;
/* 0x06 */ char unk_06[2];
/* 0x08 */ s32 centerPos[3];
/* 0x14 */ UNK_FUN_PTR(dropCallback);
/* 0x14 */ PushBlockFallCallback(dropCallback);
/* 0x18 */ char unk_18[4];
} PushBlockGrid; // size = 0x1C

7
include/enums.h
View File

@ -1694,6 +1694,13 @@ enum EntityCollisionFlags {
ENTITY_COLLISION_PLAYER_LAST_FLOOR = 0x00000100
};
typedef enum PushGridOccupant {
PUSH_GRID_EMPTY = 0,
PUSH_GRID_BLOCK = 1,
PUSH_GRID_OBSTRUCTION = 2,
PUSH_GRID_OUT_OF_BOUNDS = 3
} PushGridOccupant;
enum TriggerFlags {
TRIGGER_ACTIVE = 0x00000001,
TRIGGER_ACTIVATED = 0x00000002,

3
include/script_api/macros.h
View File

@ -103,7 +103,8 @@
/// An entity index. Entities are assigned indices in the order they are created with EVT_CALL(MakeEntity, ...).
/// Supported in EVT_BIND_TRIGGER and EVT_BIND_PADLOCK only.
#define EVT_ENTITY_INDEX(entityIndex) (((((entityIndex)) + 0x4000)))
#define EVT_ENTITY_ID_BIT 0x4000
#define EVT_ENTITY_INDEX(entityIndex) (((((entityIndex)) + EVT_ENTITY_ID_BIT)))
/****** INSTRUCTIONS **************************************************************************************************/

2
src/EA0900.c
View File

@ -3,5 +3,5 @@
#define NAMESPACE EA0900
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/EA7010.c
View File

@ -3,5 +3,5 @@
#define NAMESPACE EA7010
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/EA8AE0.c
View File

@ -9,7 +9,7 @@
extern s32 D_80248388[];
extern s32 D_80248380;
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/StarSpiritEffectFunc.inc.c"

2
src/EB0E60.c
View File

@ -3,5 +3,5 @@
#define NAMESPACE EB0E60
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/EB5130.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE EB5130
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
ApiStatus func_8024030C_EB543C(Evt* script, s32 isInitialCall) {
evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall);

2
src/EB7230.c
View File

@ -3,5 +3,5 @@
#define NAMESPACE EB7230
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/EC71B0.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE EC71B0
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/SpawnSunEffect.inc.c"

2
src/ED42A0.c
View File

@ -7,5 +7,5 @@
#include "world/common/GetItemName.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/EE65B0.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE EE65B0
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) {
dead_fx_sun(0, 0, 0, 0, 0, 0);

2
src/EF7A80.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE EF7A80
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/DeadUnkFunc1.inc.c"

2
src/EFEB00.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE EFEB00
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/DeadUnkFunc1.inc.c"

2
src/battle/area_tik/5EDDF0.c
View File

@ -4,5 +4,5 @@
INCLUDE_ASM(s32, "battle/area_tik/5EDDF0", func_80219960_5EDDF0);
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/battle/area_tik2/60A470.c
View File

@ -4,5 +4,5 @@
INCLUDE_ASM(s32, "battle/area_tik2/60A470", func_802199C0_60A470);
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/battle/area_tik3/6197E0.c
View File

@ -4,5 +4,5 @@
INCLUDE_ASM(s32, "battle/area_tik3/6197E0", func_802190F0_6197E0);
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

4
src/battle/area_trd_part_2/actor/fake_bowser.c
View File

@ -31,9 +31,7 @@ BSS s32 D_80235FC0[31];
#include "common/StartRumbleWithParams.inc.c"
#include "world/common/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"
#include "world/common/atomic/UnkFunc27.inc.c"
s32 N(defenseTable_8021A670)[] = {
ELEMENT_NORMAL, 1,

3
src/world/area_dro/dro_01/95B200.c
View File

@ -2,6 +2,5 @@
#include "world/common/atomic/Pipe.inc.c"
#include "world/common/UnkFunc27.inc.c"
#include "world/common/atomic/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"

3
src/world/area_dro/dro_02/9691C0.c
View File

@ -1,5 +1,4 @@
#include "dro_02.h"
#include "world/common/UnkFunc27.inc.c"
#include "world/common/atomic/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"

42
src/world/area_dro/dro_02/9694C0.c
View File

@ -1946,7 +1946,7 @@ EvtScript N(8024AC8C) = {
};
EvtScript N(interact_8024ADE4) = {
EVT_CALL(N(UnkFunc35), 0, 0, 0)
EVT_CALL(N(ToadHouse_InitScreenOverlay), 0, 0, 0)
EVT_EXEC_WAIT(N(8024D434))
EVT_IF_EQ(EVT_VAR(0), 0)
EVT_RETURN
@ -1954,7 +1954,7 @@ EvtScript N(interact_8024ADE4) = {
EVT_SET(EVT_VAR(9), EVT_VAR(1))
EVT_SET(EVT_VAR(10), EVT_VAR(2))
EVT_SET(EVT_VAR(11), EVT_VAR(3))
EVT_CALL(N(DoesPlayerNeedSleep))
EVT_CALL(N(ToadHouse_DoesPlayerNeedSleep))
EVT_IF_EQ(EVT_VAR(1), 0)
EVT_SET(EVT_VAR(8), EVT_VAR(0))
EVT_END_IF
@ -1968,19 +1968,19 @@ EvtScript N(interact_8024ADE4) = {
EVT_CALL(ContinueSpeech, -1, NPC_ANIM_toad_Palette_00_Anim_4, NPC_ANIM_toad_Palette_00_Anim_1, 0, EVT_VAR(10))
EVT_CALL(SetPlayerJumpscale, 1)
EVT_CALL(DisablePlayerPhysics, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), TRUE)
EVT_CALL(N(Call800E9894))
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE)
EVT_CALL(N(ToadHouse_DisableStatusMenu))
EVT_IF_NE(EVT_VAR(4), 0)
EVT_EXEC(N(8024AC8C))
EVT_END_IF
EVT_CALL(N(GetPartnerCall800EB168), EVT_VAR(10))
EVT_CALL(N(ToadHouse_PutPartnerAway), EVT_VAR(10))
EVT_WAIT_FRAMES(20)
EVT_EXEC_WAIT(N(8024D494))
EVT_THREAD
EVT_CALL(MakeLerp, 0, 255, 60, 0)
EVT_LABEL(0)
EVT_CALL(UpdateLerp)
EVT_CALL(N(UnkFunc32), 3, EVT_VAR(0))
EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 3, EVT_VAR(0))
EVT_WAIT_FRAMES(1)
EVT_IF_EQ(EVT_VAR(1), 1)
EVT_GOTO(0)
@ -1990,12 +1990,12 @@ EvtScript N(interact_8024ADE4) = {
EVT_IF_NE(EVT_VAR(4), 0)
EVT_EXEC(N(8024AC14))
EVT_END_IF
EVT_CALL(N(Call800EB168), EVT_VAR(10))
EVT_CALL(N(ToadHouse_GetPartnerBackOut), EVT_VAR(10))
EVT_WAIT_FRAMES(45)
EVT_CALL(MakeLerp, 255, 0, 30, 0)
EVT_LABEL(1)
EVT_CALL(UpdateLerp)
EVT_CALL(N(UnkFunc32), 0, EVT_VAR(0))
EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 0, EVT_VAR(0))
EVT_WAIT_FRAMES(1)
EVT_IF_EQ(EVT_VAR(1), 1)
EVT_GOTO(1)
@ -2006,7 +2006,7 @@ EvtScript N(interact_8024ADE4) = {
EVT_CALL(DisablePlayerPhysics, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100)), FALSE)
EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_toad_Palette_00_Anim_4, NPC_ANIM_toad_Palette_00_Anim_1, 0, EVT_VAR(11))
EVT_CALL(N(Call800E98C4SyncStatusMenu))
EVT_CALL(N(ToadHouse_ShowStatusMenu))
EVT_RETURN
EVT_END
};
@ -2646,7 +2646,7 @@ EvtScript N(8024D494) = {
EVT_CALL(PlayerMoveTo, -179, -198, 0)
EVT_THREAD
EVT_WAIT_FRAMES(15)
EVT_CALL(N(CamSetFOV), 0, 40)
EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40)
EVT_CALL(SetCamType, 0, 4, 0)
EVT_CALL(SetCamPitch, 0, 95, -61)
EVT_CALL(SetCamDistance, 0, 108)
@ -2669,7 +2669,7 @@ EvtScript N(8024D494) = {
EVT_WAIT_FRAMES(20)
EVT_THREAD
EVT_WAIT_FRAMES(81)
EVT_CALL(N(CamSetFOV), 0, 25)
EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25)
EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
EVT_CALL(UseSettingsFrom, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2))
EVT_WAIT_FRAMES(1)
@ -3468,25 +3468,7 @@ ApiStatus N(func_802433E8_96C5A8)(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
#include "world/common/UnkFunc32.inc.c"
#include "world/common/CamSetFOV.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"
#include "world/common/DoesPlayerNeedSleep.inc.c"
#include "world/common/UnkFunc35.inc.c"
#include "world/common/GetPartnerCall800EB168.inc.c"
#include "world/common/UnkFunc36.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"
#include "world/common/SetManyVars.inc.c"

16
src/world/area_dro/dro_02/dro_02.h
View File

@ -6,13 +6,13 @@
#define NAMESPACE dro_02
ApiStatus N(Call800E9894)(Evt* script, s32 isInitialCall);
ApiStatus N(Call800E98C4SyncStatusMenu)(Evt* script, s32 isInitialCall);
ApiStatus N(Call800EB168)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_DisableStatusMenu)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_ShowStatusMenu)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_GetPartnerBackOut)(Evt* script, s32 isInitialCall);
ApiStatus N(GetCamVfov)(Evt* script, s32 isInitialCall);
ApiStatus N(GetGameStatus75)(Evt* script, s32 isInitialCall);
ApiStatus N(GetNpcUnsafeOwner2)(Evt* script, s32 isInitialCall);
ApiStatus N(GetPartnerCall800EB168)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_PutPartnerAway)(Evt* script, s32 isInitialCall);
ApiStatus N(Set80151310_0)(Evt* script, s32 isInitialCall);
ApiStatus N(Set80151310_1)(Evt* script, s32 isInitialCall);
ApiStatus N(SetCamVfov)(Evt* script, s32 isInitialCall);
@ -49,10 +49,10 @@ ApiStatus N(func_802432C0_96C480)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80243314_96C4D4)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024334C_96C50C)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802433E8_96C5A8)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFunc32)(Evt* script, s32 isInitialCall);
ApiStatus N(CamSetFOV)(Evt* script, s32 isInitialCall);
ApiStatus N(DoesPlayerNeedSleep)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFunc35)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_UpdateScreenOverlay)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_CamSetFOV)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_DoesPlayerNeedSleep)(Evt* script, s32 isInitialCall);
ApiStatus N(ToadHouse_InitScreenOverlay)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802439FC_96CBBC)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80243A40_96CC00)(Evt* script, s32 isInitialCall);
void N(func_8024240C_96B5CC)(Evt *script, s32 isInitialCall);

3
src/world/area_end/end_01/E08050.c
View File

@ -1,5 +1,4 @@
#include "end_01.h"
#include "world/common/UnkFunc27.inc.c"
#include "world/common/atomic/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"

2
src/world/area_flo/flo_07/CAC1F0.c
View File

@ -1,7 +1,7 @@
#include "flo_07.h"
#include "effects.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/SpawnSunEffect.inc.c"

2
src/world/area_flo/flo_10/CB9280.c
View File

@ -809,5 +809,5 @@ static s32 N(pad_4084)[] = {
#include "world/common/GetItemName.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_flo/flo_14/CCB310.c
View File

@ -572,7 +572,7 @@ EvtScript N(80243E78) = {
EVT_END
};
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
void fx_sun();

2
src/world/area_flo/flo_18/CDC6A0.c
View File

@ -1732,7 +1732,7 @@ static s32 N(pad_66B4)[] = {
0x00000000, 0x00000000, 0x00000000,
};
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
// It seems like fx_sun was not properly defined for this file. Having a proper
// declaration makes it not match.

2
src/world/area_flo/flo_19/CE36F0.c
View File

@ -691,7 +691,7 @@ EvtScript N(80242FD0) = {
EVT_END
};
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
// It seems like fx_sun was not properly defined for this file. Having a proper
// declaration makes it not match.

2
src/world/area_flo/flo_21/CE6700.c
View File

@ -1383,7 +1383,7 @@ NpcGroupList N(npcGroupList_80245AEC) = {
{},
};
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
EffectInstance* fx_sun();

4
src/world/area_flo/flo_22/CEC280.c
View File

@ -1,3 +1,5 @@
#include "flo_22.h"
#include "world/common/UnkFunc36.inc.c"
ApiStatus N(80240040_CEC280)(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}

2
src/world/area_flo/flo_24/CF0BC0.c
View File

@ -1,4 +1,4 @@
#include "flo_24.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_gv/gv_01/E1E460.c
View File

@ -4,7 +4,7 @@
#include "world/common/atomic/Pipe.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
ApiStatus func_802405EC_E1EA4C(Evt* script, s32 isInitialCall) {
if (isInitialCall) {

2
src/world/area_hos/hos_01/A11020.c
View File

@ -3,7 +3,7 @@
extern u8 D_80241C2F_A124AF;
extern u8 D_80241C33_A124B3;
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240AAC_A1132C);

2
src/world/area_hos/hos_02/A16220.c
View File

@ -3,7 +3,7 @@
static char* N(exit_str_0) = "hos_01";
static char* N(exit_str_1) = "hos_03";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_8024030C_A1652C);

2
src/world/area_hos/hos_03/A1B130.c
View File

@ -1,6 +1,6 @@
#include "hos_03.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024033C_A1B43C);

20
src/world/area_hos/hos_03/A1BDB0.c
View File

@ -24,25 +24,7 @@
#include "world/common/UnkNpcAIMainFunc9.inc.c"
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
#include "world/common/UnkFunc32.inc.c"
#include "world/common/CamSetFOV.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"
#include "world/common/DoesPlayerNeedSleep.inc.c"
#include "world/common/UnkFunc35.inc.c"
#include "world/common/GetPartnerCall800EB168.inc.c"
#include "world/common/UnkFunc36.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"
#include "world/common/StashVars.inc.c"

2
src/world/area_hos/hos_04/A26ED0.c
View File

@ -7,5 +7,5 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240000_A26ED0);
INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024);
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

17
src/world/area_hos/hos_05/A2A240.c
View File

@ -3,13 +3,20 @@
static char* N(exit_str_0) = "hos_04";
static char* N(exit_str_1) = "";
#include "world/common/UnkFunc27.inc.c"
#include "world/common/atomic/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
ApiStatus N(AwaitScriptComplete)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 waitingScriptID = evt_get_variable(script, *args++);
if (!does_script_exist(waitingScriptID)) {
return ApiStatus_DONE2;
} else {
return ApiStatus_BLOCK;
}
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240634_A2A874);

6
src/world/area_hos/hos_05/A2EF00.c
View File

@ -5,11 +5,9 @@ extern u8 D_8024DCD3_A37F13;
extern u8 D_802D9D73;
#define NAMESPACE dup_hos_05
#include "world/common/UnkFunc27.inc.c"
#include "world/common/atomic/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
#define NAMESPACE hos_05

2
src/world/area_hos/hos_06/A394E0.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "hos_00";
static char* N(exit_str_1) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_hos/hos_10/A3F760.c
View File

@ -1,6 +1,6 @@
#include "hos_10.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_8024032C_A3FA6C);

2
src/world/area_hos/hos_10/A3FBA0.c
View File

@ -1,6 +1,6 @@
#include "hos_10.h"
#define NAMESPACE dup_hos_10
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
#define NAMESPACE hos_10

2
src/world/area_hos/hos_20/A45930.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "hos_00";
static char* N(exit_str_2) = "osr_03";
static char* N(exit_str_3) = "hos_05";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

4
src/world/area_isk/isk_16/9959F0.c
View File

@ -1,5 +1,3 @@
#include "isk_16.h"
#include "world/common/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"
#include "world/common/atomic/UnkFunc27.inc.c"

2
src/world/area_jan/jan_00/B20540.c
View File

@ -1,7 +1,7 @@
#include "jan_00.h"
#include "effects.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C);

2
src/world/area_jan/jan_01/B28030.c
View File

@ -3,7 +3,7 @@
static char* N(exit_str_0) = "jan_00";
static char* N(exit_str_1) = "jan_02";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_8024030C_B2833C);

2
src/world/area_jan/jan_02/B2C4A0.c
View File

@ -1,6 +1,6 @@
#include "jan_02.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_8024033C_B2C7AC);

22
src/world/area_jan/jan_03/B34BD0.c
View File

@ -9,7 +9,7 @@ static char* N(exit_str_3) = "";
#include "world/common/atomic/Pipe.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC);
@ -39,25 +39,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC);
static char* N(exit_str_4) = "tik_08";
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
#include "world/common/UnkFunc32.inc.c"
#include "world/common/CamSetFOV.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"
#include "world/common/DoesPlayerNeedSleep.inc.c"
#include "world/common/UnkFunc35.inc.c"
#include "world/common/GetPartnerCall800EB168.inc.c"
#include "world/common/UnkFunc36.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"

2
src/world/area_jan/jan_04/B447B0.c
View File

@ -1,4 +1,4 @@
#include "jan_04.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_jan/jan_05/B4AAB0.c
View File

@ -1,4 +1,4 @@
#include "jan_05.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_jan/jan_06/B52830.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "jan_07";
static char* N(exit_str_2) = "jan_12";
static char* N(exit_str_3) = "jan_09";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_jan/jan_08/B5E2B0.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "jan_05";
static char* N(exit_str_2) = "jan_09";
static char* N(exit_str_3) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_jan/jan_09/B65AB0.c
View File

@ -7,5 +7,5 @@ static char* N(exit_str_3) = "jan_11";
#include "world/common/atomic/Pipe.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_jan/jan_10/B6C390.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "jan_09";
static char* N(exit_str_1) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_jan/jan_11/B70860.c
View File

@ -3,7 +3,7 @@
static char* N(exit_str_0) = "jan_09";
static char* N(exit_str_1) = "";
#include "world/common/DarkRoom.inc.c"
#include "world/common/atomic/DarkRoom.inc.c"
#include "world/common/atomic/Pipe.inc.c"

4
src/world/area_jan/jan_16/B80000.c
View File

@ -5,6 +5,4 @@ static char* N(exit_str_1) = "jan_22";
static char* N(exit_str_2) = "jan_17";
static char* N(exit_str_3) = "";
#include "world/common/UnkFunc27.inc.c"
#include "world/common/UnkFunc26.inc.c"
#include "world/common/atomic/UnkFunc27.inc.c"

2
src/world/area_kgr/kgr_01/8A9A10.c
View File

@ -3,4 +3,4 @@
static char* N(exit_str_0) = "kgr_02";
static char* N(exit_str_1) = "mac_05";
#include "world/common/DarkRoom.inc.c"
#include "world/common/atomic/DarkRoom.inc.c"

2
src/world/area_kgr/kgr_02/8AA450.c
View File

@ -3,4 +3,4 @@
static char* N(exit_str_0) = "kgr_01";
static char* N(exit_str_1) = "mac_05";
#include "world/common/DarkRoom.inc.c"
#include "world/common/atomic/DarkRoom.inc.c"

2
src/world/area_kkj/kkj_03/AC9730.c
View File

@ -1,4 +1,4 @@
#include "kkj_03.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kkj/kkj_13/AD5EF0.c
View File

@ -1,4 +1,4 @@
#include "kkj_13.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kkj/kkj_14/ADAEF0.c
View File

@ -1,6 +1,6 @@
#include "kkj_14.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kkj/kkj_14/ADAEF0", func_8024035C_ADB1FC);

2
src/world/area_kkj/kkj_15/AE5590.c
View File

@ -7,6 +7,6 @@ static char* N(exit_str_3) = "kkj_11";
static char* N(exit_str_4) = "kkj_11\0";
static char* N(exit_str_5) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kkj/kkj_15/AE5590", func_8024030C_AE589C);

2
src/world/area_kkj/kkj_18/AF2CA0.c
View File

@ -5,6 +5,6 @@ static char* N(exit_str_1) = "kkj_19";
static char* N(exit_str_2) = "kkj_11";
static char* N(exit_str_3) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2CA0", func_8024030C_AF2FAC);

20
src/world/area_kkj/kkj_20/AFDE00.c
View File

@ -1,23 +1,5 @@
#include "kkj_20.h"
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
#include "world/common/UnkFunc32.inc.c"
#include "world/common/CamSetFOV.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"
#include "world/common/DoesPlayerNeedSleep.inc.c"
#include "world/common/UnkFunc35.inc.c"
#include "world/common/GetPartnerCall800EB168.inc.c"
#include "world/common/UnkFunc36.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"
INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405BC_AFE0FC);

2
src/world/area_kkj/kkj_27/B13D70.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kkj_14";
static char* N(exit_str_1) = "kkj_15";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

20
src/world/area_kmr/kmr_02/8B30E0.c
View File

@ -1,21 +1,3 @@
#include "kmr_02.h"
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
#include "world/common/UnkFunc32.inc.c"
#include "world/common/CamSetFOV.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"
#include "world/common/DoesPlayerNeedSleep.inc.c"
#include "world/common/UnkFunc35.inc.c"
#include "world/common/GetPartnerCall800EB168.inc.c"
#include "world/common/UnkFunc36.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"

20
src/world/area_kmr/kmr_20/8ED0C0.c
View File

@ -1,24 +1,6 @@
#include "kmr_20.h"
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
#include "world/common/UnkFunc32.inc.c"
#include "world/common/CamSetFOV.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"
#include "world/common/DoesPlayerNeedSleep.inc.c"
#include "world/common/UnkFunc35.inc.c"
#include "world/common/GetPartnerCall800EB168.inc.c"
#include "world/common/UnkFunc36.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_8024159C_8ED3BC);

2
src/world/area_kmr/kmr_30/90B6D0.c
View File

@ -1,4 +1,4 @@
#include "kmr_30.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_01/A46F60.c
View File

@ -3,4 +3,4 @@
static char* N(exit_str_0) = "kpa_14";
static char* N(exit_str_1) = "kpa_03";
#include "world/common/DarkRoom.inc.c"
#include "world/common/atomic/DarkRoom.inc.c"

2
src/world/area_kpa/kpa_03/A485C0.c
View File

@ -3,4 +3,4 @@
static char* N(exit_str_0) = "kpa_01";
static char* N(exit_str_1) = "kpa_04";
#include "world/common/DarkRoom.inc.c"
#include "world/common/atomic/DarkRoom.inc.c"

2
src/world/area_kpa/kpa_10/A51980.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kpa_12";
static char* N(exit_str_2) = "kpa_17";
static char* N(exit_str_3) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_102/A93740.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kpa_41";
static char* N(exit_str_1) = "kpa_53";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_11/A528C0.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kpa_12";
static char* N(exit_str_2) = "kpa_17";
static char* N(exit_str_3) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_12/A54990.c
View File

@ -1,4 +1,4 @@
#include "kpa_12.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_13/A55F60.c
View File

@ -1,4 +1,4 @@
#include "kpa_13.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_133/AA7480.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kpa_51";
static char* N(exit_str_1) = "kpa_134";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_134/AA8FA0.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kpa_133";
static char* N(exit_str_1) = "kpa_130";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_14/A574F0.c
View File

@ -1,5 +1,5 @@
#include "kpa_14.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_8024034C_A577FC);

2
src/world/area_kpa/kpa_15/A59390.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kpa_13";
static char* N(exit_str_1) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_16/A5A030.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kpa_14";
static char* N(exit_str_1) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_32/A5E0C0.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kpa_90";
static char* N(exit_str_2) = "kpa_51";
static char* N(exit_str_3) = "kpa_96";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_33/A5F080.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kpa_61";
static char* N(exit_str_2) = "kpa_52";
static char* N(exit_str_3) = "kpa_09";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_60/A6CBE0.c
View File

@ -1,4 +1,4 @@
#include "kpa_60.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_61/A6E3E0.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kpa_82";
static char* N(exit_str_1) = "kpa_33";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_62/A72300.c
View File

@ -1,4 +1,4 @@
#include "kpa_62.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kpa/kpa_70/A74870.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kpa_62";
static char* N(exit_str_1) = "kpa_50";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

20
src/world/area_kpa/kpa_91/A86A50.c
View File

@ -37,22 +37,4 @@ static char* N(exit_str_1) = "";
#include "world/common/UnkNpcAIMainFunc8.inc.c"
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
#include "world/common/UnkFunc32.inc.c"
#include "world/common/CamSetFOV.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"
#include "world/common/DoesPlayerNeedSleep.inc.c"
#include "world/common/UnkFunc35.inc.c"
#include "world/common/GetPartnerCall800EB168.inc.c"
#include "world/common/UnkFunc36.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"

20
src/world/area_kpa/kpa_95/A8CB60.c
View File

@ -34,22 +34,4 @@
#include "world/common/UnkNpcAIMainFunc8.inc.c"
#include "world/common/Call800E9894.inc.c"
#include "world/common/Call800E98C4SyncStatusMenu.inc.c"
#include "world/common/UnkFunc32.inc.c"
#include "world/common/CamSetFOV.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"
#include "world/common/DoesPlayerNeedSleep.inc.c"
#include "world/common/UnkFunc35.inc.c"
#include "world/common/GetPartnerCall800EB168.inc.c"
#include "world/common/UnkFunc36.inc.c"
#include "world/common/atomic/ToadHouse.inc.c"

2
src/world/area_kzn/kzn_01/C599D0.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "jan_22";
static char* N(exit_str_1) = "kzn_02";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_02/C5A740.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kzn_01";
static char* N(exit_str_1) = "kzn_03";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_03/C60D10.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kzn_04";
static char* N(exit_str_2) = "kzn_09";
static char* N(exit_str_3) = "kzn_05";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_04/C68130.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kzn_03";
static char* N(exit_str_1) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_05/C6C0D0.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kzn_06";
static char* N(exit_str_1) = "kzn_03";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_06/C6C920.c
View File

@ -5,5 +5,5 @@ static char* N(exit_str_1) = "kzn_08";
static char* N(exit_str_2) = "kzn_07";
static char* N(exit_str_3) = "";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_07/C6E330.c
View File

@ -4,5 +4,5 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240000_C6E330);
INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240348_C6E678);
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_08/C71480.c
View File

@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240000_C71480);
INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240348_C717C8);
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240718_C71B98);

2
src/world/area_kzn/kzn_10/C7E180.c
View File

@ -3,6 +3,6 @@
static char* N(exit_str_0) = "kzn_09";
static char* N(exit_str_1) = "kzn_11";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E180", func_8024030C_C7E48C);

2
src/world/area_kzn/kzn_11/C801A0.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kzn_10";
static char* N(exit_str_1) = "kzn_17";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_17/C85AB0.c
View File

@ -3,5 +3,5 @@
static char* N(exit_str_0) = "kzn_11";
static char* N(exit_str_1) = "kzn_18";
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/world/area_kzn/kzn_18/C8C0E0.c
View File

@ -1,4 +1,4 @@
#include "kzn_18.h"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

Some files were not shown because too many files have changed in this diff Show More