pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-18 23:42:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

sbk done (#815)

Browse Source 
* sbk_02

* tex panner enum everywhere

* sbk_02 done

* choice cleanup

* todo imports

* ai reorg

* more reorg

* all sbk done

* all sbk

* reduce warnings

* really fix one

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2022-10-11 17:19:39 -04:00 committed by GitHub
parent f394da14cb
commit 37e138402f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
781 changed files with 1988 additions and 2630 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/enums.h
View File

@ -1933,7 +1933,8 @@ enum ItemIDs {
enum GotItemType {
ITEM_TYPE_CONSUMABLE = 0,
ITEM_TYPE_KEY = 1,
ITEM_TYPE_BADGE = 2
ITEM_TYPE_BADGE = 2,
ITEM_TYPE_STAR_PIECE = 3,
};
enum ItemPickupFlags {

16
src/EA0C10.c
View File

@ -12,7 +12,7 @@ extern s32 EA0C10_D_802466D0[];
void func_8004D8E0(DeadEnemy*);
#include "world/common/enemy/WanderMeleeAI.inc.c"
#include "world/common/enemy/ai/WanderMeleeAI.inc.c"
#include "world/common/enemy/wip/PiranhaPlantAI_00.inc.c"
#include "world/common/enemy/wip/PiranhaPlantAI_01.inc.c"
#include "world/common/enemy/wip/PiranhaPlantAI_10.inc.c"
@ -22,17 +22,17 @@ void func_8004D8E0(DeadEnemy*);
#include "world/common/enemy/wip/PiranhaPlantAI_14.inc.c"
#include "world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c"
#include "world/common/enemy/TackleAI.inc.c"
#include "world/common/enemy/ai/TackleAI.inc.c"
#include "world/common/AwaitPlayerNearNpc.inc.c"
#include "world/common/todo/AwaitPlayerNearNpc.inc.c"
#include "world/common/StashVars.inc.c"
#include "world/common/todo/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/todo/GetItemName.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/todo/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/todo/AddPlayerHandsOffset.inc.c"
// Requires data migration
#ifdef NON_MATCHING
@ -89,4 +89,4 @@ ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) {
}
extern s32 N(LetterDelivery_SavedNpcAnim);
#include "world/common/LetterDelivery.inc.c"
#include "world/common/todo/LetterDelivery.inc.c"

12
src/EA36E0.c
View File

@ -22,14 +22,14 @@ ApiStatus N(GetActingPartner)(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#include "world/common/UnkFunc46.inc.c"
#include "world/common/todo/UnkFunc46.inc.c"
#include "world/common/SpinyTromp_CheckDist.inc.c"
#include "world/common/todo/SpinyTromp_CheckDist.inc.c"
#include "world/common/UnkFunc48.inc.c"
#include "world/common/todo/UnkFunc48.inc.c"
#include "world/common/UnkFunc49.inc.c"
#include "world/common/todo/UnkFunc49.inc.c"
#include "world/common/UnkFunc50.inc.c"
#include "world/common/todo/UnkFunc50.inc.c"
#include "world/common/UnkFunc51.inc.c"
#include "world/common/todo/UnkFunc51.inc.c"

4
src/EA7320.c
View File

@ -3,9 +3,9 @@
#define NAMESPACE EA7320
#include "world/common/SetCamera0Flag1000.inc.c"
#include "world/common/todo/SetCamera0Flag1000.inc.c"
#include "world/common/UnsetCamera0Flag1000.inc.c"
#include "world/common/todo/UnsetCamera0Flag1000.inc.c"
ApiStatus func_80240388_EA7358(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;

12
src/EA8AE0.c
View File

@ -16,7 +16,7 @@ void func_8012DFE8(s32, UNK_FUN_ARG);
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/StarSpiritEffectFunc.inc.c"
#include "world/common/todo/StarSpiritEffectFunc.inc.c"
static char* N(exit_str_0) = "kmr_23";
static char* N(exit_str_1) = "kzn_18";
@ -78,13 +78,13 @@ ApiStatus func_8024140C_EA9EEC(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#include "world/common/StashVars.inc.c"
#include "world/common/todo/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/todo/GetItemName.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/todo/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/todo/AddPlayerHandsOffset.inc.c"
#ifdef NON_MATCHING
ApiStatus func_802417AC_EAA28C(Evt* script, s32 isInitialCall) {
@ -129,6 +129,6 @@ ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) {
}
extern s32 N(LetterDelivery_SavedNpcAnim);
#include "world/common/LetterDelivery.inc.c"
#include "world/common/todo/LetterDelivery.inc.c"
INCLUDE_ASM(s32, "EA8AE0", func_80241BC0_EAA6A0);

10
src/EB1170.c
View File

@ -12,13 +12,13 @@ extern s32 EB1170_D_802442D0[];
extern s32 EB1170_LetterDelivery_SavedNpcAnim;
extern s32 D_800B8DEC;
#include "world/common/StashVars.inc.c"
#include "world/common/todo/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/todo/GetItemName.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/todo/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/todo/AddPlayerHandsOffset.inc.c"
// Needs data migrated
#ifdef NON_MATCHING
@ -67,7 +67,7 @@ ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) {
}
extern s32 N(LetterDelivery_SavedNpcAnim);
#include "world/common/LetterDelivery.inc.c"
#include "world/common/todo/LetterDelivery.inc.c"
ApiStatus func_80240A68_EB18C8(Evt* script, s32 isInitialCall) {
func_80059AC8(0, 1);

2
src/EB8E90.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE EB8E90
#include "world/common/enemy/PatrolNoAttackAI.inc.c"
#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c"
ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;

2
src/EB9D90.c
View File

@ -52,7 +52,7 @@ ApiStatus func_802410E4_EB9F34(Evt* script, s32 isInitialCall) {
#include "common/CosInterpMinMax.inc.c"
#include "world/common/SyncStatusMenu.inc.c"
#include "world/common/todo/SyncStatusMenu.inc.c"
ApiStatus func_802413CC_EBA21C(Evt* script, s32 isInitialCall) {
increment_status_menu_disabled();

2
src/EC2200.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE EC2200
#include "world/common/DeadUnkFunc1.inc.c"
#include "world/common/todo/DeadUnkFunc1.inc.c"

4
src/EC2240.c
View File

@ -9,9 +9,9 @@ const char* ascii_EC7170 = "flo_09";
const char* ascii_EC7178 = "flo_22";
const char* ascii_EC7180 = "flo_18\0";
#include "world/common/StashVars.inc.c"
#include "world/common/todo/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/todo/GetItemName.inc.c"
//const char* D_80244F98_EC7198 = "touch_choro\n";

2
src/EC71B0.c
View File

@ -7,7 +7,7 @@
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/SpawnSunEffect.inc.c"
#include "world/common/todo/SpawnSunEffect.inc.c"
ApiStatus func_80240344_EC74F4(Evt* script, s32 isInitialCall) {
EffectInstance* effect = fx_misc_particles(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0);

4
src/EC7590.c
View File

@ -5,6 +5,6 @@
#include "common/foliage.inc.c"
#include "world/common/StashVars.inc.c"
#include "world/common/todo/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/todo/GetItemName.inc.c"

2
src/EC9D00.c
View File

@ -5,4 +5,4 @@
#define NAMESPACE EC9D00
#include "world/common/atomic/SuperBlock.inc.c"
#include "world/common/entity/SuperBlock.inc.c"

2
src/ECAA40.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE ECAA40
#include "world/common/DeadUnkFunc1.inc.c"
#include "world/common/todo/DeadUnkFunc1.inc.c"

6
src/ECAA80.c
View File

@ -14,14 +14,14 @@ extern s32 ECAA80_ItemChoice_SelectedItemID;
void ECAA80_UnkFloAI_Chase(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory);
#include "world/common/enemy/UnkFloAI.inc.c"
#include "world/common/enemy/ai/UnkFloAI.inc.c"
// following four functions can be folded into this combined include when the last two are done
// #include "world/common/atomic/ItemChoice_PartA.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/todo/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/todo/AddPlayerHandsOffset.inc.c"
// Needs data migrated
#ifdef NON_MATCHING

2
src/ECBB70.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE ECBB70
#include "world/common/UnkFunc43.inc.c"
#include "world/common/todo/UnkFunc43.inc.c"

2
src/ECFFF0.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE ECFFF0
#include "world/common/DeadUnkFunc1.inc.c"
#include "world/common/todo/DeadUnkFunc1.inc.c"

2
src/ED0030.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE ED0030
#include "world/common/UnkFunc43.inc.c"
#include "world/common/todo/UnkFunc43.inc.c"

2
src/ED0310.c
View File

@ -5,4 +5,4 @@
#define NAMESPACE ED0310
#include "world/common/enemy/FlyingAI.inc.c"
#include "world/common/enemy/ai/FlyingAI.inc.c"

2
src/ED4260.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE ED4260
#include "world/common/DeadUnkFunc1.inc.c"
#include "world/common/todo/DeadUnkFunc1.inc.c"

4
src/ED42A0.c
View File

@ -3,9 +3,9 @@
#define NAMESPACE ED42A0
#include "world/common/StashVars.inc.c"
#include "world/common/todo/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/todo/GetItemName.inc.c"
#include "world/common/atomic/TexturePan.inc.c"

2
src/ED8E20.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE ED8E20
#include "world/common/atomic/Pipe.inc.c"
#include "world/common/entity/Pipe.inc.c"
ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) {
fx_sun(0, 0, 0, 0, 0, 0);

8
src/EDC020.c
View File

@ -9,13 +9,13 @@ extern s32 EDC020_D_802429E0[];
#include "common/foliage.inc.c"
#include "world/common/StashVars.inc.c"
#include "world/common/todo/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/todo/GetItemName.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/todo/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/todo/AddPlayerHandsOffset.inc.c"
#ifdef NON_MATCHING // TODO(data)
ApiStatus func_802405C0_EDC5A0(Evt* script, s32 isInitialCall) {

8
src/EDEA00.c
View File

@ -8,18 +8,18 @@
#include "world/common/util/ChangeNpcToPartner.inc.c"
// must include this before LakituAI for the debug string to end up in the right position
#include "world/common/enemy/FlyingAI.inc.c"
#include "world/common/enemy/ai/FlyingAI.inc.c"
const char D_80247B44_EE6504[] = "JUGEMU MOVE";
#define AI_LAKITU_FIRST_SPINY_ID 50
#define AI_LAKITU_LAST_SPINY_ID 55
#include "world/common/enemy/LakituAI.inc.c"
#include "world/common/enemy/SpinyAI.inc.c"
#include "world/common/enemy/ai/LakituAI.inc.c"
#include "world/common/enemy/ai/SpinyAI.inc.c"
const char D_80247BB8_EE6578[] = "TOGEZO TYPE1 : NORMAL MOVE";
#include "world/common/UnkFunc42.inc.c"
#include "world/common/todo/UnkFunc42.inc.c"
ApiStatus func_80243470_EE1E30(Evt* script, s32 isInitialCall) {
Npc* npc = get_npc_unsafe(1);

2
src/EE2040.c
View File

@ -5,4 +5,4 @@
#define PARTY_IMAGE "party_pokopi"
#include "world/common/LoadPartyImage.inc.c"
#include "world/common/todo/LoadPartyImage.inc.c"

2
src/EE65B0.c
View File

@ -16,7 +16,7 @@ ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#include "world/common/UnkFunc43.inc.c"
#include "world/common/todo/UnkFunc43.inc.c"
ApiStatus func_802403D4_EE6984(Evt* script, s32 isInitialCall) {
if (gPlayerData.currentPartner == PARTNER_NONE) {

6
src/EE70C0.c
View File

@ -10,11 +10,11 @@ extern const s32 D_802453E0_EEB990[];
extern s32 D_8024462C_EEABDC;
extern s32 D_80244630_EEABE0;
#include "world/common/enemy/FlyingAI.inc.c"
#include "world/common/enemy/ai/FlyingAI.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/todo/GetNpcCollisionHeight.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#include "world/common/todo/AddPlayerHandsOffset.inc.c"
// Needs data migrated
#ifdef NON_MATCHING

2
src/EED100.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE EED100
#include "world/common/DeadUnkFunc1.inc.c"
#include "world/common/todo/DeadUnkFunc1.inc.c"

2
src/EED140.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE EED140
#include "world/common/UnkFunc43.inc.c"
#include "world/common/todo/UnkFunc43.inc.c"

4
src/EED1E0.c
View File

@ -5,6 +5,6 @@
#define NAMESPACE EED1E0
#include "world/common/atomic/SuperBlock.inc.c"
#include "world/common/entity/SuperBlock.inc.c"
#include "world/common/UnkFunc44.inc.c"
#include "world/common/todo/UnkFunc44.inc.c"

4
src/EEDF50.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE EEDF50
#include "world/common/enemy/FlyingAI.inc.c"
#include "world/common/enemy/ai/FlyingAI.inc.c"
#include "world/common/enemy/FlyingNoAttackAI.inc.c"
#include "world/common/enemy/ai/FlyingNoAttackAI.inc.c"

2
src/EF2610.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE EF2610
#include "world/common/DeadUnkFunc1.inc.c"
#include "world/common/todo/DeadUnkFunc1.inc.c"

4
src/EF2680.c
View File

@ -7,5 +7,5 @@
#define AI_LAKITU_FIRST_SPINY_ID 50
#define AI_LAKITU_LAST_SPINY_ID 53
#include "world/common/enemy/LakituAI.inc.c"
#include "world/common/enemy/SpinyAI.inc.c"
#include "world/common/enemy/ai/LakituAI.inc.c"
#include "world/common/enemy/ai/SpinyAI.inc.c"

2
src/EF7A80.c
View File

@ -7,7 +7,7 @@
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/DeadUnkFunc1.inc.c"
#include "world/common/todo/DeadUnkFunc1.inc.c"
typedef struct unk_effect {
char unk_00[0x30];

2
src/EF7FB0.c
View File

@ -3,4 +3,4 @@
#define NAMESPACE EF7FB0
#include "world/common/UnkFunc42.inc.c"
#include "world/common/todo/UnkFunc42.inc.c"

4
src/EFEB00.c
View File

@ -7,9 +7,9 @@
#include "world/common/atomic/TexturePan.inc.c"
#include "world/common/DeadUnkFunc1.inc.c"
#include "world/common/todo/DeadUnkFunc1.inc.c"
#include "world/common/UnkFloatFuncAbs.inc.c"
#include "world/common/todo/UnkFloatFuncAbs.inc.c"
ApiStatus func_802404D0_EFEFD0(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;

4
src/battle/area_dig/stage/dig_04.c
View File

@ -12,12 +12,12 @@ extern ActorBlueprint N(slot_machine_start);
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetTexPanner, 29, 10)
EVT_CALL(SetTexPanner, 29, TEX_PANNER_A)
EVT_THREAD
EVT_SET(LVarE, 0)
EVT_LOOP(0)
EVT_ADD(LVarE, 32768)
EVT_CALL(SetTexPanOffset, 10, 0, LVarE, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_MAIN, LVarE, 0)
EVT_WAIT(10)
EVT_END_LOOP
EVT_END_THREAD

36
src/battle/area_flo/stage/flo_03.c
View File

@ -12,12 +12,12 @@ EvtScript N(80232A30) = {
EVT_IF_EQ(LVar0, 0)
EVT_BREAK_LOOP
EVT_END_IF
EVT_CALL(SetTexPanner, LVar0, 14)
EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_E)
EVT_BUF_READ1(LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_BREAK_LOOP
EVT_END_IF
EVT_CALL(SetTexPanner, LVar0, 15)
EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_F)
EVT_END_LOOP
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
@ -27,12 +27,12 @@ EvtScript N(80232A30) = {
EVT_IF_LT(LVar0, 0)
EVT_ADD(LVar0, 65536)
EVT_END_IF
EVT_CALL(SetTexPanOffset, 14, 0, LVar0, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0)
EVT_ADD(LVar1, -200)
EVT_IF_LT(LVar1, 0)
EVT_ADD(LVar1, 65536)
EVT_END_IF
EVT_CALL(SetTexPanOffset, 15, 0, LVar1, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar1, 0)
EVT_WAIT(1)
EVT_GOTO(0)
EVT_RETURN
@ -82,13 +82,13 @@ EvtScript N(beforeBattle) = {
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_SET(LVar0, N(modelList))
EVT_EXEC(N(80232A30))
EVT_CALL(SetTexPanner, 36, 1)
EVT_CALL(SetTexPanner, 37, 2)
EVT_CALL(SetTexPanner, 38, 3)
EVT_CALL(SetTexPanner, 39, 4)
EVT_CALL(SetTexPanner, 40, 5)
EVT_CALL(SetTexPanner, 41, 6)
EVT_CALL(SetTexPanner, 42, 7)
EVT_CALL(SetTexPanner, 36, TEX_PANNER_1)
EVT_CALL(SetTexPanner, 37, TEX_PANNER_2)
EVT_CALL(SetTexPanner, 38, TEX_PANNER_3)
EVT_CALL(SetTexPanner, 39, TEX_PANNER_4)
EVT_CALL(SetTexPanner, 40, TEX_PANNER_5)
EVT_CALL(SetTexPanner, 41, TEX_PANNER_6)
EVT_CALL(SetTexPanner, 42, TEX_PANNER_7)
EVT_THREAD
EVT_SET(LVarE, 1)
EVT_SET(LVarF, 0)
@ -125,13 +125,13 @@ EvtScript N(beforeBattle) = {
EVT_DIV(LVar6, 8)
EVT_MOD(LVar6, 2)
EVT_MUL(LVar6, 32768)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0)
EVT_CALL(SetTexPanOffset, 2, 0, LVar1, 0)
EVT_CALL(SetTexPanOffset, 3, 0, LVar2, 0)
EVT_CALL(SetTexPanOffset, 4, 0, LVar3, 0)
EVT_CALL(SetTexPanOffset, 5, 0, LVar4, 0)
EVT_CALL(SetTexPanOffset, 6, 0, LVar5, 0)
EVT_CALL(SetTexPanOffset, 7, 0, LVar6, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar2, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar3, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar4, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_MAIN, LVar5, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_MAIN, LVar6, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD

36
src/battle/area_flo2/stage/flo_03.c
View File

@ -12,12 +12,12 @@ EvtScript N(80232A30) = {
EVT_IF_EQ(LVar0, 0)
EVT_BREAK_LOOP
EVT_END_IF
EVT_CALL(SetTexPanner, LVar0, 14)
EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_E)
EVT_BUF_READ1(LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_BREAK_LOOP
EVT_END_IF
EVT_CALL(SetTexPanner, LVar0, 15)
EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_F)
EVT_END_LOOP
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
@ -27,12 +27,12 @@ EvtScript N(80232A30) = {
EVT_IF_LT(LVar0, 0)
EVT_ADD(LVar0, 65536)
EVT_END_IF
EVT_CALL(SetTexPanOffset, 14, 0, LVar0, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0)
EVT_ADD(LVar1, -200)
EVT_IF_LT(LVar1, 0)
EVT_ADD(LVar1, 65536)
EVT_END_IF
EVT_CALL(SetTexPanOffset, 15, 0, LVar1, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar1, 0)
EVT_WAIT(1)
EVT_GOTO(0)
EVT_RETURN
@ -82,13 +82,13 @@ EvtScript N(beforeBattle) = {
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_SET(LVar0, N(modelList))
EVT_EXEC(N(80232A30))
EVT_CALL(SetTexPanner, 36, 1)
EVT_CALL(SetTexPanner, 37, 2)
EVT_CALL(SetTexPanner, 38, 3)
EVT_CALL(SetTexPanner, 39, 4)
EVT_CALL(SetTexPanner, 40, 5)
EVT_CALL(SetTexPanner, 41, 6)
EVT_CALL(SetTexPanner, 42, 7)
EVT_CALL(SetTexPanner, 36, TEX_PANNER_1)
EVT_CALL(SetTexPanner, 37, TEX_PANNER_2)
EVT_CALL(SetTexPanner, 38, TEX_PANNER_3)
EVT_CALL(SetTexPanner, 39, TEX_PANNER_4)
EVT_CALL(SetTexPanner, 40, TEX_PANNER_5)
EVT_CALL(SetTexPanner, 41, TEX_PANNER_6)
EVT_CALL(SetTexPanner, 42, TEX_PANNER_7)
EVT_THREAD
EVT_SET(LVarE, 1)
EVT_SET(LVarF, 0)
@ -125,13 +125,13 @@ EvtScript N(beforeBattle) = {
EVT_DIV(LVar6, 8)
EVT_MOD(LVar6, 2)
EVT_MUL(LVar6, 32768)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0)
EVT_CALL(SetTexPanOffset, 2, 0, LVar1, 0)
EVT_CALL(SetTexPanOffset, 3, 0, LVar2, 0)
EVT_CALL(SetTexPanOffset, 4, 0, LVar3, 0)
EVT_CALL(SetTexPanOffset, 5, 0, LVar4, 0)
EVT_CALL(SetTexPanOffset, 6, 0, LVar5, 0)
EVT_CALL(SetTexPanOffset, 7, 0, LVar6, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar2, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar3, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar4, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_MAIN, LVar5, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_MAIN, LVar6, 0)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD

2
src/battle/area_hos/actor/magikoopa.c
View File

@ -1448,7 +1448,7 @@ EvtScript N(makeCopy) = {
EVT_END
};
#include "world/common/UnkFunc52.inc.c"
#include "world/common/todo/UnkFunc52.inc.c"
EvtScript N(boostAttack) = {
EVT_SET(LocalFlag(0), 0)

12
src/battle/area_hos/stage/hos_01.c
View File

@ -157,10 +157,10 @@ EvtScript N(beforeBattle_80224BD0) = {
EVT_CALL(SetModelFlags, MODEL_o347, 128, 1)
EVT_THREAD
EVT_CALL(SetTexPanner, MODEL_o332, 0)
EVT_CALL(SetTexPanner, MODEL_o334, 0)
EVT_CALL(SetTexPanner, MODEL_o333, 0)
EVT_CALL(SetTexPanner, MODEL_o336, 0)
EVT_CALL(SetTexPanner, MODEL_o332, TEX_PANNER_0)
EVT_CALL(SetTexPanner, MODEL_o334, TEX_PANNER_0)
EVT_CALL(SetTexPanner, MODEL_o333, TEX_PANNER_0)
EVT_CALL(SetTexPanner, MODEL_o336, TEX_PANNER_0)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_SET(LVar2, 0)
@ -182,8 +182,8 @@ EvtScript N(beforeBattle_80224BD0) = {
EVT_IF_GT(LVar3, 32768)
EVT_ADD(LVar3, -32768)
EVT_END_IF
EVT_CALL(SetTexPanOffset, 0, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, 0, 1, LVar2, LVar3)
EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_AUX, LVar2, LVar3)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD

8
src/battle/area_hos/stage/hos_02.c
View File

@ -6,8 +6,8 @@
EvtScript N(beforeBattle_802258E0) = {
EVT_THREAD
EVT_CALL(SetTexPanner, MODEL_o372, 1)
EVT_CALL(SetTexPanner, MODEL_o375, 1)
EVT_CALL(SetTexPanner, MODEL_o372, TEX_PANNER_1)
EVT_CALL(SetTexPanner, MODEL_o375, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_SET(LVar2, 0)
@ -17,8 +17,8 @@ EvtScript N(beforeBattle_802258E0) = {
EVT_ADD(LVar1, 300)
EVT_ADD(LVar2, 90)
EVT_ADD(LVar3, -200)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, 1, 1, LVar2, LVar3)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar2, LVar3)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD

4
src/battle/area_kkj/actor/kammy_koopa.c
View File

@ -175,9 +175,9 @@ EvtScript N(handleEvent) = {
EVT_END
};
#include "world/common/SetEntityPositionF.inc.c"
#include "world/common/todo/SetEntityPositionF.inc.c"
#include "world/common/GetEntityPosition.inc.c"
#include "world/common/todo/GetEntityPosition.inc.c"
ApiStatus N(BlockAppear)(Evt* script, s32 isInitialCall) {
Entity* entity = get_entity_by_index(script->varTable[9]);

2
src/battle/area_kmr_part_1/stage/kmr_03.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_1_kmr_03
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80220188) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_1/stage/kmr_04.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_1_kmr_04
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_802205D8) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_1/stage/kmr_05.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_1_kmr_05
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80220A28) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_1/stage/kmr_06.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_1_kmr_06
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
#include "common/UnkFogFunc.inc.c"
EvtScript N(beforeBattle_80220E28) = {

2
src/battle/area_kmr_part_2/stage/kmr_03.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_2_kmr_03
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80224AE8) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_2/stage/kmr_04.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_2_kmr_04
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80224F38) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_2/stage/kmr_05.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_2_kmr_05
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80225388) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_2/stage/kmr_06.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_2_kmr_06
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
#include "common/UnkFogFunc.inc.c"

2
src/battle/area_kmr_part_3/stage/kmr_03.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_3_kmr_03
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_802326B8) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_3/stage/kmr_04.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_3_kmr_04
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80232B08) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_3/stage/kmr_05.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_3_kmr_05
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80232F58) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_kmr_part_3/stage/kmr_06.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_kmr_part_3_kmr_06
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
#include "common/UnkFogFunc.inc.c"

4
src/battle/area_kmr_part_3/stage/kpa_01.c
View File

@ -5,11 +5,11 @@
EvtScript N(80234CB0) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa/stage/kpa_01.c
View File

@ -6,11 +6,11 @@
EvtScript N(8022EFE0) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa/stage/kpa_01b.c
View File

@ -6,11 +6,11 @@
EvtScript N(8022F180) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa/stage/kpa_04.c
View File

@ -5,11 +5,11 @@
EvtScript N(8022F7F0) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa/stage/kpa_04b.c
View File

@ -5,11 +5,11 @@
EvtScript N(8022FA10) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa/stage/kpa_04c.c
View File

@ -5,11 +5,11 @@
EvtScript N(8022FC20) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa/stage/kpa_13.c
View File

@ -5,11 +5,11 @@
EvtScript N(80230440) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa/stage/kpa_14.c
View File

@ -5,11 +5,11 @@
EvtScript N(80230570) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa2/stage/kpa_01.c
View File

@ -6,11 +6,11 @@
EvtScript N(8022EFE0) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa3/stage/kpa_01.c
View File

@ -6,11 +6,11 @@
EvtScript N(8022EFE0) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa4/stage/kpa_01.c
View File

@ -6,11 +6,11 @@
EvtScript N(8022EFE0) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa4/stage/kpa_01b.c
View File

@ -6,11 +6,11 @@
EvtScript N(8022F180) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa4/stage/kpa_04.c
View File

@ -5,11 +5,11 @@
EvtScript N(8022F7F0) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa4/stage/kpa_04b.c
View File

@ -5,11 +5,11 @@
EvtScript N(8022FA10) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa4/stage/kpa_04c.c
View File

@ -5,11 +5,11 @@
EvtScript N(8022FC20) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa4/stage/kpa_13.c
View File

@ -5,11 +5,11 @@
EvtScript N(80230440) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

4
src/battle/area_kpa4/stage/kpa_14.c
View File

@ -5,11 +5,11 @@
EvtScript N(80230570) = {
EVT_SET(LVarA, LVar0)
EVT_CALL(SetTexPanner, LVarA, 1)
EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
EVT_LOOP(0)
EVT_CALL(SetTexPanOffset, 1, 0, LVar0, LVar1)
EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1)
EVT_ADD(LVar0, 32768)
EVT_ADD(LVar1, 0)
EVT_WAIT(5)

2
src/battle/area_mac/actor/lee.c
View File

@ -811,7 +811,7 @@ ApiStatus func_80218100_464590(Evt* script, s32 isInitialCall) {
}
}
#include "world/common/UnkFunc62.inc.c"
#include "world/common/todo/UnkFunc62.inc.c"
#include "common/ActorJumpToPos.inc.c"

4
src/battle/area_omo/stage/omo_04.c
View File

@ -12,12 +12,12 @@ extern ActorBlueprint N(slot_machine_start);
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetTexPanner, 29, 10)
EVT_CALL(SetTexPanner, 29, TEX_PANNER_A)
EVT_THREAD
EVT_SET(LVarE, 0)
EVT_LOOP(0)
EVT_ADD(LVarE, 32768)
EVT_CALL(SetTexPanOffset, 10, 0, LVarE, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_MAIN, LVarE, 0)
EVT_WAIT(10)
EVT_END_LOOP
EVT_END_THREAD

4
src/battle/area_omo3/stage/omo_04.c
View File

@ -12,12 +12,12 @@ extern ActorBlueprint N(slot_machine_start);
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetTexPanner, 29, 10)
EVT_CALL(SetTexPanner, 29, TEX_PANNER_A)
EVT_THREAD
EVT_SET(LVarE, 0)
EVT_LOOP(0)
EVT_ADD(LVarE, 32768)
EVT_CALL(SetTexPanOffset, 10, 0, LVarE, 0)
EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_MAIN, LVarE, 0)
EVT_WAIT(10)
EVT_END_LOOP
EVT_END_THREAD

2
src/battle/area_tik/stage/tik_01.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik_tik_01
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(802301F0) = {
EVT_SET(LVarA, LVar1)

2
src/battle/area_tik/stage/tik_02.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik_tik_02
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(80230DF0) = {
EVT_SET(LVarA, LVar1)

2
src/battle/area_tik/stage/tik_03.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik_tik_03
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(802319F0) = {
EVT_SET(LVar1, ArrayVar(5))

4
src/battle/area_tik/stage/tik_05.c
View File

@ -26,7 +26,7 @@ EvtScript N(80233540) = {
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetTexPanner, 15, 1)
EVT_CALL(SetTexPanner, 15, TEX_PANNER_1)
EVT_CALL(EnableTexPanning, 15, 1)
EVT_THREAD
EVT_SET(LVar0, 1)
@ -44,7 +44,7 @@ EvtScript N(beforeBattle) = {
EVT_SET(LVarC, 0)
EVT_EXEC(N(80233540))
EVT_END_THREAD
EVT_CALL(SetTexPanner, 16, 2)
EVT_CALL(SetTexPanner, 16, TEX_PANNER_2)
EVT_CALL(EnableTexPanning, 16, 1)
EVT_THREAD
EVT_SET(LVar0, 2)

2
src/battle/area_tik2/stage/tik_01.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik2_tik_01
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(802301F0) = {
EVT_SET(LVarA, LVar1)

2
src/battle/area_tik2/stage/tik_02.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik2_tik_02
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(80230DF0) = {
EVT_SET(LVarA, LVar1)

2
src/battle/area_tik2/stage/tik_03.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik2_tik_03
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(802319F0) = {
EVT_SET(LVar1, ArrayVar(5))

4
src/battle/area_tik2/stage/tik_05.c
View File

@ -26,7 +26,7 @@ EvtScript N(80233540) = {
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetTexPanner, 15, 1)
EVT_CALL(SetTexPanner, 15, TEX_PANNER_1)
EVT_CALL(EnableTexPanning, 15, 1)
EVT_THREAD
EVT_SET(LVar0, 1)
@ -44,7 +44,7 @@ EvtScript N(beforeBattle) = {
EVT_SET(LVarC, 0)
EVT_EXEC(N(80233540))
EVT_END_THREAD
EVT_CALL(SetTexPanner, 16, 2)
EVT_CALL(SetTexPanner, 16, TEX_PANNER_2)
EVT_CALL(EnableTexPanning, 16, 1)
EVT_THREAD
EVT_SET(LVar0, 2)

2
src/battle/area_tik3/stage/tik_01.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik3_tik_01
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(802301F0) = {
EVT_SET(LVarA, LVar1)

2
src/battle/area_tik3/stage/tik_02.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik3_tik_02
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(80230DF0) = {
EVT_SET(LVarA, LVar1)

2
src/battle/area_tik3/stage/tik_03.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_tik3_tik_03
#include "world/common/UnkFunc56.inc.c"
#include "world/common/todo/UnkFunc56.inc.c"
EvtScript N(802319F0) = {
EVT_SET(LVar1, ArrayVar(5))

4
src/battle/area_tik3/stage/tik_05.c
View File

@ -26,7 +26,7 @@ EvtScript N(80233540) = {
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetTexPanner, 15, 1)
EVT_CALL(SetTexPanner, 15, TEX_PANNER_1)
EVT_CALL(EnableTexPanning, 15, 1)
EVT_THREAD
EVT_SET(LVar0, 1)
@ -44,7 +44,7 @@ EvtScript N(beforeBattle) = {
EVT_SET(LVarC, 0)
EVT_EXEC(N(80233540))
EVT_END_THREAD
EVT_CALL(SetTexPanner, 16, 2)
EVT_CALL(SetTexPanner, 16, TEX_PANNER_2)
EVT_CALL(EnableTexPanning, 16, 1)
EVT_THREAD
EVT_SET(LVar0, 2)

2
src/battle/area_trd_part_1/stage/trd_03.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_trd_part_1_trd_03
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80223F08) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/area_trd_part_2/stage/trd_03.c
View File

@ -3,7 +3,7 @@
#define NAMESPACE b_area_trd_part_2_trd_03
#include "world/common/clouds.inc.c"
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80232888) = {
EVT_CALL(SetSpriteShading, -1)

2
src/battle/common/actor/ghost_goombario.inc.c
View File

@ -5,7 +5,7 @@ extern EvtScript N(goombario_takeTurn);
extern EvtScript N(goombario_idle);
extern EvtScript N(goombario_handleEvent);
#include "world/common/UnkFunc62.inc.c"
#include "world/common/todo/UnkFunc62.inc.c"
#include "common/ActorJumpToPos.inc.c"
#include "common/UnkActorSizeFunc.inc.c"
#include "common/UnkEffect6CFunc.inc.c"

2
src/battle/common/actor/gray_magikoopa.inc.c
View File

@ -219,7 +219,7 @@ EvtScript N(idle) = {
#include "common/GetSelectedMoveID.inc.c"
#include "common/UnkBattleFunc1.inc.c"
#include "common/StartRumbleWithParams.inc.c"
#include "world/common/UnkFunc52.inc.c"
#include "world/common/todo/UnkFunc52.inc.c"
EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)

2
src/battle/common/actor/green_magikoopa.inc.c
View File

@ -221,7 +221,7 @@ EvtScript N(idle) = {
#include "common/GetSelectedMoveID.inc.c"
#include "common/UnkBattleFunc1.inc.c"
#include "common/StartRumbleWithParams.inc.c"
#include "world/common/UnkFunc52.inc.c"
#include "world/common/todo/UnkFunc52.inc.c"
EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)

2
src/battle/common/actor/magikoopa.inc.c
View File

@ -1499,7 +1499,7 @@ EvtScript N(makeClone) = {
EVT_END
};
#include "world/common/UnkFunc52.inc.c"
#include "world/common/todo/UnkFunc52.inc.c"
EvtScript N(boostAttack) = {
EVT_SET(LocalFlag(0), 0)

2
src/battle/common/actor/red_magikoopa.inc.c
View File

@ -219,7 +219,7 @@ EvtScript N(idle) = {
#include "common/GetSelectedMoveID.inc.c"
#include "common/UnkBattleFunc1.inc.c"
#include "common/StartRumbleWithParams.inc.c"
#include "world/common/UnkFunc52.inc.c"
#include "world/common/todo/UnkFunc52.inc.c"
EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)

6
src/battle/common/actor/slot_machine.inc.c
View File

@ -234,15 +234,15 @@ EvtScript N(idle) = {
EVT_END_IF
EVT_IF_EQ(ArrayVar(1), 0)
EVT_ADD(LVarF, -277)
EVT_CALL(SetTexPanOffset, 11, 0, 0, LVarF)
EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0, LVarF)
EVT_END_IF
EVT_IF_EQ(ArrayVar(1), 1)
EVT_ADD(LVarF, -1110)
EVT_CALL(SetTexPanOffset, 11, 0, 0, LVarF)
EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0, LVarF)
EVT_END_IF
EVT_IF_EQ(ArrayVar(1), 2)
EVT_ADD(LVarF, -3330)
EVT_CALL(SetTexPanOffset, 11, 0, 0, LVarF)
EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0, LVarF)
EVT_END_IF
EVT_IF_EQ(ArrayVar(1), 2)
EVT_GOTO(1)

2
src/battle/common/actor/white_magikoopa.inc.c
View File

@ -213,7 +213,7 @@ s32 N(idleAnimations_80223E08)[] = {
#include "common/StartRumbleWithParams.inc.c"
#include "world/common/UnkFunc52.inc.c"
#include "world/common/todo/UnkFunc52.inc.c"
#include "common/GetBootsHammerLevel.inc.c"

2
src/battle/common/actor/yellow_magikoopa.inc.c
View File

@ -218,7 +218,7 @@ EvtScript N(idle) = {
#include "common/GetSelectedMoveID.inc.c"
#include "common/UnkBattleFunc1.inc.c"
#include "common/StartRumbleWithParams.inc.c"
#include "world/common/UnkFunc52.inc.c"
#include "world/common/todo/UnkFunc52.inc.c"
EvtScript N(handleEvent) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)

2
src/battle/move/auto_jump/auto_jump.c
View File

@ -13,7 +13,7 @@ s32 N(D_802A10F0)[] = {
7, 3, 6, 2, 5, 2, 4, 2,
};
#include "world/common/UnkMoveFunc1.inc.c"
#include "world/common/todo/UnkMoveFunc1.inc.c"
EvtScript N(CheckForAPress) = {
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump)

2
src/battle/move/auto_multibounce/auto_multibounce.c
View File

@ -13,7 +13,7 @@ s32 N(D_802A10F0)[] = {
7, 3, 6, 2, 5, 2, 4, 2,
};
#include "world/common/UnkMoveFunc1.inc.c"
#include "world/common/todo/UnkMoveFunc1.inc.c"
EvtScript N(CheckForAPress) = {
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump)

4
src/battle/move/auto_smash/763540.c
View File

@ -2,6 +2,6 @@
#define NAMESPACE battle_move_auto_smash
#include "world/common/IsBerserkerEquipped.inc.c"
#include "world/common/todo/IsBerserkerEquipped.inc.c"
#include "world/common/IsRightOnEquipped.inc.c"
#include "world/common/todo/IsRightOnEquipped.inc.c"

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