pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

merged texture pan includes (#675)

Browse Source 
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2022-04-07 03:41:39 -04:00 committed by GitHub
parent 02d678b543
commit 2d26e6dc95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
251 changed files with 551 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/EA0900.c
View File

@ -3,6 +3,5 @@
#define NAMESPACE EA0900
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/EA7010.c
View File

@ -3,6 +3,5 @@
#define NAMESPACE EA7010
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/EA8AE0.c
View File

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

3
src/EB0E60.c
View File

@ -3,6 +3,5 @@
#define NAMESPACE EB0E60
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/EB5130.c
View File

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

3
src/EB7230.c
View File

@ -3,6 +3,5 @@
#define NAMESPACE EB7230
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/EC71B0.c
View File

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

3
src/ED42A0.c
View File

@ -7,6 +7,5 @@ INCLUDE_ASM(s32, "ED42A0", func_80240080_ED42A0);
#include "world/common/GetItemName.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/EE65B0.c
View File

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

4
src/EE70C0.c
View File

File diff suppressed because one or more lines are too long

4
src/EF7A80.c
View File

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

4
src/EFEB00.c
View File

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

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

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

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

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

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

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

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

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

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

@ -60,13 +60,13 @@ EvtScript N(updateTexturePan_802408D0) = {
EVT_IF_EQ(EVT_VAR(6), 1)
EVT_IF_EQ(EVT_VAR(7), 1)
EVT_IF_EQ(EVT_VAR(8), 1)
EVT_CALL(N(UnkTexturePanFunc))
EVT_CALL(N(UpdateTexturePanSmooth))
EVT_RETURN
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_CALL(N(UnkTexturePanFunc2))
EVT_CALL(N(UpdateTexturePanStepped))
EVT_RETURN
EVT_END
};

4
src/world/area_flo/flo_07/flo_07.h
View File

@ -8,8 +8,8 @@
ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall);
ApiStatus N(SpawnSunEffect)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240344_CAC534)(Evt* script, s32 isInitialCall);
extern NpcGroupList N(npcGroupList_80242B0C);

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

@ -182,13 +182,13 @@ EvtScript N(updateTexturePan_80241D14) = SCRIPT({
if (EVT_VAR(6) == 1) {
if (EVT_VAR(7) == 1) {
if (EVT_VAR(8) == 1) {
N(UnkTexturePanFunc)();
N(UpdateTexturePanSmooth)();
return;
}
}
}
}
N(UnkTexturePanFunc2)();
N(UpdateTexturePanStepped)();
});
EvtScript N(80241DB0) = SCRIPT({
@ -825,6 +825,5 @@ ApiStatus N(func_80240080_CB9280)(Evt* script, s32 isInitialCall) {
#include "world/common/GetItemName.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/world/area_flo/flo_10/flo_10.h
View File

@ -7,8 +7,8 @@
#define NAMESPACE flo_10
ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall);
s32 N(func_80240000_CB9200)(void);
ApiStatus N(func_80240040_CB9240)(Evt* script, s32 isInitialCall);

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

@ -31,13 +31,13 @@ EvtScript N(updateTexturePan_80242460) = {
EVT_IF_EQ(EVT_VAR(6), 1)
EVT_IF_EQ(EVT_VAR(7), 1)
EVT_IF_EQ(EVT_VAR(8), 1)
EVT_CALL(N(UnkTexturePanFunc))
EVT_CALL(N(UpdateTexturePanSmooth))
EVT_RETURN
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_CALL(N(UnkTexturePanFunc2))
EVT_CALL(N(UpdateTexturePanStepped))
EVT_RETURN
EVT_END
};
@ -572,9 +572,7 @@ EvtScript N(80243E78) = {
EVT_END
};
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
void fx_sun();

4
src/world/area_flo/flo_14/flo_14.h
View File

@ -8,8 +8,8 @@
ApiStatus N(func_80242360_CCD670)(Evt *script, s32 isInitialCall);
ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024030C_CCB61C)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802403D4_CCB6E4)(Evt* script, s32 isInitialCall);

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

@ -48,13 +48,13 @@ EvtScript N(updateTexturePan_802408C0) = {
EVT_IF_EQ(EVT_VAR(6), 1)
EVT_IF_EQ(EVT_VAR(7), 1)
EVT_IF_EQ(EVT_VAR(8), 1)
EVT_CALL(N(UnkTexturePanFunc))
EVT_CALL(N(UpdateTexturePanSmooth))
EVT_RETURN
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_CALL(N(UnkTexturePanFunc2))
EVT_CALL(N(UpdateTexturePanStepped))
EVT_RETURN
EVT_END
};
@ -1732,9 +1732,7 @@ static s32 N(pad_66B4)[] = {
0x00000000, 0x00000000, 0x00000000,
};
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
// It seems like fx_sun was not properly defined for this file. Having a proper
// declaration makes it not match.

4
src/world/area_flo/flo_18/flo_18.h
View File

@ -7,8 +7,8 @@
#define NAMESPACE flo_18
ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024030C_CDC9AC)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240340_CDC9E0)(Evt* script, s32 isInitialCall);

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

@ -83,13 +83,13 @@ EvtScript N(updateTexturePan_80240B00) = {
EVT_IF_EQ(EVT_VAR(6), 1)
EVT_IF_EQ(EVT_VAR(7), 1)
EVT_IF_EQ(EVT_VAR(8), 1)
EVT_CALL(N(UnkTexturePanFunc))
EVT_CALL(N(UpdateTexturePanSmooth))
EVT_RETURN
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_CALL(N(UnkTexturePanFunc2))
EVT_CALL(N(UpdateTexturePanStepped))
EVT_RETURN
EVT_END
};
@ -691,9 +691,7 @@ EvtScript N(80242FD0) = {
EVT_END
};
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
// It seems like fx_sun was not properly defined for this file. Having a proper
// declaration makes it not match.

4
src/world/area_flo/flo_19/flo_19.h
View File

@ -6,8 +6,8 @@
#define NAMESPACE flo_19
ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(func_8024030C_CE39FC)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240340_CE3A30)(Evt* script, s32 isInitialCall);

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

@ -54,13 +54,13 @@ EvtScript N(80240DA0) = {
EVT_IF_EQ(EVT_VAR(6), 1)
EVT_IF_EQ(EVT_VAR(7), 1)
EVT_IF_EQ(EVT_VAR(8), 1)
EVT_CALL(N(UnkTexturePanFunc))
EVT_CALL(N(UpdateTexturePanSmooth))
EVT_RETURN
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_CALL(N(UnkTexturePanFunc2))
EVT_CALL(N(UpdateTexturePanStepped))
EVT_RETURN
EVT_END
};
@ -1383,9 +1383,7 @@ NpcGroupList N(npcGroupList_80245AEC) = {
{},
};
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
EffectInstance* fx_sun();

4
src/world/area_flo/flo_21/flo_21.h
View File

@ -6,8 +6,8 @@
#define NAMESPACE flo_21
ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(flo_21_StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall);
ApiStatus N(flo_21_StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall);

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

@ -187,13 +187,13 @@ EvtScript N(updateTexturePan_802417A0) = {
EVT_IF_EQ(EVT_VAR(6), 1)
EVT_IF_EQ(EVT_VAR(7), 1)
EVT_IF_EQ(EVT_VAR(8), 1)
EVT_CALL(N(UnkTexturePanFunc))
EVT_CALL(N(UpdateTexturePanSmooth))
EVT_RETURN
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_END_IF
EVT_CALL(N(UnkTexturePanFunc2))
EVT_CALL(N(UpdateTexturePanStepped))
EVT_RETURN
EVT_END
};

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

@ -1,5 +1,4 @@
#include "flo_24.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/world/area_flo/flo_24/flo_24.h
View File

@ -7,8 +7,8 @@
#define NAMESPACE flo_24
ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall);
ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall);
ApiStatus N(func_80240000_CF0940)(Evt* script, s32 isInitialCall);
extern EvtScript N(80241728);

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

@ -14,9 +14,7 @@
#include "world/common/SomeXYZFunc2.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
ApiStatus func_802405EC_E1EA4C(Evt* script, s32 isInitialCall) {
if (isInitialCall) {

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

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

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

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

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

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

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

@ -7,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -7,9 +7,7 @@ static char* N(exit_str_1) = "";
#include "world/common/UnkFunc26.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"

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

@ -9,9 +9,8 @@ extern u8 D_802D9D73;
#include "world/common/UnkFunc26.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#define NAMESPACE hos_05
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802452C4_A2F504);

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

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

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

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

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

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

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

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

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

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

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

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

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

@ -19,9 +19,7 @@ static char* N(exit_str_3) = "";
#include "world/common/SomeXYZFunc2.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC);

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

@ -1,5 +1,4 @@
#include "jan_04.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -1,5 +1,4 @@
#include "jan_05.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -17,6 +17,5 @@ static char* N(exit_str_3) = "jan_11";
#include "world/common/SomeXYZFunc2.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

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

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

@ -1,5 +1,4 @@
#include "kkj_03.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -1,5 +1,4 @@
#include "kkj_13.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

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

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

@ -7,8 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kkj/kkj_15/AE5590", func_8024030C_AE589C);

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

@ -5,8 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2CA0", func_8024030C_AF2FAC);

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

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

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

@ -1,5 +1,4 @@
#include "kmr_30.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

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

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -1,5 +1,4 @@
#include "kpa_12.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -1,5 +1,4 @@
#include "kpa_13.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

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

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

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

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

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

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

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

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

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

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -1,5 +1,4 @@
#include "kpa_60.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

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

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

@ -1,5 +1,4 @@
#include "kpa_62.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

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

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

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

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

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

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

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

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

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

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

@ -5,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -4,6 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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

@ -4,8 +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/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240718_C71B98);

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

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

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

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

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

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

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

@ -1,5 +1,4 @@
#include "kzn_18.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/world/area_kzn/kzn_19/C8DBB0.c
View File

@ -1,8 +1,6 @@
#include "kzn_19.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/StarSpiritEffectFunc.inc.c"

3
src/world/area_kzn/kzn_20/C95F30.c
View File

@ -3,6 +3,5 @@
static char* N(exit_str_0) = "kzn_19";
static char* N(exit_str_1) = "kzn_22";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/world/area_kzn/kzn_22/C9A200.c
View File

@ -3,8 +3,6 @@
static char* N(exit_str_0) = "kzn_20";
static char* N(exit_str_1) = "kzn_23";
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/GetFloorCollider.inc.c"

3
src/world/area_kzn/kzn_23/C9C300.c
View File

@ -1,5 +1,4 @@
#include "kzn_23.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/world/area_mac/mac_00/7EAD10.c
View File

@ -19,9 +19,7 @@ static char* N(exit_str_5) = "\0\0\0\0";
#include "world/common/SomeXYZFunc2.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
ApiStatus func_802405EC_7EB2FC(Evt* script, s32 isInitialCall) {
f32 x;

3
src/world/area_mac/mac_02/8232C0.c
View File

@ -19,6 +19,5 @@ static char* N(exit_str_5) = "tik_15";
#include "world/common/SomeXYZFunc2.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

4
src/world/area_mac/mac_05/852170.c
View File

@ -5,9 +5,7 @@ static char* N(exit_str_1) = "kgr_01";
#define UNK_ALPHA_FUNC_NPC 6
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C);

4
src/world/area_mac/mac_06/864B40.c
View File

@ -1,8 +1,6 @@
#include "mac_06.h"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_8024030C_864E4C);

4
src/world/area_mim/mim_11/BB7070.c
View File

@ -19,9 +19,7 @@ static char* N(exit_str_5) = "";
#include "world/common/SomeXYZFunc2.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802405EC_BB765C);

3
src/world/area_omo/omo_03/DA5260.c
View File

@ -18,6 +18,5 @@
#include "common/IsAOrBPressed.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_omo/omo_06/DB7910.c
View File

@ -25,6 +25,5 @@ static char* N(exit_str_7) = "";
#include "common/IsAOrBPressed.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_omo/omo_08/DC43D0.c
View File

@ -23,6 +23,5 @@ static char* N(exit_str_5) = "omo_16";
#include "common/IsAOrBPressed.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

3
src/world/area_omo/omo_10/DD79B0.c
View File

@ -25,6 +25,5 @@ static char* N(exit_str_7) = "";
#include "common/IsAOrBPressed.inc.c"
#include "world/common/UnkTexturePanFunc.inc.c"
#include "world/common/UpdateTexturePan.inc.c"
#include "world/common/UnkTexturePanFunc2.inc.c"

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