diff --git a/include/code_8031D70.h b/include/code_8031D70.h new file mode 100644 index 000000000..e8d7f9631 --- /dev/null +++ b/include/code_8031D70.h @@ -0,0 +1,9 @@ +#ifndef GUARD_CODE_8031D70_H +#define GUARD_CODE_8031D70_H + +bool8 sub_8031D70(u32 mailIndex, s32 param_2); +u32 sub_8031DCC(void); +void sub_8031E00(void); +void sub_8031E10(void); + +#endif // GUARD_CODE_8031D70_H diff --git a/include/code_803C1B4.h b/include/code_803C1B4.h index 62e2295ef..81e21a5b0 100644 --- a/include/code_803C1B4.h +++ b/include/code_803C1B4.h @@ -2,8 +2,15 @@ #define GUARD_CODE_803C1B4_H #include "structs/str_dungeon_location.h" +#include "structs/str_wonder_mail.h" -void sub_803C37C(DungeonLocation *location, u8 r1, u8 *itemReward); u32 GetDungeonTeamRankPts(DungeonLocation *dungeon, u8 r1); +void sub_803C37C(DungeonLocation *location, u8 r1, u8 *itemReward); +bool8 sub_803C4F0(WonderMail *mail); +bool8 sub_803C3E0(WonderMail *mail); +bool8 sub_803C45C(WonderMail *mail); +bool8 sub_803C610(WonderMail *param_1); +bool8 sub_803C580(WonderMail *param_1); + #endif // GUARD_CODE_803C1B4_H diff --git a/include/code_803C1D0.h b/include/code_803C1D0.h index d6d76a016..31965fb9d 100644 --- a/include/code_803C1D0.h +++ b/include/code_803C1D0.h @@ -3,9 +3,8 @@ #include "structs/str_wonder_mail.h" -// code_803C1D0.s -extern u8 sub_803C1D0(DungeonLocation *, u8); -extern u8 *GetMissionRankText(u8); -extern void sub_803C21C(WonderMail *, unkStruct_802F204 *); +u8 sub_803C1D0(DungeonLocation *, u8); +const u8 *GetMissionRankText(u8 index); +void sub_803C21C(WonderMail *, unkStruct_802F204 *); #endif // GUARD_CODE_803C1D0_H diff --git a/include/code_8040094_1.h b/include/code_8040094_1.h new file mode 100644 index 000000000..323a53ce8 --- /dev/null +++ b/include/code_8040094_1.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CODE_8040094_1_H +#define GUARD_CODE_8040094_1_H + +#include "structs/dungeon_entity.h" + +u16 GetEffectiveMoveId(u16 moveId, u8 weather, bool32 hasSpecialEffect); + +bool8 sub_8040BB0(Entity *entity, Move *move, bool8 a2); +void sub_8040DA0(Entity *entity, Move *move); +void sub_8041168(Entity *entity, Entity *entity2, Move *move, DungeonPos *pos); + +#endif // GUARD_CODE_8040094_1_H diff --git a/include/code_8094F88.h b/include/code_8094F88.h index cd7c61e50..006f79b20 100644 --- a/include/code_8094F88.h +++ b/include/code_8094F88.h @@ -49,5 +49,6 @@ s32 GetFirstIndexofMailType(u8 mailType); void sub_8095824(DataSerializer *a, unkStruct_203B480 *b); void sub_8095774(DataSerializer *a, unkStruct_203B480 *b); void sub_809542C(DungeonMailSeed *param_1); +void sub_8095494(DungeonMailSeed *param_1, u8 index); #endif // GUARD_CODE_8094F88_H \ No newline at end of file diff --git a/include/code_8099360.h b/include/code_8099360.h index bbe27c936..46696947b 100644 --- a/include/code_8099360.h +++ b/include/code_8099360.h @@ -1,9 +1,12 @@ #ifndef GUARD_CODE_8099360_H #define GUARD_CODE_8099360_H +#include "structs/rgb.h" + void sub_8099648(void); void nullsub_103(void); void sub_809965C(void); void sub_8099690(u32 param_1); +void sub_809971C(u16 idx, RGB_Array *strPtrs, s32 n); #endif //GUARD_CODE_8099360_H diff --git a/include/constants/event_flag.h b/include/constants/event_flag.h index 3229300c8..5e42f0112 100644 --- a/include/constants/event_flag.h +++ b/include/constants/event_flag.h @@ -107,6 +107,11 @@ enum StartModeVal STARTMODE_10, STARTMODE_11, STARTMODE_DUNGEON_LOST, + STARTMODE_13, + STARTMODE_14, + STARTMODE_15, + STARTMODE_16, + STARTMODE_17, }; // SCENARIO_MAIN: diff --git a/include/dungeon_action.h b/include/dungeon_action.h index 19b2ebb1f..f0b8b26a4 100644 --- a/include/dungeon_action.h +++ b/include/dungeon_action.h @@ -23,7 +23,7 @@ Item *sub_8044D90(Entity *entity, s32 index, s32 unused); Entity *sub_8044DA4(Entity *entity, s32 index); u16 sub_8044DC8(Item *param_1); void sub_8044DF0(Entity *entity, s32 index, u32 unused); -void sub_8044E24(Entity *entity,int index,u32 unused); +void sub_8044E24(Entity *entity,s32 index,u32 unused); const u8 *GetDungeonSubMenuItemString(s32 param_1); bool8 CanSubMenuItemBeChosen(s32 itemId); void AddActionToDungeonSubMenu(u16 actionId, u8 param_2); diff --git a/include/dungeon_damage.h b/include/dungeon_damage.h index 96598e315..65bb6864b 100644 --- a/include/dungeon_damage.h +++ b/include/dungeon_damage.h @@ -13,6 +13,6 @@ void sub_806F370_Async(Entity *pokemon, Entity *target, s32 dmg, s32 giveExp, bo void SetShopkeeperAggression(Entity *pokemon, Entity *target); void sub_806F480(Entity *pokemon, bool8 attackEnemies); u8 sub_806F4A4(Entity *pokemon, u8 type); -s32 sub_806F62C(int param_1); +s32 sub_806F62C(s32 param_1); #endif diff --git a/include/dungeon_misc.h b/include/dungeon_misc.h index 66eb306d2..bcffbe01c 100644 --- a/include/dungeon_misc.h +++ b/include/dungeon_misc.h @@ -37,7 +37,7 @@ void sub_8068F28(void); void sub_8068F80(void); void HandleFaint_Async(Entity *entity, s32 dungeonExitReason, Entity *param_3); void sub_80694C0(Entity *target,s32 x,s32 y,u8 param_4); -void sub_80695EC(Entity *param_1,int x,int y); +void sub_80695EC(Entity *param_1,s32 x,s32 y); Entity * sub_8069660(Entity *target); Entity * sub_80696A8(Entity *target); Entity * sub_80696FC(Entity *target); diff --git a/include/effect_main.h b/include/effect_main.h index 84135747b..f6bc249c0 100644 --- a/include/effect_main.h +++ b/include/effect_main.h @@ -27,6 +27,8 @@ struct UnkStruct_8040094 s32 unk10; }; +bool8 EffectiveMoveHasSineWobble(s32 moveId); + void sub_800DAC0(u32 fileSelection); void sub_800DB7C(void); void sub_800DBBC(void); diff --git a/include/graphics_memory.h b/include/graphics_memory.h index 9e2ad8a80..85e811d14 100644 --- a/include/graphics_memory.h +++ b/include/graphics_memory.h @@ -20,6 +20,8 @@ void ScheduleBgTilemapCopy(u32); void DoScheduledMemCopies(void); void CopyBgTilemaps0And1(void); void SetFontsBaseColor(RGB_Struct); + bool8 sub_8009A7C(struct EfbFileData *a0, s32 a1, s32 a2, s32 a3, bool8 a4, s32 *a5, s16 *a6); +void sub_8009BE4(void); #endif // GUARD_GRAPHICS_MEMORY_H diff --git a/include/ground_lives_helper.h b/include/ground_lives_helper.h index 5499af5a3..4bd68d041 100644 --- a/include/ground_lives_helper.h +++ b/include/ground_lives_helper.h @@ -9,6 +9,8 @@ void nullsub_118(void); void sub_809CD68(struct GroundLives_Sub120 *dst); void sub_809CD8C(struct GroundLives_Sub120 *dst, s32 a1); s32 sub_809CDB8(struct GroundLives_Sub120 *dst); +// r6 is enum "ESC_RetID" ? +// param_4 is enum "ESC_RetID" ? u32 sub_809CDC8(struct GroundLives_Sub120 *strPtr, u32 *r6, s8 *direction, s32 *param_4, PixelPos *unused, u32 flags); s32 DpadToDirection(u16 dpad); diff --git a/include/ground_main.h b/include/ground_main.h index 3152f03b1..4072feab8 100644 --- a/include/ground_main.h +++ b/include/ground_main.h @@ -4,21 +4,26 @@ #include "constants/rescue_dungeon_id.h" #include "structs/str_dungeon_setup.h" -u32 xxx_script_related_8098468(s32 param_1); +// startMode: See enum "StartModeVal" +u32 xxx_script_related_8098468(s32 startMode); void sub_8098C58(void); void sub_8098CC8(void); bool8 GroundMainGroundRequest(s32 r0, s32 r1, s32 r2); bool8 sub_8098D80(u32 speed); bool8 sub_8098DCC(u32 speed); -bool8 GroundMainRescueRequest(s32 dungeonId_, s32 r1); +// scriptDungeon: See enum "ScriptDungeonId" +bool8 GroundMainRescueRequest(s32 scriptDungeon, s32 r1); bool32 GroundMainGameEndRequest(u32 r0); bool32 GroundMainGameCancelRequest(u32 r0); bool8 sub_8098F88(void); bool8 GetScriptMode(void); const char *GetCurrentGroundPlaceName(void); -u8 sub_80990EC(struct DungeonSetupInfo *param_1, s32 param_2); -u8 sub_80991E0(struct DungeonSetupInfo *param_1, s16 *param_2); -void sub_8099220(struct DungeonSetupInfo *param_1, s32 param_2); +// scriptDungeon: See enum "ScriptDungeonId" +u8 sub_80990EC(DungeonSetupInfo *param_1, s32 scriptDungeon); +// scriptDungeon: See enum "ScriptDungeonId" +u8 sub_80991E0(DungeonSetupInfo *param_1, s16 *scriptDungeon); +// scriptDungeon: See enum "ScriptDungeonId" +void sub_8099220(DungeonSetupInfo *param_1, s32 scriptDungeon); void sub_809927C(u8 param_1); // See enum "RescueDungeonId" bool8 sub_80992E0(s16 *param_1, s16 *rescueDungeonId); diff --git a/include/ground_script.h b/include/ground_script.h index 29cb8461d..69abd5a22 100644 --- a/include/ground_script.h +++ b/include/ground_script.h @@ -30,7 +30,7 @@ void sub_809D4B0(void); void sub_809D508(void); void InitActionWithParams(Action *action, const CallbackData *callbacks, void *parent, s32 group, s32 sector); void InitAction2(Action *action); -bool8 sub_809D678(Action *action); +bool8 Action_SavedStateIsNot0(Action *action); bool8 sub_809D684(Action *action, ScriptInfoSmall *scriptInfo); void SetPredefinedScript(Action *param_1, s16 index, const ScriptCommand *param_3); bool8 GetPredefinedScript(Action *param_1, ScriptInfoSmall *script, s32 _index); @@ -42,6 +42,7 @@ bool8 GroundScript_Cancel(Action *r0); bool8 GroundScriptNotify(Action *param_1, s32 param_2); void GroundScriptLockJumpZero(s16 index); void GroundScriptLock(s16 index, s32 r1); +// Return value is enum "ESC_RetID" s16 HandleAction(Action *action, const DebugLocation *debug); void GroundScript_Unlock(void); diff --git a/include/move_orb_actions_3.h b/include/move_orb_actions_3.h index 97d345459..ab48a6e78 100644 --- a/include/move_orb_actions_3.h +++ b/include/move_orb_actions_3.h @@ -4,6 +4,8 @@ #include "structs/dungeon_entity.h" #include "structs/str_stat_index.h" +extern const s32 gUnknown_8106A8C[]; + bool8 PoisonStingMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId); bool8 TriAttackMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId); bool8 TrickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId); diff --git a/include/rescue_password_menu.h b/include/rescue_password_menu.h index 0a56dd0a9..22606c6e2 100644 --- a/include/rescue_password_menu.h +++ b/include/rescue_password_menu.h @@ -44,4 +44,6 @@ void CreateRescuePasswordMenu(u32 currMenu); s32 UpdateRescuePasswordMenu(void); void CleanRescuePasswordMenu(void); -#endif +u32 sub_8039068(u32 mailMode, u8 *passwordBuffer, unkStruct_203B480 *param_3); + +#endif // GUARD_RESCUE_PASSWORD_MENU_H diff --git a/include/structs/str_ground_bg.h b/include/structs/str_ground_bg.h index 31658978f..83c9b1ef0 100644 --- a/include/structs/str_ground_bg.h +++ b/include/structs/str_ground_bg.h @@ -63,23 +63,24 @@ typedef struct MapRender PixelPos bgRegOffsets; // Either bg2 or bg3 } MapRender; +// Size: 0xC typedef struct BmaHeader { // Map width/height that the camera in game will travel in tiles. Also the width/height of the collision and unknown data layers! For most maps (Map Width Chunks) * (Tiling Width) = (Map Width Camera). - u8 mapWidthTiles; - u8 mapHeightTiles; + /* 0x0 */ u8 mapWidthTiles; + /* 0x1 */ u8 mapHeightTiles; // Width/Height of chunks in tiles. Always 3, the value is ignored for these. - u8 tilingWidth; - u8 tilingHeight; + /* 0x2 */ u8 tilingWidth; + /* 0x3 */ u8 tilingHeight; // Map width/height in chunks. Also the width/height of the chunk mappings. - u8 mapWidthChunks; - u8 mapHeightChunks; + /* 0x4 */ u8 mapWidthChunks; + /* 0x5 */ u8 mapHeightChunks; - u16 numLayers; // Number of layers in this map. Must match BPC layer size. Allowed values are only 1 or 2. - u16 hasDataLayer; // Seems to be a boolean flag (0 or 1). If >0, the Unknown Data Layer exists. - u16 hasCollision; // Number of Collision layers. 0, 1 or 2. + /* 0x6 */ u16 numLayers; // Number of layers in this map. Must match BPC layer size. Allowed values are only 1 or 2. + /* 0x8 */ s16 hasDataLayer; // Seems to be a boolean flag (0 or 1). If >0, the Unknown Data Layer exists. + /* 0xA */ s16 hasCollision; // Number of Collision layers. 0, 1 or 2. } BmaHeader; // size: 0x18? @@ -95,7 +96,7 @@ typedef struct SubStruct_52C s16 unkE; // 0x53A s16 unk10; // 0x53C s16 unk12; // 0x53E - void (*unk14)(void *, const void *, BmaHeader *, s32); // TODO: fix void * to proper ptr types 0x540 + u8* (*unk14)(void *, const u8 *, BmaHeader *, s32); // TODO: fix void * to proper ptr types 0x540 } SubStruct_52C; typedef struct LayerSpecs @@ -144,7 +145,7 @@ typedef struct GroundBg BmaHeader bmaHeader; LayerSpecs layerSpecs; BplHeader bplHeader; - const void *unk468; + const u8 *decompressedBMAData; const AnimationSpecification *animationSpecifications; u8 unk470; u8 unk471; diff --git a/include/structs/str_ground_script.h b/include/structs/str_ground_script.h index 359d11bee..9582fa965 100644 --- a/include/structs/str_ground_script.h +++ b/include/structs/str_ground_script.h @@ -5,6 +5,66 @@ #include "constants/script_cmd.h" #include "structs/str_position.h" +enum ESC_RetID +{ + // Indicates a RET on script engine level, HandleAction copies action->scriptData2 onto action->scriptData, and reinitializes scriptData2. + // If there is no active scriptData2 it clears and reinits scriptData. + // Ultimately returns ESC_RET_03 to the script engine caller. + // Caveat: If the scripting engine is in state 0, HandleAction will immediately return ESC_RET_00 without performing any work. + ESC_RET_00, + // A terminal state (script success? error?), no further scripting progress will happen. + // This code is always returned to the caller from now on. + ESC_RET_01, + // Gives control back to the HandleAction function (entry point into the scripting engine state machine). + // This is the only return value that does not return to the script engine caller. + // Async commands? + ESC_RET_02, + // Returns to the caller, but will give control back to ExecuteScriptCommand when reentering the script ("script not finished"). + ESC_RET_03, + // Some kind of fatal error state, no further scripting progress will happen. + // This code is always returned to the caller from now on. + ESC_RET_04, +}; + +enum ScriptRefType +{ + // Unused? + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_00, + // Seems to be "enter" scripts. + // Sets GroundEvent Unk8 to 0x60 + SCRIPT_TYPE_01, + // Seems to be "exit" (GETOUT) scripts. + // Sets GroundEvent Unk8 to 0x60 + SCRIPT_TYPE_02, + // Unused? + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_03, + // Seems to be related to speaking. + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_04, + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_05, + // Unused? + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_06, + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_07, + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_08, + // Seems to be for emote/looking effects. + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_09, + // Seems to be debug scripts that are only used from a debug menu. + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_10, + // Seems to indicate sub-scenarios beginning/continuing/ending. + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_11, + // Sets GroundEvent Unk8 to 0x20 + SCRIPT_TYPE_12, +}; + // size: 0x10 typedef struct ScriptCommand { @@ -44,7 +104,7 @@ typedef struct ActionUnkIds { typedef struct ScriptData { /* 0x00 */ s16 state; - /* 0x02 */ s16 savedState; + /* 0x02 */ s16 savedState; // See enum "ESC_RetID" /* 0x04 */ ScriptInfo script; /* 0x10 */ ScriptInfo savedScript; /* 0x1C */ const ScriptCommand *curPtr; @@ -133,7 +193,7 @@ typedef struct GroundMapAction typedef struct ScriptRef { /* 0x0 */ s16 id; // See enum "ScriptID" - /* 0x2 */ s16 type; + /* 0x2 */ s16 type; // See enum "ScriptRefType" /* 0x4 */ const u8 *name; /* 0x8 */ const ScriptCommand *script; } ScriptRef; diff --git a/include/structs/str_stat_index.h b/include/structs/str_stat_index.h index 1f3fa8400..dad739314 100644 --- a/include/structs/str_stat_index.h +++ b/include/structs/str_stat_index.h @@ -9,7 +9,7 @@ // Needed to match in Blue/Sky. I wonder what was the reason for making it a struct as opposed to a simple int... typedef struct StatIndex { - int id; + s32 id; } StatIndex; #endif // GUARD_STR_STAT_INDEX_X diff --git a/include/thank_you_wonder_mail.h b/include/thank_you_wonder_mail.h index 4dea1d84f..d94a5d3d3 100644 --- a/include/thank_you_wonder_mail.h +++ b/include/thank_you_wonder_mail.h @@ -20,7 +20,7 @@ typedef struct WonderMailStruct_203B2C4 u8 filler48[0x1B8 - 0x48]; unkStruct_203B480 unk1B8; unkStruct_203B480 unk1E8; - /* 0x218 */ s8 mailIndex; + /* 0x218 */ u8 mailIndex; MenuStruct unk21C[4]; WindowTemplates unk35C; WindowTemplates unk3BC; diff --git a/include/trap.h b/include/trap.h index 87c0e59fe..dd15cf64e 100644 --- a/include/trap.h +++ b/include/trap.h @@ -10,10 +10,10 @@ void sub_807FC3C(DungeonPos *pos, u32 trapID, u32 param_3); bool8 CanLayTrap(DungeonPos *pos); bool8 LayTrap(DungeonPos *pos, u8 trapID, u8 param_3); bool8 sub_807FD84(Entity *entity); -bool8 sub_807FE04(DungeonPos *pos, char param_2); -bool8 sub_807FE44(DungeonPos *pos, char param_2); +bool8 sub_807FE04(DungeonPos *pos, u8 param_2); +bool8 sub_807FE44(DungeonPos *pos, u8 param_2); void GetTrapName(u8 *buffer, u8 trapIndex); -void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4); +void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, s32 param_3, u8 param_4); void HandleMudTrap(Entity *pokemon, Entity *target); void HandleStickyTrap(Entity *pokemon, Entity *target); void HandleGrimyTrap(Entity *pokemon, Entity *target); diff --git a/include/unk_menu_203B360.h b/include/unk_menu_203B360.h index 4821dfe14..bd28f0067 100644 --- a/include/unk_menu_203B360.h +++ b/include/unk_menu_203B360.h @@ -3,5 +3,6 @@ void sub_80383A8(void); u32 sub_80383D4(void); +void sub_8038440(void); -#endif // GUARD_UNK_MENU_203B360_H \ No newline at end of file +#endif // GUARD_UNK_MENU_203B360_H diff --git a/include/wonder_mail_6.h b/include/wonder_mail_6.h new file mode 100644 index 000000000..0d4628eef --- /dev/null +++ b/include/wonder_mail_6.h @@ -0,0 +1,8 @@ +#ifndef GUARD_WONDER_MAIL_6_H +#define GUARD_WONDER_MAIL_6_H + +bool8 sub_8030F58(u32 wonderMailType); +u32 sub_8031050(void); +void sub_80310B4(void); + +#endif // GUARD_WONDER_MAIL_6_H diff --git a/src/blow_away.c b/src/blow_away.c index ab5360b9c..1a733e2ea 100644 --- a/src/blow_away.c +++ b/src/blow_away.c @@ -143,16 +143,16 @@ void BlowAwayTarget(Entity *pokemon, Entity *target, u32 direction) void sub_807D068(Entity *pokemon, DungeonPos *pos) { - int pixelX; - int posY; - int pixelY; - int posX; - int counter; - int iVar8; + s32 pixelX; + s32 posY; + s32 pixelY; + s32 posX; + s32 counter; + s32 iVar8; s32 diff; PixelPos local_34; - int incrementX; - int incrementY; + s32 incrementX; + s32 incrementY; posX = X_POS_TO_PIXELPOS(pos->x); posY = Y_POS_TO_PIXELPOS(pos->y); diff --git a/src/code_800D090.c b/src/code_800D090.c index 4d60ddfc1..0ece563d9 100644 --- a/src/code_800D090.c +++ b/src/code_800D090.c @@ -158,6 +158,7 @@ EWRAM_DATA u32 gUnknown_202DBB8[80] = {0}; EWRAM_DATA struct UnkStruct_202DCF8 gUnknown_202DCF8 = {0}; +// arm_funcs.s extern u32 sub_80001E8(void); extern void sub_8000228(void); diff --git a/src/code_801EE10.c b/src/code_801EE10.c index f15f72af5..be0af66af 100644 --- a/src/code_801EE10.c +++ b/src/code_801EE10.c @@ -272,7 +272,7 @@ void sub_801F214(void) void sub_801F280(bool8 param_1) { - int i; + s32 i; u8 buffer[20]; CallPrepareTextbox_8008C54(gUnknown_203B270->unk50); @@ -331,7 +331,7 @@ void sub_801F280(bool8 param_1) s32 sub_801F3F8(void) { Move *move; - int index; + s32 index; s32 counter; counter = 0; diff --git a/src/code_801F428.c b/src/code_801F428.c index 3ba1fe1f1..a7dc1948c 100644 --- a/src/code_801F428.c +++ b/src/code_801F428.c @@ -138,7 +138,7 @@ void sub_801F690(void) void sub_801F700(void) { u32 y; - int index; + s32 index; u8 buffer2 [48]; u8 buffer1 [128]; diff --git a/src/code_801F808.c b/src/code_801F808.c index 771086e33..a5d255bec 100644 --- a/src/code_801F808.c +++ b/src/code_801F808.c @@ -41,13 +41,11 @@ static const WindowTemplate sUnknown_80DC2F8 = { NULL }; -const u8 gUnknown_80DC310[] = _("{POKEMON_0}"); - -extern void sub_801F918(s32); -extern void sub_801FA58(void); -extern void sub_801FAD4(void); -extern void sub_801F930(void); -extern void sub_801F9A4(void); +static void sub_801F918(s32); +static void sub_801FA58(void); +static void sub_801FAD4(void); +static void sub_801F930(void); +static void sub_801F9A4(void); bool8 sub_801F808(u16 *moveIDs) { @@ -102,14 +100,14 @@ void sub_801F8D0(void) } } -void sub_801F918(s32 newState) +static void sub_801F918(s32 newState) { gUnknown_203B278->state = newState; sub_801F930(); sub_801F9A4(); } -void sub_801F930(void) +static void sub_801F930(void) { sub_80140B4(&gUnknown_203B278->windows); switch(gUnknown_203B278->state) @@ -132,7 +130,7 @@ void sub_801F930(void) } } -void sub_801F9A4(void) +static void sub_801F9A4(void) { switch (gUnknown_203B278->state) { case 0: @@ -145,7 +143,7 @@ void sub_801F9A4(void) CallPrepareTextbox_8008C54(gUnknown_203B278->unk5C); sub_80073B8(gUnknown_203B278->unk5C); InlineStrcpy(gFormatBuffer_Monsters[0], gUnknown_203B278->unk14[gUnknown_203B278->unkC]->name); - PrintFormattedStringOnWindow(0x10,0,gUnknown_80DC310,gUnknown_203B278->unk5C,0); // $m0 + PrintFormattedStringOnWindow(0x10,0,_("{POKEMON_0}"),gUnknown_203B278->unk5C,0); PrintFormattedStringOnWindow(4,0x10,gUnknown_203B278->unk14[gUnknown_203B278->unkC]->desc,gUnknown_203B278->unk5C,0); sub_80073E0(gUnknown_203B278->unk5C); break; @@ -154,7 +152,7 @@ void sub_801F9A4(void) } } -void sub_801FA58(void) +static void sub_801FA58(void) { if(gUnknown_203B278->unk10 != 0) { @@ -190,7 +188,7 @@ void sub_801FA58(void) } } -void sub_801FAD4(void) +static void sub_801FAD4(void) { if(gUnknown_203B278->unkC < gUnknown_203B278->unk10 - 1) { diff --git a/src/code_8031D70.c b/src/code_8031D70.c index 418ce8b6c..99ea3d279 100644 --- a/src/code_8031D70.c +++ b/src/code_8031D70.c @@ -4,6 +4,7 @@ #include "constants/colors.h" #include "structs/str_dungeon.h" #include "music_util.h" +#include "code_8031D70.h" #include "code_803D0D8.h" #include "code_8094F88.h" #include "input.h" @@ -50,7 +51,6 @@ const WindowTemplate gUnknown_80E1FC4 = { ALIGNED(4) const u8 gUnknown_80E1FDC[] = "Password"; -void sub_8031E00(void); void sub_8031E58(void); void DrawSOSPasswordScreen(void); @@ -108,7 +108,7 @@ void sub_8031E58(void) void DrawSOSPasswordScreen(void) { - int rowIndex; + s32 rowIndex; u32 x; u32 y; u32 color; diff --git a/src/code_803B050.c b/src/code_803B050.c index 99e20a0c7..7c9726e8a 100644 --- a/src/code_803B050.c +++ b/src/code_803B050.c @@ -144,7 +144,7 @@ bool8 sub_803B050(void) for (i = 0, max = NUM_SCRIPT_IDS - 1; i <= max; i = (s16)(i + 1)) { const ScriptRef *info = &gFunctionScriptTable[i]; - if (info->type == 10) { + if (info->type == SCRIPT_TYPE_10) { gUnknown_203B3FC->scriptIDs[count++] = i; } } diff --git a/src/code_803B344.c b/src/code_803B344.c index 7bb814da8..f56a0d9f8 100644 --- a/src/code_803B344.c +++ b/src/code_803B344.c @@ -244,7 +244,7 @@ static s32 sub_803B600(WonderMail *mail) s32 sub_803B628(WonderMail *param_1) { const unkStruct_80E9F8C *ptr; - int i; + s32 i; ptr = &gUnknown_80E9F8C[0]; for (i = 0; i < ARRAY_COUNT_INT(gUnknown_80E9F8C); ptr++, i++) { @@ -260,7 +260,7 @@ s32 sub_803B628(WonderMail *param_1) s32 sub_803B66C(WonderMail *param_1) { const struct PokemonPair *ptr; - int i; + s32 i; ptr = &gUnknown_80E8168[0]; for (i = 0; i < ARRAY_COUNT_INT(gUnknown_80E8168); ptr++, i++) { diff --git a/src/code_803C1B4.c b/src/code_803C1B4.c index 2d3103d83..bd95f66f6 100644 --- a/src/code_803C1B4.c +++ b/src/code_803C1B4.c @@ -21,7 +21,7 @@ s32 sub_803C1B4(DungeonLocation *dungeon, u8 missionType) return temp; } -u8 sub_803C1D0(struct DungeonLocation *dungeon, u8 missionType) +u8 sub_803C1D0(DungeonLocation *dungeon, u8 missionType) { s32 a = sub_803C1B4(dungeon, missionType); a /= 2; @@ -32,7 +32,7 @@ u8 sub_803C1D0(struct DungeonLocation *dungeon, u8 missionType) return a; } -u8 *GetMissionRankText(u8 index) +const u8 *GetMissionRankText(u8 index) { return gMissionRankText[index]; } @@ -45,7 +45,7 @@ u32 GetDungeonTeamRankPts(DungeonLocation *dungeon, u8 r1) void sub_803C21C(WonderMail *param_1, unkStruct_802F204 *param_2) { - int index; + s32 index; u32 uVar2; uVar2 = sub_803C1D0(¶m_1->dungeonSeed.location,param_1->missionType); diff --git a/src/code_8040094_1.c b/src/code_8040094_1.c index 895b1fc80..f12679b34 100644 --- a/src/code_8040094_1.c +++ b/src/code_8040094_1.c @@ -3,40 +3,31 @@ #include "constants/move_id.h" #include "constants/type.h" #include "constants/weather.h" -#include "structs/dungeon_entity.h" #include "structs/str_dungeon.h" #include "code_800558C.h" -#include "graphics_memory.h" -#include "effect_data.h" -#include "effect_sub_1.h" -#include "dungeon_vram.h" +#include "code_8040094_1.h" +#include "dungeon_8041AD0.h" #include "dungeon_info.h" +#include "dungeon_logic.h" +#include "dungeon_map_access.h" #include "dungeon_message.h" +#include "dungeon_mon_sprite_render.h" #include "dungeon_move.h" #include "dungeon_move_util.h" #include "dungeon_music.h" #include "dungeon_random.h" +#include "dungeon_strings.h" +#include "dungeon_tilemap.h" #include "dungeon_util.h" -#include "dungeon_logic.h" +#include "dungeon_vram.h" +#include "effect_data.h" +#include "effect_main.h" +#include "effect_sub_1.h" +#include "graphics_memory.h" +#include "move_orb_actions_3.h" #include "sprite.h" #include "weather.h" -#include "dungeon_map_access.h" -#include "dungeon_strings.h" -#include "dungeon_mon_sprite_render.h" -#include "dungeon_8041AD0.h" -#include "effect_main.h" -extern u8 sub_800EC94(s32 param_1); -extern void sub_800EEC8(u16 r0); -extern bool8 sub_800E9A8(s32 a0); -extern void sub_800EEF8(u16 a0); -extern bool8 sub_803F428(DungeonPos *pos); -extern void sub_800EEE0(u16 a0); -extern bool8 EffectiveMoveHasSineWobble(s32 moveId); - -extern const s32 gUnknown_8106A8C[]; - -u16 GetEffectiveMoveId(u16 moveId, u8 weather, bool32 hasSpecialEffect); static bool32 MoveHasSpecialEffect(Entity *entity, Move *move); static bool8 sub_80414C0(Entity *entity, Move *move); static bool8 MoveHasSineWobble(u16 moveId, u8 weather, bool32 hasSpecialEffect); diff --git a/src/code_80958E8.c b/src/code_80958E8.c index b291c62c9..73c369e5f 100644 --- a/src/code_80958E8.c +++ b/src/code_80958E8.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "code_803C1B4.h" #include "code_803C1D0.h" #include "code_80958E8.h" #include "code_80A26CC.h" @@ -17,28 +18,30 @@ #include "pokemon_mail.h" #include "event_flag.h" #include "rescue_team_info.h" -#include "code_803C1B4.h" -bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4); -u8 sub_8095F28(u8 param_1); -bool8 GenerateMailJobDungeonInfo(WonderMail *mail); -bool8 GenerateMailJobInfo(WonderMail *); -bool8 sub_8096E80(u8); -u8 sub_8095E78(void); -bool8 sub_80963B4(void); -s32 CalculateMailChecksum(WonderMail *mail); +static const u8 sPossibleMissionTypes[8] = { + MISSION_TYPE_FRIEND_RESCUE, + MISSION_TYPE_FIND_ITEM, + MISSION_TYPE_DELIVER_ITEM, + MISSION_TYPE_RESCUE_CLIENT, + MISSION_TYPE_RESCUE_TARGET, + MISSION_TYPE_DELIVER_ITEM, + MISSION_TYPE_FIND_ITEM, + MISSION_TYPE_FRIEND_RESCUE +}; -extern void sub_803C4F0(WonderMail *); -extern void sub_803C3E0(WonderMail *); -extern void sub_803C45C(WonderMail *); -extern void sub_803C610(WonderMail *); -extern void sub_803C580(WonderMail *); +static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = { 0 }; -static const u8 sPossibleMissionTypes[] = {MISSION_TYPE_FRIEND_RESCUE, MISSION_TYPE_FIND_ITEM, MISSION_TYPE_DELIVER_ITEM, MISSION_TYPE_RESCUE_CLIENT, MISSION_TYPE_RESCUE_TARGET, MISSION_TYPE_DELIVER_ITEM, MISSION_TYPE_FIND_ITEM, MISSION_TYPE_FRIEND_RESCUE}; +EWRAM_INIT unkStruct_203B490 *gUnknown_203B490 = { NULL }; -static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = {0}; - -EWRAM_INIT unkStruct_203B490 *gUnknown_203B490 = {0}; +static bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4); +static u8 sub_8095F28(u8 param_1); +static bool8 GenerateMailJobDungeonInfo(WonderMail *mail); +static bool8 GenerateMailJobInfo(WonderMail *); +static bool8 sub_8096E80(u8); +static u8 sub_8095E78(void); +static bool8 sub_80963B4(void); +static s32 CalculateMailChecksum(WonderMail *mail); void LoadMailInfo(void) { @@ -169,7 +172,7 @@ bool8 ValidateWonderMail(WonderMail *data) } } -bool8 GenerateMailJobInfo(struct WonderMail *mail) +static bool8 GenerateMailJobInfo(WonderMail *mail) { s32 missionType; s32 i; @@ -262,7 +265,7 @@ bool8 GenerateMailJobInfo(struct WonderMail *mail) return TRUE; } -bool8 GenerateMailJobDungeonInfo(WonderMail *mail) +static bool8 GenerateMailJobDungeonInfo(WonderMail *mail) { s32 counter; s32 floor; @@ -342,7 +345,7 @@ bool8 GenerateMailJobDungeonInfo(WonderMail *mail) } while( TRUE ); } -bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4) +static bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4) { if (mail->mailType != MAIL_TYPE_NONE) { if ((mail->missionType == WONDER_MAIL_MISSION_TYPE_ESCORT_CLIENT) && (param_4 == 1)) { @@ -357,7 +360,7 @@ bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4) return FALSE; } -u8 sub_8095E78(void) +static u8 sub_8095E78(void) { bool8 flag; s32 index; @@ -401,7 +404,7 @@ u8 sub_8095E78(void) } } -u8 sub_8095F28(u8 param_1) +static u8 sub_8095F28(u8 param_1) { s32 itemID; s32 counter; @@ -487,8 +490,8 @@ void ResetMailboxSlot(u8 index) void ShiftMailboxSlotsDown(void) { - int counter1; // r5 - int counter2; + s32 counter1; // r5 + s32 counter2; counter1 = 0; @@ -613,7 +616,8 @@ _0809638E: if(GenerateMailJobInfo(slot)) { friendAreaReward = sub_8095E78(); - if(!sub_803C1D0(&slot->dungeonSeed.location, slot->missionType)) friendAreaReward = FRIEND_AREA_NONE; + if (sub_803C1D0(&slot->dungeonSeed.location, slot->missionType) == 0) + friendAreaReward = FRIEND_AREA_NONE; slot->rewardType = RandRange(MONEY1, END_REWARDS); if(slot->rewardType == FRIEND_AREA) { @@ -643,7 +647,7 @@ _08096392: return flag; } -bool8 sub_80963B4(void) +static bool8 sub_80963B4(void) { u8 floor; s32 num; @@ -787,8 +791,8 @@ void ResetPelipperBoardSlot(u8 index) void ShiftPelipperJobsDown(void) { - int counter1; // r5 - int counter2; + s32 counter1; // r5 + s32 counter2; counter1 = 0; @@ -1165,8 +1169,8 @@ void ResetJobSlot(u8 index) void ShiftJobSlotsDown(void) { - int counter1; // r5 - int counter2; + s32 counter1; // r5 + s32 counter2; counter1 = 0; @@ -1257,12 +1261,13 @@ u8 sub_8096E2C(void) for(index = floor; index < 0x32; index++) { - if(!gUnknown_203B490->PKMNNewsReceived[index]) return index; + if(!gUnknown_203B490->PKMNNewsReceived[index]) + return index; } return 0x38; } -bool8 sub_8096E80(u8 floor) +static bool8 sub_8096E80(u8 floor) { s32 index; for(index = 0; index < NUM_MAILBOX_SLOTS; index++) @@ -1276,7 +1281,7 @@ bool8 sub_8096E80(u8 floor) return FALSE; } -s32 CalculateMailChecksum(WonderMail *mail) +static s32 CalculateMailChecksum(WonderMail *mail) { s32 sum; diff --git a/src/data/event_flag.h b/src/data/event_flag.h index 37831a738..68794ddf0 100644 --- a/src/data/event_flag.h +++ b/src/data/event_flag.h @@ -95,7 +95,7 @@ const u8 *const gUnknown_80B71A0[4] = { struct MapIdToFriendAreaIdStruct { - s16 mapId; + s16 mapId; // See enum "GroundMapID" u8 friendAreaId; }; diff --git a/src/data/ground/ground_data_a01p01_station.h b/src/data/ground/ground_data_a01p01_station.h index a629f284f..04c9cb1e0 100644 --- a/src/data/ground/ground_data_a01p01_station.h +++ b/src/data/ground/ground_data_a01p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs162_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs162_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs162_g0_s0_station_sref_script }; /* 0x820fd9c */ +static const ScriptRef s_gs162_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs162_g0_s0_station_sref_script }; /* 0x820fd9c */ static const struct ScriptCommand s_gs162_g1_s0_station_sref_script[] = { /* 0x820fda8 */ DEBUGINFO_O(19), @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs162_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g1_s0_station_sref_script }; /* 0x820fe48 */ +static const ScriptRef s_gs162_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g1_s0_station_sref_script }; /* 0x820fe48 */ static const struct ScriptCommand s_gs162_g1_s0_lives0_dlg0[] = { /* 0x820fe54 */ DEBUGINFO_O(34), @@ -72,7 +72,7 @@ static const struct ScriptCommand s_gs162_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g2_s0_station_sref_script }; /* 0x8210144 */ +static const ScriptRef s_gs162_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g2_s0_station_sref_script }; /* 0x8210144 */ static const struct ScriptCommand s_gs162_g2_s0_eff0_script[] = { /* 0x8210150 */ DEBUGINFO_O(78), @@ -130,7 +130,7 @@ static const struct ScriptCommand s_gs162_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g3_s0_station_sref_script }; /* 0x821055c */ +static const ScriptRef s_gs162_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g3_s0_station_sref_script }; /* 0x821055c */ static const struct ScriptCommand s_gs162_g3_s0_lives0_dlg0[] = { /* 0x8210568 */ DEBUGINFO_O(136), @@ -239,7 +239,7 @@ static const struct ScriptCommand s_gs162_g4_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g4_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g4_s0_station_sref_script }; /* 0x8210c5c */ +static const ScriptRef s_gs162_g4_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g4_s0_station_sref_script }; /* 0x8210c5c */ static const struct ScriptCommand s_gs162_g4_s0_lives0_dlg0[] = { /* 0x8210c68 */ DEBUGINFO_O(245), @@ -386,7 +386,7 @@ static const struct ScriptCommand s_gs162_g5_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g5_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g5_s0_station_sref_script }; /* 0x82116ac */ +static const ScriptRef s_gs162_g5_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g5_s0_station_sref_script }; /* 0x82116ac */ static const struct ScriptCommand s_gs162_g5_s0_lives0_dlg0[] = { /* 0x82116b8 */ DEBUGINFO_O(392), @@ -423,7 +423,7 @@ static const struct ScriptCommand s_gs162_g6_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g6_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g6_s0_station_sref_script }; /* 0x8211894 */ +static const ScriptRef s_gs162_g6_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g6_s0_station_sref_script }; /* 0x8211894 */ static const struct ScriptCommand s_gs162_g6_s0_lives0_dlg0[] = { /* 0x82118a0 */ DEBUGINFO_O(429), @@ -682,7 +682,7 @@ static const struct ScriptCommand s_gs162_g7_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g7_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g7_s0_station_sref_script }; /* 0x8212e64 */ +static const ScriptRef s_gs162_g7_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g7_s0_station_sref_script }; /* 0x8212e64 */ static const struct ScriptCommand s_gs162_g7_s0_lives0_dlg0[] = { /* 0x8212e70 */ DEBUGINFO_O(688), @@ -722,7 +722,7 @@ static const struct ScriptCommand s_gs162_g8_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g8_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g8_s0_station_sref_script }; /* 0x8213030 */ +static const ScriptRef s_gs162_g8_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g8_s0_station_sref_script }; /* 0x8213030 */ static const struct ScriptCommand s_gs162_g8_s0_lives0_dlg0[] = { /* 0x821303c */ DEBUGINFO_O(728), @@ -987,7 +987,7 @@ static const struct ScriptCommand s_gs162_g9_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs162_g9_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g9_s0_station_sref_script }; /* 0x8214520 */ +static const ScriptRef s_gs162_g9_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g9_s0_station_sref_script }; /* 0x8214520 */ static const struct ScriptCommand s_gs162_g9_s0_lives0_dlg0[] = { /* 0x821452c */ DEBUGINFO_O(993), @@ -1243,7 +1243,7 @@ static const struct ScriptCommand s_gs162_g10_s0_station_sref_script[] = { /* 0x RET, }; -static const struct ScriptRef s_gs162_g10_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs162_g10_s0_station_sref_script }; /* 0x8215d98 */ +static const ScriptRef s_gs162_g10_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs162_g10_s0_station_sref_script }; /* 0x8215d98 */ static const struct ScriptCommand s_gs162_g10_s0_lives0_dlg0[] = { /* 0x8215da4 */ DEBUGINFO_O(1249), @@ -1404,7 +1404,7 @@ static const struct GroundEffectData s_gs162_g10_s0_effs[] = { /* 0x82160a8 */ /* 0 */ { 0, 0, 1, 1, { 30, 19, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82160b4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82160b4 */ &s_gs162_g0_s0_station_sref, &s_gs162_g1_s0_station_sref, &s_gs162_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a01p02_station.h b/src/data/ground/ground_data_a01p02_station.h index 547f7351c..22ecb6843 100644 --- a/src/data/ground/ground_data_a01p02_station.h +++ b/src/data/ground/ground_data_a01p02_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs163_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs163_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs163_g0_s0_station_sref_script }; /* 0x8216440 */ +static const ScriptRef s_gs163_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs163_g0_s0_station_sref_script }; /* 0x8216440 */ static const struct ScriptCommand s_gs163_g1_s0_station_sref_script[] = { /* 0x821644c */ DEBUGINFO_O(19), @@ -34,7 +34,7 @@ static const struct ScriptCommand s_gs163_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs163_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs163_g1_s0_station_sref_script }; /* 0x8216588 */ +static const ScriptRef s_gs163_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs163_g1_s0_station_sref_script }; /* 0x8216588 */ static const struct ScriptCommand s_gs163_g1_s0_lives0_dlg0[] = { /* 0x8216594 */ @@ -64,7 +64,7 @@ static const struct ScriptCommand s_gs163_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs163_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs163_g2_s0_station_sref_script }; /* 0x821674c */ +static const ScriptRef s_gs163_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs163_g2_s0_station_sref_script }; /* 0x821674c */ static const struct ScriptCommand s_gs163_g2_s0_lives0_dlg0[] = { /* 0x8216758 */ DEBUGINFO_O(70), @@ -99,7 +99,7 @@ static const struct ScriptCommand s_gs163_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs163_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs163_g3_s0_station_sref_script }; /* 0x8216948 */ +static const ScriptRef s_gs163_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs163_g3_s0_station_sref_script }; /* 0x8216948 */ static const struct ScriptCommand s_gs163_g3_s0_lives0_dlg0[] = { /* 0x8216954 */ DEBUGINFO_O(105), @@ -299,7 +299,7 @@ static const struct GroundEffectData s_gs163_g3_s0_effs[] = { /* 0x8218048 */ /* 0 */ { 0, 0, 1, 1, { 30, 19, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8218054 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8218054 */ &s_gs163_g0_s0_station_sref, &s_gs163_g1_s0_station_sref, &s_gs163_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a02p01_station.h b/src/data/ground/ground_data_a02p01_station.h index d153a0abc..b28d288d7 100644 --- a/src/data/ground/ground_data_a02p01_station.h +++ b/src/data/ground/ground_data_a02p01_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs164_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs164_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs164_g0_s0_station_sref_script }; /* 0x82181ac */ +static const ScriptRef s_gs164_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs164_g0_s0_station_sref_script }; /* 0x82181ac */ static const struct ScriptCommand s_gs164_g1_s0_station_sref_script[] = { /* 0x82181b8 */ DEBUGINFO_O(21), @@ -37,7 +37,7 @@ static const struct ScriptCommand s_gs164_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs164_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs164_g1_s0_station_sref_script }; /* 0x8218330 */ +static const ScriptRef s_gs164_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs164_g1_s0_station_sref_script }; /* 0x8218330 */ static const struct ScriptCommand s_gs164_g1_s0_lives0_dlg0[] = { /* 0x821833c */ @@ -81,7 +81,7 @@ static const struct GroundEffectData s_gs164_g1_s0_effs[] = { /* 0x8218508 */ /* 0 */ { 0, 0, 1, 1, { 40, 20, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8218514 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8218514 */ &s_gs164_g0_s0_station_sref, &s_gs164_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_a02p02_station.h b/src/data/ground/ground_data_a02p02_station.h index d9285d081..f43e8c76d 100644 --- a/src/data/ground/ground_data_a02p02_station.h +++ b/src/data/ground/ground_data_a02p02_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs165_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs165_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs165_g0_s0_station_sref_script }; /* 0x821860c */ +static const ScriptRef s_gs165_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs165_g0_s0_station_sref_script }; /* 0x821860c */ static const struct ScriptCommand s_gs165_g1_s0_station_sref_script[] = { /* 0x8218618 */ DEBUGINFO_O(21), @@ -44,7 +44,7 @@ static const struct ScriptCommand s_gs165_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs165_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs165_g1_s0_station_sref_script }; /* 0x8218828 */ +static const ScriptRef s_gs165_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs165_g1_s0_station_sref_script }; /* 0x8218828 */ @@ -101,7 +101,7 @@ static const struct GroundEffectData s_gs165_g1_s0_effs[] = { /* 0x8218b24 */ /* 0 */ { 0, 0, 1, 1, { 16, 11, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8218b30 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8218b30 */ &s_gs165_g0_s0_station_sref, &s_gs165_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_a02p03_station.h b/src/data/ground/ground_data_a02p03_station.h index caf998c55..ce1495b3e 100644 --- a/src/data/ground/ground_data_a02p03_station.h +++ b/src/data/ground/ground_data_a02p03_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs166_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs166_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs166_g0_s0_station_sref_script }; /* 0x8218c28 */ +static const ScriptRef s_gs166_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs166_g0_s0_station_sref_script }; /* 0x8218c28 */ static const struct ScriptCommand s_gs166_g1_s0_station_sref_script[] = { /* 0x8218c34 */ DEBUGINFO_O(21), @@ -27,7 +27,7 @@ static const struct ScriptCommand s_gs166_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs166_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs166_g1_s0_station_sref_script }; /* 0x8218ca4 */ +static const ScriptRef s_gs166_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs166_g1_s0_station_sref_script }; /* 0x8218ca4 */ static const struct ScriptCommand s_gs166_g1_s0_lives0_dlg0[] = { /* 0x8218cb0 */ DEBUGINFO_O(33), @@ -95,7 +95,7 @@ static const struct ScriptCommand s_gs166_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs166_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs166_g2_s0_station_sref_script }; /* 0x8219150 */ +static const ScriptRef s_gs166_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs166_g2_s0_station_sref_script }; /* 0x8219150 */ static const struct ScriptCommand s_gs166_g2_s0_lives0_dlg0[] = { /* 0x821915c */ @@ -194,7 +194,7 @@ static const struct GroundEffectData s_gs166_g2_s0_effs[] = { /* 0x82196b8 */ /* 0 */ { 0, 0, 1, 1, { 30, 28, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82196c4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82196c4 */ &s_gs166_g0_s0_station_sref, &s_gs166_g1_s0_station_sref, &s_gs166_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a02p04_station.h b/src/data/ground/ground_data_a02p04_station.h index d3e30e71a..6fff7cf3b 100644 --- a/src/data/ground/ground_data_a02p04_station.h +++ b/src/data/ground/ground_data_a02p04_station.h @@ -18,7 +18,7 @@ static const struct ScriptCommand s_gs167_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs167_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs167_g0_s0_station_sref_script }; /* 0x82197f0 */ +static const ScriptRef s_gs167_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs167_g0_s0_station_sref_script }; /* 0x82197f0 */ static const struct ScriptCommand s_gs167_g1_s0_station_sref_script[] = { /* 0x82197fc */ DEBUGINFO_O(24), @@ -30,7 +30,7 @@ static const struct ScriptCommand s_gs167_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs167_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs167_g1_s0_station_sref_script }; /* 0x821986c */ +static const ScriptRef s_gs167_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs167_g1_s0_station_sref_script }; /* 0x821986c */ static const struct ScriptCommand s_gs167_g2_s0_station_sref_script[] = { /* 0x8219878 */ DEBUGINFO_O(36), @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs167_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs167_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs167_g2_s0_station_sref_script }; /* 0x8219b4c */ +static const ScriptRef s_gs167_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs167_g2_s0_station_sref_script }; /* 0x8219b4c */ static const struct ScriptCommand s_gs167_g2_s0_eff0_script[] = { /* 0x8219b58 */ @@ -332,7 +332,7 @@ static const struct GroundEffectData s_gs167_g2_s0_effs[] = { /* 0x821b940 */ /* 0 */ { 0, 0, 1, 1, { 16, 8, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs167_g2_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x821b94c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x821b94c */ &s_gs167_g0_s0_station_sref, &s_gs167_g1_s0_station_sref, &s_gs167_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a03p01_station.h b/src/data/ground/ground_data_a03p01_station.h index 0f7a430d7..b47fec5d2 100644 --- a/src/data/ground/ground_data_a03p01_station.h +++ b/src/data/ground/ground_data_a03p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs168_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs168_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs168_g0_s0_station_sref_script }; /* 0x821ba90 */ +static const ScriptRef s_gs168_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs168_g0_s0_station_sref_script }; /* 0x821ba90 */ static const struct ScriptCommand s_gs168_g1_s0_station_sref_script[] = { /* 0x821ba9c */ DEBUGINFO_O(19), @@ -27,7 +27,7 @@ static const struct ScriptCommand s_gs168_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs168_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs168_g1_s0_station_sref_script }; /* 0x821bb2c */ +static const ScriptRef s_gs168_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs168_g1_s0_station_sref_script }; /* 0x821bb2c */ static const struct ScriptCommand s_gs168_g1_s0_eff0_script[] = { /* 0x821bb38 */ DEBUGINFO_O(33), @@ -223,7 +223,7 @@ static const struct ScriptCommand s_gs168_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs168_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs168_g2_s0_station_sref_script }; /* 0x821ca10 */ +static const ScriptRef s_gs168_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs168_g2_s0_station_sref_script }; /* 0x821ca10 */ static const struct ScriptCommand s_gs168_g2_s0_lives0_dlg0[] = { /* 0x821ca1c */ DEBUGINFO_O(229), @@ -307,7 +307,7 @@ static const struct GroundEffectData s_gs168_g2_s0_effs[] = { /* 0x821cddc */ /* 0 */ { 0, 0, 1, 1, { 79, 24, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x821cde8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x821cde8 */ &s_gs168_g0_s0_station_sref, &s_gs168_g1_s0_station_sref, &s_gs168_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a03p02_station.h b/src/data/ground/ground_data_a03p02_station.h index e7de50f63..93d136168 100644 --- a/src/data/ground/ground_data_a03p02_station.h +++ b/src/data/ground/ground_data_a03p02_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs169_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs169_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs169_g0_s0_station_sref_script }; /* 0x821cf0c */ +static const ScriptRef s_gs169_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs169_g0_s0_station_sref_script }; /* 0x821cf0c */ static const struct ScriptCommand s_gs169_g1_s0_station_sref_script[] = { /* 0x821cf18 */ DEBUGINFO_O(19), @@ -26,7 +26,7 @@ static const struct ScriptCommand s_gs169_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs169_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs169_g1_s0_station_sref_script }; /* 0x821cf98 */ +static const ScriptRef s_gs169_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs169_g1_s0_station_sref_script }; /* 0x821cf98 */ static const struct ScriptCommand s_gs169_g1_s0_lives0_dlg0[] = { /* 0x821cfa4 */ DEBUGINFO_O(32), @@ -66,7 +66,7 @@ static const struct GroundEffectData s_gs169_g1_s0_effs[] = { /* 0x821d154 */ /* 0 */ { 0, 0, 1, 1, { 17, 18, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x821d160 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x821d160 */ &s_gs169_g0_s0_station_sref, &s_gs169_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_a03p03_station.h b/src/data/ground/ground_data_a03p03_station.h index 68c5bd7d1..8dbb3ffee 100644 --- a/src/data/ground/ground_data_a03p03_station.h +++ b/src/data/ground/ground_data_a03p03_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs170_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs170_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs170_g0_s0_station_sref_script }; /* 0x821d250 */ +static const ScriptRef s_gs170_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs170_g0_s0_station_sref_script }; /* 0x821d250 */ static const struct ScriptCommand s_gs170_g1_s0_station_sref_script[] = { /* 0x821d25c */ DEBUGINFO_O(19), @@ -27,7 +27,7 @@ static const struct ScriptCommand s_gs170_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs170_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs170_g1_s0_station_sref_script }; /* 0x821d2ec */ +static const ScriptRef s_gs170_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs170_g1_s0_station_sref_script }; /* 0x821d2ec */ static const struct ScriptCommand s_gs170_g1_s0_lives0_dlg0[] = { /* 0x821d2f8 */ DEBUGINFO_O(33), @@ -278,7 +278,7 @@ static const struct ScriptCommand s_gs170_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs170_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs170_g2_s0_station_sref_script }; /* 0x821ee58 */ +static const ScriptRef s_gs170_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs170_g2_s0_station_sref_script }; /* 0x821ee58 */ static const struct ScriptCommand s_gs170_g2_s0_lives0_dlg0[] = { /* 0x821ee64 */ DEBUGINFO_O(284), @@ -453,7 +453,7 @@ static const struct GroundEffectData s_gs170_g2_s0_effs[] = { /* 0x821f8d0 */ /* 0 */ { 0, 0, 1, 1, { 103, 15, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x821f8dc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x821f8dc */ &s_gs170_g0_s0_station_sref, &s_gs170_g1_s0_station_sref, &s_gs170_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a04p01_station.h b/src/data/ground/ground_data_a04p01_station.h index acfb039dd..15da12e97 100644 --- a/src/data/ground/ground_data_a04p01_station.h +++ b/src/data/ground/ground_data_a04p01_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs171_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs171_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs171_g0_s0_station_sref_script }; /* 0x821fa28 */ +static const ScriptRef s_gs171_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs171_g0_s0_station_sref_script }; /* 0x821fa28 */ static const struct ScriptCommand s_gs171_g1_s0_station_sref_script[] = { /* 0x821fa34 */ DEBUGINFO_O(30), @@ -37,7 +37,7 @@ static const struct ScriptCommand s_gs171_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs171_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs171_g1_s0_station_sref_script }; /* 0x821fab4 */ +static const ScriptRef s_gs171_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs171_g1_s0_station_sref_script }; /* 0x821fab4 */ static const struct ScriptCommand s_gs171_g1_s0_eff0_script[] = { /* 0x821fac0 */ DEBUGINFO_O(43), @@ -81,7 +81,7 @@ static const struct ScriptCommand s_gs171_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs171_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs171_g2_s0_station_sref_script }; /* 0x821fd38 */ +static const ScriptRef s_gs171_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs171_g2_s0_station_sref_script }; /* 0x821fd38 */ static const struct ScriptCommand s_gs171_g2_s0_eff0_script[] = { /* 0x821fd44 */ DEBUGINFO_O(87), @@ -130,7 +130,7 @@ static const struct ScriptCommand s_gs171_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs171_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs171_g3_s0_station_sref_script }; /* 0x82200a4 */ +static const ScriptRef s_gs171_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs171_g3_s0_station_sref_script }; /* 0x82200a4 */ static const struct ScriptCommand s_gs171_g3_s0_lives0_dlg0[] = { /* 0x82200b0 */ DEBUGINFO_O(136), @@ -390,7 +390,7 @@ static const struct ScriptCommand s_gs171_g4_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs171_g4_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs171_g4_s0_station_sref_script }; /* 0x82213f0 */ +static const ScriptRef s_gs171_g4_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs171_g4_s0_station_sref_script }; /* 0x82213f0 */ static const struct ScriptCommand s_gs171_g4_s0_lives0_dlg0[] = { /* 0x82213fc */ DEBUGINFO_O(396), @@ -578,7 +578,7 @@ static const struct ScriptCommand s_gs171_g5_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs171_g5_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs171_g5_s0_station_sref_script }; /* 0x8221e34 */ +static const ScriptRef s_gs171_g5_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs171_g5_s0_station_sref_script }; /* 0x8221e34 */ static const struct ScriptCommand s_gs171_g5_s0_eff0_script[] = { /* 0x8221e40 */ DEBUGINFO_O(584), @@ -1064,7 +1064,7 @@ static const struct ScriptCommand s_gs171_g6_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs171_g6_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs171_g6_s0_station_sref_script }; /* 0x8223c34 */ +static const ScriptRef s_gs171_g6_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs171_g6_s0_station_sref_script }; /* 0x8223c34 */ static const struct ScriptCommand s_gs171_g6_s0_eff0_script[] = { /* 0x8223c40 */ DEBUGINFO_O(1070), @@ -2108,7 +2108,7 @@ static const struct ScriptCommand s_gs171_g7_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs171_g7_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs171_g7_s0_station_sref_script }; /* 0x8227f48 */ +static const ScriptRef s_gs171_g7_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs171_g7_s0_station_sref_script }; /* 0x8227f48 */ static const struct ScriptCommand s_gs171_g7_s0_lives0_dlg0[] = { /* 0x8227f54 */ DEBUGINFO_O(2114), @@ -2595,7 +2595,7 @@ static const struct GroundEffectData s_gs171_g7_s0_effs[] = { /* 0x8229674 */ /* 0 */ { 0, 0, 1, 1, { 20, 42, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8229680 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8229680 */ &s_gs171_g0_s0_station_sref, &s_gs171_g1_s0_station_sref, &s_gs171_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a04p02_station.h b/src/data/ground/ground_data_a04p02_station.h index f2387d6a3..388e2aabe 100644 --- a/src/data/ground/ground_data_a04p02_station.h +++ b/src/data/ground/ground_data_a04p02_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs172_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs172_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs172_g0_s0_station_sref_script }; /* 0x8229920 */ +static const ScriptRef s_gs172_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs172_g0_s0_station_sref_script }; /* 0x8229920 */ static const struct ScriptCommand s_gs172_g1_s0_station_sref_script[] = { /* 0x822992c */ DEBUGINFO_O(19), @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs172_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs172_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs172_g1_s0_station_sref_script }; /* 0x8229a20 */ +static const ScriptRef s_gs172_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs172_g1_s0_station_sref_script }; /* 0x8229a20 */ static const struct ScriptCommand s_gs172_g1_s0_eff0_script[] = { /* 0x8229a2c */ @@ -48,7 +48,7 @@ static const struct GroundEffectData s_gs172_g1_s0_effs[] = { /* 0x8229a9c */ /* 0 */ { 0, 0, 1, 1, { 18, 19, 0, CPOS_HALFTILE }, s_gs172_g1_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8229aa8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8229aa8 */ &s_gs172_g0_s0_station_sref, &s_gs172_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_a04p03_station.h b/src/data/ground/ground_data_a04p03_station.h index fe5616c6b..4aa60cc6b 100644 --- a/src/data/ground/ground_data_a04p03_station.h +++ b/src/data/ground/ground_data_a04p03_station.h @@ -14,7 +14,7 @@ static const struct ScriptCommand s_gs173_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs173_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs173_g0_s0_station_sref_script }; /* 0x8229b98 */ +static const ScriptRef s_gs173_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs173_g0_s0_station_sref_script }; /* 0x8229b98 */ static const struct ScriptCommand s_gs173_g1_s0_station_sref_script[] = { /* 0x8229ba4 */ DEBUGINFO_O(20), @@ -32,7 +32,7 @@ static const struct ScriptCommand s_gs173_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs173_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs173_g1_s0_station_sref_script }; /* 0x8229c74 */ +static const ScriptRef s_gs173_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs173_g1_s0_station_sref_script }; /* 0x8229c74 */ static const struct ScriptCommand s_gs173_g1_s0_eff0_script[] = { /* 0x8229c80 */ DEBUGINFO_O(38), @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs173_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs173_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs173_g2_s0_station_sref_script }; /* 0x8229d90 */ +static const ScriptRef s_gs173_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs173_g2_s0_station_sref_script }; /* 0x8229d90 */ static const struct ScriptCommand s_gs173_g2_s0_eff0_script[] = { /* 0x8229d9c */ DEBUGINFO_O(63), @@ -92,7 +92,7 @@ static const struct ScriptCommand s_gs173_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs173_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs173_g3_s0_station_sref_script }; /* 0x8229f4c */ +static const ScriptRef s_gs173_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs173_g3_s0_station_sref_script }; /* 0x8229f4c */ static const struct ScriptCommand s_gs173_g3_s0_eff0_script[] = { /* 0x8229f58 */ DEBUGINFO_O(98), @@ -124,7 +124,7 @@ static const struct GroundEffectData s_gs173_g3_s0_effs[] = { /* 0x822a020 */ /* 1 */ { 3, 0, 1, 1, { 18, 33, 0, CPOS_HALFTILE }, s_gs173_g3_s0_eff1_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x822a038 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x822a038 */ &s_gs173_g0_s0_station_sref, &s_gs173_g1_s0_station_sref, &s_gs173_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a04p04_station.h b/src/data/ground/ground_data_a04p04_station.h index 7ef0f2ffd..34a72ed4a 100644 --- a/src/data/ground/ground_data_a04p04_station.h +++ b/src/data/ground/ground_data_a04p04_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs174_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs174_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs174_g0_s0_station_sref_script }; /* 0x822a190 */ +static const ScriptRef s_gs174_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs174_g0_s0_station_sref_script }; /* 0x822a190 */ static const struct ScriptCommand s_gs174_g1_s0_station_sref_script[] = { /* 0x822a19c */ DEBUGINFO_O(19), @@ -29,7 +29,7 @@ static const struct ScriptCommand s_gs174_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs174_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs174_g1_s0_station_sref_script }; /* 0x822a24c */ +static const ScriptRef s_gs174_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs174_g1_s0_station_sref_script }; /* 0x822a24c */ static const struct ScriptCommand s_gs174_g1_s0_lives0_dlg0[] = { /* 0x822a258 */ DEBUGINFO_O(35), @@ -194,7 +194,7 @@ static const struct GroundEffectData s_gs174_g1_s0_effs[] = { /* 0x822aec8 */ /* 0 */ { 0, 0, 1, 1, { 20, 12, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x822aed4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x822aed4 */ &s_gs174_g0_s0_station_sref, &s_gs174_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_a05p01_station.h b/src/data/ground/ground_data_a05p01_station.h index 74222cab6..fe50f20de 100644 --- a/src/data/ground/ground_data_a05p01_station.h +++ b/src/data/ground/ground_data_a05p01_station.h @@ -12,7 +12,7 @@ static const struct ScriptCommand s_gs175_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs175_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs175_g0_s0_station_sref_script }; /* 0x822afdc */ +static const ScriptRef s_gs175_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs175_g0_s0_station_sref_script }; /* 0x822afdc */ static const struct ScriptCommand s_gs175_g1_s0_station_sref_script[] = { /* 0x822afe8 */ DEBUGINFO_O(18), @@ -33,7 +33,7 @@ static const struct ScriptCommand s_gs175_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs175_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs175_g1_s0_station_sref_script }; /* 0x822b0e8 */ +static const ScriptRef s_gs175_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs175_g1_s0_station_sref_script }; /* 0x822b0e8 */ static const struct ScriptCommand s_gs175_g1_s0_eff1_script[] = { /* 0x822b0f4 */ DEBUGINFO_O(39), @@ -76,7 +76,7 @@ static const struct ScriptCommand s_gs175_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs175_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs175_g2_s0_station_sref_script }; /* 0x822b3c4 */ +static const ScriptRef s_gs175_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs175_g2_s0_station_sref_script }; /* 0x822b3c4 */ static const struct ScriptCommand s_gs175_g2_s0_eff1_script[] = { /* 0x822b3d0 */ DEBUGINFO_O(82), @@ -111,7 +111,7 @@ static const struct GroundEffectData s_gs175_g2_s0_effs[] = { /* 0x822b59c */ /* 1 */ { 3, 4, 2, 1, { 22, 15, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs175_g2_s0_eff1_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x822b5b4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x822b5b4 */ &s_gs175_g0_s0_station_sref, &s_gs175_g1_s0_station_sref, &s_gs175_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_a05p02_station.h b/src/data/ground/ground_data_a05p02_station.h index 5214ca911..7f40a45c3 100644 --- a/src/data/ground/ground_data_a05p02_station.h +++ b/src/data/ground/ground_data_a05p02_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs176_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs176_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs176_g0_s0_station_sref_script }; /* 0x822b6d8 */ +static const ScriptRef s_gs176_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs176_g0_s0_station_sref_script }; /* 0x822b6d8 */ static const struct ScriptCommand s_gs176_g1_s0_station_sref_script[] = { /* 0x822b6e4 */ DEBUGINFO_O(19), @@ -88,7 +88,7 @@ static const struct ScriptCommand s_gs176_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs176_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs176_g1_s0_station_sref_script }; /* 0x822bb44 */ +static const ScriptRef s_gs176_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs176_g1_s0_station_sref_script }; /* 0x822bb44 */ static const struct ScriptCommand s_gs176_g1_s0_eff1_script[] = { /* 0x822bb50 */ DEBUGINFO_O(94), @@ -118,7 +118,7 @@ static const struct GroundEffectData s_gs176_g1_s0_effs[] = { /* 0x822bd4c */ /* 1 */ { 3, 4, 2, 1, { 22, 15, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs176_g1_s0_eff1_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x822bd64 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x822bd64 */ &s_gs176_g0_s0_station_sref, &s_gs176_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_a05p03_station.h b/src/data/ground/ground_data_a05p03_station.h index b0ef76edb..f0b556d39 100644 --- a/src/data/ground/ground_data_a05p03_station.h +++ b/src/data/ground/ground_data_a05p03_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs177_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs177_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs177_g0_s0_station_sref_script }; /* 0x822be54 */ +static const ScriptRef s_gs177_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs177_g0_s0_station_sref_script }; /* 0x822be54 */ static const struct ScriptCommand s_gs177_g1_s0_station_sref_script[] = { /* 0x822be60 */ DEBUGINFO_O(19), @@ -54,12 +54,12 @@ static const struct ScriptCommand s_gs177_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs177_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs177_g1_s0_station_sref_script }; /* 0x822c1ac */ +static const ScriptRef s_gs177_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs177_g1_s0_station_sref_script }; /* 0x822c1ac */ static const struct GroundEffectData s_gs177_g1_s0_effs[] = { /* 0x822c1b8 */ /* 0 */ { 0, 0, 1, 1, { 21, 15, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x822c1c4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x822c1c4 */ &s_gs177_g0_s0_station_sref, &s_gs177_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_b01p01a_station.h b/src/data/ground/ground_data_b01p01a_station.h index 345dbd818..d701505cf 100644 --- a/src/data/ground/ground_data_b01p01a_station.h +++ b/src/data/ground/ground_data_b01p01a_station.h @@ -282,7 +282,7 @@ static const struct ScriptCommand s_gs9_g0_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs9_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs9_g0_s0_station_sref_script }; /* 0x819bec8 */ +static const ScriptRef s_gs9_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs9_g0_s0_station_sref_script }; /* 0x819bec8 */ static const struct ScriptCommand s_gs9_g0_s0_evt0_sref_script[] = { /* 0x819bed4 */ @@ -295,7 +295,7 @@ static const struct ScriptCommand s_gs9_g0_s0_evt0_sref_script[] = { /* 0x819bed HALT, }; -static const struct ScriptRef s_gs9_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs9_g0_s0_evt0_sref_script }; /* 0x819bf44 */ +static const ScriptRef s_gs9_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs9_g0_s0_evt0_sref_script }; /* 0x819bf44 */ static const struct ScriptCommand s_gs9_g0_s0_evt1_sref_script[] = { /* 0x819bf50 */ DEBUGINFO_O(442), @@ -329,7 +329,7 @@ static const struct ScriptCommand s_gs9_g0_s0_evt1_sref_script[] = { /* 0x819bf5 RET, }; -static const struct ScriptRef s_gs9_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs9_g0_s0_evt1_sref_script }; /* 0x819c174 */ +static const ScriptRef s_gs9_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs9_g0_s0_evt1_sref_script }; /* 0x819c174 */ static const struct ScriptCommand s_gs9_g0_s0_evt2_sref_script[] = { /* 0x819c180 */ DEBUGINFO_O(476), @@ -361,7 +361,7 @@ static const struct ScriptCommand s_gs9_g0_s0_evt2_sref_script[] = { /* 0x819c18 HALT, }; -static const struct ScriptRef s_gs9_g0_s0_evt2_sref = { GETOUT_NORMAL, 2, NULL, s_gs9_g0_s0_evt2_sref_script }; /* 0x819c330 */ +static const ScriptRef s_gs9_g0_s0_evt2_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs9_g0_s0_evt2_sref_script }; /* 0x819c330 */ static const struct ScriptCommand s_gs9_g0_s0_evt3_sref_script[] = { /* 0x819c33c */ @@ -370,7 +370,7 @@ static const struct ScriptCommand s_gs9_g0_s0_evt3_sref_script[] = { /* 0x819c33 HALT, }; -static const struct ScriptRef s_gs9_g0_s0_evt3_sref = { GETOUT_NORMAL, 2, NULL, s_gs9_g0_s0_evt3_sref_script }; /* 0x819c36c */ +static const ScriptRef s_gs9_g0_s0_evt3_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs9_g0_s0_evt3_sref_script }; /* 0x819c36c */ static const struct ScriptCommand s_gs9_g0_s0_obj0_dlg2[] = { /* 0x819c378 */ DEBUGINFO_O(517), @@ -865,7 +865,7 @@ static const struct ScriptCommand s_gs9_g1_s0_station_sref_script[] = { /* 0x819 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g1_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g1_s0_station_sref_script }; /* 0x819e758 */ +static const ScriptRef s_gs9_g1_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g1_s0_station_sref_script }; /* 0x819e758 */ @@ -905,7 +905,7 @@ static const struct ScriptCommand s_gs9_g2_s0_station_sref_script[] = { /* 0x819 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g2_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g2_s0_station_sref_script }; /* 0x819e8b4 */ +static const ScriptRef s_gs9_g2_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g2_s0_station_sref_script }; /* 0x819e8b4 */ static const struct ScriptCommand s_gs9_g2_s0_eff0_script[] = { /* 0x819e8c0 */ DEBUGINFO_O(1052), @@ -968,7 +968,7 @@ static const struct ScriptCommand s_gs9_g3_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs9_g3_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g3_s0_station_sref_script }; /* 0x819ebb4 */ +static const ScriptRef s_gs9_g3_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g3_s0_station_sref_script }; /* 0x819ebb4 */ static const struct ScriptCommand s_gs9_g4_s0_station_sref_script[] = { /* 0x819ebc0 */ DEBUGINFO_O(1115), @@ -1023,7 +1023,7 @@ static const struct ScriptCommand s_gs9_g4_s0_station_sref_script[] = { /* 0x819 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g4_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g4_s0_station_sref_script }; /* 0x819eee0 */ +static const ScriptRef s_gs9_g4_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g4_s0_station_sref_script }; /* 0x819eee0 */ @@ -1057,7 +1057,7 @@ static const struct ScriptCommand s_gs9_g5_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs9_g5_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g5_s0_station_sref_script }; /* 0x819f03c */ +static const ScriptRef s_gs9_g5_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g5_s0_station_sref_script }; /* 0x819f03c */ static const struct ScriptCommand s_gs9_g5_s0_lives0_dlg0[] = { /* 0x819f048 */ DEBUGINFO_O(1204), @@ -1114,7 +1114,7 @@ static const struct ScriptCommand s_gs9_g6_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs9_g6_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g6_s0_station_sref_script }; /* 0x819f39c */ +static const ScriptRef s_gs9_g6_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g6_s0_station_sref_script }; /* 0x819f39c */ static const struct ScriptCommand s_gs9_g6_s1_lives0_dlg0[] = { /* 0x819f3a8 */ @@ -1179,7 +1179,7 @@ static const struct ScriptCommand s_gs9_g7_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs9_g7_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g7_s0_station_sref_script }; /* 0x819f7b8 */ +static const ScriptRef s_gs9_g7_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g7_s0_station_sref_script }; /* 0x819f7b8 */ static const struct ScriptCommand s_gs9_g7_s0_lives0_dlg0[] = { /* 0x819f7c4 */ DEBUGINFO_O(1326), @@ -1223,7 +1223,7 @@ static const struct ScriptCommand s_gs9_g8_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs9_g8_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g8_s0_station_sref_script }; /* 0x819f9a4 */ +static const ScriptRef s_gs9_g8_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g8_s0_station_sref_script }; /* 0x819f9a4 */ static const struct ScriptCommand s_gs9_g8_s0_lives0_dlg0[] = { /* 0x819f9b0 */ DEBUGINFO_O(1370), @@ -1417,7 +1417,7 @@ static const struct ScriptCommand s_gs9_g17_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g17_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g17_s0_station_sref_script }; /* 0x81a0500 */ +static const ScriptRef s_gs9_g17_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g17_s0_station_sref_script }; /* 0x81a0500 */ static const struct ScriptCommand s_gs9_g17_s0_eff0_script[] = { /* 0x81a050c - PART 1 0:18:58-0:19:03 - Possibly the camera scroll? WAIT timing seems to match */ @@ -1695,7 +1695,7 @@ static const struct ScriptCommand s_gs9_g18_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g18_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g18_s0_station_sref_script }; /* 0x81a2390 */ +static const ScriptRef s_gs9_g18_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g18_s0_station_sref_script }; /* 0x81a2390 */ static const struct ScriptCommand s_gs9_g18_s0_eff0_script[] = { /* 0x81a239c */ DEBUGINFO_O(1842), @@ -2016,7 +2016,7 @@ static const struct ScriptCommand s_gs9_g19_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g19_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g19_s0_station_sref_script }; /* 0x81a40e0 */ +static const ScriptRef s_gs9_g19_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g19_s0_station_sref_script }; /* 0x81a40e0 */ static const struct ScriptCommand s_gs9_g19_s0_lives0_dlg0[] = { /* 0x81a40ec */ DEBUGINFO_O(2163), @@ -2061,7 +2061,7 @@ static const struct ScriptCommand s_gs9_g19_s0_evt0_sref_script[] = { /* 0x81a43 HALT, }; -static const struct ScriptRef s_gs9_g19_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs9_g19_s0_evt0_sref_script }; /* 0x81a4380 */ +static const ScriptRef s_gs9_g19_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs9_g19_s0_evt0_sref_script }; /* 0x81a4380 */ static const struct ScriptCommand s_gs9_g19_s1_station_sref_script[] = { /* 0x81a438c */ DEBUGINFO_O(2208), @@ -2072,7 +2072,7 @@ static const struct ScriptCommand s_gs9_g19_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g19_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g19_s1_station_sref_script }; /* 0x81a43ec */ +static const ScriptRef s_gs9_g19_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g19_s1_station_sref_script }; /* 0x81a43ec */ static const struct ScriptCommand s_gs9_g19_s1_lives0_dlg0[] = { /* 0x81a43f8 */ DEBUGINFO_O(2219), @@ -2131,7 +2131,7 @@ static const struct ScriptCommand s_gs9_g20_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g20_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g20_s0_station_sref_script }; /* 0x81a484c */ +static const ScriptRef s_gs9_g20_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g20_s0_station_sref_script }; /* 0x81a484c */ static const struct ScriptCommand s_gs9_g20_s0_eff0_script[] = { /* 0x81a4858 */ DEBUGINFO_O(2278), @@ -2277,7 +2277,7 @@ static const struct ScriptCommand s_gs9_g21_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g21_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g21_s0_station_sref_script }; /* 0x81a536c */ +static const ScriptRef s_gs9_g21_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g21_s0_station_sref_script }; /* 0x81a536c */ static const struct ScriptCommand s_gs9_g21_s0_lives0_dlg0[] = { /* 0x81a5378 */ DEBUGINFO_O(2424), @@ -2325,7 +2325,7 @@ static const struct ScriptCommand s_gs9_g22_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g22_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g22_s0_station_sref_script }; /* 0x81a566c */ +static const ScriptRef s_gs9_g22_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g22_s0_station_sref_script }; /* 0x81a566c */ static const struct ScriptCommand s_gs9_g22_s1_station_sref_script[] = { /* 0x81a5678 */ DEBUGINFO_O(2472), @@ -2333,7 +2333,7 @@ static const struct ScriptCommand s_gs9_g22_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g22_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g22_s1_station_sref_script }; /* 0x81a56a8 */ +static const ScriptRef s_gs9_g22_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g22_s1_station_sref_script }; /* 0x81a56a8 */ static const struct ScriptCommand s_gs9_g22_s1_lives0_dlg0[] = { /* 0x81a56b4 */ DEBUGINFO_O(2480), @@ -2390,7 +2390,7 @@ static const struct ScriptCommand s_gs9_g22_s2_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g22_s2_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g22_s2_station_sref_script }; /* 0x81a5a70 */ +static const ScriptRef s_gs9_g22_s2_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g22_s2_station_sref_script }; /* 0x81a5a70 */ static const struct ScriptCommand s_gs9_g22_s2_lives0_dlg0[] = { /* 0x81a5a7c */ DEBUGINFO_O(2537), @@ -2454,7 +2454,7 @@ static const struct ScriptCommand s_gs9_g23_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g23_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g23_s0_station_sref_script }; /* 0x81a5dcc */ +static const ScriptRef s_gs9_g23_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g23_s0_station_sref_script }; /* 0x81a5dcc */ static const struct ScriptCommand s_gs9_g23_s0_lives0_dlg0[] = { /* 0x81a5dd8 */ DEBUGINFO_O(2601), @@ -2506,7 +2506,7 @@ static const struct ScriptCommand s_gs9_g24_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g24_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g24_s0_station_sref_script }; /* 0x81a6378 */ +static const ScriptRef s_gs9_g24_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g24_s0_station_sref_script }; /* 0x81a6378 */ static const struct ScriptCommand s_gs9_g24_s0_obj0_dlg2[] = { /* 0x81a6384 */ DEBUGINFO_O(2653), @@ -2533,7 +2533,7 @@ static const struct ScriptCommand s_gs9_g24_s0_evt0_sref_script[] = { /* 0x81a64 HALT, }; -static const struct ScriptRef s_gs9_g24_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs9_g24_s0_evt0_sref_script }; /* 0x81a64e4 */ +static const ScriptRef s_gs9_g24_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs9_g24_s0_evt0_sref_script }; /* 0x81a64e4 */ static const struct ScriptCommand s_gs9_g24_s1_station_sref_script[] = { /* 0x81a64f0 */ DEBUGINFO_O(2680), @@ -2544,7 +2544,7 @@ static const struct ScriptCommand s_gs9_g24_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g24_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g24_s1_station_sref_script }; /* 0x81a6550 */ +static const ScriptRef s_gs9_g24_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g24_s1_station_sref_script }; /* 0x81a6550 */ static const struct ScriptCommand s_gs9_g24_s1_lives0_dlg0[] = { /* 0x81a655c */ DEBUGINFO_O(2691), @@ -2568,7 +2568,7 @@ static const struct ScriptCommand s_gs9_g25_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g25_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g25_s0_station_sref_script }; /* 0x81a6684 */ +static const ScriptRef s_gs9_g25_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g25_s0_station_sref_script }; /* 0x81a6684 */ static const struct ScriptCommand s_gs9_g25_s0_eff0_script[] = { /* 0x81a6690 */ DEBUGINFO_O(2715), @@ -2689,7 +2689,7 @@ static const struct ScriptCommand s_gs9_g26_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g26_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g26_s0_station_sref_script }; /* 0x81a7134 */ +static const ScriptRef s_gs9_g26_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g26_s0_station_sref_script }; /* 0x81a7134 */ static const struct ScriptCommand s_gs9_g26_s0_lives0_dlg0[] = { /* 0x81a7140 */ DEBUGINFO_O(2836), @@ -2805,7 +2805,7 @@ static const struct ScriptCommand s_gs9_g27_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g27_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g27_s0_station_sref_script }; /* 0x81a7904 */ +static const ScriptRef s_gs9_g27_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g27_s0_station_sref_script }; /* 0x81a7904 */ static const struct ScriptCommand s_gs9_g27_s0_lives0_dlg0[] = { /* 0x81a7910 */ DEBUGINFO_O(2952), @@ -2854,7 +2854,7 @@ static const struct ScriptCommand s_gs9_g28_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g28_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g28_s0_station_sref_script }; /* 0x81a7bf4 */ +static const ScriptRef s_gs9_g28_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g28_s0_station_sref_script }; /* 0x81a7bf4 */ static const struct ScriptCommand s_gs9_g28_s0_eff0_script[] = { /* 0x81a7c00 */ DEBUGINFO_O(3001), @@ -3521,7 +3521,7 @@ static const struct ScriptCommand s_gs9_g29_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g29_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g29_s0_station_sref_script }; /* 0x81ab6c8 */ +static const ScriptRef s_gs9_g29_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g29_s0_station_sref_script }; /* 0x81ab6c8 */ static const struct ScriptCommand s_gs9_g29_s0_lives0_dlg0[] = { /* 0x81ab6d4 */ DEBUGINFO_O(3668), @@ -3712,7 +3712,7 @@ static const struct ScriptCommand s_gs9_g30_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g30_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g30_s0_station_sref_script }; /* 0x81acc48 */ +static const ScriptRef s_gs9_g30_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g30_s0_station_sref_script }; /* 0x81acc48 */ static const struct ScriptCommand s_gs9_g30_s0_eff0_script[] = { /* 0x81acc54 */ DEBUGINFO_O(3859), @@ -4165,7 +4165,7 @@ static const struct ScriptCommand s_gs9_g31_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g31_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g31_s0_station_sref_script }; /* 0x81aed3c */ +static const ScriptRef s_gs9_g31_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g31_s0_station_sref_script }; /* 0x81aed3c */ static const struct ScriptCommand s_gs9_g31_s0_eff0_script[] = { /* 0x81aed48 */ DEBUGINFO_O(4312), @@ -4526,7 +4526,7 @@ static const struct ScriptCommand s_gs9_g32_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g32_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g32_s0_station_sref_script }; /* 0x81b07dc */ +static const ScriptRef s_gs9_g32_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g32_s0_station_sref_script }; /* 0x81b07dc */ static const struct ScriptCommand s_gs9_g32_s0_lives0_dlg0[] = { /* 0x81b07e8 */ DEBUGINFO_O(4673), @@ -4561,7 +4561,7 @@ static const struct ScriptCommand s_gs9_g33_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g33_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g33_s0_station_sref_script }; /* 0x81b09f4 */ +static const ScriptRef s_gs9_g33_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g33_s0_station_sref_script }; /* 0x81b09f4 */ static const struct ScriptCommand s_gs9_g33_s0_lives0_dlg0[] = { /* 0x81b0a00 */ DEBUGINFO_O(4708), @@ -4604,7 +4604,7 @@ static const struct ScriptCommand s_gs9_g34_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g34_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g34_s0_station_sref_script }; /* 0x81b0c8c */ +static const ScriptRef s_gs9_g34_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g34_s0_station_sref_script }; /* 0x81b0c8c */ static const struct ScriptCommand s_gs9_g34_s0_lives0_dlg0[] = { /* 0x81b0c98 */ DEBUGINFO_O(4751), @@ -4920,7 +4920,7 @@ static const struct ScriptCommand s_gs9_g35_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g35_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g35_s0_station_sref_script }; /* 0x81b2534 */ +static const ScriptRef s_gs9_g35_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g35_s0_station_sref_script }; /* 0x81b2534 */ static const struct ScriptCommand s_gs9_g35_s0_lives0_dlg0[] = { /* 0x81b2540 */ DEBUGINFO_O(5067), @@ -5010,7 +5010,7 @@ static const struct ScriptCommand s_gs9_g36_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g36_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g36_s0_station_sref_script }; /* 0x81b2aa4 */ +static const ScriptRef s_gs9_g36_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g36_s0_station_sref_script }; /* 0x81b2aa4 */ static const struct ScriptCommand s_gs9_g36_s0_lives0_dlg0[] = { /* 0x81b2ab0 */ DEBUGINFO_O(5157), @@ -5170,7 +5170,7 @@ static const struct ScriptCommand s_gs9_g37_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g37_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g37_s0_station_sref_script }; /* 0x81b38d0 */ +static const ScriptRef s_gs9_g37_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g37_s0_station_sref_script }; /* 0x81b38d0 */ static const struct ScriptCommand s_gs9_g37_s0_lives0_dlg0[] = { /* 0x81b38dc */ DEBUGINFO_O(5317), @@ -5204,7 +5204,7 @@ static const struct ScriptCommand s_gs9_g38_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g38_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g38_s0_station_sref_script }; /* 0x81b3ac0 */ +static const ScriptRef s_gs9_g38_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g38_s0_station_sref_script }; /* 0x81b3ac0 */ static const struct ScriptCommand s_gs9_g38_s0_lives0_dlg0[] = { /* 0x81b3acc */ DEBUGINFO_O(5351), @@ -5246,7 +5246,7 @@ static const struct ScriptCommand s_gs9_g39_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g39_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g39_s0_station_sref_script }; /* 0x81b3d24 */ +static const ScriptRef s_gs9_g39_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g39_s0_station_sref_script }; /* 0x81b3d24 */ static const struct ScriptCommand s_gs9_g39_s0_eff0_script[] = { /* 0x81b3d30 */ DEBUGINFO_O(5393), @@ -5693,7 +5693,7 @@ static const struct ScriptCommand s_gs9_g40_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g40_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g40_s0_station_sref_script }; /* 0x81b6030 */ +static const ScriptRef s_gs9_g40_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g40_s0_station_sref_script }; /* 0x81b6030 */ static const struct ScriptCommand s_gs9_g40_s0_lives0_dlg0[] = { /* 0x81b603c */ DEBUGINFO_O(5840), @@ -5741,7 +5741,7 @@ static const struct ScriptCommand s_gs9_g41_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g41_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g41_s0_station_sref_script }; /* 0x81b6548 */ +static const ScriptRef s_gs9_g41_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g41_s0_station_sref_script }; /* 0x81b6548 */ static const struct ScriptCommand s_gs9_g42_s0_station_sref_script[] = { /* 0x81b6554 */ DEBUGINFO_O(5888), @@ -5759,7 +5759,7 @@ static const struct ScriptCommand s_gs9_g42_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g42_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g42_s0_station_sref_script }; /* 0x81b6624 */ +static const ScriptRef s_gs9_g42_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g42_s0_station_sref_script }; /* 0x81b6624 */ static const struct ScriptCommand s_gs9_g42_s0_lives0_dlg0[] = { /* 0x81b6630 */ DEBUGINFO_O(5906), @@ -5804,7 +5804,7 @@ static const struct ScriptCommand s_gs9_g43_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g43_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g43_s0_station_sref_script }; /* 0x81b6880 */ +static const ScriptRef s_gs9_g43_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g43_s0_station_sref_script }; /* 0x81b6880 */ static const struct ScriptCommand s_gs9_g43_s0_eff0_script[] = { /* 0x81b688c */ DEBUGINFO_O(5951), @@ -5978,7 +5978,7 @@ static const struct ScriptCommand s_gs9_g44_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g44_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g44_s0_station_sref_script }; /* 0x81b78b4 */ +static const ScriptRef s_gs9_g44_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g44_s0_station_sref_script }; /* 0x81b78b4 */ static const struct ScriptCommand s_gs9_g44_s0_lives0_dlg0[] = { /* 0x81b78c0 */ DEBUGINFO_O(6125), @@ -6024,7 +6024,7 @@ static const struct ScriptCommand s_gs9_g45_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g45_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g45_s0_station_sref_script }; /* 0x81b7b44 */ +static const ScriptRef s_gs9_g45_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g45_s0_station_sref_script }; /* 0x81b7b44 */ static const struct ScriptCommand s_gs9_g45_s0_lives0_dlg0[] = { /* 0x81b7b50 */ DEBUGINFO_O(6171), @@ -6446,7 +6446,7 @@ static const struct ScriptCommand s_gs9_g46_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g46_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g46_s0_station_sref_script }; /* 0x81ba658 */ +static const ScriptRef s_gs9_g46_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g46_s0_station_sref_script }; /* 0x81ba658 */ static const struct ScriptCommand s_gs9_g46_s0_lives0_dlg0[] = { /* 0x81ba664 */ DEBUGINFO_O(6593), @@ -6562,7 +6562,7 @@ static const struct ScriptCommand s_gs9_g47_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g47_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g47_s0_station_sref_script }; /* 0x81bb148 */ +static const ScriptRef s_gs9_g47_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g47_s0_station_sref_script }; /* 0x81bb148 */ static const struct ScriptCommand s_gs9_g47_s0_lives0_dlg0[] = { /* 0x81bb154 */ DEBUGINFO_O(6709), @@ -6629,7 +6629,7 @@ static const struct ScriptCommand s_gs9_g48_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g48_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g48_s0_station_sref_script }; /* 0x81bb620 */ +static const ScriptRef s_gs9_g48_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g48_s0_station_sref_script }; /* 0x81bb620 */ static const struct ScriptCommand s_gs9_g48_s0_eff0_script[] = { /* 0x81bb62c */ DEBUGINFO_O(6776), @@ -7202,7 +7202,7 @@ static const struct ScriptCommand s_gs9_g49_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g49_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g49_s0_station_sref_script }; /* 0x81bea5c */ +static const ScriptRef s_gs9_g49_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g49_s0_station_sref_script }; /* 0x81bea5c */ static const struct ScriptCommand s_gs9_g49_s0_lives0_dlg0[] = { /* 0x81bea68 */ @@ -7261,7 +7261,7 @@ static const struct ScriptCommand s_gs9_g50_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g50_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g50_s0_station_sref_script }; /* 0x81beebc */ +static const ScriptRef s_gs9_g50_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g50_s0_station_sref_script }; /* 0x81beebc */ static const struct ScriptCommand s_gs9_g50_s0_lives0_dlg0[] = { /* 0x81beec8 */ DEBUGINFO_O(7408), @@ -7303,7 +7303,7 @@ static const struct ScriptCommand s_gs9_g50_s1_evt0_sref_script[] = { /* 0x81bf0 RET, }; -static const struct ScriptRef s_gs9_g50_s1_evt0_sref = { NORMAL_EVENT, 7, NULL, s_gs9_g50_s1_evt0_sref_script }; /* 0x81bf110 */ +static const ScriptRef s_gs9_g50_s1_evt0_sref = { NORMAL_EVENT, SCRIPT_TYPE_07, NULL, s_gs9_g50_s1_evt0_sref_script }; /* 0x81bf110 */ static const struct ScriptCommand s_gs9_g50_s2_station_sref_script[] = { /* 0x81bf11c */ DEBUGINFO_O(7450), @@ -7314,7 +7314,7 @@ static const struct ScriptCommand s_gs9_g50_s2_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g50_s2_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g50_s2_station_sref_script }; /* 0x81bf17c */ +static const ScriptRef s_gs9_g50_s2_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g50_s2_station_sref_script }; /* 0x81bf17c */ static const struct ScriptCommand s_gs9_g50_s2_lives0_dlg0[] = { /* 0x81bf188 */ DEBUGINFO_O(7461), @@ -7378,7 +7378,7 @@ static const struct ScriptCommand s_gs9_g50_s3_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g50_s3_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g50_s3_station_sref_script }; /* 0x81bf63c */ +static const ScriptRef s_gs9_g50_s3_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g50_s3_station_sref_script }; /* 0x81bf63c */ static const struct ScriptCommand s_gs9_g50_s3_lives0_dlg0[] = { /* 0x81bf648 */ DEBUGINFO_O(7525), @@ -7411,7 +7411,7 @@ static const struct ScriptCommand s_gs9_g51_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g51_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g51_s0_station_sref_script }; /* 0x81bf7c8 */ +static const ScriptRef s_gs9_g51_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g51_s0_station_sref_script }; /* 0x81bf7c8 */ static const struct ScriptCommand s_gs9_g51_s0_lives0_dlg0[] = { /* 0x81bf7d4 */ DEBUGINFO_O(7558), @@ -7481,7 +7481,7 @@ static const struct ScriptCommand s_gs9_g52_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g52_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g52_s0_station_sref_script }; /* 0x81bff64 */ +static const ScriptRef s_gs9_g52_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g52_s0_station_sref_script }; /* 0x81bff64 */ static const struct ScriptCommand s_gs9_g52_s0_lives0_dlg0[] = { /* 0x81bff70 */ DEBUGINFO_O(7628), @@ -7542,7 +7542,7 @@ static const struct ScriptCommand s_gs9_g53_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g53_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g53_s0_station_sref_script }; /* 0x81c01f0 */ +static const ScriptRef s_gs9_g53_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g53_s0_station_sref_script }; /* 0x81c01f0 */ static const struct ScriptCommand s_gs9_g53_s0_eff0_script[] = { /* 0x81c01fc */ DEBUGINFO_O(7689), @@ -8055,7 +8055,7 @@ static const struct ScriptCommand s_gs9_g55_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g55_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g55_s0_station_sref_script }; /* 0x81c23b4 */ +static const ScriptRef s_gs9_g55_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g55_s0_station_sref_script }; /* 0x81c23b4 */ static const struct ScriptCommand s_gs9_g55_s0_lives0_dlg0[] = { /* 0x81c23c0 */ DEBUGINFO_O(8202), @@ -8167,7 +8167,7 @@ static const struct ScriptCommand s_gs9_g56_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g56_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g56_s0_station_sref_script }; /* 0x81c2b58 */ +static const ScriptRef s_gs9_g56_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g56_s0_station_sref_script }; /* 0x81c2b58 */ static const struct ScriptCommand s_gs9_g57_s0_station_sref_script[] = { /* 0x81c2b64 */ DEBUGINFO_O(8314), @@ -8186,7 +8186,7 @@ static const struct ScriptCommand s_gs9_g57_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g57_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g57_s0_station_sref_script }; /* 0x81c2c44 */ +static const ScriptRef s_gs9_g57_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g57_s0_station_sref_script }; /* 0x81c2c44 */ static const struct ScriptCommand s_gs9_g57_s0_lives0_dlg0[] = { /* 0x81c2c50 */ DEBUGINFO_O(8333), @@ -8275,7 +8275,7 @@ static const struct ScriptCommand s_gs9_g58_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g58_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g58_s0_station_sref_script }; /* 0x81c372c */ +static const ScriptRef s_gs9_g58_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g58_s0_station_sref_script }; /* 0x81c372c */ static const struct ScriptCommand s_gs9_g58_s0_eff0_script[] = { /* 0x81c3738 */ DEBUGINFO_O(8422), @@ -8419,7 +8419,7 @@ static const struct ScriptCommand s_gs9_g59_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g59_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g59_s0_station_sref_script }; /* 0x81c40f4 */ +static const ScriptRef s_gs9_g59_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g59_s0_station_sref_script }; /* 0x81c40f4 */ static const struct ScriptCommand s_gs9_g59_s0_lives0_dlg0[] = { /* 0x81c4100 */ DEBUGINFO_O(8566), @@ -8473,7 +8473,7 @@ static const struct ScriptCommand s_gs9_g60_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g60_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g60_s0_station_sref_script }; /* 0x81c458c */ +static const ScriptRef s_gs9_g60_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g60_s0_station_sref_script }; /* 0x81c458c */ static const struct ScriptCommand s_gs9_g60_s0_eff0_script[] = { /* 0x81c4598 */ DEBUGINFO_O(8620), @@ -8525,7 +8525,7 @@ static const struct ScriptCommand s_gs9_g61_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g61_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g61_s0_station_sref_script }; /* 0x81c4a34 */ +static const ScriptRef s_gs9_g61_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g61_s0_station_sref_script }; /* 0x81c4a34 */ static const struct ScriptCommand s_gs9_g61_s0_lives0_dlg0[] = { /* 0x81c4a40 */ DEBUGINFO_O(8672), @@ -8575,7 +8575,7 @@ static const struct ScriptCommand s_gs9_g61_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g61_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g61_s1_station_sref_script }; /* 0x81c4da8 */ +static const ScriptRef s_gs9_g61_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g61_s1_station_sref_script }; /* 0x81c4da8 */ static const struct ScriptCommand s_gs9_g61_s1_lives0_dlg0[] = { /* 0x81c4db4 */ DEBUGINFO_O(8722), @@ -8616,7 +8616,7 @@ static const struct ScriptCommand s_gs9_g62_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g62_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g62_s0_station_sref_script }; /* 0x81c4f94 */ +static const ScriptRef s_gs9_g62_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g62_s0_station_sref_script }; /* 0x81c4f94 */ static const struct ScriptCommand s_gs9_g62_s0_eff0_script[] = { /* 0x81c4fa0 */ DEBUGINFO_O(8763), @@ -8719,7 +8719,7 @@ static const struct ScriptCommand s_gs9_g63_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g63_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g63_s0_station_sref_script }; /* 0x81c56a8 */ +static const ScriptRef s_gs9_g63_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g63_s0_station_sref_script }; /* 0x81c56a8 */ static const struct ScriptCommand s_gs9_g63_s0_lives0_dlg0[] = { /* 0x81c56b4 */ DEBUGINFO_O(8866), @@ -8762,7 +8762,7 @@ static const struct ScriptCommand s_gs9_g64_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g64_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g64_s0_station_sref_script }; /* 0x81c5ad4 */ +static const ScriptRef s_gs9_g64_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g64_s0_station_sref_script }; /* 0x81c5ad4 */ static const struct ScriptCommand s_gs9_g64_s1_station_sref_script[] = { /* 0x81c5ae0 */ DEBUGINFO_O(8909), @@ -8772,7 +8772,7 @@ static const struct ScriptCommand s_gs9_g64_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g64_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g64_s1_station_sref_script }; /* 0x81c5b30 */ +static const ScriptRef s_gs9_g64_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g64_s1_station_sref_script }; /* 0x81c5b30 */ static const struct ScriptCommand s_gs9_g64_s1_lives0_dlg0[] = { /* 0x81c5b3c */ DEBUGINFO_O(8919), @@ -8802,7 +8802,7 @@ static const struct ScriptCommand s_gs9_g65_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g65_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g65_s0_station_sref_script }; /* 0x81c5cc8 */ +static const ScriptRef s_gs9_g65_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g65_s0_station_sref_script }; /* 0x81c5cc8 */ static const struct ScriptCommand s_gs9_g65_s0_lives0_dlg0[] = { /* 0x81c5cd4 */ DEBUGINFO_O(8949), @@ -8844,7 +8844,7 @@ static const struct ScriptCommand s_gs9_g66_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g66_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g66_s0_station_sref_script }; /* 0x81c5f74 */ +static const ScriptRef s_gs9_g66_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g66_s0_station_sref_script }; /* 0x81c5f74 */ static const struct ScriptCommand s_gs9_g67_s0_station_sref_script[] = { /* 0x81c5f80 */ DEBUGINFO_O(8991), @@ -8862,7 +8862,7 @@ static const struct ScriptCommand s_gs9_g67_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g67_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g67_s0_station_sref_script }; /* 0x81c6050 */ +static const ScriptRef s_gs9_g67_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g67_s0_station_sref_script }; /* 0x81c6050 */ static const struct ScriptCommand s_gs9_g67_s0_lives0_dlg0[] = { /* 0x81c605c */ DEBUGINFO_O(9009), @@ -8919,7 +8919,7 @@ static const struct ScriptCommand s_gs9_g68_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g68_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g68_s0_station_sref_script }; /* 0x81c6514 */ +static const ScriptRef s_gs9_g68_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g68_s0_station_sref_script }; /* 0x81c6514 */ static const struct ScriptCommand s_gs9_g68_s0_eff0_script[] = { /* 0x81c6520 */ DEBUGINFO_O(9066), @@ -9413,7 +9413,7 @@ static const struct ScriptCommand s_gs9_g69_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g69_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g69_s0_station_sref_script }; /* 0x81c80b0 */ +static const ScriptRef s_gs9_g69_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g69_s0_station_sref_script }; /* 0x81c80b0 */ static const struct ScriptCommand s_gs9_g69_s0_eff0_script[] = { /* 0x81c80bc */ DEBUGINFO_O(9560), @@ -9559,7 +9559,7 @@ static const struct ScriptCommand s_gs9_g70_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g70_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g70_s0_station_sref_script }; /* 0x81c8914 */ +static const ScriptRef s_gs9_g70_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g70_s0_station_sref_script }; /* 0x81c8914 */ static const struct ScriptCommand s_gs9_g71_s0_station_sref_script[] = { /* 0x81c8920 */ DEBUGINFO_O(9706), @@ -9571,7 +9571,7 @@ static const struct ScriptCommand s_gs9_g71_s0_station_sref_script[] = { /* 0x81 HALT, }; -static const struct ScriptRef s_gs9_g71_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g71_s0_station_sref_script }; /* 0x81c8990 */ +static const ScriptRef s_gs9_g71_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g71_s0_station_sref_script }; /* 0x81c8990 */ static const struct ScriptCommand s_gs9_g71_s0_lives0_dlg0[] = { /* 0x81c899c */ DEBUGINFO_O(9718), @@ -9624,7 +9624,7 @@ static const struct ScriptCommand s_gs9_g72_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g72_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g72_s0_station_sref_script }; /* 0x81c8d84 */ +static const ScriptRef s_gs9_g72_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g72_s0_station_sref_script }; /* 0x81c8d84 */ static const struct ScriptCommand s_gs9_g72_s0_lives0_dlg0[] = { /* 0x81c8d90 */ DEBUGINFO_O(9771), @@ -9768,7 +9768,7 @@ static const struct ScriptCommand s_gs9_g73_s0_evt0_sref_script[] = { /* 0x81ca5 HALT, }; -static const struct ScriptRef s_gs9_g73_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs9_g73_s0_evt0_sref_script }; /* 0x81ca5b0 */ +static const ScriptRef s_gs9_g73_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs9_g73_s0_evt0_sref_script }; /* 0x81ca5b0 */ static const struct ScriptCommand s_gs9_g74_s0_station_sref_script[] = { /* 0x81ca5bc */ DEBUGINFO_O(9915), @@ -9779,7 +9779,7 @@ static const struct ScriptCommand s_gs9_g74_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g74_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g74_s0_station_sref_script }; /* 0x81ca61c */ +static const ScriptRef s_gs9_g74_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g74_s0_station_sref_script }; /* 0x81ca61c */ static const struct ScriptCommand s_gs9_g74_s0_eff0_script[] = { /* 0x81ca628 */ DEBUGINFO_O(9926), @@ -10021,7 +10021,7 @@ static const struct ScriptCommand s_gs9_g75_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g75_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g75_s0_station_sref_script }; /* 0x81cb7f8 */ +static const ScriptRef s_gs9_g75_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g75_s0_station_sref_script }; /* 0x81cb7f8 */ static const struct ScriptCommand s_gs9_g75_s0_eff0_script[] = { /* 0x81cb804 */ DEBUGINFO_O(10168), @@ -11047,7 +11047,7 @@ static const struct ScriptCommand s_gs9_g76_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g76_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g76_s0_station_sref_script }; /* 0x81d0340 */ +static const ScriptRef s_gs9_g76_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g76_s0_station_sref_script }; /* 0x81d0340 */ static const struct ScriptCommand s_gs9_g76_s0_eff0_script[] = { /* 0x81d034c */ @@ -11411,7 +11411,7 @@ static const struct ScriptCommand s_gs9_g77_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs9_g77_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs9_g77_s0_station_sref_script }; /* 0x81d1bb8 */ +static const ScriptRef s_gs9_g77_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs9_g77_s0_station_sref_script }; /* 0x81d1bb8 */ static const struct ScriptCommand s_gs9_g77_s0_lives0_dlg0[] = { /* 0x81d1bc4 */ DEBUGINFO_O(11558), @@ -11536,7 +11536,7 @@ static const struct ScriptCommand s_gs9_g77_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g77_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs9_g77_s1_station_sref_script }; /* 0x81d22f0 */ +static const ScriptRef s_gs9_g77_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs9_g77_s1_station_sref_script }; /* 0x81d22f0 */ static const struct ScriptCommand s_gs9_g77_s1_eff0_script[] = { /* 0x81d22fc */ DEBUGINFO_O(11683), @@ -11890,7 +11890,7 @@ static const struct ScriptCommand s_gs9_g78_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g78_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g78_s0_station_sref_script }; /* 0x81d3b78 */ +static const ScriptRef s_gs9_g78_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g78_s0_station_sref_script }; /* 0x81d3b78 */ @@ -12377,7 +12377,7 @@ static const struct ScriptCommand s_gs9_g79_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g79_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g79_s0_station_sref_script }; /* 0x81d5c34 */ +static const ScriptRef s_gs9_g79_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g79_s0_station_sref_script }; /* 0x81d5c34 */ static const struct ScriptCommand s_gs9_g79_s0_eff0_script[] = { /* 0x81d5c40 */ DEBUGINFO_O(12524), @@ -12956,7 +12956,7 @@ static const struct ScriptCommand s_gs9_g81_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g81_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g81_s0_station_sref_script }; /* 0x81d87cc */ +static const ScriptRef s_gs9_g81_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g81_s0_station_sref_script }; /* 0x81d87cc */ static const struct ScriptCommand s_gs9_g81_s0_lives0_dlg0[] = { /* 0x81d87d8 */ DEBUGINFO_O(13103), @@ -13282,7 +13282,7 @@ static const struct ScriptCommand s_gs9_g82_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g82_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g82_s0_station_sref_script }; /* 0x81da284 */ +static const ScriptRef s_gs9_g82_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g82_s0_station_sref_script }; /* 0x81da284 */ static const struct ScriptCommand s_gs9_g83_s0_station_sref_script[] = { /* 0x81da290 */ DEBUGINFO_O(13429), @@ -13295,7 +13295,7 @@ static const struct ScriptCommand s_gs9_g83_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g83_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g83_s0_station_sref_script }; /* 0x81da310 */ +static const ScriptRef s_gs9_g83_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g83_s0_station_sref_script }; /* 0x81da310 */ static const struct ScriptCommand s_gs9_g83_s0_eff1_script[] = { /* 0x81da31c */ DEBUGINFO_O(13442), @@ -13393,7 +13393,7 @@ static const struct ScriptCommand s_gs9_g84_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g84_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g84_s0_station_sref_script }; /* 0x81da9bc */ +static const ScriptRef s_gs9_g84_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g84_s0_station_sref_script }; /* 0x81da9bc */ static const struct ScriptCommand s_gs9_g84_s0_lives0_dlg0[] = { /* 0x81da9c8 */ DEBUGINFO_O(13540), @@ -13567,7 +13567,7 @@ static const struct ScriptCommand s_gs9_g85_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g85_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g85_s0_station_sref_script }; /* 0x81db734 */ +static const ScriptRef s_gs9_g85_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g85_s0_station_sref_script }; /* 0x81db734 */ static const struct ScriptCommand s_gs9_g85_s0_lives0_dlg0[] = { /* 0x81db740 */ DEBUGINFO_O(13714), @@ -13644,7 +13644,7 @@ static const struct ScriptCommand s_gs9_g86_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g86_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g86_s0_station_sref_script }; /* 0x81dbc08 */ +static const ScriptRef s_gs9_g86_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g86_s0_station_sref_script }; /* 0x81dbc08 */ static const struct ScriptCommand s_gs9_g86_s0_lives0_dlg0[] = { /* 0x81dbc14 */ DEBUGINFO_O(13791), @@ -13771,7 +13771,7 @@ static const struct ScriptCommand s_gs9_g88_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g88_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g88_s0_station_sref_script }; /* 0x81dc6b8 */ +static const ScriptRef s_gs9_g88_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g88_s0_station_sref_script }; /* 0x81dc6b8 */ static const struct ScriptCommand s_gs9_g88_s0_lives0_dlg0[] = { /* 0x81dc6c4 */ DEBUGINFO_O(13918), @@ -13827,7 +13827,7 @@ static const struct ScriptCommand s_gs9_g89_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g89_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs9_g89_s0_station_sref_script }; /* 0x81dca3c */ +static const ScriptRef s_gs9_g89_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs9_g89_s0_station_sref_script }; /* 0x81dca3c */ static const struct ScriptCommand s_gs9_g89_s0_lives0_dlg0[] = { /* 0x81dca48 */ DEBUGINFO_O(13974), @@ -13959,7 +13959,7 @@ static const struct ScriptCommand s_gs9_g91_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs9_g91_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs9_g91_s0_station_sref_script }; /* 0x81dd404 */ +static const ScriptRef s_gs9_g91_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs9_g91_s0_station_sref_script }; /* 0x81dd404 */ static const struct ScriptCommand s_gs9_g91_s0_lives0_dlg0[] = { /* 0x81dd410 */ DEBUGINFO_O(14106), @@ -15619,7 +15619,7 @@ static const struct GroundEventData s_gs9_g73_s0_evts[] = { /* 0x81dfa6c */ /* 0 */ { 15, 3, 0, 0, { 27, 39, 0, 0 }, &s_gs9_g73_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81dfa78 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81dfa78 */ &s_gs9_g0_s0_station_sref, &s_gs9_g1_s0_station_sref, &s_gs9_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_b01p02a_station.h b/src/data/ground/ground_data_b01p02a_station.h index 91c632c66..8668c1898 100644 --- a/src/data/ground/ground_data_b01p02a_station.h +++ b/src/data/ground/ground_data_b01p02a_station.h @@ -79,7 +79,7 @@ static const struct ScriptCommand s_gs12_g0_s0_station_sref_script[] = { /* 0x81 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs12_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs12_g0_s0_station_sref_script }; /* 0x81e1da4 */ +static const ScriptRef s_gs12_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs12_g0_s0_station_sref_script }; /* 0x81e1da4 */ static const struct ScriptCommand s_gs12_g0_s0_evt0_sref_script[] = { /* 0x81e1db0 */ DEBUGINFO_O(85), @@ -87,7 +87,7 @@ static const struct ScriptCommand s_gs12_g0_s0_evt0_sref_script[] = { /* 0x81e1d HALT, }; -static const struct ScriptRef s_gs12_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs12_g0_s0_evt0_sref_script }; /* 0x81e1de0 */ +static const ScriptRef s_gs12_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs12_g0_s0_evt0_sref_script }; /* 0x81e1de0 */ static const struct ScriptCommand s_gs12_g0_s0_evt1_sref_script[] = { /* 0x81e1dec */ DEBUGINFO_O(93), @@ -105,7 +105,7 @@ static const struct ScriptCommand s_gs12_g0_s0_evt1_sref_script[] = { /* 0x81e1d JUMP_SCRIPT(END_TALK), }; -static const struct ScriptRef s_gs12_g0_s0_evt1_sref = { NORMAL_EVENT, 7, NULL, s_gs12_g0_s0_evt1_sref_script }; /* 0x81e1ee4 */ +static const ScriptRef s_gs12_g0_s0_evt1_sref = { NORMAL_EVENT, SCRIPT_TYPE_07, NULL, s_gs12_g0_s0_evt1_sref_script }; /* 0x81e1ee4 */ static const struct ScriptCommand s_gs12_g0_s0_obj0_dlg0[] = { /* 0x81e1ef0 */ DEBUGINFO_O(111), @@ -179,7 +179,7 @@ static const struct ScriptCommand s_gs12_g1_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g1_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs12_g1_s0_station_sref_script }; /* 0x81e2220 */ +static const ScriptRef s_gs12_g1_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs12_g1_s0_station_sref_script }; /* 0x81e2220 */ static const struct ScriptCommand s_gs12_g1_s0_lives0_dlg0[] = { /* 0x81e222c */ DEBUGINFO_O(185), @@ -204,7 +204,7 @@ static const struct ScriptCommand s_gs12_g1_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g1_s1_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g1_s1_station_sref_script }; /* 0x81e230c */ +static const ScriptRef s_gs12_g1_s1_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g1_s1_station_sref_script }; /* 0x81e230c */ static const struct ScriptCommand s_gs12_g1_s1_lives0_dlg0[] = { /* 0x81e2318 */ DEBUGINFO_O(210), @@ -233,7 +233,7 @@ static const struct ScriptCommand s_gs12_g2_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g2_s0_station_sref_script }; /* 0x81e2438 */ +static const ScriptRef s_gs12_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g2_s0_station_sref_script }; /* 0x81e2438 */ static const struct ScriptCommand s_gs12_g2_s0_lives0_dlg0[] = { /* 0x81e2444 */ DEBUGINFO_O(239), @@ -267,7 +267,7 @@ static const struct ScriptCommand s_gs12_g3_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g3_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g3_s0_station_sref_script }; /* 0x81e25fc */ +static const ScriptRef s_gs12_g3_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g3_s0_station_sref_script }; /* 0x81e25fc */ static const struct ScriptCommand s_gs12_g3_s0_lives0_dlg0[] = { /* 0x81e2608 */ DEBUGINFO_O(273), @@ -296,7 +296,7 @@ static const struct ScriptCommand s_gs12_g4_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g4_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g4_s0_station_sref_script }; /* 0x81e2758 */ +static const ScriptRef s_gs12_g4_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g4_s0_station_sref_script }; /* 0x81e2758 */ static const struct ScriptCommand s_gs12_g4_s0_lives0_dlg0[] = { /* 0x81e2764 */ DEBUGINFO_O(302), @@ -321,7 +321,7 @@ static const struct ScriptCommand s_gs12_g5_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g5_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g5_s0_station_sref_script }; /* 0x81e2874 */ +static const ScriptRef s_gs12_g5_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g5_s0_station_sref_script }; /* 0x81e2874 */ static const struct ScriptCommand s_gs12_g6_s0_station_sref_script[] = { /* 0x81e2880 */ DEBUGINFO_O(327), @@ -346,7 +346,7 @@ static const struct ScriptCommand s_gs12_g6_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g6_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g6_s0_station_sref_script }; /* 0x81e29c0 */ +static const ScriptRef s_gs12_g6_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g6_s0_station_sref_script }; /* 0x81e29c0 */ static const struct ScriptCommand s_gs12_g6_s0_lives0_dlg0[] = { /* 0x81e29cc */ DEBUGINFO_O(352), @@ -374,7 +374,7 @@ static const struct ScriptCommand s_gs12_g7_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g7_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g7_s0_station_sref_script }; /* 0x81e2b0c */ +static const ScriptRef s_gs12_g7_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g7_s0_station_sref_script }; /* 0x81e2b0c */ static const struct ScriptCommand s_gs12_g7_s0_lives0_dlg0[] = { /* 0x81e2b18 */ DEBUGINFO_O(380), @@ -403,7 +403,7 @@ static const struct ScriptCommand s_gs12_g8_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g8_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g8_s0_station_sref_script }; /* 0x81e2c68 */ +static const ScriptRef s_gs12_g8_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g8_s0_station_sref_script }; /* 0x81e2c68 */ static const struct ScriptCommand s_gs12_g8_s0_lives0_dlg0[] = { /* 0x81e2c74 */ DEBUGINFO_O(409), @@ -441,7 +441,7 @@ static const struct ScriptCommand s_gs12_g9_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs12_g9_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g9_s0_station_sref_script }; /* 0x81e2e54 */ +static const ScriptRef s_gs12_g9_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g9_s0_station_sref_script }; /* 0x81e2e54 */ static const struct ScriptCommand s_gs12_g9_s0_eff0_script[] = { /* 0x81e2e60 */ DEBUGINFO_O(447), @@ -871,7 +871,7 @@ static const struct ScriptCommand s_gs12_g10_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g10_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g10_s0_station_sref_script }; /* 0x81e5070 */ +static const ScriptRef s_gs12_g10_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g10_s0_station_sref_script }; /* 0x81e5070 */ static const struct ScriptCommand s_gs12_g10_s0_lives0_dlg0[] = { /* 0x81e507c */ @@ -937,7 +937,7 @@ static const struct ScriptCommand s_gs12_g11_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g11_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g11_s0_station_sref_script }; /* 0x81e551c */ +static const ScriptRef s_gs12_g11_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g11_s0_station_sref_script }; /* 0x81e551c */ static const struct ScriptCommand s_gs12_g11_s0_lives0_dlg0[] = { /* 0x81e5528 */ @@ -989,7 +989,7 @@ static const struct ScriptCommand s_gs12_g12_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g12_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g12_s0_station_sref_script }; /* 0x81e5878 */ +static const ScriptRef s_gs12_g12_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g12_s0_station_sref_script }; /* 0x81e5878 */ static const struct ScriptCommand s_gs12_g12_s0_lives0_dlg0[] = { /* 0x81e5884 */ DEBUGINFO_O(995), @@ -1133,7 +1133,7 @@ static const struct ScriptCommand s_gs12_g13_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g13_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g13_s0_station_sref_script }; /* 0x81e6574 */ +static const ScriptRef s_gs12_g13_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g13_s0_station_sref_script }; /* 0x81e6574 */ static const struct ScriptCommand s_gs12_g13_s0_lives0_dlg0[] = { /* 0x81e6580 */ DEBUGINFO_O(1139), @@ -1233,7 +1233,7 @@ static const struct ScriptCommand s_gs12_g14_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g14_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g14_s0_station_sref_script }; /* 0x81e6fc0 */ +static const ScriptRef s_gs12_g14_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g14_s0_station_sref_script }; /* 0x81e6fc0 */ static const struct ScriptCommand s_gs12_g14_s0_lives0_dlg0[] = { /* 0x81e6fcc */ DEBUGINFO_O(1239), @@ -1309,7 +1309,7 @@ static const struct ScriptCommand s_gs12_g15_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g15_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g15_s0_station_sref_script }; /* 0x81e7554 */ +static const ScriptRef s_gs12_g15_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g15_s0_station_sref_script }; /* 0x81e7554 */ static const struct ScriptCommand s_gs12_g15_s0_lives0_dlg0[] = { /* 0x81e7560 - PART 1 0:22:30-0:22:53 - Player */ @@ -1344,7 +1344,7 @@ static const struct ScriptCommand s_gs12_g16_s0_station_sref_script[] = { /* 0x8 RET_DIRECT, }; -static const struct ScriptRef s_gs12_g16_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs12_g16_s0_station_sref_script }; /* 0x81e77f4 */ +static const ScriptRef s_gs12_g16_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs12_g16_s0_station_sref_script }; /* 0x81e77f4 */ static const struct ScriptCommand s_gs12_g16_s0_evt0_sref_script[] = { /* 0x81e7800 - Likely door event/nearby trigger */ DEBUGINFO_O(1350), @@ -1357,7 +1357,7 @@ static const struct ScriptCommand s_gs12_g16_s0_evt0_sref_script[] = { /* 0x81e7 RET, }; -static const struct ScriptRef s_gs12_g16_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs12_g16_s0_evt0_sref_script }; /* 0x81e78b8 */ +static const ScriptRef s_gs12_g16_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs12_g16_s0_evt0_sref_script }; /* 0x81e78b8 */ static const struct ScriptCommand s_gs12_g16_s0_evt1_sref_script[] = { /* 0x81e78c4 - PART 1 0:22:53-0:23:04 - Bed, sleep trigger */ @@ -1377,7 +1377,7 @@ static const struct ScriptCommand s_gs12_g16_s0_evt1_sref_script[] = { /* 0x81e7 HALT, }; -static const struct ScriptRef s_gs12_g16_s0_evt1_sref = { NORMAL_EVENT, 7, NULL, s_gs12_g16_s0_evt1_sref_script }; /* 0x81e79a4 */ +static const ScriptRef s_gs12_g16_s0_evt1_sref = { NORMAL_EVENT, SCRIPT_TYPE_07, NULL, s_gs12_g16_s0_evt1_sref_script }; /* 0x81e79a4 */ static const struct ScriptCommand s_gs12_g16_s1_station_sref_script[] = { /* 0x81e79b0 */ DEBUGINFO_O(1383), @@ -1395,7 +1395,7 @@ static const struct ScriptCommand s_gs12_g16_s1_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g16_s1_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g16_s1_station_sref_script }; /* 0x81e7a80 */ +static const ScriptRef s_gs12_g16_s1_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g16_s1_station_sref_script }; /* 0x81e7a80 */ static const struct ScriptCommand s_gs12_g16_s1_lives0_dlg0[] = { /* 0x81e7a8c */ DEBUGINFO_O(1401), @@ -1424,7 +1424,7 @@ static const struct ScriptCommand s_gs12_g17_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g17_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g17_s0_station_sref_script }; /* 0x81e7bdc */ +static const ScriptRef s_gs12_g17_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g17_s0_station_sref_script }; /* 0x81e7bdc */ static const struct ScriptCommand s_gs12_g17_s0_lives0_dlg0[] = { /* 0x81e7be8 */ DEBUGINFO_O(1430), @@ -1469,7 +1469,7 @@ static const struct ScriptCommand s_gs12_g18_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g18_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g18_s0_station_sref_script }; /* 0x81e7f2c */ +static const ScriptRef s_gs12_g18_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g18_s0_station_sref_script }; /* 0x81e7f2c */ static const struct ScriptCommand s_gs12_g18_s0_lives0_dlg0[] = { /* 0x81e7f38 */ DEBUGINFO_O(1475), @@ -1498,7 +1498,7 @@ static const struct ScriptCommand s_gs12_g19_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g19_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g19_s0_station_sref_script }; /* 0x81e8088 */ +static const ScriptRef s_gs12_g19_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g19_s0_station_sref_script }; /* 0x81e8088 */ static const struct ScriptCommand s_gs12_g19_s0_lives0_dlg0[] = { /* 0x81e8094 */ DEBUGINFO_O(1504), @@ -1542,7 +1542,7 @@ static const struct ScriptCommand s_gs12_g20_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g20_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g20_s0_station_sref_script }; /* 0x81e8388 */ +static const ScriptRef s_gs12_g20_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g20_s0_station_sref_script }; /* 0x81e8388 */ static const struct ScriptCommand s_gs12_g20_s0_lives0_dlg0[] = { /* 0x81e8394 */ DEBUGINFO_O(1548), @@ -1670,7 +1670,7 @@ static const struct ScriptCommand s_gs12_g21_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g21_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g21_s0_station_sref_script }; /* 0x81e8d48 */ +static const ScriptRef s_gs12_g21_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g21_s0_station_sref_script }; /* 0x81e8d48 */ static const struct ScriptCommand s_gs12_g21_s0_lives0_dlg0[] = { /* 0x81e8d54 */ DEBUGINFO_O(1676), @@ -1707,7 +1707,7 @@ static const struct ScriptCommand s_gs12_g22_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g22_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g22_s0_station_sref_script }; /* 0x81e8f24 */ +static const ScriptRef s_gs12_g22_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g22_s0_station_sref_script }; /* 0x81e8f24 */ static const struct ScriptCommand s_gs12_g22_s0_lives0_dlg0[] = { /* 0x81e8f30 */ DEBUGINFO_O(1713), @@ -1743,7 +1743,7 @@ static const struct ScriptCommand s_gs12_g23_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g23_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g23_s0_station_sref_script }; /* 0x81e90f0 */ +static const ScriptRef s_gs12_g23_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g23_s0_station_sref_script }; /* 0x81e90f0 */ static const struct ScriptCommand s_gs12_g23_s0_lives0_dlg0[] = { /* 0x81e90fc */ DEBUGINFO_O(1749), @@ -1779,7 +1779,7 @@ static const struct ScriptCommand s_gs12_g24_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g24_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g24_s0_station_sref_script }; /* 0x81e92bc */ +static const ScriptRef s_gs12_g24_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g24_s0_station_sref_script }; /* 0x81e92bc */ static const struct ScriptCommand s_gs12_g24_s0_lives0_dlg0[] = { /* 0x81e92c8 */ DEBUGINFO_O(1785), @@ -1807,7 +1807,7 @@ static const struct ScriptCommand s_gs12_g25_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g25_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g25_s0_station_sref_script }; /* 0x81e9408 */ +static const ScriptRef s_gs12_g25_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g25_s0_station_sref_script }; /* 0x81e9408 */ static const struct ScriptCommand s_gs12_g25_s0_lives0_dlg0[] = { /* 0x81e9414 */ DEBUGINFO_O(1813), @@ -1843,7 +1843,7 @@ static const struct ScriptCommand s_gs12_g26_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g26_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g26_s0_station_sref_script }; /* 0x81e95d4 */ +static const ScriptRef s_gs12_g26_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g26_s0_station_sref_script }; /* 0x81e95d4 */ static const struct ScriptCommand s_gs12_g26_s0_lives0_dlg0[] = { /* 0x81e95e0 */ DEBUGINFO_O(1849), @@ -1871,7 +1871,7 @@ static const struct ScriptCommand s_gs12_g27_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g27_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g27_s0_station_sref_script }; /* 0x81e9720 */ +static const ScriptRef s_gs12_g27_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g27_s0_station_sref_script }; /* 0x81e9720 */ static const struct ScriptCommand s_gs12_g27_s0_lives0_dlg0[] = { /* 0x81e972c */ DEBUGINFO_O(1877), @@ -1907,7 +1907,7 @@ static const struct ScriptCommand s_gs12_g28_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g28_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g28_s0_station_sref_script }; /* 0x81e98ec */ +static const ScriptRef s_gs12_g28_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g28_s0_station_sref_script }; /* 0x81e98ec */ static const struct ScriptCommand s_gs12_g28_s0_lives0_dlg0[] = { /* 0x81e98f8 */ DEBUGINFO_O(1913), @@ -1935,7 +1935,7 @@ static const struct ScriptCommand s_gs12_g29_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g29_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g29_s0_station_sref_script }; /* 0x81e9a38 */ +static const ScriptRef s_gs12_g29_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g29_s0_station_sref_script }; /* 0x81e9a38 */ static const struct ScriptCommand s_gs12_g29_s0_lives0_dlg0[] = { /* 0x81e9a44 */ DEBUGINFO_O(1941), @@ -1971,7 +1971,7 @@ static const struct ScriptCommand s_gs12_g30_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g30_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g30_s0_station_sref_script }; /* 0x81e9c04 */ +static const ScriptRef s_gs12_g30_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g30_s0_station_sref_script }; /* 0x81e9c04 */ static const struct ScriptCommand s_gs12_g30_s0_lives0_dlg0[] = { /* 0x81e9c10 */ DEBUGINFO_O(1977), @@ -1999,7 +1999,7 @@ static const struct ScriptCommand s_gs12_g31_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g31_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g31_s0_station_sref_script }; /* 0x81e9d50 */ +static const ScriptRef s_gs12_g31_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g31_s0_station_sref_script }; /* 0x81e9d50 */ static const struct ScriptCommand s_gs12_g31_s0_lives0_dlg0[] = { /* 0x81e9d5c */ DEBUGINFO_O(2005), @@ -2035,7 +2035,7 @@ static const struct ScriptCommand s_gs12_g32_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g32_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g32_s0_station_sref_script }; /* 0x81e9f1c */ +static const ScriptRef s_gs12_g32_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g32_s0_station_sref_script }; /* 0x81e9f1c */ static const struct ScriptCommand s_gs12_g32_s0_lives0_dlg0[] = { /* 0x81e9f28 */ DEBUGINFO_O(2041), @@ -2065,7 +2065,7 @@ static const struct ScriptCommand s_gs12_g33_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g33_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g33_s0_station_sref_script }; /* 0x81ea088 */ +static const ScriptRef s_gs12_g33_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g33_s0_station_sref_script }; /* 0x81ea088 */ static const struct ScriptCommand s_gs12_g33_s0_lives0_dlg0[] = { /* 0x81ea094 */ DEBUGINFO_O(2071), @@ -2110,7 +2110,7 @@ static const struct ScriptCommand s_gs12_g34_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g34_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g34_s0_station_sref_script }; /* 0x81ea3b8 */ +static const ScriptRef s_gs12_g34_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g34_s0_station_sref_script }; /* 0x81ea3b8 */ static const struct ScriptCommand s_gs12_g34_s0_lives0_dlg0[] = { /* 0x81ea3c4 */ DEBUGINFO_O(2116), @@ -2157,7 +2157,7 @@ static const struct ScriptCommand s_gs12_g35_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g35_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g35_s0_station_sref_script }; /* 0x81ea6e4 */ +static const ScriptRef s_gs12_g35_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g35_s0_station_sref_script }; /* 0x81ea6e4 */ static const struct ScriptCommand s_gs12_g35_s0_lives0_dlg0[] = { /* 0x81ea6f0 */ DEBUGINFO_O(2163), @@ -2187,7 +2187,7 @@ static const struct ScriptCommand s_gs12_g36_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g36_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g36_s0_station_sref_script }; /* 0x81ea850 */ +static const ScriptRef s_gs12_g36_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g36_s0_station_sref_script }; /* 0x81ea850 */ static const struct ScriptCommand s_gs12_g36_s0_lives0_dlg0[] = { /* 0x81ea85c */ DEBUGINFO_O(2193), @@ -2229,7 +2229,7 @@ static const struct ScriptCommand s_gs12_g37_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g37_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g37_s0_station_sref_script }; /* 0x81eab3c */ +static const ScriptRef s_gs12_g37_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g37_s0_station_sref_script }; /* 0x81eab3c */ static const struct ScriptCommand s_gs12_g37_s0_lives0_dlg0[] = { /* 0x81eab48 */ DEBUGINFO_O(2235), @@ -2271,7 +2271,7 @@ static const struct ScriptCommand s_gs12_g38_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g38_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g38_s0_station_sref_script }; /* 0x81eadd0 */ +static const ScriptRef s_gs12_g38_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g38_s0_station_sref_script }; /* 0x81eadd0 */ static const struct ScriptCommand s_gs12_g38_s0_lives0_dlg0[] = { /* 0x81eaddc */ DEBUGINFO_O(2277), @@ -2321,7 +2321,7 @@ static const struct ScriptCommand s_gs12_g39_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g39_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g39_s0_station_sref_script }; /* 0x81eb0f4 */ +static const ScriptRef s_gs12_g39_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g39_s0_station_sref_script }; /* 0x81eb0f4 */ static const struct ScriptCommand s_gs12_g39_s0_lives0_dlg0[] = { /* 0x81eb100 */ DEBUGINFO_O(2327), @@ -2405,7 +2405,7 @@ static const struct ScriptCommand s_gs12_g40_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g40_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g40_s0_station_sref_script }; /* 0x81eb668 */ +static const ScriptRef s_gs12_g40_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g40_s0_station_sref_script }; /* 0x81eb668 */ static const struct ScriptCommand s_gs12_g40_s0_lives0_dlg0[] = { /* 0x81eb674 */ DEBUGINFO_O(2411), @@ -2440,7 +2440,7 @@ static const struct ScriptCommand s_gs12_g41_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g41_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g41_s0_station_sref_script }; /* 0x81eb824 */ +static const ScriptRef s_gs12_g41_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g41_s0_station_sref_script }; /* 0x81eb824 */ static const struct ScriptCommand s_gs12_g41_s0_lives0_dlg0[] = { /* 0x81eb830 */ DEBUGINFO_O(2446), @@ -2466,7 +2466,7 @@ static const struct ScriptCommand s_gs12_g42_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g42_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs12_g42_s0_station_sref_script }; /* 0x81eb950 */ +static const ScriptRef s_gs12_g42_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs12_g42_s0_station_sref_script }; /* 0x81eb950 */ static const struct ScriptCommand s_gs12_g42_s0_lives0_dlg0[] = { /* 0x81eb95c */ DEBUGINFO_O(2472), @@ -2566,7 +2566,7 @@ static const struct ScriptCommand s_gs12_g43_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g43_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g43_s0_station_sref_script }; /* 0x81ec024 */ +static const ScriptRef s_gs12_g43_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g43_s0_station_sref_script }; /* 0x81ec024 */ static const struct ScriptCommand s_gs12_g43_s0_lives0_dlg0[] = { /* 0x81ec030 */ DEBUGINFO_O(2572), @@ -2594,7 +2594,7 @@ static const struct ScriptCommand s_gs12_g44_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g44_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g44_s0_station_sref_script }; /* 0x81ec170 */ +static const ScriptRef s_gs12_g44_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g44_s0_station_sref_script }; /* 0x81ec170 */ static const struct ScriptCommand s_gs12_g44_s0_lives0_dlg0[] = { /* 0x81ec17c */ DEBUGINFO_O(2600), @@ -2644,7 +2644,7 @@ static const struct ScriptCommand s_gs12_g45_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g45_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g45_s0_station_sref_script }; /* 0x81ec590 */ +static const ScriptRef s_gs12_g45_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g45_s0_station_sref_script }; /* 0x81ec590 */ static const struct ScriptCommand s_gs12_g45_s0_lives0_dlg0[] = { /* 0x81ec59c */ DEBUGINFO_O(2650), @@ -2692,7 +2692,7 @@ static const struct ScriptCommand s_gs12_g46_s0_station_sref_script[] = { /* 0x8 RET_DIRECT, }; -static const struct ScriptRef s_gs12_g46_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs12_g46_s0_station_sref_script }; /* 0x81eca10 */ +static const ScriptRef s_gs12_g46_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs12_g46_s0_station_sref_script }; /* 0x81eca10 */ static const struct ScriptCommand s_gs12_g46_s0_evt0_sref_script[] = { /* 0x81eca1c */ DEBUGINFO_O(2698), @@ -2700,7 +2700,7 @@ static const struct ScriptCommand s_gs12_g46_s0_evt0_sref_script[] = { /* 0x81ec HALT, }; -static const struct ScriptRef s_gs12_g46_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs12_g46_s0_evt0_sref_script }; /* 0x81eca4c */ +static const ScriptRef s_gs12_g46_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs12_g46_s0_evt0_sref_script }; /* 0x81eca4c */ static const struct ScriptCommand s_gs12_g46_s0_evt1_sref_script[] = { /* 0x81eca58 */ DEBUGINFO_O(2706), @@ -2716,7 +2716,7 @@ static const struct ScriptCommand s_gs12_g46_s0_evt1_sref_script[] = { /* 0x81ec JUMP_SCRIPT(END_TALK), }; -static const struct ScriptRef s_gs12_g46_s0_evt1_sref = { NORMAL_EVENT, 7, NULL, s_gs12_g46_s0_evt1_sref_script }; /* 0x81ecb2c */ +static const ScriptRef s_gs12_g46_s0_evt1_sref = { NORMAL_EVENT, SCRIPT_TYPE_07, NULL, s_gs12_g46_s0_evt1_sref_script }; /* 0x81ecb2c */ static const struct ScriptCommand s_gs12_g46_s1_station_sref_script[] = { /* 0x81ecb38 */ DEBUGINFO_O(2722), @@ -2733,7 +2733,7 @@ static const struct ScriptCommand s_gs12_g46_s1_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs12_g46_s1_station_sref = { EVENT_STATION , 7, NULL, s_gs12_g46_s1_station_sref_script }; /* 0x81ecbf8 */ +static const ScriptRef s_gs12_g46_s1_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs12_g46_s1_station_sref_script }; /* 0x81ecbf8 */ static const struct ScriptCommand s_gs12_g46_s1_lives0_dlg0[] = { /* 0x81ecc04 */ DEBUGINFO_O(2739), @@ -3321,7 +3321,7 @@ static const struct GroundEventData s_gs12_g46_s0_evts[] = { /* 0x81ed6dc */ /* 1 */ { 6, 3, 0, 0, { 27, 28, 0, 0 }, &s_gs12_g46_s0_evt1_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81ed6f4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81ed6f4 */ &s_gs12_g0_s0_station_sref, &s_gs12_g1_s0_station_sref, &s_gs12_g1_s1_station_sref, diff --git a/src/data/ground/ground_data_d01p01_station.h b/src/data/ground/ground_data_d01p01_station.h index 7123ad279..0008209a9 100644 --- a/src/data/ground/ground_data_d01p01_station.h +++ b/src/data/ground/ground_data_d01p01_station.h @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs178_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs178_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs178_g0_s0_station_sref_script }; /* 0x822c2b4 */ +static const ScriptRef s_gs178_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs178_g0_s0_station_sref_script }; /* 0x822c2b4 */ static const struct ScriptCommand s_gs178_g1_s0_station_sref_script[] = { /* 0x822c2c0 - PART 1 0:04:05-0:06:38 */ DEBUGINFO_O(37), @@ -68,7 +68,7 @@ static const struct ScriptCommand s_gs178_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs178_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs178_g1_s0_station_sref_script }; /* 0x822c5d8 */ +static const ScriptRef s_gs178_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs178_g1_s0_station_sref_script }; /* 0x822c5d8 */ @@ -373,7 +373,7 @@ static const struct ScriptCommand s_gs178_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs178_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs178_g2_s0_station_sref_script }; /* 0x822df54 */ +static const ScriptRef s_gs178_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs178_g2_s0_station_sref_script }; /* 0x822df54 */ static const struct ScriptCommand s_gs178_g2_s0_lives0_dlg0[] = { /* 0x822df60 - PART 1 0:11:39-0:12:15 - Player */ @@ -528,7 +528,7 @@ static const struct ScriptCommand s_gs178_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs178_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs178_g3_s0_station_sref_script }; /* 0x822ea0c */ +static const ScriptRef s_gs178_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs178_g3_s0_station_sref_script }; /* 0x822ea0c */ static const struct ScriptCommand s_gs178_g3_s0_lives0_dlg0[] = { /* 0x822ea18 - PART 1 0:17:17-0:18:51 - Player */ DEBUGINFO_O(534), @@ -778,7 +778,7 @@ static const struct GroundEffectData s_gs178_g3_s0_effs[] = { /* 0x822fb14 */ /* 0 */ { 0, 0, 1, 1, { 27, 23, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x822fb20 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x822fb20 */ &s_gs178_g0_s0_station_sref, &s_gs178_g1_s0_station_sref, &s_gs178_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d01p02_station.h b/src/data/ground/ground_data_d01p02_station.h index 216b505de..1e0e55e01 100644 --- a/src/data/ground/ground_data_d01p02_station.h +++ b/src/data/ground/ground_data_d01p02_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs179_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs179_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs179_g0_s0_station_sref_script }; /* 0x822fd28 */ +static const ScriptRef s_gs179_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs179_g0_s0_station_sref_script }; /* 0x822fd28 */ static const struct ScriptCommand s_gs179_g1_s0_station_sref_script[] = { /* 0x822fd34 - PART 1 0:16:37-0:17:16 - Tiny Woods end room */ DEBUGINFO_O(21), @@ -29,7 +29,7 @@ static const struct ScriptCommand s_gs179_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs179_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs179_g1_s0_station_sref_script }; /* 0x822fdc4 */ +static const ScriptRef s_gs179_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs179_g1_s0_station_sref_script }; /* 0x822fdc4 */ static const struct ScriptCommand s_gs179_g1_s0_lives0_dlg0[] = { /* 0x822fdd0 - PART 1 0:16:37-0:17:16 - Player */ DEBUGINFO_O(35), @@ -121,7 +121,7 @@ static const struct GroundEffectData s_gs179_g1_s0_effs[] = { /* 0x8230260 */ /* 0 */ { 0, 0, 1, 1, { 22, 21, CPOS_HALFTILE, 0 }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x823026c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x823026c */ &s_gs179_g0_s0_station_sref, &s_gs179_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d02p01_station.h b/src/data/ground/ground_data_d02p01_station.h index 51e06dfdd..90fd3ed23 100644 --- a/src/data/ground/ground_data_d02p01_station.h +++ b/src/data/ground/ground_data_d02p01_station.h @@ -17,7 +17,7 @@ static const struct ScriptCommand s_gs180_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs180_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs180_g0_s0_station_sref_script }; /* 0x8230364 */ +static const ScriptRef s_gs180_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs180_g0_s0_station_sref_script }; /* 0x8230364 */ static const struct ScriptCommand s_gs180_g1_s0_station_sref_script[] = { /* 0x8230370 */ DEBUGINFO_O(23), @@ -30,7 +30,7 @@ static const struct ScriptCommand s_gs180_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs180_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs180_g1_s0_station_sref_script }; /* 0x82303f0 */ +static const ScriptRef s_gs180_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs180_g1_s0_station_sref_script }; /* 0x82303f0 */ static const struct ScriptCommand s_gs180_g1_s0_eff0_script[] = { /* 0x82303fc */ DEBUGINFO_O(36), @@ -144,7 +144,7 @@ static const struct ScriptCommand s_gs180_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs180_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs180_g2_s0_station_sref_script }; /* 0x8230a58 */ +static const ScriptRef s_gs180_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs180_g2_s0_station_sref_script }; /* 0x8230a58 */ static const struct ScriptCommand s_gs180_g2_s0_eff0_script[] = { /* 0x8230a64 */ DEBUGINFO_O(150), @@ -248,7 +248,7 @@ static const struct ScriptCommand s_gs180_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs180_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs180_g3_s0_station_sref_script }; /* 0x8231014 */ +static const ScriptRef s_gs180_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs180_g3_s0_station_sref_script }; /* 0x8231014 */ static const struct ScriptCommand s_gs180_g3_s0_lives0_dlg0[] = { /* 0x8231020 */ DEBUGINFO_O(254), @@ -483,7 +483,7 @@ static const struct GroundEffectData s_gs180_g3_s0_effs[] = { /* 0x8231b60 */ /* 0 */ { 0, 0, 1, 1, { 25, 18, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8231b6c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8231b6c */ &s_gs180_g0_s0_station_sref, &s_gs180_g1_s0_station_sref, &s_gs180_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d02p02_station.h b/src/data/ground/ground_data_d02p02_station.h index 3b8ccef60..dc557f79a 100644 --- a/src/data/ground/ground_data_d02p02_station.h +++ b/src/data/ground/ground_data_d02p02_station.h @@ -17,7 +17,7 @@ static const struct ScriptCommand s_gs181_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs181_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs181_g0_s0_station_sref_script }; /* 0x8231cdc */ +static const ScriptRef s_gs181_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs181_g0_s0_station_sref_script }; /* 0x8231cdc */ static const struct ScriptCommand s_gs181_g1_s0_station_sref_script[] = { /* 0x8231ce8 */ DEBUGINFO_O(23), @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs181_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs181_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs181_g1_s0_station_sref_script }; /* 0x8231d78 */ +static const ScriptRef s_gs181_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs181_g1_s0_station_sref_script }; /* 0x8231d78 */ static const struct ScriptCommand s_gs181_g1_s0_lives0_dlg0[] = { /* 0x8231d84 */ DEBUGINFO_O(37), @@ -100,7 +100,7 @@ static const struct GroundEffectData s_gs181_g1_s0_effs[] = { /* 0x823207c */ /* 0 */ { 0, 0, 1, 1, { 22, 20, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8232088 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8232088 */ &s_gs181_g0_s0_station_sref, &s_gs181_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d03p01_station.h b/src/data/ground/ground_data_d03p01_station.h index 9cc9cc3d0..07ef36a6f 100644 --- a/src/data/ground/ground_data_d03p01_station.h +++ b/src/data/ground/ground_data_d03p01_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs182_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs182_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs182_g0_s0_station_sref_script }; /* 0x8232190 */ +static const ScriptRef s_gs182_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs182_g0_s0_station_sref_script }; /* 0x8232190 */ static const struct ScriptCommand s_gs182_g1_s0_station_sref_script[] = { /* 0x823219c */ DEBUGINFO_O(21), @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs182_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs182_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs182_g1_s0_station_sref_script }; /* 0x823221c */ +static const ScriptRef s_gs182_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs182_g1_s0_station_sref_script }; /* 0x823221c */ static const struct ScriptCommand s_gs182_g1_s0_lives0_dlg0[] = { /* 0x8232228 */ DEBUGINFO_O(34), @@ -144,7 +144,7 @@ static const struct ScriptCommand s_gs182_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs182_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs182_g2_s0_station_sref_script }; /* 0x823297c */ +static const ScriptRef s_gs182_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs182_g2_s0_station_sref_script }; /* 0x823297c */ static const struct ScriptCommand s_gs182_g2_s0_lives0_dlg0[] = { /* 0x8232988 */ DEBUGINFO_O(150), @@ -294,7 +294,7 @@ static const struct GroundEffectData s_gs182_g2_s0_effs[] = { /* 0x823313c */ /* 0 */ { 0, 0, 1, 1, { 22, 23, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8233148 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8233148 */ &s_gs182_g0_s0_station_sref, &s_gs182_g1_s0_station_sref, &s_gs182_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d03p02_station.h b/src/data/ground/ground_data_d03p02_station.h index 875b7fdc8..572fc8fe4 100644 --- a/src/data/ground/ground_data_d03p02_station.h +++ b/src/data/ground/ground_data_d03p02_station.h @@ -18,7 +18,7 @@ static const struct ScriptCommand s_gs183_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs183_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs183_g0_s0_station_sref_script }; /* 0x82332c4 */ +static const ScriptRef s_gs183_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs183_g0_s0_station_sref_script }; /* 0x82332c4 */ static const struct ScriptCommand s_gs183_g1_s0_station_sref_script[] = { /* 0x82332d0 */ DEBUGINFO_O(24), @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs183_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs183_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs183_g1_s0_station_sref_script }; /* 0x8233350 */ +static const ScriptRef s_gs183_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs183_g1_s0_station_sref_script }; /* 0x8233350 */ static const struct ScriptCommand s_gs183_g1_s0_eff0_script[] = { /* 0x823335c */ DEBUGINFO_O(37), @@ -266,7 +266,7 @@ static const struct GroundEffectData s_gs183_g1_s0_effs[] = { /* 0x823421c */ /* 0 */ { 0, 0, 1, 1, { 28, 39, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs183_g1_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8234228 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8234228 */ &s_gs183_g0_s0_station_sref, &s_gs183_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d04p01_station.h b/src/data/ground/ground_data_d04p01_station.h index e438cb306..113d55aa8 100644 --- a/src/data/ground/ground_data_d04p01_station.h +++ b/src/data/ground/ground_data_d04p01_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs184_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs184_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs184_g0_s0_station_sref_script }; /* 0x8234360 */ +static const ScriptRef s_gs184_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs184_g0_s0_station_sref_script }; /* 0x8234360 */ static const struct ScriptCommand s_gs184_g1_s0_station_sref_script[] = { /* 0x823436c */ DEBUGINFO_O(21), @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs184_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs184_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs184_g1_s0_station_sref_script }; /* 0x82343ec */ +static const ScriptRef s_gs184_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs184_g1_s0_station_sref_script }; /* 0x82343ec */ static const struct ScriptCommand s_gs184_g1_s0_lives0_dlg0[] = { /* 0x82343f8 */ DEBUGINFO_O(34), @@ -85,7 +85,7 @@ static const struct ScriptCommand s_gs184_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs184_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs184_g2_s0_station_sref_script }; /* 0x8234824 */ +static const ScriptRef s_gs184_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs184_g2_s0_station_sref_script }; /* 0x8234824 */ static const struct ScriptCommand s_gs184_g2_s0_lives0_dlg0[] = { /* 0x8234830 */ DEBUGINFO_O(91), @@ -151,7 +151,7 @@ static const struct GroundEffectData s_gs184_g2_s0_effs[] = { /* 0x8234bc4 */ /* 0 */ { 0, 0, 1, 1, { 28, 22, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8234bd0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8234bd0 */ &s_gs184_g0_s0_station_sref, &s_gs184_g1_s0_station_sref, &s_gs184_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d04p02_station.h b/src/data/ground/ground_data_d04p02_station.h index 3ae413bd0..76158f2ec 100644 --- a/src/data/ground/ground_data_d04p02_station.h +++ b/src/data/ground/ground_data_d04p02_station.h @@ -17,7 +17,7 @@ static const struct ScriptCommand s_gs185_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs185_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs185_g0_s0_station_sref_script }; /* 0x8234cfc */ +static const ScriptRef s_gs185_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs185_g0_s0_station_sref_script }; /* 0x8234cfc */ static const struct ScriptCommand s_gs185_g1_s0_station_sref_script[] = { /* 0x8234d08 */ DEBUGINFO_O(23), @@ -30,7 +30,7 @@ static const struct ScriptCommand s_gs185_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs185_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs185_g1_s0_station_sref_script }; /* 0x8234d88 */ +static const ScriptRef s_gs185_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs185_g1_s0_station_sref_script }; /* 0x8234d88 */ static const struct ScriptCommand s_gs185_g1_s0_lives0_dlg0[] = { /* 0x8234d94 */ DEBUGINFO_O(36), @@ -253,7 +253,7 @@ static const struct GroundEffectData s_gs185_g1_s0_effs[] = { /* 0x823595c */ /* 0 */ { 0, 0, 1, 1, { 34, 30, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8235968 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8235968 */ &s_gs185_g0_s0_station_sref, &s_gs185_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d05p01_station.h b/src/data/ground/ground_data_d05p01_station.h index 328e79295..5fa252c2a 100644 --- a/src/data/ground/ground_data_d05p01_station.h +++ b/src/data/ground/ground_data_d05p01_station.h @@ -16,7 +16,7 @@ static const struct ScriptCommand s_gs186_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs186_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs186_g0_s0_station_sref_script }; /* 0x8235a70 */ +static const ScriptRef s_gs186_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs186_g0_s0_station_sref_script }; /* 0x8235a70 */ static const struct ScriptCommand s_gs186_g1_s0_station_sref_script[] = { /* 0x8235a7c */ DEBUGINFO_O(22), @@ -30,7 +30,7 @@ static const struct ScriptCommand s_gs186_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs186_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs186_g1_s0_station_sref_script }; /* 0x8235b0c */ +static const ScriptRef s_gs186_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs186_g1_s0_station_sref_script }; /* 0x8235b0c */ static const struct ScriptCommand s_gs186_g1_s0_eff0_script[] = { /* 0x8235b18 */ DEBUGINFO_O(36), @@ -433,7 +433,7 @@ static const struct GroundEffectData s_gs186_g1_s0_effs[] = { /* 0x8237ad8 */ /* 0 */ { 0, 0, 1, 1, { 18, 16, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs186_g1_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8237ae4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8237ae4 */ &s_gs186_g0_s0_station_sref, &s_gs186_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d05p02_station.h b/src/data/ground/ground_data_d05p02_station.h index 3b8e8f65b..63ce54298 100644 --- a/src/data/ground/ground_data_d05p02_station.h +++ b/src/data/ground/ground_data_d05p02_station.h @@ -14,7 +14,7 @@ static const struct ScriptCommand s_gs187_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs187_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs187_g0_s0_station_sref_script }; /* 0x8237be4 */ +static const ScriptRef s_gs187_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs187_g0_s0_station_sref_script }; /* 0x8237be4 */ static const struct ScriptCommand s_gs187_g1_s0_station_sref_script[] = { /* 0x8237bf0 */ DEBUGINFO_O(19), @@ -29,7 +29,7 @@ static const struct ScriptCommand s_gs187_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs187_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs187_g1_s0_station_sref_script }; /* 0x8237c90 */ +static const ScriptRef s_gs187_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs187_g1_s0_station_sref_script }; /* 0x8237c90 */ static const struct ScriptCommand s_gs187_g1_s0_eff0_script[] = { /* 0x8237c9c */ DEBUGINFO_O(34), @@ -353,7 +353,7 @@ static const struct GroundEffectData s_gs187_g1_s0_effs[] = { /* 0x82390c0 */ /* 0 */ { 0, 0, 1, 1, { 22, 29, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs187_g1_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82390cc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82390cc */ &s_gs187_g0_s0_station_sref, &s_gs187_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d06p01_station.h b/src/data/ground/ground_data_d06p01_station.h index 84b05a6bc..df3a13bdc 100644 --- a/src/data/ground/ground_data_d06p01_station.h +++ b/src/data/ground/ground_data_d06p01_station.h @@ -16,7 +16,7 @@ static const struct ScriptCommand s_gs188_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs188_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs188_g0_s0_station_sref_script }; /* 0x82391e4 */ +static const ScriptRef s_gs188_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs188_g0_s0_station_sref_script }; /* 0x82391e4 */ static const struct ScriptCommand s_gs188_g1_s0_station_sref_script[] = { /* 0x82391f0 */ DEBUGINFO_O(22), @@ -30,7 +30,7 @@ static const struct ScriptCommand s_gs188_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs188_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs188_g1_s0_station_sref_script }; /* 0x8239280 */ +static const ScriptRef s_gs188_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs188_g1_s0_station_sref_script }; /* 0x8239280 */ static const struct ScriptCommand s_gs188_g1_s0_eff0_script[] = { /* 0x823928c */ DEBUGINFO_O(36), @@ -124,7 +124,7 @@ static const struct ScriptCommand s_gs188_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs188_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs188_g2_s0_station_sref_script }; /* 0x82399e4 */ +static const ScriptRef s_gs188_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs188_g2_s0_station_sref_script }; /* 0x82399e4 */ static const struct ScriptCommand s_gs188_g2_s0_eff0_script[] = { /* 0x82399f0 */ DEBUGINFO_O(130), @@ -202,7 +202,7 @@ static const struct GroundEffectData s_gs188_g2_s0_effs[] = { /* 0x8239d74 */ /* 0 */ { 0, 0, 1, 1, { 25, 16, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs188_g2_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8239d80 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8239d80 */ &s_gs188_g0_s0_station_sref, &s_gs188_g1_s0_station_sref, &s_gs188_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d06p02_station.h b/src/data/ground/ground_data_d06p02_station.h index 9c08562a3..762eaea77 100644 --- a/src/data/ground/ground_data_d06p02_station.h +++ b/src/data/ground/ground_data_d06p02_station.h @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs189_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs189_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs189_g0_s0_station_sref_script }; /* 0x823a06c */ +static const ScriptRef s_gs189_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs189_g0_s0_station_sref_script }; /* 0x823a06c */ static const struct ScriptCommand s_gs189_g0_s0_evt0_sref_script[] = { /* 0x823a078 */ DEBUGINFO_O(46), @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs189_g0_s0_evt0_sref_script[] = { /* 0x823a HALT, }; -static const struct ScriptRef s_gs189_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs189_g0_s0_evt0_sref_script }; /* 0x823a164 */ +static const ScriptRef s_gs189_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs189_g0_s0_evt0_sref_script }; /* 0x823a164 */ static const struct ScriptCommand s_gs189_g0_s0_evt1_sref_script[] = { /* 0x823a170 */ DEBUGINFO_O(63), @@ -76,7 +76,7 @@ static const struct ScriptCommand s_gs189_g0_s0_evt1_sref_script[] = { /* 0x823a HALT, }; -static const struct ScriptRef s_gs189_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs189_g0_s0_evt1_sref_script }; /* 0x823a270 */ +static const ScriptRef s_gs189_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs189_g0_s0_evt1_sref_script }; /* 0x823a270 */ static const struct ScriptCommand s_gs189_g0_s0_obj0_dlg2[] = { /* 0x823a27c */ DEBUGINFO_O(82), @@ -139,7 +139,7 @@ static const struct ScriptCommand s_gs189_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs189_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs189_g1_s0_station_sref_script }; /* 0x823a4cc */ +static const ScriptRef s_gs189_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs189_g1_s0_station_sref_script }; /* 0x823a4cc */ static const struct ScriptCommand s_gs189_g1_s0_lives0_dlg0[] = { /* 0x823a4d8 */ DEBUGINFO_O(145), @@ -236,7 +236,7 @@ static const struct GroundEventData s_gs189_g0_s0_evts[] = { /* 0x823a8d8 */ /* 1 */ { 15, 3, 0, 0, { 21, 42, 0, 0 }, &s_gs189_g0_s0_evt1_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x823a8f0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x823a8f0 */ &s_gs189_g0_s0_station_sref, &s_gs189_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d06p03_station.h b/src/data/ground/ground_data_d06p03_station.h index 796c49e6a..a4bc827e3 100644 --- a/src/data/ground/ground_data_d06p03_station.h +++ b/src/data/ground/ground_data_d06p03_station.h @@ -20,7 +20,7 @@ static const struct ScriptCommand s_gs190_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs190_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs190_g0_s0_station_sref_script }; /* 0x823aa80 */ +static const ScriptRef s_gs190_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs190_g0_s0_station_sref_script }; /* 0x823aa80 */ static const struct ScriptCommand s_gs190_g1_s0_station_sref_script[] = { /* 0x823aa8c */ DEBUGINFO_O(26), @@ -34,7 +34,7 @@ static const struct ScriptCommand s_gs190_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs190_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs190_g1_s0_station_sref_script }; /* 0x823ab1c */ +static const ScriptRef s_gs190_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs190_g1_s0_station_sref_script }; /* 0x823ab1c */ static const struct ScriptCommand s_gs190_g1_s0_eff0_script[] = { /* 0x823ab28 */ DEBUGINFO_O(40), @@ -657,7 +657,7 @@ static const struct GroundEffectData s_gs190_g1_s0_effs[] = { /* 0x823d6e8 */ /* 1 */ { 4, 0, 1, 1, { 28, 20, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs190_g1_s0_eff1_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x823d700 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x823d700 */ &s_gs190_g0_s0_station_sref, &s_gs190_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d07p01_station.h b/src/data/ground/ground_data_d07p01_station.h index 86f0cc4d2..7b38e563f 100644 --- a/src/data/ground/ground_data_d07p01_station.h +++ b/src/data/ground/ground_data_d07p01_station.h @@ -18,7 +18,7 @@ static const struct ScriptCommand s_gs191_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs191_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs191_g0_s0_station_sref_script }; /* 0x823d848 */ +static const ScriptRef s_gs191_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs191_g0_s0_station_sref_script }; /* 0x823d848 */ static const struct ScriptCommand s_gs191_g1_s0_station_sref_script[] = { /* 0x823d854 */ DEBUGINFO_O(24), @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs191_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs191_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs191_g1_s0_station_sref_script }; /* 0x823d8d4 */ +static const ScriptRef s_gs191_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs191_g1_s0_station_sref_script }; /* 0x823d8d4 */ static const struct ScriptCommand s_gs191_g1_s0_lives0_dlg0[] = { /* 0x823d8e0 */ DEBUGINFO_O(37), @@ -98,7 +98,7 @@ static const struct ScriptCommand s_gs191_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs191_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs191_g2_s0_station_sref_script }; /* 0x823dda0 */ +static const ScriptRef s_gs191_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs191_g2_s0_station_sref_script }; /* 0x823dda0 */ static const struct ScriptCommand s_gs191_g2_s0_lives0_dlg0[] = { /* 0x823ddac */ DEBUGINFO_O(104), @@ -168,7 +168,7 @@ static const struct GroundEffectData s_gs191_g2_s0_effs[] = { /* 0x823e164 */ /* 0 */ { 0, 0, 1, 1, { 30, 15, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x823e170 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x823e170 */ &s_gs191_g0_s0_station_sref, &s_gs191_g1_s0_station_sref, &s_gs191_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d07p02_station.h b/src/data/ground/ground_data_d07p02_station.h index 401e1cd3c..8699492b5 100644 --- a/src/data/ground/ground_data_d07p02_station.h +++ b/src/data/ground/ground_data_d07p02_station.h @@ -27,7 +27,7 @@ static const struct ScriptCommand s_gs192_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs192_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs192_g0_s0_station_sref_script }; /* 0x823e2b4 */ +static const ScriptRef s_gs192_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs192_g0_s0_station_sref_script }; /* 0x823e2b4 */ static const struct ScriptCommand s_gs192_g1_s0_station_sref_script[] = { /* 0x823e2c0 */ DEBUGINFO_O(33), @@ -42,7 +42,7 @@ static const struct ScriptCommand s_gs192_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs192_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs192_g1_s0_station_sref_script }; /* 0x823e360 */ +static const ScriptRef s_gs192_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs192_g1_s0_station_sref_script }; /* 0x823e360 */ static const struct ScriptCommand s_gs192_g1_s0_lives0_dlg0[] = { /* 0x823e36c */ DEBUGINFO_O(48), @@ -166,7 +166,7 @@ static const struct ScriptCommand s_gs192_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs192_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs192_g2_s0_station_sref_script }; /* 0x823ee8c */ +static const ScriptRef s_gs192_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs192_g2_s0_station_sref_script }; /* 0x823ee8c */ static const struct ScriptCommand s_gs192_g2_s0_eff0_script[] = { /* 0x823ee98 */ DEBUGINFO_O(172), @@ -928,7 +928,7 @@ static const struct GroundEffectData s_gs192_g2_s0_effs[] = { /* 0x8242a5c */ /* 0 */ { 0, 0, 1, 1, { 20, 51, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs192_g2_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8242a68 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8242a68 */ &s_gs192_g0_s0_station_sref, &s_gs192_g1_s0_station_sref, &s_gs192_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d08p01_station.h b/src/data/ground/ground_data_d08p01_station.h index 78a1827e2..22020bf49 100644 --- a/src/data/ground/ground_data_d08p01_station.h +++ b/src/data/ground/ground_data_d08p01_station.h @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs193_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs193_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs193_g0_s0_station_sref_script }; /* 0x8242e54 */ +static const ScriptRef s_gs193_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs193_g0_s0_station_sref_script }; /* 0x8242e54 */ static const struct ScriptCommand s_gs193_g0_s0_obj0_dlg2[] = { /* 0x8242e60 */ DEBUGINFO_O(57), @@ -124,7 +124,7 @@ static const struct ScriptCommand s_gs193_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs193_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs193_g1_s0_station_sref_script }; /* 0x8243130 */ +static const ScriptRef s_gs193_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs193_g1_s0_station_sref_script }; /* 0x8243130 */ static const struct ScriptCommand s_gs193_g1_s0_lives0_dlg0[] = { /* 0x824313c */ DEBUGINFO_O(140), @@ -233,7 +233,7 @@ static const struct ScriptCommand s_gs193_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs193_g2_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs193_g2_s0_station_sref_script }; /* 0x8243aac */ +static const ScriptRef s_gs193_g2_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs193_g2_s0_station_sref_script }; /* 0x8243aac */ static const struct ScriptCommand s_gs193_g2_s0_lives0_dlg0[] = { /* 0x8243ab8 */ DEBUGINFO_O(249), @@ -289,7 +289,7 @@ static const struct ScriptCommand s_gs193_g3_s0_station_sref_script[] = { /* 0x8 RET_DIRECT, }; -static const struct ScriptRef s_gs193_g3_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs193_g3_s0_station_sref_script }; /* 0x8243f64 */ +static const ScriptRef s_gs193_g3_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs193_g3_s0_station_sref_script }; /* 0x8243f64 */ static const struct ScriptCommand s_gs193_g3_s0_lives0_dlg1[] = { /* 0x8243f70 */ DEBUGINFO_O(305), @@ -310,7 +310,7 @@ static const struct ScriptCommand s_gs193_g3_s0_evt0_sref_script[] = { /* 0x8243 HALT, }; -static const struct ScriptRef s_gs193_g3_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs193_g3_s0_evt0_sref_script }; /* 0x8244010 */ +static const ScriptRef s_gs193_g3_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs193_g3_s0_evt0_sref_script }; /* 0x8244010 */ static const struct ScriptCommand s_gs193_g3_s1_station_sref_script[] = { /* 0x824401c */ DEBUGINFO_O(326), @@ -320,7 +320,7 @@ static const struct ScriptCommand s_gs193_g3_s1_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs193_g3_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs193_g3_s1_station_sref_script }; /* 0x824406c */ +static const ScriptRef s_gs193_g3_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs193_g3_s1_station_sref_script }; /* 0x824406c */ static const struct ScriptCommand s_gs193_g3_s1_lives0_dlg0[] = { /* 0x8244078 */ DEBUGINFO_O(336), @@ -434,7 +434,7 @@ static const struct ScriptCommand s_gs193_g4_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs193_g4_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs193_g4_s0_station_sref_script }; /* 0x82447f8 */ +static const ScriptRef s_gs193_g4_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs193_g4_s0_station_sref_script }; /* 0x82447f8 */ static const struct ScriptCommand s_gs193_g4_s0_lives0_dlg0[] = { /* 0x8244804 */ DEBUGINFO_O(450), @@ -501,7 +501,7 @@ static const struct ScriptCommand s_gs193_g5_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs193_g5_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs193_g5_s0_station_sref_script }; /* 0x8244d24 */ +static const ScriptRef s_gs193_g5_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs193_g5_s0_station_sref_script }; /* 0x8244d24 */ static const struct ScriptCommand s_gs193_g5_s0_lives0_dlg0[] = { /* 0x8244d30 */ DEBUGINFO_O(517), @@ -680,7 +680,7 @@ static const struct GroundEventData s_gs193_g3_s0_evts[] = { /* 0x82452b0 */ /* 0 */ { 12, 3, 0, 0, { 28, 16, 0, 0 }, &s_gs193_g3_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82452bc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82452bc */ &s_gs193_g0_s0_station_sref, &s_gs193_g1_s0_station_sref, &s_gs193_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d08p02_station.h b/src/data/ground/ground_data_d08p02_station.h index 0839c9242..4959ef4bb 100644 --- a/src/data/ground/ground_data_d08p02_station.h +++ b/src/data/ground/ground_data_d08p02_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs194_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs194_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs194_g0_s0_station_sref_script }; /* 0x8245580 */ +static const ScriptRef s_gs194_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs194_g0_s0_station_sref_script }; /* 0x8245580 */ static const struct ScriptCommand s_gs194_g1_s0_station_sref_script[] = { /* 0x824558c */ DEBUGINFO_O(21), @@ -36,7 +36,7 @@ static const struct ScriptCommand s_gs194_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs194_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs194_g1_s0_station_sref_script }; /* 0x8245728 */ +static const ScriptRef s_gs194_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs194_g1_s0_station_sref_script }; /* 0x8245728 */ @@ -122,7 +122,7 @@ static const struct GroundEffectData s_gs194_g1_s0_effs[] = { /* 0x8245c30 */ /* 0 */ { 0, 0, 1, 1, { 17, 22, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8245c3c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8245c3c */ &s_gs194_g0_s0_station_sref, &s_gs194_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d09p01_station.h b/src/data/ground/ground_data_d09p01_station.h index 67fb4f117..1d2b1dd5a 100644 --- a/src/data/ground/ground_data_d09p01_station.h +++ b/src/data/ground/ground_data_d09p01_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs195_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs195_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs195_g0_s0_station_sref_script }; /* 0x8245f84 */ +static const ScriptRef s_gs195_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs195_g0_s0_station_sref_script }; /* 0x8245f84 */ static const struct ScriptCommand s_gs195_g0_s0_obj0_dlg2[] = { /* 0x8245f90 */ DEBUGINFO_O(67), @@ -152,7 +152,7 @@ static const struct ScriptCommand s_gs195_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs195_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs195_g1_s0_station_sref_script }; /* 0x82464f8 */ +static const ScriptRef s_gs195_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs195_g1_s0_station_sref_script }; /* 0x82464f8 */ @@ -244,7 +244,7 @@ static const struct ScriptCommand s_gs195_g2_s0_station_sref_script[] = { /* 0x8 RET_DIRECT, }; -static const struct ScriptRef s_gs195_g2_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs195_g2_s0_station_sref_script }; /* 0x8246afc */ +static const ScriptRef s_gs195_g2_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs195_g2_s0_station_sref_script }; /* 0x8246afc */ static const struct ScriptCommand s_gs195_g2_s0_lives0_dlg2[] = { /* 0x8246b08 */ DEBUGINFO_O(268), @@ -258,7 +258,7 @@ static const struct ScriptCommand s_gs195_g2_s0_evt0_sref_script[] = { /* 0x8246 HALT, }; -static const struct ScriptRef s_gs195_g2_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs195_g2_s0_evt0_sref_script }; /* 0x8246b68 */ +static const ScriptRef s_gs195_g2_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs195_g2_s0_evt0_sref_script }; /* 0x8246b68 */ static const struct ScriptCommand s_gs195_g2_s1_station_sref_script[] = { /* 0x8246b74 */ DEBUGINFO_O(282), @@ -268,7 +268,7 @@ static const struct ScriptCommand s_gs195_g2_s1_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs195_g2_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs195_g2_s1_station_sref_script }; /* 0x8246bc4 */ +static const ScriptRef s_gs195_g2_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs195_g2_s1_station_sref_script }; /* 0x8246bc4 */ static const struct ScriptCommand s_gs195_g2_s1_lives0_dlg0[] = { /* 0x8246bd0 */ DEBUGINFO_O(292), @@ -394,7 +394,7 @@ static const struct ScriptCommand s_gs195_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs195_g3_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs195_g3_s0_station_sref_script }; /* 0x82474e0 */ +static const ScriptRef s_gs195_g3_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs195_g3_s0_station_sref_script }; /* 0x82474e0 */ static const struct ScriptCommand s_gs195_g3_s0_lives0_dlg0[] = { /* 0x82474ec */ DEBUGINFO_O(418), @@ -509,7 +509,7 @@ static const struct ScriptCommand s_gs195_g4_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs195_g4_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs195_g4_s0_station_sref_script }; /* 0x8247d24 */ +static const ScriptRef s_gs195_g4_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs195_g4_s0_station_sref_script }; /* 0x8247d24 */ static const struct ScriptCommand s_gs195_g4_s0_lives0_dlg0[] = { /* 0x8247d30 */ DEBUGINFO_O(533), @@ -574,7 +574,7 @@ static const struct ScriptCommand s_gs195_g5_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs195_g5_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs195_g5_s0_station_sref_script }; /* 0x8248224 */ +static const ScriptRef s_gs195_g5_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs195_g5_s0_station_sref_script }; /* 0x8248224 */ static const struct ScriptCommand s_gs195_g5_s0_lives0_dlg0[] = { /* 0x8248230 */ DEBUGINFO_O(598), @@ -752,7 +752,7 @@ static const struct GroundEventData s_gs195_g2_s0_evts[] = { /* 0x82487b0 */ /* 0 */ { 12, 3, 0, 0, { 17, 19, 0, 0 }, &s_gs195_g2_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82487bc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82487bc */ &s_gs195_g0_s0_station_sref, &s_gs195_g1_s0_station_sref, &s_gs195_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d09p02_station.h b/src/data/ground/ground_data_d09p02_station.h index 46e09f571..33a31c789 100644 --- a/src/data/ground/ground_data_d09p02_station.h +++ b/src/data/ground/ground_data_d09p02_station.h @@ -45,7 +45,7 @@ static const struct ScriptCommand s_gs196_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs196_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs196_g0_s0_station_sref_script }; /* 0x8248cc0 */ +static const ScriptRef s_gs196_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs196_g0_s0_station_sref_script }; /* 0x8248cc0 */ static const struct ScriptCommand s_gs196_g0_s0_evt0_sref_script[] = { /* 0x8248ccc */ DEBUGINFO_O(51), @@ -62,7 +62,7 @@ static const struct ScriptCommand s_gs196_g0_s0_evt0_sref_script[] = { /* 0x8248 HALT, }; -static const struct ScriptRef s_gs196_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs196_g0_s0_evt0_sref_script }; /* 0x8248da8 */ +static const ScriptRef s_gs196_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs196_g0_s0_evt0_sref_script }; /* 0x8248da8 */ static const struct ScriptCommand s_gs196_g0_s0_evt1_sref_script[] = { /* 0x8248db4 */ DEBUGINFO_O(68), @@ -92,7 +92,7 @@ static const struct ScriptCommand s_gs196_g0_s0_evt1_sref_script[] = { /* 0x8248 HALT, }; -static const struct ScriptRef s_gs196_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs196_g0_s0_evt1_sref_script }; /* 0x8248f7c */ +static const ScriptRef s_gs196_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs196_g0_s0_evt1_sref_script }; /* 0x8248f7c */ static const struct ScriptCommand s_gs196_g0_s0_obj0_dlg2[] = { /* 0x8248f88 */ DEBUGINFO_O(98), @@ -155,7 +155,7 @@ static const struct ScriptCommand s_gs196_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs196_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs196_g1_s0_station_sref_script }; /* 0x82491d8 */ +static const ScriptRef s_gs196_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs196_g1_s0_station_sref_script }; /* 0x82491d8 */ static const struct ScriptCommand s_gs196_g1_s0_lives0_dlg0[] = { /* 0x82491e4 */ DEBUGINFO_O(161), @@ -252,7 +252,7 @@ static const struct GroundEventData s_gs196_g0_s0_evts[] = { /* 0x82495c0 */ /* 1 */ { 15, 3, 0, 0, { 21, 42, 0, 0 }, &s_gs196_g0_s0_evt1_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82495d8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82495d8 */ &s_gs196_g0_s0_station_sref, &s_gs196_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d09p03_station.h b/src/data/ground/ground_data_d09p03_station.h index ee304e24f..813edecef 100644 --- a/src/data/ground/ground_data_d09p03_station.h +++ b/src/data/ground/ground_data_d09p03_station.h @@ -14,7 +14,7 @@ static const struct ScriptCommand s_gs197_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs197_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs197_g0_s0_station_sref_script }; /* 0x8249768 */ +static const ScriptRef s_gs197_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs197_g0_s0_station_sref_script }; /* 0x8249768 */ static const struct ScriptCommand s_gs197_g1_s0_station_sref_script[] = { /* 0x8249774 */ DEBUGINFO_O(20), @@ -27,7 +27,7 @@ static const struct ScriptCommand s_gs197_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs197_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs197_g1_s0_station_sref_script }; /* 0x82497f4 */ +static const ScriptRef s_gs197_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs197_g1_s0_station_sref_script }; /* 0x82497f4 */ static const struct ScriptCommand s_gs197_g1_s0_eff0_script[] = { /* 0x8249800 */ DEBUGINFO_O(33), @@ -426,7 +426,7 @@ static const struct GroundEffectData s_gs197_g1_s0_effs[] = { /* 0x824bb54 */ /* 2 */ { 4, 0, 1, 1, { 39, 18, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs197_g1_s0_eff2_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x824bb78 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x824bb78 */ &s_gs197_g0_s0_station_sref, &s_gs197_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d10p01_station.h b/src/data/ground/ground_data_d10p01_station.h index 9ce330aff..b152909ce 100644 --- a/src/data/ground/ground_data_d10p01_station.h +++ b/src/data/ground/ground_data_d10p01_station.h @@ -43,7 +43,7 @@ static const struct ScriptCommand s_gs198_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs198_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs198_g0_s0_station_sref_script }; /* 0x824beb8 */ +static const ScriptRef s_gs198_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs198_g0_s0_station_sref_script }; /* 0x824beb8 */ static const struct ScriptCommand s_gs198_g0_s0_obj0_dlg2[] = { /* 0x824bec4 */ DEBUGINFO_O(57), @@ -133,7 +133,7 @@ static const struct ScriptCommand s_gs198_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs198_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs198_g1_s0_station_sref_script }; /* 0x824c204 */ +static const ScriptRef s_gs198_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs198_g1_s0_station_sref_script }; /* 0x824c204 */ static const struct ScriptCommand s_gs198_g1_s0_eff0_script[] = { /* 0x824c210 */ DEBUGINFO_O(147), @@ -191,7 +191,7 @@ static const struct ScriptCommand s_gs198_g2_s0_station_sref_script[] = { /* 0x8 RET_DIRECT, }; -static const struct ScriptRef s_gs198_g2_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs198_g2_s0_station_sref_script }; /* 0x824c700 */ +static const ScriptRef s_gs198_g2_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs198_g2_s0_station_sref_script }; /* 0x824c700 */ static const struct ScriptCommand s_gs198_g2_s0_lives0_dlg2[] = { /* 0x824c70c */ DEBUGINFO_O(205), @@ -205,7 +205,7 @@ static const struct ScriptCommand s_gs198_g2_s0_evt0_sref_script[] = { /* 0x824c HALT, }; -static const struct ScriptRef s_gs198_g2_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs198_g2_s0_evt0_sref_script }; /* 0x824c76c */ +static const ScriptRef s_gs198_g2_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs198_g2_s0_evt0_sref_script }; /* 0x824c76c */ static const struct ScriptCommand s_gs198_g2_s1_station_sref_script[] = { /* 0x824c778 */ DEBUGINFO_O(219), @@ -215,7 +215,7 @@ static const struct ScriptCommand s_gs198_g2_s1_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs198_g2_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs198_g2_s1_station_sref_script }; /* 0x824c7c8 */ +static const ScriptRef s_gs198_g2_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs198_g2_s1_station_sref_script }; /* 0x824c7c8 */ static const struct ScriptCommand s_gs198_g2_s1_lives0_dlg0[] = { /* 0x824c7d4 */ DEBUGINFO_O(229), @@ -342,7 +342,7 @@ static const struct ScriptCommand s_gs198_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs198_g3_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs198_g3_s0_station_sref_script }; /* 0x824d0b4 */ +static const ScriptRef s_gs198_g3_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs198_g3_s0_station_sref_script }; /* 0x824d0b4 */ static const struct ScriptCommand s_gs198_g3_s0_lives0_dlg0[] = { /* 0x824d0c0 */ DEBUGINFO_O(356), @@ -404,7 +404,7 @@ static const struct ScriptCommand s_gs198_g4_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs198_g4_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs198_g4_s0_station_sref_script }; /* 0x824d4f4 */ +static const ScriptRef s_gs198_g4_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs198_g4_s0_station_sref_script }; /* 0x824d4f4 */ static const struct ScriptCommand s_gs198_g4_s0_lives0_dlg0[] = { /* 0x824d500 */ DEBUGINFO_O(418), @@ -462,7 +462,7 @@ static const struct ScriptCommand s_gs198_g5_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs198_g5_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs198_g5_s0_station_sref_script }; /* 0x824d974 */ +static const ScriptRef s_gs198_g5_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs198_g5_s0_station_sref_script }; /* 0x824d974 */ static const struct ScriptCommand s_gs198_g5_s0_lives0_dlg0[] = { /* 0x824d980 */ DEBUGINFO_O(476), @@ -531,7 +531,7 @@ static const struct ScriptCommand s_gs198_g6_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs198_g6_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs198_g6_s0_station_sref_script }; /* 0x824dec8 */ +static const ScriptRef s_gs198_g6_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs198_g6_s0_station_sref_script }; /* 0x824dec8 */ static const struct ScriptCommand s_gs198_g6_s0_lives0_dlg0[] = { /* 0x824ded4 */ DEBUGINFO_O(545), @@ -721,7 +721,7 @@ static const struct GroundEventData s_gs198_g2_s0_evts[] = { /* 0x824e48c */ /* 0 */ { 4, 3, 0, 0, { 15, 27, 0, 0 }, &s_gs198_g2_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x824e498 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x824e498 */ &s_gs198_g0_s0_station_sref, &s_gs198_g1_s0_station_sref, &s_gs198_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d10p02_station.h b/src/data/ground/ground_data_d10p02_station.h index ac6fe3f05..d36b1d51b 100644 --- a/src/data/ground/ground_data_d10p02_station.h +++ b/src/data/ground/ground_data_d10p02_station.h @@ -45,7 +45,7 @@ static const struct ScriptCommand s_gs199_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs199_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs199_g0_s0_station_sref_script }; /* 0x824e980 */ +static const ScriptRef s_gs199_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs199_g0_s0_station_sref_script }; /* 0x824e980 */ static const struct ScriptCommand s_gs199_g0_s0_evt0_sref_script[] = { /* 0x824e98c */ DEBUGINFO_O(51), @@ -62,7 +62,7 @@ static const struct ScriptCommand s_gs199_g0_s0_evt0_sref_script[] = { /* 0x824e HALT, }; -static const struct ScriptRef s_gs199_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs199_g0_s0_evt0_sref_script }; /* 0x824ea68 */ +static const ScriptRef s_gs199_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs199_g0_s0_evt0_sref_script }; /* 0x824ea68 */ static const struct ScriptCommand s_gs199_g0_s0_evt1_sref_script[] = { /* 0x824ea74 */ DEBUGINFO_O(68), @@ -92,7 +92,7 @@ static const struct ScriptCommand s_gs199_g0_s0_evt1_sref_script[] = { /* 0x824e HALT, }; -static const struct ScriptRef s_gs199_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs199_g0_s0_evt1_sref_script }; /* 0x824ec3c */ +static const ScriptRef s_gs199_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs199_g0_s0_evt1_sref_script }; /* 0x824ec3c */ static const struct ScriptCommand s_gs199_g0_s0_obj0_dlg2[] = { /* 0x824ec48 */ DEBUGINFO_O(98), @@ -155,7 +155,7 @@ static const struct ScriptCommand s_gs199_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs199_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs199_g1_s0_station_sref_script }; /* 0x824ee98 */ +static const ScriptRef s_gs199_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs199_g1_s0_station_sref_script }; /* 0x824ee98 */ static const struct ScriptCommand s_gs199_g1_s0_lives0_dlg0[] = { /* 0x824eea4 */ DEBUGINFO_O(161), @@ -223,7 +223,7 @@ static const struct ScriptCommand s_gs199_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs199_g2_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs199_g2_s0_station_sref_script }; /* 0x824f330 */ +static const ScriptRef s_gs199_g2_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs199_g2_s0_station_sref_script }; /* 0x824f330 */ static const struct ScriptCommand s_gs199_g2_s0_lives0_dlg0[] = { /* 0x824f33c */ DEBUGINFO_O(229), @@ -343,7 +343,7 @@ static const struct GroundEventData s_gs199_g0_s0_evts[] = { /* 0x824f8b4 */ /* 1 */ { 15, 3, 0, 0, { 21, 42, 0, 0 }, &s_gs199_g0_s0_evt1_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x824f8cc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x824f8cc */ &s_gs199_g0_s0_station_sref, &s_gs199_g1_s0_station_sref, &s_gs199_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d10p03_station.h b/src/data/ground/ground_data_d10p03_station.h index baa43677d..02d9b76e5 100644 --- a/src/data/ground/ground_data_d10p03_station.h +++ b/src/data/ground/ground_data_d10p03_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs200_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs200_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs200_g0_s0_station_sref_script }; /* 0x824fa90 */ +static const ScriptRef s_gs200_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs200_g0_s0_station_sref_script }; /* 0x824fa90 */ static const struct ScriptCommand s_gs200_g1_s0_station_sref_script[] = { /* 0x824fa9c */ DEBUGINFO_O(19), @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs200_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs200_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs200_g1_s0_station_sref_script }; /* 0x824fca8 */ +static const ScriptRef s_gs200_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs200_g1_s0_station_sref_script }; /* 0x824fca8 */ static const struct ScriptCommand s_gs200_g1_s0_lives0_dlg0[] = { /* 0x824fcb4 */ @@ -470,7 +470,7 @@ static const struct GroundEffectData s_gs200_g1_s0_effs[] = { /* 0x8251e8c */ /* 0 */ { 0, 0, 1, 1, { 33, 27, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8251e98 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8251e98 */ &s_gs200_g0_s0_station_sref, &s_gs200_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d11p01_station.h b/src/data/ground/ground_data_d11p01_station.h index 995264372..261f9e68f 100644 --- a/src/data/ground/ground_data_d11p01_station.h +++ b/src/data/ground/ground_data_d11p01_station.h @@ -44,7 +44,7 @@ static const struct ScriptCommand s_gs201_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs201_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs201_g0_s0_station_sref_script }; /* 0x8252210 */ +static const ScriptRef s_gs201_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs201_g0_s0_station_sref_script }; /* 0x8252210 */ static const struct ScriptCommand s_gs201_g0_s0_obj0_dlg2[] = { /* 0x825221c */ DEBUGINFO_O(59), @@ -132,7 +132,7 @@ static const struct ScriptCommand s_gs201_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs201_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs201_g1_s0_station_sref_script }; /* 0x825253c */ +static const ScriptRef s_gs201_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs201_g1_s0_station_sref_script }; /* 0x825253c */ static const struct ScriptCommand s_gs201_g1_s0_lives0_dlg0[] = { /* 0x8252548 */ DEBUGINFO_O(147), @@ -286,7 +286,7 @@ static const struct ScriptCommand s_gs201_g2_s0_station_sref_script[] = { /* 0x8 RET_DIRECT, }; -static const struct ScriptRef s_gs201_g2_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs201_g2_s0_station_sref_script }; /* 0x825383c */ +static const ScriptRef s_gs201_g2_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs201_g2_s0_station_sref_script }; /* 0x825383c */ static const struct ScriptCommand s_gs201_g2_s0_lives0_dlg2[] = { /* 0x8253848 */ DEBUGINFO_O(301), @@ -300,7 +300,7 @@ static const struct ScriptCommand s_gs201_g2_s0_evt0_sref_script[] = { /* 0x8253 HALT, }; -static const struct ScriptRef s_gs201_g2_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs201_g2_s0_evt0_sref_script }; /* 0x82538a8 */ +static const ScriptRef s_gs201_g2_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs201_g2_s0_evt0_sref_script }; /* 0x82538a8 */ static const struct ScriptCommand s_gs201_g2_s1_station_sref_script[] = { /* 0x82538b4 */ DEBUGINFO_O(315), @@ -310,7 +310,7 @@ static const struct ScriptCommand s_gs201_g2_s1_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs201_g2_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs201_g2_s1_station_sref_script }; /* 0x8253904 */ +static const ScriptRef s_gs201_g2_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs201_g2_s1_station_sref_script }; /* 0x8253904 */ static const struct ScriptCommand s_gs201_g2_s1_lives0_dlg0[] = { /* 0x8253910 */ DEBUGINFO_O(325), @@ -440,7 +440,7 @@ static const struct ScriptCommand s_gs201_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs201_g3_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs201_g3_s0_station_sref_script }; /* 0x82541a0 */ +static const ScriptRef s_gs201_g3_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs201_g3_s0_station_sref_script }; /* 0x82541a0 */ static const struct ScriptCommand s_gs201_g3_s0_lives0_dlg0[] = { /* 0x82541ac */ DEBUGINFO_O(455), @@ -503,7 +503,7 @@ static const struct ScriptCommand s_gs201_g4_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs201_g4_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs201_g4_s0_station_sref_script }; /* 0x82545e0 */ +static const ScriptRef s_gs201_g4_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs201_g4_s0_station_sref_script }; /* 0x82545e0 */ static const struct ScriptCommand s_gs201_g4_s0_lives0_dlg0[] = { /* 0x82545ec */ DEBUGINFO_O(518), @@ -573,7 +573,7 @@ static const struct ScriptCommand s_gs201_g5_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs201_g5_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs201_g5_s0_station_sref_script }; /* 0x8254aec */ +static const ScriptRef s_gs201_g5_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs201_g5_s0_station_sref_script }; /* 0x8254aec */ static const struct ScriptCommand s_gs201_g5_s0_lives0_dlg0[] = { /* 0x8254af8 */ DEBUGINFO_O(588), @@ -628,7 +628,7 @@ static const struct ScriptCommand s_gs201_g6_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs201_g6_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs201_g6_s0_station_sref_script }; /* 0x8254ea4 */ +static const ScriptRef s_gs201_g6_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs201_g6_s0_station_sref_script }; /* 0x8254ea4 */ static const struct ScriptCommand s_gs201_g6_s0_eff0_script[] = { /* 0x8254eb0 */ DEBUGINFO_O(643), @@ -820,7 +820,7 @@ static const struct GroundEventData s_gs201_g2_s0_evts[] = { /* 0x8255410 */ /* 0 */ { 3, 3, 0, 0, { 26, 17, 0, 0 }, &s_gs201_g2_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x825541c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x825541c */ &s_gs201_g0_s0_station_sref, &s_gs201_g1_s0_station_sref, &s_gs201_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d11p02_station.h b/src/data/ground/ground_data_d11p02_station.h index 959f7ca4c..60bbd8aeb 100644 --- a/src/data/ground/ground_data_d11p02_station.h +++ b/src/data/ground/ground_data_d11p02_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs202_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs202_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs202_g0_s0_station_sref_script }; /* 0x825592c */ +static const ScriptRef s_gs202_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs202_g0_s0_station_sref_script }; /* 0x825592c */ static const struct ScriptCommand s_gs202_g0_s0_evt0_sref_script[] = { /* 0x8255938 */ DEBUGINFO_O(53), @@ -69,7 +69,7 @@ static const struct ScriptCommand s_gs202_g0_s0_evt0_sref_script[] = { /* 0x8255 HALT, }; -static const struct ScriptRef s_gs202_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs202_g0_s0_evt0_sref_script }; /* 0x8255a64 */ +static const ScriptRef s_gs202_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs202_g0_s0_evt0_sref_script }; /* 0x8255a64 */ static const struct ScriptCommand s_gs202_g0_s0_evt1_sref_script[] = { /* 0x8255a70 */ DEBUGINFO_O(75), @@ -99,7 +99,7 @@ static const struct ScriptCommand s_gs202_g0_s0_evt1_sref_script[] = { /* 0x8255 HALT, }; -static const struct ScriptRef s_gs202_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs202_g0_s0_evt1_sref_script }; /* 0x8255c38 */ +static const ScriptRef s_gs202_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs202_g0_s0_evt1_sref_script }; /* 0x8255c38 */ static const struct ScriptCommand s_gs202_g0_s0_obj0_dlg2[] = { /* 0x8255c44 */ DEBUGINFO_O(105), @@ -168,7 +168,7 @@ static const struct ScriptCommand s_gs202_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs202_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs202_g1_s0_station_sref_script }; /* 0x8255ef4 */ +static const ScriptRef s_gs202_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs202_g1_s0_station_sref_script }; /* 0x8255ef4 */ static const struct ScriptCommand s_gs202_g1_s0_lives0_dlg0[] = { /* 0x8255f00 */ DEBUGINFO_O(174), @@ -224,7 +224,7 @@ static const struct ScriptCommand s_gs202_g2_s0_station_sref_script[] = { /* 0x8 RET_DIRECT, }; -static const struct ScriptRef s_gs202_g2_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs202_g2_s0_station_sref_script }; /* 0x82562bc */ +static const ScriptRef s_gs202_g2_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs202_g2_s0_station_sref_script }; /* 0x82562bc */ static const struct GroundLivesData s_gs202_g0_s0_lives[] = { /* 0x82562c8 */ /* 0 */ { 145, 0, 0, 0, { 28, 28, CPOS_HALFTILE, CPOS_HALFTILE }, {} }, }; @@ -280,7 +280,7 @@ static const struct GroundEventData s_gs202_g0_s0_evts[] = { /* 0x82563c4 */ /* 1 */ { 15, 3, 0, 0, { 21, 42, 0, 0 }, &s_gs202_g0_s0_evt1_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82563dc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82563dc */ &s_gs202_g0_s0_station_sref, &s_gs202_g1_s0_station_sref, &s_gs202_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d11p03_station.h b/src/data/ground/ground_data_d11p03_station.h index d3fd35a37..551d94745 100644 --- a/src/data/ground/ground_data_d11p03_station.h +++ b/src/data/ground/ground_data_d11p03_station.h @@ -27,7 +27,7 @@ static const struct ScriptCommand s_gs203_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs203_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs203_g0_s0_station_sref_script }; /* 0x82565a0 */ +static const ScriptRef s_gs203_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs203_g0_s0_station_sref_script }; /* 0x82565a0 */ static const struct ScriptCommand s_gs203_g1_s0_station_sref_script[] = { /* 0x82565ac */ DEBUGINFO_O(33), @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs203_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs203_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs203_g1_s0_station_sref_script }; /* 0x825663c */ +static const ScriptRef s_gs203_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs203_g1_s0_station_sref_script }; /* 0x825663c */ static const struct ScriptCommand s_gs203_g1_s0_eff0_script[] = { /* 0x8256648 */ DEBUGINFO_O(47), @@ -317,7 +317,7 @@ static const struct ScriptCommand s_gs203_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs203_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs203_g2_s0_station_sref_script }; /* 0x8257e9c */ +static const ScriptRef s_gs203_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs203_g2_s0_station_sref_script }; /* 0x8257e9c */ static const struct ScriptCommand s_gs203_g2_s0_eff0_script[] = { /* 0x8257ea8 */ DEBUGINFO_O(323), @@ -663,7 +663,7 @@ static const struct ScriptCommand s_gs203_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs203_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs203_g3_s0_station_sref_script }; /* 0x825964c */ +static const ScriptRef s_gs203_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs203_g3_s0_station_sref_script }; /* 0x825964c */ static const struct ScriptCommand s_gs203_g3_s0_lives0_dlg0[] = { /* 0x8259658 */ @@ -1361,7 +1361,7 @@ static const struct GroundEffectData s_gs203_g3_s0_effs[] = { /* 0x825cc5c */ /* 0 */ { 0, 0, 1, 1, { 31, 30, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x825cc68 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x825cc68 */ &s_gs203_g0_s0_station_sref, &s_gs203_g1_s0_station_sref, &s_gs203_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d12p01_station.h b/src/data/ground/ground_data_d12p01_station.h index f23fdf1ac..d891ef5cd 100644 --- a/src/data/ground/ground_data_d12p01_station.h +++ b/src/data/ground/ground_data_d12p01_station.h @@ -42,7 +42,7 @@ static const struct ScriptCommand s_gs204_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs204_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs204_g0_s0_station_sref_script }; /* 0x825d030 */ +static const ScriptRef s_gs204_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs204_g0_s0_station_sref_script }; /* 0x825d030 */ static const struct ScriptCommand s_gs204_g0_s1_lives0_dlg0[] = { /* 0x825d03c */ DEBUGINFO_O(48), @@ -95,7 +95,7 @@ static const struct ScriptCommand s_gs204_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs204_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs204_g1_s0_station_sref_script }; /* 0x825d21c */ +static const ScriptRef s_gs204_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs204_g1_s0_station_sref_script }; /* 0x825d21c */ static const struct ScriptCommand s_gs204_g1_s0_lives0_dlg0[] = { /* 0x825d228 */ DEBUGINFO_O(101), @@ -163,7 +163,7 @@ static const struct ScriptCommand s_gs204_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs204_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs204_g2_s0_station_sref_script }; /* 0x825d80c */ +static const ScriptRef s_gs204_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs204_g2_s0_station_sref_script }; /* 0x825d80c */ static const struct ScriptCommand s_gs204_g2_s0_lives0_dlg0[] = { /* 0x825d818 */ DEBUGINFO_O(169), @@ -252,7 +252,7 @@ static const struct GroundEffectData s_gs204_g2_s0_effs[] = { /* 0x825db48 */ /* 0 */ { 0, 0, 1, 1, { 26, 17, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x825db54 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x825db54 */ &s_gs204_g0_s0_station_sref, &s_gs204_g1_s0_station_sref, &s_gs204_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d12p02_station.h b/src/data/ground/ground_data_d12p02_station.h index da9f7a5a7..2ab13d659 100644 --- a/src/data/ground/ground_data_d12p02_station.h +++ b/src/data/ground/ground_data_d12p02_station.h @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs205_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs205_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs205_g0_s0_station_sref_script }; /* 0x825dee8 */ +static const ScriptRef s_gs205_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs205_g0_s0_station_sref_script }; /* 0x825dee8 */ static const struct ScriptCommand s_gs205_g0_s0_evt0_sref_script[] = { /* 0x825def4 */ DEBUGINFO_O(46), @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs205_g0_s0_evt0_sref_script[] = { /* 0x825d HALT, }; -static const struct ScriptRef s_gs205_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs205_g0_s0_evt0_sref_script }; /* 0x825dfd0 */ +static const ScriptRef s_gs205_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs205_g0_s0_evt0_sref_script }; /* 0x825dfd0 */ static const struct ScriptCommand s_gs205_g0_s0_evt1_sref_script[] = { /* 0x825dfdc */ DEBUGINFO_O(63), @@ -76,7 +76,7 @@ static const struct ScriptCommand s_gs205_g0_s0_evt1_sref_script[] = { /* 0x825d HALT, }; -static const struct ScriptRef s_gs205_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs205_g0_s0_evt1_sref_script }; /* 0x825e0dc */ +static const ScriptRef s_gs205_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs205_g0_s0_evt1_sref_script }; /* 0x825e0dc */ static const struct ScriptCommand s_gs205_g0_s0_obj0_dlg2[] = { /* 0x825e0e8 */ DEBUGINFO_O(82), @@ -139,7 +139,7 @@ static const struct ScriptCommand s_gs205_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs205_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs205_g1_s0_station_sref_script }; /* 0x825e338 */ +static const ScriptRef s_gs205_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs205_g1_s0_station_sref_script }; /* 0x825e338 */ static const struct ScriptCommand s_gs205_g1_s0_lives0_dlg0[] = { /* 0x825e344 */ DEBUGINFO_O(145), @@ -235,7 +235,7 @@ static const struct GroundEventData s_gs205_g0_s0_evts[] = { /* 0x825e71c */ /* 1 */ { 15, 3, 0, 0, { 21, 42, 0, 0 }, &s_gs205_g0_s0_evt1_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x825e734 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x825e734 */ &s_gs205_g0_s0_station_sref, &s_gs205_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d12p04_station.h b/src/data/ground/ground_data_d12p04_station.h index c8649aeb7..0b66f4d6c 100644 --- a/src/data/ground/ground_data_d12p04_station.h +++ b/src/data/ground/ground_data_d12p04_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs206_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs206_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs206_g0_s0_station_sref_script }; /* 0x825e8c4 */ +static const ScriptRef s_gs206_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs206_g0_s0_station_sref_script }; /* 0x825e8c4 */ static const struct ScriptCommand s_gs206_g1_s0_station_sref_script[] = { /* 0x825e8d0 */ DEBUGINFO_O(19), @@ -42,7 +42,7 @@ static const struct ScriptCommand s_gs206_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs206_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs206_g1_s0_station_sref_script }; /* 0x825eacc */ +static const ScriptRef s_gs206_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs206_g1_s0_station_sref_script }; /* 0x825eacc */ static const struct ScriptCommand s_gs206_g1_s0_eff0_script[] = { /* 0x825ead8 */ DEBUGINFO_O(48), @@ -394,7 +394,7 @@ static const struct GroundEffectData s_gs206_g1_s0_effs[] = { /* 0x825fe8c */ /* 3 */ { 4, 0, 2, 1, { 26, 24, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs206_g1_s0_eff3_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x825febc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x825febc */ &s_gs206_g0_s0_station_sref, &s_gs206_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d13p01_station.h b/src/data/ground/ground_data_d13p01_station.h index 11c059b40..cb9229efb 100644 --- a/src/data/ground/ground_data_d13p01_station.h +++ b/src/data/ground/ground_data_d13p01_station.h @@ -14,7 +14,7 @@ static const struct ScriptCommand s_gs207_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs207_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs207_g0_s0_station_sref_script }; /* 0x825ffd4 */ +static const ScriptRef s_gs207_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs207_g0_s0_station_sref_script }; /* 0x825ffd4 */ static const struct ScriptCommand s_gs207_g1_s0_station_sref_script[] = { /* 0x825ffe0 */ DEBUGINFO_O(20), @@ -29,7 +29,7 @@ static const struct ScriptCommand s_gs207_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs207_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs207_g1_s0_station_sref_script }; /* 0x8260080 */ +static const ScriptRef s_gs207_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs207_g1_s0_station_sref_script }; /* 0x8260080 */ static const struct ScriptCommand s_gs207_g1_s0_lives0_dlg0[] = { /* 0x826008c */ DEBUGINFO_O(35), @@ -173,7 +173,7 @@ static const struct ScriptCommand s_gs207_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs207_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs207_g2_s0_station_sref_script }; /* 0x8260928 */ +static const ScriptRef s_gs207_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs207_g2_s0_station_sref_script }; /* 0x8260928 */ static const struct ScriptCommand s_gs207_g2_s0_lives0_dlg0[] = { /* 0x8260934 */ DEBUGINFO_O(179), @@ -239,7 +239,7 @@ static const struct ScriptCommand s_gs207_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs207_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs207_g3_s0_station_sref_script }; /* 0x8260d2c */ +static const ScriptRef s_gs207_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs207_g3_s0_station_sref_script }; /* 0x8260d2c */ static const struct ScriptCommand s_gs207_g3_s0_lives0_dlg0[] = { /* 0x8260d38 */ DEBUGINFO_O(245), @@ -383,7 +383,7 @@ static const struct GroundEffectData s_gs207_g3_s0_effs[] = { /* 0x826140c */ /* 0 */ { 0, 0, 1, 1, { 25, 16, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8261418 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8261418 */ &s_gs207_g0_s0_station_sref, &s_gs207_g1_s0_station_sref, &s_gs207_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d13p02_station.h b/src/data/ground/ground_data_d13p02_station.h index 91013fadb..e7456cd21 100644 --- a/src/data/ground/ground_data_d13p02_station.h +++ b/src/data/ground/ground_data_d13p02_station.h @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs208_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs208_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs208_g0_s0_station_sref_script }; /* 0x8261728 */ +static const ScriptRef s_gs208_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs208_g0_s0_station_sref_script }; /* 0x8261728 */ static const struct ScriptCommand s_gs208_g0_s0_evt0_sref_script[] = { /* 0x8261734 */ DEBUGINFO_O(46), @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs208_g0_s0_evt0_sref_script[] = { /* 0x8261 HALT, }; -static const struct ScriptRef s_gs208_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs208_g0_s0_evt0_sref_script }; /* 0x8261810 */ +static const ScriptRef s_gs208_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs208_g0_s0_evt0_sref_script }; /* 0x8261810 */ static const struct ScriptCommand s_gs208_g0_s0_evt1_sref_script[] = { /* 0x826181c */ DEBUGINFO_O(63), @@ -76,7 +76,7 @@ static const struct ScriptCommand s_gs208_g0_s0_evt1_sref_script[] = { /* 0x8261 HALT, }; -static const struct ScriptRef s_gs208_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs208_g0_s0_evt1_sref_script }; /* 0x826191c */ +static const ScriptRef s_gs208_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs208_g0_s0_evt1_sref_script }; /* 0x826191c */ static const struct ScriptCommand s_gs208_g0_s0_obj0_dlg2[] = { /* 0x8261928 */ DEBUGINFO_O(82), @@ -139,7 +139,7 @@ static const struct ScriptCommand s_gs208_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs208_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs208_g1_s0_station_sref_script }; /* 0x8261b78 */ +static const ScriptRef s_gs208_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs208_g1_s0_station_sref_script }; /* 0x8261b78 */ static const struct ScriptCommand s_gs208_g1_s0_lives0_dlg0[] = { /* 0x8261b84 */ DEBUGINFO_O(145), @@ -236,7 +236,7 @@ static const struct GroundEventData s_gs208_g0_s0_evts[] = { /* 0x8261f6c */ /* 1 */ { 15, 3, 0, 0, { 21, 42, 0, 0 }, &s_gs208_g0_s0_evt1_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8261f84 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8261f84 */ &s_gs208_g0_s0_station_sref, &s_gs208_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d13p03_station.h b/src/data/ground/ground_data_d13p03_station.h index 8c0bbfe2f..fd7982de4 100644 --- a/src/data/ground/ground_data_d13p03_station.h +++ b/src/data/ground/ground_data_d13p03_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs209_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs209_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs209_g0_s0_station_sref_script }; /* 0x8262114 */ +static const ScriptRef s_gs209_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs209_g0_s0_station_sref_script }; /* 0x8262114 */ static const struct ScriptCommand s_gs209_g1_s0_station_sref_script[] = { /* 0x8262120 */ DEBUGINFO_O(19), @@ -27,7 +27,7 @@ static const struct ScriptCommand s_gs209_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs209_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs209_g1_s0_station_sref_script }; /* 0x82621b0 */ +static const ScriptRef s_gs209_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs209_g1_s0_station_sref_script }; /* 0x82621b0 */ static const struct ScriptCommand s_gs209_g1_s0_eff0_script[] = { /* 0x82621bc */ DEBUGINFO_O(33), @@ -238,7 +238,7 @@ static const struct ScriptCommand s_gs209_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs209_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs209_g2_s0_station_sref_script }; /* 0x8262eb0 */ +static const ScriptRef s_gs209_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs209_g2_s0_station_sref_script }; /* 0x8262eb0 */ static const struct ScriptCommand s_gs209_g2_s0_eff0_script[] = { /* 0x8262ebc */ DEBUGINFO_O(244), @@ -410,7 +410,7 @@ static const struct ScriptCommand s_gs209_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs209_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs209_g3_s0_station_sref_script }; /* 0x8263a70 */ +static const ScriptRef s_gs209_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs209_g3_s0_station_sref_script }; /* 0x8263a70 */ static const struct ScriptCommand s_gs209_g3_s0_lives0_dlg0[] = { /* 0x8263a7c */ DEBUGINFO_O(416), @@ -527,7 +527,7 @@ static const struct GroundEffectData s_gs209_g3_s0_effs[] = { /* 0x8263de0 */ /* 1 */ { 3, 0, 1, 1, { 35, 28, 0, 0 }, s_gs209_g3_s0_eff1_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8263df8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8263df8 */ &s_gs209_g0_s0_station_sref, &s_gs209_g1_s0_station_sref, &s_gs209_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d14p01_station.h b/src/data/ground/ground_data_d14p01_station.h index a7acc50be..18f1fff17 100644 --- a/src/data/ground/ground_data_d14p01_station.h +++ b/src/data/ground/ground_data_d14p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs210_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs210_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs210_g0_s0_station_sref_script }; /* 0x8263f50 */ +static const ScriptRef s_gs210_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs210_g0_s0_station_sref_script }; /* 0x8263f50 */ static const struct ScriptCommand s_gs210_g1_s0_station_sref_script[] = { /* 0x8263f5c */ DEBUGINFO_O(19), @@ -26,7 +26,7 @@ static const struct ScriptCommand s_gs210_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs210_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs210_g1_s0_station_sref_script }; /* 0x8263fdc */ +static const ScriptRef s_gs210_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs210_g1_s0_station_sref_script }; /* 0x8263fdc */ static const struct ScriptCommand s_gs210_g1_s0_lives0_dlg0[] = { /* 0x8263fe8 */ DEBUGINFO_O(32), @@ -58,7 +58,7 @@ static const struct GroundEffectData s_gs210_g1_s0_effs[] = { /* 0x82640c8 */ /* 0 */ { 0, 0, 1, 1, { 34, 27, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82640d4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82640d4 */ &s_gs210_g0_s0_station_sref, &s_gs210_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d15p01_station.h b/src/data/ground/ground_data_d15p01_station.h index 51786838f..75050ea5a 100644 --- a/src/data/ground/ground_data_d15p01_station.h +++ b/src/data/ground/ground_data_d15p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs211_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs211_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs211_g0_s0_station_sref_script }; /* 0x82641c4 */ +static const ScriptRef s_gs211_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs211_g0_s0_station_sref_script }; /* 0x82641c4 */ static const struct ScriptCommand s_gs211_g1_s0_station_sref_script[] = { /* 0x82641d0 */ DEBUGINFO_O(19), @@ -26,7 +26,7 @@ static const struct ScriptCommand s_gs211_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs211_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs211_g1_s0_station_sref_script }; /* 0x8264250 */ +static const ScriptRef s_gs211_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs211_g1_s0_station_sref_script }; /* 0x8264250 */ static const struct ScriptCommand s_gs211_g1_s0_lives0_dlg0[] = { /* 0x826425c */ DEBUGINFO_O(32), @@ -89,7 +89,7 @@ static const struct GroundEffectData s_gs211_g1_s0_effs[] = { /* 0x82647a4 */ /* 0 */ { 0, 0, 1, 1, { 34, 39, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82647b0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82647b0 */ &s_gs211_g0_s0_station_sref, &s_gs211_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d16p01_station.h b/src/data/ground/ground_data_d16p01_station.h index ce023a182..eb13d51ae 100644 --- a/src/data/ground/ground_data_d16p01_station.h +++ b/src/data/ground/ground_data_d16p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs212_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs212_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs212_g0_s0_station_sref_script }; /* 0x82648a0 */ +static const ScriptRef s_gs212_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs212_g0_s0_station_sref_script }; /* 0x82648a0 */ static const struct ScriptCommand s_gs212_g1_s0_station_sref_script[] = { /* 0x82648ac */ DEBUGINFO_O(19), @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs212_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs212_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs212_g1_s0_station_sref_script }; /* 0x826494c */ +static const ScriptRef s_gs212_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs212_g1_s0_station_sref_script }; /* 0x826494c */ static const struct ScriptCommand s_gs212_g1_s0_eff0_script[] = { /* 0x8264958 */ DEBUGINFO_O(34), @@ -235,7 +235,7 @@ static const struct GroundEffectData s_gs212_g1_s1_effs[] = { /* 0x8265588 */ /* 0 */ { 5, 0, 1, 1, { 22, 17, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs212_g1_s1_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8265594 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8265594 */ &s_gs212_g0_s0_station_sref, &s_gs212_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d17p01_station.h b/src/data/ground/ground_data_d17p01_station.h index 21543c92b..1572a4c0e 100644 --- a/src/data/ground/ground_data_d17p01_station.h +++ b/src/data/ground/ground_data_d17p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs213_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs213_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs213_g0_s0_station_sref_script }; /* 0x82656ac */ +static const ScriptRef s_gs213_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs213_g0_s0_station_sref_script }; /* 0x82656ac */ static const struct ScriptCommand s_gs213_g1_s0_station_sref_script[] = { /* 0x82656b8 */ DEBUGINFO_O(19), @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs213_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs213_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs213_g1_s0_station_sref_script }; /* 0x8265758 */ +static const ScriptRef s_gs213_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs213_g1_s0_station_sref_script }; /* 0x8265758 */ static const struct ScriptCommand s_gs213_g1_s0_eff0_script[] = { /* 0x8265764 */ DEBUGINFO_O(34), @@ -234,7 +234,7 @@ static const struct GroundEffectData s_gs213_g1_s1_effs[] = { /* 0x8266418 */ /* 0 */ { 5, 0, 1, 1, { 22, 14, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs213_g1_s1_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8266424 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8266424 */ &s_gs213_g0_s0_station_sref, &s_gs213_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d18p01_station.h b/src/data/ground/ground_data_d18p01_station.h index 421723527..0fcbc770f 100644 --- a/src/data/ground/ground_data_d18p01_station.h +++ b/src/data/ground/ground_data_d18p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs214_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs214_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs214_g0_s0_station_sref_script }; /* 0x826653c */ +static const ScriptRef s_gs214_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs214_g0_s0_station_sref_script }; /* 0x826653c */ static const struct ScriptCommand s_gs214_g1_s0_station_sref_script[] = { /* 0x8266548 */ DEBUGINFO_O(19), @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs214_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs214_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs214_g1_s0_station_sref_script }; /* 0x82665e8 */ +static const ScriptRef s_gs214_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs214_g1_s0_station_sref_script }; /* 0x82665e8 */ static const struct ScriptCommand s_gs214_g1_s0_eff0_script[] = { /* 0x82665f4 */ DEBUGINFO_O(34), @@ -234,7 +234,7 @@ static const struct GroundEffectData s_gs214_g1_s1_effs[] = { /* 0x8267310 */ /* 0 */ { 5, 0, 1, 1, { 22, 17, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs214_g1_s1_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826731c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826731c */ &s_gs214_g0_s0_station_sref, &s_gs214_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d19p01_station.h b/src/data/ground/ground_data_d19p01_station.h index bdc2cf537..86416d80e 100644 --- a/src/data/ground/ground_data_d19p01_station.h +++ b/src/data/ground/ground_data_d19p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs215_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs215_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs215_g0_s0_station_sref_script }; /* 0x8267434 */ +static const ScriptRef s_gs215_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs215_g0_s0_station_sref_script }; /* 0x8267434 */ static const struct ScriptCommand s_gs215_g1_s0_station_sref_script[] = { /* 0x8267440 */ DEBUGINFO_O(19), @@ -26,7 +26,7 @@ static const struct ScriptCommand s_gs215_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs215_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs215_g1_s0_station_sref_script }; /* 0x82674c0 */ +static const ScriptRef s_gs215_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs215_g1_s0_station_sref_script }; /* 0x82674c0 */ static const struct ScriptCommand s_gs215_g1_s0_lives0_dlg0[] = { /* 0x82674cc */ DEBUGINFO_O(32), @@ -89,7 +89,7 @@ static const struct GroundEffectData s_gs215_g1_s0_effs[] = { /* 0x8267a38 */ /* 0 */ { 0, 0, 1, 1, { 35, 29, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8267a44 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8267a44 */ &s_gs215_g0_s0_station_sref, &s_gs215_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d20p01_station.h b/src/data/ground/ground_data_d20p01_station.h index 3171a4a01..129fafa7a 100644 --- a/src/data/ground/ground_data_d20p01_station.h +++ b/src/data/ground/ground_data_d20p01_station.h @@ -16,7 +16,7 @@ static const struct ScriptCommand s_gs216_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs216_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs216_g0_s0_station_sref_script }; /* 0x8267b34 */ +static const ScriptRef s_gs216_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs216_g0_s0_station_sref_script }; /* 0x8267b34 */ static const struct ScriptCommand s_gs216_g1_s0_station_sref_script[] = { /* 0x8267b40 */ DEBUGINFO_O(22), @@ -41,7 +41,7 @@ static const struct ScriptCommand s_gs216_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs216_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs216_g1_s0_station_sref_script }; /* 0x8267cbc */ +static const ScriptRef s_gs216_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs216_g1_s0_station_sref_script }; /* 0x8267cbc */ static const struct ScriptCommand s_gs216_g1_s0_lives0_dlg0[] = { /* 0x8267cc8 */ @@ -415,7 +415,7 @@ static const struct GroundEffectData s_gs216_g1_s0_effs[] = { /* 0x8269690 */ /* 3 */ { 4, 0, 1, 1, { 25, 20, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs216_g1_s0_eff3_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82696c0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82696c0 */ &s_gs216_g0_s0_station_sref, &s_gs216_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d21p01_station.h b/src/data/ground/ground_data_d21p01_station.h index 32579e6ba..291271ced 100644 --- a/src/data/ground/ground_data_d21p01_station.h +++ b/src/data/ground/ground_data_d21p01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs217_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs217_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs217_g0_s0_station_sref_script }; /* 0x82697c0 */ +static const ScriptRef s_gs217_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs217_g0_s0_station_sref_script }; /* 0x82697c0 */ static const struct ScriptCommand s_gs217_g1_s0_station_sref_script[] = { /* 0x82697cc */ DEBUGINFO_O(19), @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs217_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs217_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs217_g1_s0_station_sref_script }; /* 0x826986c */ +static const ScriptRef s_gs217_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs217_g1_s0_station_sref_script }; /* 0x826986c */ static const struct ScriptCommand s_gs217_g1_s0_lives0_dlg0[] = { /* 0x8269878 */ DEBUGINFO_O(34), @@ -107,7 +107,7 @@ static const struct GroundEffectData s_gs217_g1_s0_effs[] = { /* 0x8269ce4 */ /* 0 */ { 0, 0, 1, 1, { 31, 29, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8269cf0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8269cf0 */ &s_gs217_g0_s0_station_sref, &s_gs217_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d22p01_station.h b/src/data/ground/ground_data_d22p01_station.h index 94990b887..195c48e50 100644 --- a/src/data/ground/ground_data_d22p01_station.h +++ b/src/data/ground/ground_data_d22p01_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs218_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs218_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs218_g0_s0_station_sref_script }; /* 0x8269de0 */ +static const ScriptRef s_gs218_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs218_g0_s0_station_sref_script }; /* 0x8269de0 */ static const struct ScriptCommand s_gs218_g1_s0_station_sref_script[] = { /* 0x8269dec */ DEBUGINFO_O(21), @@ -28,7 +28,7 @@ static const struct ScriptCommand s_gs218_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs218_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs218_g1_s0_station_sref_script }; /* 0x8269e6c */ +static const ScriptRef s_gs218_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs218_g1_s0_station_sref_script }; /* 0x8269e6c */ static const struct ScriptCommand s_gs218_g1_s0_eff1_script[] = { /* 0x8269e78 */ DEBUGINFO_O(34), @@ -151,7 +151,7 @@ static const struct GroundEffectData s_gs218_g1_s0_effs[] = { /* 0x826a4e8 */ /* 3 */ { 4, 0, 1, 1, { 25, 23, 0, CPOS_HALFTILE }, s_gs218_g1_s0_eff3_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826a518 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826a518 */ &s_gs218_g0_s0_station_sref, &s_gs218_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d23p01_station.h b/src/data/ground/ground_data_d23p01_station.h index 9295c9d20..435c5dfc0 100644 --- a/src/data/ground/ground_data_d23p01_station.h +++ b/src/data/ground/ground_data_d23p01_station.h @@ -17,7 +17,7 @@ static const struct ScriptCommand s_gs219_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs219_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs219_g0_s0_station_sref_script }; /* 0x826a610 */ +static const ScriptRef s_gs219_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs219_g0_s0_station_sref_script }; /* 0x826a610 */ static const struct ScriptCommand s_gs219_g1_s0_station_sref_script[] = { /* 0x826a61c */ DEBUGINFO_O(23), @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs219_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs219_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs219_g1_s0_station_sref_script }; /* 0x826a6ac */ +static const ScriptRef s_gs219_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs219_g1_s0_station_sref_script }; /* 0x826a6ac */ static const struct ScriptCommand s_gs219_g1_s0_lives0_dlg0[] = { /* 0x826a6b8 */ DEBUGINFO_O(37), @@ -90,7 +90,7 @@ static const struct GroundEffectData s_gs219_g1_s0_effs[] = { /* 0x826a964 */ /* 0 */ { 0, 0, 1, 1, { 22, 20, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826a970 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826a970 */ &s_gs219_g0_s0_station_sref, &s_gs219_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d24p01_station.h b/src/data/ground/ground_data_d24p01_station.h index 9023bcad7..a2c12ba66 100644 --- a/src/data/ground/ground_data_d24p01_station.h +++ b/src/data/ground/ground_data_d24p01_station.h @@ -16,7 +16,7 @@ static const struct ScriptCommand s_gs220_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs220_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs220_g0_s0_station_sref_script }; /* 0x826aa78 */ +static const ScriptRef s_gs220_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs220_g0_s0_station_sref_script }; /* 0x826aa78 */ static const struct ScriptCommand s_gs220_g1_s0_station_sref_script[] = { /* 0x826aa84 */ DEBUGINFO_O(22), @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs220_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs220_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs220_g1_s0_station_sref_script }; /* 0x826ab24 */ +static const ScriptRef s_gs220_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs220_g1_s0_station_sref_script }; /* 0x826ab24 */ static const struct ScriptCommand s_gs220_g1_s0_eff0_script[] = { /* 0x826ab30 */ DEBUGINFO_O(37), @@ -320,7 +320,7 @@ static const struct ScriptCommand s_gs220_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs220_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs220_g2_s0_station_sref_script }; /* 0x826c22c */ +static const ScriptRef s_gs220_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs220_g2_s0_station_sref_script }; /* 0x826c22c */ static const struct ScriptCommand s_gs220_g2_s0_eff0_script[] = { /* 0x826c238 */ DEBUGINFO_O(326), @@ -587,7 +587,7 @@ static const struct GroundEffectData s_gs220_g2_s0_effs[] = { /* 0x826d62c */ /* 1 */ { 4, 0, 1, 1, { 26, 21, 0, CPOS_HALFTILE }, s_gs220_g2_s0_eff1_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826d644 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826d644 */ &s_gs220_g0_s0_station_sref, &s_gs220_g1_s0_station_sref, &s_gs220_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_d24p02_station.h b/src/data/ground/ground_data_d24p02_station.h index 5dfc787aa..211085ed2 100644 --- a/src/data/ground/ground_data_d24p02_station.h +++ b/src/data/ground/ground_data_d24p02_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs221_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs221_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs221_g0_s0_station_sref_script }; /* 0x826d7a0 */ +static const ScriptRef s_gs221_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs221_g0_s0_station_sref_script }; /* 0x826d7a0 */ static const struct ScriptCommand s_gs221_g1_s0_station_sref_script[] = { /* 0x826d7ac */ DEBUGINFO_O(19), @@ -25,7 +25,7 @@ static const struct ScriptCommand s_gs221_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs221_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs221_g1_s0_station_sref_script }; /* 0x826d81c */ +static const ScriptRef s_gs221_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs221_g1_s0_station_sref_script }; /* 0x826d81c */ static const struct ScriptCommand s_gs221_g1_s0_eff0_script[] = { /* 0x826d828 */ DEBUGINFO_O(31), @@ -79,7 +79,7 @@ static const struct GroundEffectData s_gs221_g1_s0_effs[] = { /* 0x826da88 */ /* 0 */ { 0, 0, 1, 1, { 25, 17, CPOS_HALFTILE, CPOS_HALFTILE }, s_gs221_g1_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826da94 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826da94 */ &s_gs221_g0_s0_station_sref, &s_gs221_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_d25p01_station.h b/src/data/ground/ground_data_d25p01_station.h index 046ca8a08..4d9f10a35 100644 --- a/src/data/ground/ground_data_d25p01_station.h +++ b/src/data/ground/ground_data_d25p01_station.h @@ -17,7 +17,7 @@ static const struct ScriptCommand s_gs222_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs222_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs222_g0_s0_station_sref_script }; /* 0x826db84 */ +static const ScriptRef s_gs222_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs222_g0_s0_station_sref_script }; /* 0x826db84 */ static const struct ScriptCommand s_gs222_g1_s0_station_sref_script[] = { /* 0x826db90 */ DEBUGINFO_O(23), @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs222_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs222_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs222_g1_s0_station_sref_script }; /* 0x826dc20 */ +static const ScriptRef s_gs222_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs222_g1_s0_station_sref_script }; /* 0x826dc20 */ static const struct ScriptCommand s_gs222_g1_s0_lives0_dlg0[] = { /* 0x826dc2c */ DEBUGINFO_O(37), @@ -90,7 +90,7 @@ static const struct GroundEffectData s_gs222_g1_s0_effs[] = { /* 0x826ded8 */ /* 0 */ { 0, 0, 1, 1, { 22, 20, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826dee4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826dee4 */ &s_gs222_g0_s0_station_sref, &s_gs222_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h01p01_station.h b/src/data/ground/ground_data_h01p01_station.h index 4561d349f..aafe42d9e 100644 --- a/src/data/ground/ground_data_h01p01_station.h +++ b/src/data/ground/ground_data_h01p01_station.h @@ -44,7 +44,7 @@ static const struct ScriptCommand s_gs105_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs105_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs105_g0_s0_station_sref_script }; /* 0x81ee3f4 */ +static const ScriptRef s_gs105_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs105_g0_s0_station_sref_script }; /* 0x81ee3f4 */ static const struct ScriptCommand s_gs105_g0_s1_lives0_dlg0[] = { /* 0x81ee400 */ @@ -257,7 +257,7 @@ static const struct GroundEventData s_gs105_g0_s0_evts[] = { /* 0x81ee998 */ /* 1 */ { 58, 1, 0, 0, { 0, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81ee9b0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81ee9b0 */ &s_gs105_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h01p02_station.h b/src/data/ground/ground_data_h01p02_station.h index bab8e73bc..eb6287a9c 100644 --- a/src/data/ground/ground_data_h01p02_station.h +++ b/src/data/ground/ground_data_h01p02_station.h @@ -56,7 +56,7 @@ static const struct ScriptCommand s_gs106_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs106_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs106_g0_s0_station_sref_script }; /* 0x81eed8c */ +static const ScriptRef s_gs106_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs106_g0_s0_station_sref_script }; /* 0x81eed8c */ static const struct ScriptCommand s_gs106_g0_s1_lives0_dlg0[] = { /* 0x81eed98 */ DEBUGINFO_O(62), @@ -285,7 +285,7 @@ static const struct GroundEventData s_gs106_g0_s0_evts[] = { /* 0x81ef398 */ /* 3 */ { 1, 42, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81ef3c8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81ef3c8 */ &s_gs106_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h01p03_station.h b/src/data/ground/ground_data_h01p03_station.h index c627c5cfc..eea7bdd71 100644 --- a/src/data/ground/ground_data_h01p03_station.h +++ b/src/data/ground/ground_data_h01p03_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs107_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs107_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs107_g0_s0_station_sref_script }; /* 0x81ef7b4 */ +static const ScriptRef s_gs107_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs107_g0_s0_station_sref_script }; /* 0x81ef7b4 */ static const struct ScriptCommand s_gs107_g0_s1_lives0_dlg0[] = { /* 0x81ef7c0 */ DEBUGINFO_O(56), @@ -189,7 +189,7 @@ static const struct GroundEventData s_gs107_g0_s0_evts[] = { /* 0x81efb50 */ /* 3 */ { 66, 3, 0, 0, { 0, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81efb80 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81efb80 */ &s_gs107_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h02p01_station.h b/src/data/ground/ground_data_h02p01_station.h index b6d2ce36e..96d963275 100644 --- a/src/data/ground/ground_data_h02p01_station.h +++ b/src/data/ground/ground_data_h02p01_station.h @@ -58,7 +58,7 @@ static const struct ScriptCommand s_gs108_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs108_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs108_g0_s0_station_sref_script }; /* 0x81eff3c */ +static const ScriptRef s_gs108_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs108_g0_s0_station_sref_script }; /* 0x81eff3c */ static const struct ScriptCommand s_gs108_g0_s1_lives0_dlg0[] = { /* 0x81eff48 */ DEBUGINFO_O(64), @@ -317,7 +317,7 @@ static const struct GroundEventData s_gs108_g0_s0_evts[] = { /* 0x81f0618 */ /* 3 */ { 1, 42, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f0648 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f0648 */ &s_gs108_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h02p02_station.h b/src/data/ground/ground_data_h02p02_station.h index 56926b64e..ed0a71dfe 100644 --- a/src/data/ground/ground_data_h02p02_station.h +++ b/src/data/ground/ground_data_h02p02_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs109_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs109_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs109_g0_s0_station_sref_script }; /* 0x81f0a44 */ +static const ScriptRef s_gs109_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs109_g0_s0_station_sref_script }; /* 0x81f0a44 */ static const struct ScriptCommand s_gs109_g0_s1_lives0_dlg0[] = { /* 0x81f0a50 */ DEBUGINFO_O(53), @@ -141,7 +141,7 @@ static const struct GroundEventData s_gs109_g0_s0_evts[] = { /* 0x81f0ca8 */ /* 3 */ { 1, 39, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f0cd8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f0cd8 */ &s_gs109_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h02p03_station.h b/src/data/ground/ground_data_h02p03_station.h index bf1f32676..dec56526f 100644 --- a/src/data/ground/ground_data_h02p03_station.h +++ b/src/data/ground/ground_data_h02p03_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs110_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs110_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs110_g0_s0_station_sref_script }; /* 0x81f107c */ +static const ScriptRef s_gs110_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs110_g0_s0_station_sref_script }; /* 0x81f107c */ static const struct ScriptCommand s_gs110_g0_s1_lives0_dlg0[] = { /* 0x81f1088 */ DEBUGINFO_O(53), @@ -141,7 +141,7 @@ static const struct GroundEventData s_gs110_g0_s0_evts[] = { /* 0x81f12e0 */ /* 3 */ { 45, 3, 0, 0, { 0, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f1310 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f1310 */ &s_gs110_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h03p01_station.h b/src/data/ground/ground_data_h03p01_station.h index dd8c24db2..dec46a778 100644 --- a/src/data/ground/ground_data_h03p01_station.h +++ b/src/data/ground/ground_data_h03p01_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs111_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs111_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs111_g0_s0_station_sref_script }; /* 0x81f16b4 */ +static const ScriptRef s_gs111_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs111_g0_s0_station_sref_script }; /* 0x81f16b4 */ static const struct ScriptCommand s_gs111_g0_s1_lives0_dlg0[] = { /* 0x81f16c0 */ DEBUGINFO_O(58), @@ -221,7 +221,7 @@ static const struct GroundEventData s_gs111_g0_s0_evts[] = { /* 0x81f1b20 */ /* 3 */ { 1, 42, 0, 0, { 68, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f1b50 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f1b50 */ &s_gs111_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h04p01_station.h b/src/data/ground/ground_data_h04p01_station.h index 12f40f799..818e4d81e 100644 --- a/src/data/ground/ground_data_h04p01_station.h +++ b/src/data/ground/ground_data_h04p01_station.h @@ -58,7 +58,7 @@ static const struct ScriptCommand s_gs112_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs112_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs112_g0_s0_station_sref_script }; /* 0x81f1f1c */ +static const ScriptRef s_gs112_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs112_g0_s0_station_sref_script }; /* 0x81f1f1c */ static const struct ScriptCommand s_gs112_g0_s1_lives0_dlg0[] = { /* 0x81f1f28 */ DEBUGINFO_O(64), @@ -314,7 +314,7 @@ static const struct GroundEventData s_gs112_g0_s0_evts[] = { /* 0x81f25f8 */ /* 0 */ { 63, 1, 0, 0, { 0, 41, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f2604 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f2604 */ &s_gs112_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h04p02_station.h b/src/data/ground/ground_data_h04p02_station.h index 2da8094e3..79c49a127 100644 --- a/src/data/ground/ground_data_h04p02_station.h +++ b/src/data/ground/ground_data_h04p02_station.h @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs113_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs113_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs113_g0_s0_station_sref_script }; /* 0x81f2a00 */ +static const ScriptRef s_gs113_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs113_g0_s0_station_sref_script }; /* 0x81f2a00 */ static const struct ScriptCommand s_gs113_g0_s1_lives0_dlg0[] = { /* 0x81f2a0c */ DEBUGINFO_O(61), @@ -267,7 +267,7 @@ static const struct GroundEventData s_gs113_g0_s0_evts[] = { /* 0x81f2fa4 */ /* 1 */ { 1, 42, 0, 0, { 0, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f2fbc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f2fbc */ &s_gs113_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h05p01_station.h b/src/data/ground/ground_data_h05p01_station.h index 2ab2ac5d0..597fd79ae 100644 --- a/src/data/ground/ground_data_h05p01_station.h +++ b/src/data/ground/ground_data_h05p01_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs114_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs114_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs114_g0_s0_station_sref_script }; /* 0x81f33a0 */ +static const ScriptRef s_gs114_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs114_g0_s0_station_sref_script }; /* 0x81f33a0 */ static const struct ScriptCommand s_gs114_g0_s1_lives0_dlg0[] = { /* 0x81f33ac */ DEBUGINFO_O(58), @@ -218,7 +218,7 @@ static const struct GroundEventData s_gs114_g0_s0_evts[] = { /* 0x81f380c */ /* 0 */ { 60, 1, 0, 0, { 0, 41, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f3818 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f3818 */ &s_gs114_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h05p02_station.h b/src/data/ground/ground_data_h05p02_station.h index f2577e3a3..6396314e6 100644 --- a/src/data/ground/ground_data_h05p02_station.h +++ b/src/data/ground/ground_data_h05p02_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs115_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs115_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs115_g0_s0_station_sref_script }; /* 0x81f3be4 */ +static const ScriptRef s_gs115_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs115_g0_s0_station_sref_script }; /* 0x81f3be4 */ static const struct ScriptCommand s_gs115_g0_s1_lives0_dlg0[] = { /* 0x81f3bf0 */ DEBUGINFO_O(53), @@ -141,7 +141,7 @@ static const struct GroundEventData s_gs115_g0_s0_evts[] = { /* 0x81f3e48 */ /* 3 */ { 3, 39, 0, 0, { 54, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f3e78 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f3e78 */ &s_gs115_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h06p01_station.h b/src/data/ground/ground_data_h06p01_station.h index b5bc33c4d..849d78d16 100644 --- a/src/data/ground/ground_data_h06p01_station.h +++ b/src/data/ground/ground_data_h06p01_station.h @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs116_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs116_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs116_g0_s0_station_sref_script }; /* 0x81f421c */ +static const ScriptRef s_gs116_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs116_g0_s0_station_sref_script }; /* 0x81f421c */ static const struct ScriptCommand s_gs116_g0_s1_lives0_dlg0[] = { /* 0x81f4228 */ DEBUGINFO_O(65), @@ -333,7 +333,7 @@ static const struct GroundEventData s_gs116_g0_s0_evts[] = { /* 0x81f4960 */ /* 3 */ { 1, 42, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f4990 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f4990 */ &s_gs116_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h06p02_station.h b/src/data/ground/ground_data_h06p02_station.h index c5472fd53..dc399def5 100644 --- a/src/data/ground/ground_data_h06p02_station.h +++ b/src/data/ground/ground_data_h06p02_station.h @@ -58,7 +58,7 @@ static const struct ScriptCommand s_gs117_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs117_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs117_g0_s0_station_sref_script }; /* 0x81f4d94 */ +static const ScriptRef s_gs117_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs117_g0_s0_station_sref_script }; /* 0x81f4d94 */ static const struct ScriptCommand s_gs117_g0_s1_lives0_dlg0[] = { /* 0x81f4da0 */ DEBUGINFO_O(64), @@ -317,7 +317,7 @@ static const struct GroundEventData s_gs117_g0_s0_evts[] = { /* 0x81f5470 */ /* 3 */ { 1, 42, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f54a0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f54a0 */ &s_gs117_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h06p03_station.h b/src/data/ground/ground_data_h06p03_station.h index 2606d7a7d..0e275ba37 100644 --- a/src/data/ground/ground_data_h06p03_station.h +++ b/src/data/ground/ground_data_h06p03_station.h @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs118_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs118_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs118_g0_s0_station_sref_script }; /* 0x81f589c */ +static const ScriptRef s_gs118_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs118_g0_s0_station_sref_script }; /* 0x81f589c */ static const struct ScriptCommand s_gs118_g0_s1_lives0_dlg0[] = { /* 0x81f58a8 */ DEBUGINFO_O(65), @@ -333,7 +333,7 @@ static const struct GroundEventData s_gs118_g0_s0_evts[] = { /* 0x81f5fe0 */ /* 3 */ { 1, 42, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f6010 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f6010 */ &s_gs118_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h06p04_station.h b/src/data/ground/ground_data_h06p04_station.h index 539bf6a70..5f62473df 100644 --- a/src/data/ground/ground_data_h06p04_station.h +++ b/src/data/ground/ground_data_h06p04_station.h @@ -61,7 +61,7 @@ static const struct ScriptCommand s_gs119_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs119_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs119_g0_s0_station_sref_script }; /* 0x81f6414 */ +static const ScriptRef s_gs119_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs119_g0_s0_station_sref_script }; /* 0x81f6414 */ static const struct ScriptCommand s_gs119_g0_s1_lives0_dlg0[] = { /* 0x81f6420 */ DEBUGINFO_O(67), @@ -365,7 +365,7 @@ static const struct GroundEventData s_gs119_g0_s0_evts[] = { /* 0x81f6c28 */ /* 3 */ { 1, 42, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f6c58 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f6c58 */ &s_gs119_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h06p05_station.h b/src/data/ground/ground_data_h06p05_station.h index fda58db97..7fbcf9493 100644 --- a/src/data/ground/ground_data_h06p05_station.h +++ b/src/data/ground/ground_data_h06p05_station.h @@ -56,7 +56,7 @@ static const struct ScriptCommand s_gs120_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs120_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs120_g0_s0_station_sref_script }; /* 0x81f706c */ +static const ScriptRef s_gs120_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs120_g0_s0_station_sref_script }; /* 0x81f706c */ static const struct ScriptCommand s_gs120_g0_s1_lives0_dlg0[] = { /* 0x81f7078 */ DEBUGINFO_O(62), @@ -285,7 +285,7 @@ static const struct GroundEventData s_gs120_g0_s0_evts[] = { /* 0x81f7678 */ /* 3 */ { 3, 42, 0, 0, { 54, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f76a8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f76a8 */ &s_gs120_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h06p06_station.h b/src/data/ground/ground_data_h06p06_station.h index eed98e2f9..26f12dd5e 100644 --- a/src/data/ground/ground_data_h06p06_station.h +++ b/src/data/ground/ground_data_h06p06_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs121_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs121_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs121_g0_s0_station_sref_script }; /* 0x81f7a94 */ +static const ScriptRef s_gs121_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs121_g0_s0_station_sref_script }; /* 0x81f7a94 */ static const struct ScriptCommand s_gs121_g0_s1_lives0_dlg0[] = { /* 0x81f7aa0 */ DEBUGINFO_O(55), @@ -173,7 +173,7 @@ static const struct GroundEventData s_gs121_g0_s0_evts[] = { /* 0x81f7dc8 */ /* 3 */ { 1, 39, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f7df8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f7df8 */ &s_gs121_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h07p01_station.h b/src/data/ground/ground_data_h07p01_station.h index 51f1291d2..3d5c48951 100644 --- a/src/data/ground/ground_data_h07p01_station.h +++ b/src/data/ground/ground_data_h07p01_station.h @@ -60,7 +60,7 @@ static const struct ScriptCommand s_gs122_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs122_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs122_g0_s0_station_sref_script }; /* 0x81f81ac */ +static const ScriptRef s_gs122_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs122_g0_s0_station_sref_script }; /* 0x81f81ac */ static const struct ScriptCommand s_gs122_g0_s1_lives0_dlg0[] = { /* 0x81f81b8 */ DEBUGINFO_O(66), @@ -349,7 +349,7 @@ static const struct GroundEventData s_gs122_g0_s0_evts[] = { /* 0x81f8958 */ /* 3 */ { 1, 39, 0, 0, { 54, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f8988 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f8988 */ &s_gs122_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h07p02_station.h b/src/data/ground/ground_data_h07p02_station.h index 114927d14..e659e87da 100644 --- a/src/data/ground/ground_data_h07p02_station.h +++ b/src/data/ground/ground_data_h07p02_station.h @@ -58,7 +58,7 @@ static const struct ScriptCommand s_gs123_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs123_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs123_g0_s0_station_sref_script }; /* 0x81f8d94 */ +static const ScriptRef s_gs123_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs123_g0_s0_station_sref_script }; /* 0x81f8d94 */ static const struct ScriptCommand s_gs123_g0_s1_lives0_dlg0[] = { /* 0x81f8da0 */ DEBUGINFO_O(64), @@ -315,7 +315,7 @@ static const struct GroundEventData s_gs123_g0_s0_evts[] = { /* 0x81f9470 */ /* 1 */ { 60, 1, 0, 0, { 0, 38, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f9488 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f9488 */ &s_gs123_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h07p03_station.h b/src/data/ground/ground_data_h07p03_station.h index 59a1ee402..9189f387e 100644 --- a/src/data/ground/ground_data_h07p03_station.h +++ b/src/data/ground/ground_data_h07p03_station.h @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs124_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs124_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs124_g0_s0_station_sref_script }; /* 0x81f9884 */ +static const ScriptRef s_gs124_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs124_g0_s0_station_sref_script }; /* 0x81f9884 */ static const struct ScriptCommand s_gs124_g0_s1_lives0_dlg0[] = { /* 0x81f9890 */ DEBUGINFO_O(61), @@ -266,7 +266,7 @@ static const struct GroundEventData s_gs124_g0_s0_evts[] = { /* 0x81f9e28 */ /* 0 */ { 60, 1, 0, 0, { 1, 38, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81f9e34 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81f9e34 */ &s_gs124_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h07p04_station.h b/src/data/ground/ground_data_h07p04_station.h index 9f59d49d3..2f64d8f80 100644 --- a/src/data/ground/ground_data_h07p04_station.h +++ b/src/data/ground/ground_data_h07p04_station.h @@ -62,7 +62,7 @@ static const struct ScriptCommand s_gs125_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs125_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs125_g0_s0_station_sref_script }; /* 0x81fa218 */ +static const ScriptRef s_gs125_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs125_g0_s0_station_sref_script }; /* 0x81fa218 */ static const struct ScriptCommand s_gs125_g0_s1_lives0_dlg0[] = { /* 0x81fa224 */ DEBUGINFO_O(68), @@ -378,7 +378,7 @@ static const struct GroundEventData s_gs125_g0_s0_evts[] = { /* 0x81faa94 */ /* 0 */ { 60, 1, 0, 0, { 0, 41, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81faaa0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81faaa0 */ &s_gs125_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h07p05_station.h b/src/data/ground/ground_data_h07p05_station.h index 43bb8d4c3..9978c42ee 100644 --- a/src/data/ground/ground_data_h07p05_station.h +++ b/src/data/ground/ground_data_h07p05_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs126_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs126_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs126_g0_s0_station_sref_script }; /* 0x81fae8c */ +static const ScriptRef s_gs126_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs126_g0_s0_station_sref_script }; /* 0x81fae8c */ static const struct ScriptCommand s_gs126_g0_s1_lives0_dlg0[] = { /* 0x81fae98 */ @@ -235,7 +235,7 @@ static const struct GroundEventData s_gs126_g0_s0_evts[] = { /* 0x81fb360 */ /* 3 */ { 1, 42, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81fb390 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81fb390 */ &s_gs126_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h07p06_station.h b/src/data/ground/ground_data_h07p06_station.h index e0151fc7f..269a99617 100644 --- a/src/data/ground/ground_data_h07p06_station.h +++ b/src/data/ground/ground_data_h07p06_station.h @@ -47,21 +47,21 @@ static const struct ScriptCommand s_gs127_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs127_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs127_g0_s0_station_sref_script }; /* 0x81fb764 */ +static const ScriptRef s_gs127_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs127_g0_s0_station_sref_script }; /* 0x81fb764 */ static const struct ScriptCommand s_gs127_g0_s0_evt1_sref_script[] = { /* 0x81fb770 */ DEBUGINFO_O(53), JUMP_SCRIPT(GETOUT_HABITAT), }; -static const struct ScriptRef s_gs127_g0_s0_evt1_sref = { GETOUT_HABITAT, 2, NULL, s_gs127_g0_s0_evt1_sref_script }; /* 0x81fb790 */ +static const ScriptRef s_gs127_g0_s0_evt1_sref = { GETOUT_HABITAT, SCRIPT_TYPE_02, NULL, s_gs127_g0_s0_evt1_sref_script }; /* 0x81fb790 */ static const struct ScriptCommand s_gs127_g0_s0_evt2_sref_script[] = { /* 0x81fb79c */ DEBUGINFO_O(60), JUMP_SCRIPT(GETOUT_HABITAT), }; -static const struct ScriptRef s_gs127_g0_s0_evt2_sref = { GETOUT_HABITAT, 2, NULL, s_gs127_g0_s0_evt2_sref_script }; /* 0x81fb7bc */ +static const ScriptRef s_gs127_g0_s0_evt2_sref = { GETOUT_HABITAT, SCRIPT_TYPE_02, NULL, s_gs127_g0_s0_evt2_sref_script }; /* 0x81fb7bc */ static const struct ScriptCommand s_gs127_g0_s1_lives0_dlg0[] = { /* 0x81fb7c8 */ DEBUGINFO_O(67), @@ -155,7 +155,7 @@ static const struct GroundEventData s_gs127_g0_s0_evts[] = { /* 0x81fba20 */ /* 3 */ { 60, 3, 0, 0, { 0, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81fba50 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81fba50 */ &s_gs127_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h07p07_station.h b/src/data/ground/ground_data_h07p07_station.h index 449e78b3e..988699ca8 100644 --- a/src/data/ground/ground_data_h07p07_station.h +++ b/src/data/ground/ground_data_h07p07_station.h @@ -52,21 +52,21 @@ static const struct ScriptCommand s_gs128_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs128_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs128_g0_s0_station_sref_script }; /* 0x81fbdf4 */ +static const ScriptRef s_gs128_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs128_g0_s0_station_sref_script }; /* 0x81fbdf4 */ static const struct ScriptCommand s_gs128_g0_s0_evt2_sref_script[] = { /* 0x81fbe00 */ DEBUGINFO_O(58), JUMP_SCRIPT(GETOUT_HABITAT), }; -static const struct ScriptRef s_gs128_g0_s0_evt2_sref = { GETOUT_HABITAT, 2, NULL, s_gs128_g0_s0_evt2_sref_script }; /* 0x81fbe20 */ +static const ScriptRef s_gs128_g0_s0_evt2_sref = { GETOUT_HABITAT, SCRIPT_TYPE_02, NULL, s_gs128_g0_s0_evt2_sref_script }; /* 0x81fbe20 */ static const struct ScriptCommand s_gs128_g0_s0_evt3_sref_script[] = { /* 0x81fbe2c */ DEBUGINFO_O(65), JUMP_SCRIPT(GETOUT_HABITAT), }; -static const struct ScriptRef s_gs128_g0_s0_evt3_sref = { GETOUT_HABITAT, 2, NULL, s_gs128_g0_s0_evt3_sref_script }; /* 0x81fbe4c */ +static const ScriptRef s_gs128_g0_s0_evt3_sref = { GETOUT_HABITAT, SCRIPT_TYPE_02, NULL, s_gs128_g0_s0_evt3_sref_script }; /* 0x81fbe4c */ static const struct ScriptCommand s_gs128_g0_s1_lives0_dlg0[] = { /* 0x81fbe58 */ DEBUGINFO_O(72), @@ -228,7 +228,7 @@ static const struct GroundEventData s_gs128_g0_s0_evts[] = { /* 0x81fc288 */ /* 3 */ { 3, 39, 0, 0, { 57, 0, 0, 0 }, &s_gs128_g0_s0_evt3_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81fc2b8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81fc2b8 */ &s_gs128_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h07p08_station.h b/src/data/ground/ground_data_h07p08_station.h index 7568664c4..619b16924 100644 --- a/src/data/ground/ground_data_h07p08_station.h +++ b/src/data/ground/ground_data_h07p08_station.h @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs129_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs129_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs129_g0_s0_station_sref_script }; /* 0x81fc684 */ +static const ScriptRef s_gs129_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs129_g0_s0_station_sref_script }; /* 0x81fc684 */ static const struct ScriptCommand s_gs129_g0_s1_lives0_dlg0[] = { /* 0x81fc690 */ DEBUGINFO_O(61), @@ -269,7 +269,7 @@ static const struct GroundEventData s_gs129_g0_s0_evts[] = { /* 0x81fcc28 */ /* 3 */ { 3, 39, 0, 0, { 54, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81fcc58 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81fcc58 */ &s_gs129_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h08p01_station.h b/src/data/ground/ground_data_h08p01_station.h index 829d22dcc..9c4195ccf 100644 --- a/src/data/ground/ground_data_h08p01_station.h +++ b/src/data/ground/ground_data_h08p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs130_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs130_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs130_g0_s0_station_sref_script }; /* 0x81fd03c */ +static const ScriptRef s_gs130_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs130_g0_s0_station_sref_script }; /* 0x81fd03c */ static const struct ScriptCommand s_gs130_g0_s1_lives0_dlg0[] = { /* 0x81fd048 */ DEBUGINFO_O(59), @@ -250,7 +250,7 @@ static const struct GroundEventData s_gs130_g0_s0_evts[] = { /* 0x81fd5e0 */ /* 3 */ { 1, 42, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81fd610 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81fd610 */ &s_gs130_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h09p01_station.h b/src/data/ground/ground_data_h09p01_station.h index 5e278bac9..4eda94465 100644 --- a/src/data/ground/ground_data_h09p01_station.h +++ b/src/data/ground/ground_data_h09p01_station.h @@ -55,7 +55,7 @@ static const struct ScriptCommand s_gs131_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs131_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs131_g0_s0_station_sref_script }; /* 0x81fd9e4 */ +static const ScriptRef s_gs131_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs131_g0_s0_station_sref_script }; /* 0x81fd9e4 */ static const struct ScriptCommand s_gs131_g0_s1_lives0_dlg0[] = { /* 0x81fd9f0 */ DEBUGINFO_O(61), @@ -266,7 +266,7 @@ static const struct GroundEventData s_gs131_g0_s0_evts[] = { /* 0x81fdf88 */ /* 0 */ { 63, 1, 0, 0, { 0, 41, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81fdf94 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81fdf94 */ &s_gs131_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h09p02_station.h b/src/data/ground/ground_data_h09p02_station.h index 458dcfe45..afa993cb3 100644 --- a/src/data/ground/ground_data_h09p02_station.h +++ b/src/data/ground/ground_data_h09p02_station.h @@ -56,7 +56,7 @@ static const struct ScriptCommand s_gs132_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs132_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs132_g0_s0_station_sref_script }; /* 0x81fe378 */ +static const ScriptRef s_gs132_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs132_g0_s0_station_sref_script }; /* 0x81fe378 */ static const struct ScriptCommand s_gs132_g0_s1_lives0_dlg0[] = { /* 0x81fe384 */ DEBUGINFO_O(62), @@ -285,7 +285,7 @@ static const struct GroundEventData s_gs132_g0_s0_evts[] = { /* 0x81fe984 */ /* 3 */ { 1, 42, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81fe9b4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81fe9b4 */ &s_gs132_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h10p01_station.h b/src/data/ground/ground_data_h10p01_station.h index e4c411446..e65edca85 100644 --- a/src/data/ground/ground_data_h10p01_station.h +++ b/src/data/ground/ground_data_h10p01_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs133_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs133_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs133_g0_s0_station_sref_script }; /* 0x81feda0 */ +static const ScriptRef s_gs133_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs133_g0_s0_station_sref_script }; /* 0x81feda0 */ static const struct ScriptCommand s_gs133_g0_s1_lives0_dlg0[] = { /* 0x81fedac */ DEBUGINFO_O(56), @@ -186,7 +186,7 @@ static const struct GroundEventData s_gs133_g0_s0_evts[] = { /* 0x81ff13c */ /* 0 */ { 60, 1, 0, 0, { 0, 41, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81ff148 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81ff148 */ &s_gs133_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h10p02_station.h b/src/data/ground/ground_data_h10p02_station.h index 1bae0d5a8..4de5a0984 100644 --- a/src/data/ground/ground_data_h10p02_station.h +++ b/src/data/ground/ground_data_h10p02_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs134_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs134_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs134_g0_s0_station_sref_script }; /* 0x81ff504 */ +static const ScriptRef s_gs134_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs134_g0_s0_station_sref_script }; /* 0x81ff504 */ static const struct ScriptCommand s_gs134_g0_s1_lives0_dlg0[] = { /* 0x81ff510 */ DEBUGINFO_O(56), @@ -199,7 +199,7 @@ static const struct GroundEventData s_gs134_g0_s0_evts[] = { /* 0x81ff940 */ /* 3 */ { 1, 39, 0, 0, { 56, 1, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81ff970 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81ff970 */ &s_gs134_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h11p01_station.h b/src/data/ground/ground_data_h11p01_station.h index 55e82a4ae..f27d02568 100644 --- a/src/data/ground/ground_data_h11p01_station.h +++ b/src/data/ground/ground_data_h11p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs135_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs135_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs135_g0_s0_station_sref_script }; /* 0x81ffd2c */ +static const ScriptRef s_gs135_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs135_g0_s0_station_sref_script }; /* 0x81ffd2c */ static const struct ScriptCommand s_gs135_g0_s1_lives0_dlg0[] = { /* 0x81ffd38 */ DEBUGINFO_O(59), @@ -237,7 +237,7 @@ static const struct GroundEventData s_gs135_g0_s0_evts[] = { /* 0x8200200 */ /* 3 */ { 1, 42, 0, 0, { 65, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8200230 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8200230 */ &s_gs135_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h12p01_station.h b/src/data/ground/ground_data_h12p01_station.h index 8ed7b7625..779379e57 100644 --- a/src/data/ground/ground_data_h12p01_station.h +++ b/src/data/ground/ground_data_h12p01_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs136_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs136_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs136_g0_s0_station_sref_script }; /* 0x8200604 */ +static const ScriptRef s_gs136_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs136_g0_s0_station_sref_script }; /* 0x8200604 */ static const struct ScriptCommand s_gs136_g0_s1_lives0_dlg0[] = { /* 0x8200610 */ DEBUGINFO_O(58), @@ -221,7 +221,7 @@ static const struct GroundEventData s_gs136_g0_s0_evts[] = { /* 0x8200a70 */ /* 3 */ { 1, 42, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8200aa0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8200aa0 */ &s_gs136_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h13p01_station.h b/src/data/ground/ground_data_h13p01_station.h index 5fd716fa7..9106cc6a3 100644 --- a/src/data/ground/ground_data_h13p01_station.h +++ b/src/data/ground/ground_data_h13p01_station.h @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs137_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs137_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs137_g0_s0_station_sref_script }; /* 0x8200e6c */ +static const ScriptRef s_gs137_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs137_g0_s0_station_sref_script }; /* 0x8200e6c */ static const struct ScriptCommand s_gs137_g0_s1_lives0_dlg0[] = { /* 0x8200e78 */ DEBUGINFO_O(63), @@ -301,7 +301,7 @@ static const struct GroundEventData s_gs137_g0_s0_evts[] = { /* 0x82014e0 */ /* 3 */ { 3, 45, 0, 0, { 60, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8201510 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8201510 */ &s_gs137_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h13p02_station.h b/src/data/ground/ground_data_h13p02_station.h index 7c7c94a43..ae3425b5d 100644 --- a/src/data/ground/ground_data_h13p02_station.h +++ b/src/data/ground/ground_data_h13p02_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs138_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs138_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs138_g0_s0_station_sref_script }; /* 0x8201904 */ +static const ScriptRef s_gs138_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs138_g0_s0_station_sref_script }; /* 0x8201904 */ static const struct ScriptCommand s_gs138_g0_s1_lives0_dlg0[] = { /* 0x8201910 */ DEBUGINFO_O(53), @@ -141,7 +141,7 @@ static const struct GroundEventData s_gs138_g0_s0_evts[] = { /* 0x8201b68 */ /* 3 */ { 3, 39, 0, 0, { 42, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8201b98 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8201b98 */ &s_gs138_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h13p03_station.h b/src/data/ground/ground_data_h13p03_station.h index a1f735c78..da8a0b2e5 100644 --- a/src/data/ground/ground_data_h13p03_station.h +++ b/src/data/ground/ground_data_h13p03_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs139_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs139_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs139_g0_s0_station_sref_script }; /* 0x8201f3c */ +static const ScriptRef s_gs139_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs139_g0_s0_station_sref_script }; /* 0x8201f3c */ static const struct ScriptCommand s_gs139_g0_s1_lives0_dlg0[] = { /* 0x8201f48 */ DEBUGINFO_O(56), @@ -189,7 +189,7 @@ static const struct GroundEventData s_gs139_g0_s0_evts[] = { /* 0x82022d8 */ /* 3 */ { 3, 40, 0, 0, { 54, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8202308 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8202308 */ &s_gs139_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h13p04_station.h b/src/data/ground/ground_data_h13p04_station.h index 0d6187aa2..b8f506f4a 100644 --- a/src/data/ground/ground_data_h13p04_station.h +++ b/src/data/ground/ground_data_h13p04_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs140_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs140_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs140_g0_s0_station_sref_script }; /* 0x82026c4 */ +static const ScriptRef s_gs140_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs140_g0_s0_station_sref_script }; /* 0x82026c4 */ static const struct ScriptCommand s_gs140_g0_s1_lives0_dlg0[] = { /* 0x82026d0 */ DEBUGINFO_O(56), @@ -187,7 +187,7 @@ static const struct GroundEventData s_gs140_g0_s0_evts[] = { /* 0x8202a60 */ /* 1 */ { 63, 1, 0, 0, { 0, 44, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8202a78 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8202a78 */ &s_gs140_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h14p01_station.h b/src/data/ground/ground_data_h14p01_station.h index c5c233afe..baa05db4f 100644 --- a/src/data/ground/ground_data_h14p01_station.h +++ b/src/data/ground/ground_data_h14p01_station.h @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs141_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs141_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs141_g0_s0_station_sref_script }; /* 0x8202e34 */ +static const ScriptRef s_gs141_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs141_g0_s0_station_sref_script }; /* 0x8202e34 */ static const struct ScriptCommand s_gs141_g0_s1_lives0_dlg0[] = { /* 0x8202e40 */ DEBUGINFO_O(65), @@ -333,7 +333,7 @@ static const struct GroundEventData s_gs141_g0_s0_evts[] = { /* 0x8203578 */ /* 3 */ { 1, 42, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82035a8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82035a8 */ &s_gs141_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h15p01_station.h b/src/data/ground/ground_data_h15p01_station.h index 24e814fc4..122fce26b 100644 --- a/src/data/ground/ground_data_h15p01_station.h +++ b/src/data/ground/ground_data_h15p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs142_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs142_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs142_g0_s0_station_sref_script }; /* 0x82039ac */ +static const ScriptRef s_gs142_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs142_g0_s0_station_sref_script }; /* 0x82039ac */ static const struct ScriptCommand s_gs142_g0_s1_lives0_dlg0[] = { /* 0x82039b8 */ DEBUGINFO_O(59), @@ -234,7 +234,7 @@ static const struct GroundEventData s_gs142_g0_s0_evts[] = { /* 0x8203e80 */ /* 0 */ { 60, 1, 0, 0, { 0, 38, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8203e8c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8203e8c */ &s_gs142_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h16p01_station.h b/src/data/ground/ground_data_h16p01_station.h index 4235ce939..11ef55a84 100644 --- a/src/data/ground/ground_data_h16p01_station.h +++ b/src/data/ground/ground_data_h16p01_station.h @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs143_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs143_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs143_g0_s0_station_sref_script }; /* 0x8204260 */ +static const ScriptRef s_gs143_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs143_g0_s0_station_sref_script }; /* 0x8204260 */ static const struct ScriptCommand s_gs143_g0_s1_lives0_dlg0[] = { /* 0x820426c */ DEBUGINFO_O(63), @@ -301,7 +301,7 @@ static const struct GroundEventData s_gs143_g0_s0_evts[] = { /* 0x82048d4 */ /* 3 */ { 3, 42, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8204904 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8204904 */ &s_gs143_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h17p01_station.h b/src/data/ground/ground_data_h17p01_station.h index 80198ed28..2d6c2584f 100644 --- a/src/data/ground/ground_data_h17p01_station.h +++ b/src/data/ground/ground_data_h17p01_station.h @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs144_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs144_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs144_g0_s0_station_sref_script }; /* 0x8204cf8 */ +static const ScriptRef s_gs144_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs144_g0_s0_station_sref_script }; /* 0x8204cf8 */ static const struct ScriptCommand s_gs144_g0_s1_lives0_dlg0[] = { /* 0x8204d04 */ DEBUGINFO_O(63), @@ -301,7 +301,7 @@ static const struct GroundEventData s_gs144_g0_s0_evts[] = { /* 0x820536c */ /* 3 */ { 1, 42, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820539c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820539c */ &s_gs144_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h18p01_station.h b/src/data/ground/ground_data_h18p01_station.h index 32b6be27d..a6df69e00 100644 --- a/src/data/ground/ground_data_h18p01_station.h +++ b/src/data/ground/ground_data_h18p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs145_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs145_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs145_g0_s0_station_sref_script }; /* 0x8205790 */ +static const ScriptRef s_gs145_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs145_g0_s0_station_sref_script }; /* 0x8205790 */ static const struct ScriptCommand s_gs145_g0_s1_lives0_dlg0[] = { /* 0x820579c */ DEBUGINFO_O(59), @@ -237,7 +237,7 @@ static const struct GroundEventData s_gs145_g0_s0_evts[] = { /* 0x8205c64 */ /* 3 */ { 3, 42, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8205c94 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8205c94 */ &s_gs145_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h19p01_station.h b/src/data/ground/ground_data_h19p01_station.h index 9f82eb1cd..f8e1358ef 100644 --- a/src/data/ground/ground_data_h19p01_station.h +++ b/src/data/ground/ground_data_h19p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs146_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs146_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs146_g0_s0_station_sref_script }; /* 0x8206068 */ +static const ScriptRef s_gs146_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs146_g0_s0_station_sref_script }; /* 0x8206068 */ static const struct ScriptCommand s_gs146_g0_s1_lives0_dlg0[] = { /* 0x8206074 */ DEBUGINFO_O(59), @@ -237,7 +237,7 @@ static const struct GroundEventData s_gs146_g0_s0_evts[] = { /* 0x820653c */ /* 3 */ { 3, 39, 0, 0, { 54, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820656c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820656c */ &s_gs146_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h20p01_station.h b/src/data/ground/ground_data_h20p01_station.h index bae621786..bbe4e26e7 100644 --- a/src/data/ground/ground_data_h20p01_station.h +++ b/src/data/ground/ground_data_h20p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs147_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs147_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs147_g0_s0_station_sref_script }; /* 0x8206940 */ +static const ScriptRef s_gs147_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs147_g0_s0_station_sref_script }; /* 0x8206940 */ static const struct ScriptCommand s_gs147_g0_s1_lives0_dlg0[] = { /* 0x820694c */ DEBUGINFO_O(59), @@ -237,7 +237,7 @@ static const struct GroundEventData s_gs147_g0_s0_evts[] = { /* 0x8206e14 */ /* 3 */ { 1, 42, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8206e44 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8206e44 */ &s_gs147_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h21p01_station.h b/src/data/ground/ground_data_h21p01_station.h index a441901be..1b231cff9 100644 --- a/src/data/ground/ground_data_h21p01_station.h +++ b/src/data/ground/ground_data_h21p01_station.h @@ -60,7 +60,7 @@ static const struct ScriptCommand s_gs148_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs148_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs148_g0_s0_station_sref_script }; /* 0x8207218 */ +static const ScriptRef s_gs148_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs148_g0_s0_station_sref_script }; /* 0x8207218 */ static const struct ScriptCommand s_gs148_g0_s1_lives0_dlg0[] = { /* 0x8207224 */ DEBUGINFO_O(66), @@ -347,7 +347,7 @@ static const struct GroundEventData s_gs148_g0_s0_evts[] = { /* 0x82079c4 */ /* 1 */ { 60, 1, 0, 0, { 0, 38, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82079dc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82079dc */ &s_gs148_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h21p02_station.h b/src/data/ground/ground_data_h21p02_station.h index 675e957f9..a2e3b0f49 100644 --- a/src/data/ground/ground_data_h21p02_station.h +++ b/src/data/ground/ground_data_h21p02_station.h @@ -60,7 +60,7 @@ static const struct ScriptCommand s_gs149_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs149_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs149_g0_s0_station_sref_script }; /* 0x8207de8 */ +static const ScriptRef s_gs149_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs149_g0_s0_station_sref_script }; /* 0x8207de8 */ static const struct ScriptCommand s_gs149_g0_s1_lives0_dlg0[] = { /* 0x8207df4 */ DEBUGINFO_O(66), @@ -347,7 +347,7 @@ static const struct GroundEventData s_gs149_g0_s0_evts[] = { /* 0x8208594 */ /* 1 */ { 60, 1, 0, 0, { 0, 38, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x82085ac */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x82085ac */ &s_gs149_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h22p01_station.h b/src/data/ground/ground_data_h22p01_station.h index 2b2876cac..a69a3e823 100644 --- a/src/data/ground/ground_data_h22p01_station.h +++ b/src/data/ground/ground_data_h22p01_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs150_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs150_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs150_g0_s0_station_sref_script }; /* 0x82089b8 */ +static const ScriptRef s_gs150_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs150_g0_s0_station_sref_script }; /* 0x82089b8 */ static const struct ScriptCommand s_gs150_g0_s1_lives0_dlg0[] = { /* 0x82089c4 */ DEBUGINFO_O(58), @@ -221,7 +221,7 @@ static const struct GroundEventData s_gs150_g0_s0_evts[] = { /* 0x8208e24 */ /* 3 */ { 3, 39, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8208e54 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8208e54 */ &s_gs150_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h23p01_station.h b/src/data/ground/ground_data_h23p01_station.h index 22ce254b5..c21cf29f8 100644 --- a/src/data/ground/ground_data_h23p01_station.h +++ b/src/data/ground/ground_data_h23p01_station.h @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs151_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs151_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs151_g0_s0_station_sref_script }; /* 0x8209220 */ +static const ScriptRef s_gs151_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs151_g0_s0_station_sref_script }; /* 0x8209220 */ static const struct ScriptCommand s_gs151_g0_s1_lives0_dlg0[] = { /* 0x820922c */ DEBUGINFO_O(65), @@ -333,7 +333,7 @@ static const struct GroundEventData s_gs151_g0_s0_evts[] = { /* 0x8209964 */ /* 3 */ { 1, 39, 0, 0, { 56, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8209994 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8209994 */ &s_gs151_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h24p01_station.h b/src/data/ground/ground_data_h24p01_station.h index 669583f80..0135cdbaa 100644 --- a/src/data/ground/ground_data_h24p01_station.h +++ b/src/data/ground/ground_data_h24p01_station.h @@ -53,7 +53,7 @@ static const struct ScriptCommand s_gs152_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs152_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs152_g0_s0_station_sref_script }; /* 0x8209d98 */ +static const ScriptRef s_gs152_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs152_g0_s0_station_sref_script }; /* 0x8209d98 */ static const struct ScriptCommand s_gs152_g0_s1_lives0_dlg0[] = { /* 0x8209da4 */ DEBUGINFO_O(59), @@ -237,7 +237,7 @@ static const struct GroundEventData s_gs152_g0_s0_evts[] = { /* 0x820a26c */ /* 3 */ { 1, 45, 0, 0, { 59, 1, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820a29c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820a29c */ &s_gs152_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h25p01_station.h b/src/data/ground/ground_data_h25p01_station.h index e8d709fee..e2535bf73 100644 --- a/src/data/ground/ground_data_h25p01_station.h +++ b/src/data/ground/ground_data_h25p01_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs153_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs153_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs153_g0_s0_station_sref_script }; /* 0x820a670 */ +static const ScriptRef s_gs153_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs153_g0_s0_station_sref_script }; /* 0x820a670 */ static const struct ScriptCommand s_gs153_g0_s1_lives0_dlg0[] = { /* 0x820a67c */ DEBUGINFO_O(58), @@ -221,7 +221,7 @@ static const struct GroundEventData s_gs153_g0_s0_evts[] = { /* 0x820aadc */ /* 3 */ { 1, 36, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820ab0c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820ab0c */ &s_gs153_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h26p01_station.h b/src/data/ground/ground_data_h26p01_station.h index e6f52e766..8ee43dc90 100644 --- a/src/data/ground/ground_data_h26p01_station.h +++ b/src/data/ground/ground_data_h26p01_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs154_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs154_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs154_g0_s0_station_sref_script }; /* 0x820aed8 */ +static const ScriptRef s_gs154_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs154_g0_s0_station_sref_script }; /* 0x820aed8 */ static const struct ScriptCommand s_gs154_g0_s1_lives0_dlg0[] = { /* 0x820aee4 */ DEBUGINFO_O(53), @@ -141,7 +141,7 @@ static const struct GroundEventData s_gs154_g0_s0_evts[] = { /* 0x820b13c */ /* 3 */ { 3, 39, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820b16c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820b16c */ &s_gs154_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h27p01_station.h b/src/data/ground/ground_data_h27p01_station.h index c52de7b18..974f7d4eb 100644 --- a/src/data/ground/ground_data_h27p01_station.h +++ b/src/data/ground/ground_data_h27p01_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs155_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs155_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs155_g0_s0_station_sref_script }; /* 0x820b510 */ +static const ScriptRef s_gs155_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs155_g0_s0_station_sref_script }; /* 0x820b510 */ static const struct ScriptCommand s_gs155_g0_s1_lives0_dlg0[] = { /* 0x820b51c */ DEBUGINFO_O(53), @@ -141,7 +141,7 @@ static const struct GroundEventData s_gs155_g0_s0_evts[] = { /* 0x820b774 */ /* 3 */ { 3, 39, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820b7a4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820b7a4 */ &s_gs155_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h28p01_station.h b/src/data/ground/ground_data_h28p01_station.h index 3068713b4..a300e30c5 100644 --- a/src/data/ground/ground_data_h28p01_station.h +++ b/src/data/ground/ground_data_h28p01_station.h @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs156_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs156_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs156_g0_s0_station_sref_script }; /* 0x820bb48 */ +static const ScriptRef s_gs156_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs156_g0_s0_station_sref_script }; /* 0x820bb48 */ static const struct ScriptCommand s_gs156_g0_s1_lives0_dlg0[] = { /* 0x820bb54 */ DEBUGINFO_O(58), @@ -221,7 +221,7 @@ static const struct GroundEventData s_gs156_g0_s0_evts[] = { /* 0x820bfb4 */ /* 3 */ { 3, 39, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820bfe4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820bfe4 */ &s_gs156_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h28p02_station.h b/src/data/ground/ground_data_h28p02_station.h index 9f6f589f8..12a270765 100644 --- a/src/data/ground/ground_data_h28p02_station.h +++ b/src/data/ground/ground_data_h28p02_station.h @@ -50,7 +50,7 @@ static const struct ScriptCommand s_gs157_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs157_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs157_g0_s0_station_sref_script }; /* 0x820c3b0 */ +static const ScriptRef s_gs157_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs157_g0_s0_station_sref_script }; /* 0x820c3b0 */ static const struct ScriptCommand s_gs157_g0_s1_lives0_dlg0[] = { /* 0x820c3bc */ DEBUGINFO_O(56), @@ -186,7 +186,7 @@ static const struct GroundEventData s_gs157_g0_s0_evts[] = { /* 0x820c74c */ /* 0 */ { 60, 1, 0, 0, { 0, 38, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820c758 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820c758 */ &s_gs157_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h29p01_station.h b/src/data/ground/ground_data_h29p01_station.h index f28734cca..73accda70 100644 --- a/src/data/ground/ground_data_h29p01_station.h +++ b/src/data/ground/ground_data_h29p01_station.h @@ -49,7 +49,7 @@ static const struct ScriptCommand s_gs158_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs158_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs158_g0_s0_station_sref_script }; /* 0x820cb74 */ +static const ScriptRef s_gs158_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs158_g0_s0_station_sref_script }; /* 0x820cb74 */ static const struct ScriptCommand s_gs158_g0_s1_lives0_dlg0[] = { /* 0x820cb80 */ DEBUGINFO_O(71), @@ -183,7 +183,7 @@ static const struct ScriptCommand s_gs158_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs158_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs158_g2_s0_station_sref_script }; /* 0x820d150 */ +static const ScriptRef s_gs158_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs158_g2_s0_station_sref_script }; /* 0x820d150 */ static const struct ScriptCommand s_gs158_g2_s0_eff0_script[] = { /* 0x820d15c */ DEBUGINFO_O(205), @@ -610,7 +610,7 @@ static const struct GroundEventData s_gs158_g0_s0_evts[] = { /* 0x820e834 */ /* 3 */ { 1, 33, 0, 0, { 59, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820e864 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820e864 */ &s_gs158_g0_s0_station_sref, &s_gs158_g2_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h29p02_station.h b/src/data/ground/ground_data_h29p02_station.h index 748ba733e..c95449eb0 100644 --- a/src/data/ground/ground_data_h29p02_station.h +++ b/src/data/ground/ground_data_h29p02_station.h @@ -48,7 +48,7 @@ static const struct ScriptCommand s_gs159_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs159_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs159_g0_s0_station_sref_script }; /* 0x820ec94 */ +static const ScriptRef s_gs159_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs159_g0_s0_station_sref_script }; /* 0x820ec94 */ static const struct ScriptCommand s_gs159_g0_s1_lives0_dlg0[] = { /* 0x820eca0 */ DEBUGINFO_O(54), @@ -157,7 +157,7 @@ static const struct GroundEventData s_gs159_g0_s0_evts[] = { /* 0x820ef60 */ /* 3 */ { 3, 42, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820ef90 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820ef90 */ &s_gs159_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h29p03_station.h b/src/data/ground/ground_data_h29p03_station.h index 4a168e278..6ef813e0c 100644 --- a/src/data/ground/ground_data_h29p03_station.h +++ b/src/data/ground/ground_data_h29p03_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs160_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs160_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs160_g0_s0_station_sref_script }; /* 0x820f33c */ +static const ScriptRef s_gs160_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs160_g0_s0_station_sref_script }; /* 0x820f33c */ static const struct ScriptCommand s_gs160_g0_s1_lives0_dlg0[] = { /* 0x820f348 */ DEBUGINFO_O(53), @@ -141,7 +141,7 @@ static const struct GroundEventData s_gs160_g0_s0_evts[] = { /* 0x820f5a0 */ /* 3 */ { 3, 42, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820f5d0 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820f5d0 */ &s_gs160_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_h29p04_station.h b/src/data/ground/ground_data_h29p04_station.h index b242625d9..2be8d9cd5 100644 --- a/src/data/ground/ground_data_h29p04_station.h +++ b/src/data/ground/ground_data_h29p04_station.h @@ -47,7 +47,7 @@ static const struct ScriptCommand s_gs161_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs161_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs161_g0_s0_station_sref_script }; /* 0x820f974 */ +static const ScriptRef s_gs161_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs161_g0_s0_station_sref_script }; /* 0x820f974 */ static const struct ScriptCommand s_gs161_g0_s1_lives0_dlg0[] = { /* 0x820f980 */ DEBUGINFO_O(53), @@ -141,7 +141,7 @@ static const struct GroundEventData s_gs161_g0_s0_evts[] = { /* 0x820fbd8 */ /* 3 */ { 3, 39, 0, 0, { 57, 0, 0, 0 }, &gFunctionScriptTable[GETOUT_HABITAT] }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x820fc08 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x820fc08 */ &s_gs161_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_s01_station.h b/src/data/ground/ground_data_s01_station.h index bde960a7c..4d5695f16 100644 --- a/src/data/ground/ground_data_s01_station.h +++ b/src/data/ground/ground_data_s01_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs223_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs223_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs223_g0_s0_station_sref_script }; /* 0x826dfec */ +static const ScriptRef s_gs223_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs223_g0_s0_station_sref_script }; /* 0x826dfec */ static const struct ScriptCommand s_gs223_g1_s0_station_sref_script[] = { /* 0x826dff8 - PART 1 0:00:31-0:00:45 - New game intro to personality test */ DEBUGINFO_O(19), @@ -35,12 +35,12 @@ static const struct ScriptCommand s_gs223_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs223_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs223_g1_s0_station_sref_script }; /* 0x826e200 */ +static const ScriptRef s_gs223_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs223_g1_s0_station_sref_script }; /* 0x826e200 */ static const struct GroundEffectData s_gs223_g1_s0_effs[] = { /* 0x826e20c */ /* 0 */ { 0, 0, 1, 1, { 30, 19, CPOS_HALFTILE, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826e218 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826e218 */ &s_gs223_g0_s0_station_sref, &s_gs223_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_s02_station.h b/src/data/ground/ground_data_s02_station.h index de60a4098..5cd6d33d2 100644 --- a/src/data/ground/ground_data_s02_station.h +++ b/src/data/ground/ground_data_s02_station.h @@ -24,7 +24,7 @@ static const struct ScriptCommand s_gs224_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs224_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs224_g0_s0_station_sref_script }; /* 0x826e308 */ +static const ScriptRef s_gs224_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs224_g0_s0_station_sref_script }; /* 0x826e308 */ static const struct ScriptCommand s_gs224_g1_s0_obj0_dlg1[] = { /* 0x826e314 */ DEBUGINFO_O(30), @@ -52,7 +52,7 @@ static const struct ScriptCommand s_gs224_g2_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs224_g2_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs224_g2_s0_station_sref_script }; /* 0x826e454 */ +static const ScriptRef s_gs224_g2_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs224_g2_s0_station_sref_script }; /* 0x826e454 */ static const struct ScriptCommand s_gs224_g3_s0_station_sref_script[] = { /* 0x826e460 */ DEBUGINFO_O(58), @@ -74,7 +74,7 @@ static const struct ScriptCommand s_gs224_g3_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs224_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs224_g3_s0_station_sref_script }; /* 0x826e570 */ +static const ScriptRef s_gs224_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs224_g3_s0_station_sref_script }; /* 0x826e570 */ static const struct ScriptCommand s_gs224_g3_s0_eff0_script[] = { /* 0x826e57c */ DEBUGINFO_O(80), @@ -155,7 +155,7 @@ static const struct ScriptCommand s_gs224_g4_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs224_g4_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs224_g4_s0_station_sref_script }; /* 0x826e97c */ +static const ScriptRef s_gs224_g4_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs224_g4_s0_station_sref_script }; /* 0x826e97c */ static const struct ScriptCommand s_gs224_g4_s0_eff0_script[] = { /* 0x826e988 */ DEBUGINFO_O(161), @@ -205,7 +205,7 @@ static const struct GroundEffectData s_gs224_g4_s0_effs[] = { /* 0x826ea90 */ /* 0 */ { 0, 0, 1, 1, { 18, 14, 0, CPOS_HALFTILE }, s_gs224_g4_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826ea9c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826ea9c */ &s_gs224_g0_s0_station_sref, &s_gs224_g2_s0_station_sref, &s_gs224_g3_s0_station_sref, diff --git a/src/data/ground/ground_data_s03_station.h b/src/data/ground/ground_data_s03_station.h index 7ca4fa67b..54796daf7 100644 --- a/src/data/ground/ground_data_s03_station.h +++ b/src/data/ground/ground_data_s03_station.h @@ -25,7 +25,7 @@ static const struct ScriptCommand s_gs225_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs225_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs225_g0_s0_station_sref_script }; /* 0x826ecc4 */ +static const ScriptRef s_gs225_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs225_g0_s0_station_sref_script }; /* 0x826ecc4 */ static const struct ScriptCommand s_gs225_g1_s0_station_sref_script[] = { /* 0x826ecd0 */ DEBUGINFO_O(31), @@ -45,7 +45,7 @@ static const struct ScriptCommand s_gs225_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs225_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs225_g1_s0_station_sref_script }; /* 0x826edc0 */ +static const ScriptRef s_gs225_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs225_g1_s0_station_sref_script }; /* 0x826edc0 */ static const struct ScriptCommand s_gs225_g1_s0_eff0_script[] = { /* 0x826edcc */ DEBUGINFO_O(51), @@ -114,7 +114,7 @@ static const struct GroundEffectData s_gs225_g1_s0_effs[] = { /* 0x826f0cc */ /* 0 */ { 0, 0, 1, 1, { 18, 27, 0, CPOS_HALFTILE }, s_gs225_g1_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826f0d8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826f0d8 */ &s_gs225_g0_s0_station_sref, &s_gs225_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_s04_station.h b/src/data/ground/ground_data_s04_station.h index 4d427913a..62af895b8 100644 --- a/src/data/ground/ground_data_s04_station.h +++ b/src/data/ground/ground_data_s04_station.h @@ -16,7 +16,7 @@ static const struct ScriptCommand s_gs226_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs226_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs226_g0_s0_station_sref_script }; /* 0x826f220 */ +static const ScriptRef s_gs226_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs226_g0_s0_station_sref_script }; /* 0x826f220 */ static const struct ScriptCommand s_gs226_g1_s0_station_sref_script[] = { /* 0x826f22c */ DEBUGINFO_O(22), @@ -38,7 +38,7 @@ static const struct ScriptCommand s_gs226_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs226_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs226_g1_s0_station_sref_script }; /* 0x826f33c */ +static const ScriptRef s_gs226_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs226_g1_s0_station_sref_script }; /* 0x826f33c */ static const struct ScriptCommand s_gs226_g1_s0_eff0_script[] = { /* 0x826f348 */ DEBUGINFO_O(44), @@ -79,7 +79,7 @@ static const struct GroundEffectData s_gs226_g1_s0_effs[] = { /* 0x826f508 */ /* 1 */ { 2, 0, 1, 1, { 0, 0, 0, CPOS_HALFTILE }, s_gs226_g1_s0_eff1_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826f520 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826f520 */ &s_gs226_g0_s0_station_sref, &s_gs226_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_s05_station.h b/src/data/ground/ground_data_s05_station.h index 8d77c2ae8..aeca879ea 100644 --- a/src/data/ground/ground_data_s05_station.h +++ b/src/data/ground/ground_data_s05_station.h @@ -15,7 +15,7 @@ static const struct ScriptCommand s_gs227_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs227_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs227_g0_s0_station_sref_script }; /* 0x826f620 */ +static const ScriptRef s_gs227_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs227_g0_s0_station_sref_script }; /* 0x826f620 */ static const struct ScriptCommand s_gs227_g1_s0_station_sref_script[] = { /* 0x826f62c */ DEBUGINFO_O(21), @@ -31,7 +31,7 @@ static const struct ScriptCommand s_gs227_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs227_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs227_g1_s0_station_sref_script }; /* 0x826f6dc */ +static const ScriptRef s_gs227_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs227_g1_s0_station_sref_script }; /* 0x826f6dc */ static const struct ScriptCommand s_gs227_g1_s0_eff0_script[] = { /* 0x826f6e8 */ DEBUGINFO_O(37), @@ -49,7 +49,7 @@ static const struct GroundEffectData s_gs227_g1_s0_effs[] = { /* 0x826f778 */ /* 0 */ { 0, 0, 1, 1, { 15, 11, 0, CPOS_HALFTILE }, s_gs227_g1_s0_eff0_script }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826f784 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826f784 */ &s_gs227_g0_s0_station_sref, &s_gs227_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_s06_station.h b/src/data/ground/ground_data_s06_station.h index 3d8ccada8..c9758aa99 100644 --- a/src/data/ground/ground_data_s06_station.h +++ b/src/data/ground/ground_data_s06_station.h @@ -13,7 +13,7 @@ static const struct ScriptCommand s_gs228_g0_s0_station_sref_script[] = { /* 0x8 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs228_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs228_g0_s0_station_sref_script }; /* 0x826f87c */ +static const ScriptRef s_gs228_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs228_g0_s0_station_sref_script }; /* 0x826f87c */ static const struct ScriptCommand s_gs228_g1_s0_station_sref_script[] = { /* 0x826f888 */ DEBUGINFO_O(19), @@ -25,12 +25,12 @@ static const struct ScriptCommand s_gs228_g1_s0_station_sref_script[] = { /* 0x8 RET, }; -static const struct ScriptRef s_gs228_g1_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs228_g1_s0_station_sref_script }; /* 0x826f8f8 */ +static const ScriptRef s_gs228_g1_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs228_g1_s0_station_sref_script }; /* 0x826f8f8 */ static const struct GroundEffectData s_gs228_g1_s0_effs[] = { /* 0x826f904 */ /* 0 */ { 0, 0, 1, 1, { 15, 11, 0, CPOS_HALFTILE }, NULL }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x826f910 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x826f910 */ &s_gs228_g0_s0_station_sref, &s_gs228_g1_s0_station_sref, }; diff --git a/src/data/ground/ground_data_t00p01_station.h b/src/data/ground/ground_data_t00p01_station.h index abad7970b..6671eb7d0 100644 --- a/src/data/ground/ground_data_t00p01_station.h +++ b/src/data/ground/ground_data_t00p01_station.h @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs0_g0_s0_station_sref_script[] = { /* 0x813 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs0_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs0_g0_s0_station_sref_script }; /* 0x8132918 */ +static const ScriptRef s_gs0_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs0_g0_s0_station_sref_script }; /* 0x8132918 */ @@ -50,21 +50,21 @@ static const struct ScriptCommand s_gs0_g0_s0_evt0_sref_script[] = { /* 0x813292 RET, }; -static const struct ScriptRef s_gs0_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs0_g0_s0_evt0_sref_script }; /* 0x8132944 */ +static const ScriptRef s_gs0_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs0_g0_s0_evt0_sref_script }; /* 0x8132944 */ static const struct ScriptCommand s_gs0_g0_s0_evt1_sref_script[] = { /* 0x8132950 */ DEBUGINFO_O(56), RET, }; -static const struct ScriptRef s_gs0_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs0_g0_s0_evt1_sref_script }; /* 0x8132970 */ +static const ScriptRef s_gs0_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs0_g0_s0_evt1_sref_script }; /* 0x8132970 */ static const struct ScriptCommand s_gs0_g0_s0_evt2_sref_script[] = { /* 0x813297c */ DEBUGINFO_O(63), RET, }; -static const struct ScriptRef s_gs0_g0_s0_evt2_sref = { GETOUT_NORMAL, 2, NULL, s_gs0_g0_s0_evt2_sref_script }; /* 0x813299c */ +static const ScriptRef s_gs0_g0_s0_evt2_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs0_g0_s0_evt2_sref_script }; /* 0x813299c */ static const struct ScriptCommand s_gs0_g0_s1_lives0_dlg0[] = { /* 0x81329a8 */ DEBUGINFO_O(70), @@ -1454,7 +1454,7 @@ static const struct GroundEventData s_gs0_g0_s0_evts[] = { /* 0x813805c */ /* 2 */ { 6, 12, 0, 0, { 138, 30, 0, 0 }, &s_gs0_g0_s0_evt2_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8138080 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8138080 */ &s_gs0_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_t01p01_station.h b/src/data/ground/ground_data_t01p01_station.h index 2c9c937d2..3b3448e43 100644 --- a/src/data/ground/ground_data_t01p01_station.h +++ b/src/data/ground/ground_data_t01p01_station.h @@ -333,7 +333,7 @@ static const struct ScriptCommand s_gs1_g0_s0_station_sref_script[] = { /* 0x813 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs1_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs1_g0_s0_station_sref_script }; /* 0x8138db4 */ +static const ScriptRef s_gs1_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs1_g0_s0_station_sref_script }; /* 0x8138db4 */ static const struct ScriptCommand s_gs1_g0_s0_evt0_sref_script[] = { /* 0x8138dc0 */ DEBUGINFO_O(339), @@ -358,7 +358,7 @@ static const struct ScriptCommand s_gs1_g0_s0_evt0_sref_script[] = { /* 0x8138dc HALT, }; -static const struct ScriptRef s_gs1_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs1_g0_s0_evt0_sref_script }; /* 0x8138f00 */ +static const ScriptRef s_gs1_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs1_g0_s0_evt0_sref_script }; /* 0x8138f00 */ static const struct ScriptCommand s_gs1_g0_s0_evt1_sref_script[] = { /* 0x8138f0c */ @@ -367,7 +367,7 @@ static const struct ScriptCommand s_gs1_g0_s0_evt1_sref_script[] = { /* 0x8138f0 HALT, }; -static const struct ScriptRef s_gs1_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs1_g0_s0_evt1_sref_script }; /* 0x8138f3c */ +static const ScriptRef s_gs1_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs1_g0_s0_evt1_sref_script }; /* 0x8138f3c */ static const struct ScriptCommand s_gs1_g0_s0_evt2_sref_script[] = { /* 0x8138f48 */ DEBUGINFO_O(373), @@ -375,7 +375,7 @@ static const struct ScriptCommand s_gs1_g0_s0_evt2_sref_script[] = { /* 0x8138f4 HALT, }; -static const struct ScriptRef s_gs1_g0_s0_evt2_sref = { GETOUT_NORMAL, 2, NULL, s_gs1_g0_s0_evt2_sref_script }; /* 0x8138f78 */ +static const ScriptRef s_gs1_g0_s0_evt2_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs1_g0_s0_evt2_sref_script }; /* 0x8138f78 */ static const struct ScriptCommand s_gs1_g0_s0_evt3_sref_script[] = { /* 0x8138f84 */ DEBUGINFO_O(381), @@ -383,7 +383,7 @@ static const struct ScriptCommand s_gs1_g0_s0_evt3_sref_script[] = { /* 0x8138f8 HALT, }; -static const struct ScriptRef s_gs1_g0_s0_evt3_sref = { GETOUT_NORMAL, 2, NULL, s_gs1_g0_s0_evt3_sref_script }; /* 0x8138fb4 */ +static const ScriptRef s_gs1_g0_s0_evt3_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs1_g0_s0_evt3_sref_script }; /* 0x8138fb4 */ static const struct ScriptCommand s_gs1_g0_s0_obj0_dlg2[] = { /* 0x8138fc0 */ DEBUGINFO_O(389), @@ -508,7 +508,7 @@ static const struct ScriptCommand s_gs1_g1_s0_station_sref_script[] = { /* 0x813 RET, }; -static const struct ScriptRef s_gs1_g1_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g1_s0_station_sref_script }; /* 0x8139514 */ +static const ScriptRef s_gs1_g1_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g1_s0_station_sref_script }; /* 0x8139514 */ static const struct ScriptCommand s_gs1_g1_s0_lives0_dlg2[] = { /* 0x8139520 */ DEBUGINFO_O(514), @@ -750,7 +750,7 @@ static const struct ScriptCommand s_gs1_g2_s0_station_sref_script[] = { /* 0x813 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g2_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g2_s0_station_sref_script }; /* 0x813a604 */ +static const ScriptRef s_gs1_g2_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g2_s0_station_sref_script }; /* 0x813a604 */ @@ -822,7 +822,7 @@ static const struct ScriptCommand s_gs1_g4_s1_station_sref_script[] = { /* 0x813 RET, }; -static const struct ScriptRef s_gs1_g4_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g4_s1_station_sref_script }; /* 0x813a9a8 */ +static const ScriptRef s_gs1_g4_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g4_s1_station_sref_script }; /* 0x813a9a8 */ static const struct ScriptCommand s_gs1_g4_s1_lives0_dlg0[] = { /* 0x813a9b4 */ DEBUGINFO_O(828), @@ -1135,7 +1135,7 @@ static const struct ScriptCommand s_gs1_g5_s1_station_sref_script[] = { /* 0x813 RET, }; -static const struct ScriptRef s_gs1_g5_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g5_s1_station_sref_script }; /* 0x813bbe4 */ +static const ScriptRef s_gs1_g5_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g5_s1_station_sref_script }; /* 0x813bbe4 */ static const struct ScriptCommand s_gs1_g5_s1_lives0_dlg0[] = { /* 0x813bbf0 */ DEBUGINFO_O(1141), @@ -1402,7 +1402,7 @@ static const struct ScriptCommand s_gs1_g5_s4_station_sref_script[] = { /* 0x813 RET, }; -static const struct ScriptRef s_gs1_g5_s4_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g5_s4_station_sref_script }; /* 0x813c7d8 */ +static const ScriptRef s_gs1_g5_s4_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g5_s4_station_sref_script }; /* 0x813c7d8 */ static const struct ScriptCommand s_gs1_g5_s4_lives0_dlg0[] = { /* 0x813c7e4 */ DEBUGINFO_O(1408), @@ -1585,7 +1585,7 @@ static const struct ScriptCommand s_gs1_g6_s0_station_sref_script[] = { /* 0x813 RET, }; -static const struct ScriptRef s_gs1_g6_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs1_g6_s0_station_sref_script }; /* 0x813d310 */ +static const ScriptRef s_gs1_g6_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs1_g6_s0_station_sref_script }; /* 0x813d310 */ static const struct ScriptCommand s_gs1_g6_s0_eff0_script[] = { /* 0x813d31c */ DEBUGINFO_O(1591), @@ -1722,7 +1722,7 @@ static const struct ScriptCommand s_gs1_g7_s0_station_sref_script[] = { /* 0x813 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g7_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g7_s0_station_sref_script }; /* 0x813e128 */ +static const ScriptRef s_gs1_g7_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g7_s0_station_sref_script }; /* 0x813e128 */ static const struct ScriptCommand s_gs1_g7_s0_lives0_dlg2[] = { /* 0x813e134 */ DEBUGINFO_O(1728), @@ -1841,7 +1841,7 @@ static const struct ScriptCommand s_gs1_g7_s1_station_sref_script[] = { /* 0x813 RET, }; -static const struct ScriptRef s_gs1_g7_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g7_s1_station_sref_script }; /* 0x813e874 */ +static const ScriptRef s_gs1_g7_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g7_s1_station_sref_script }; /* 0x813e874 */ static const struct ScriptCommand s_gs1_g7_s1_lives0_dlg0[] = { /* 0x813e880 */ DEBUGINFO_O(1847), @@ -1889,7 +1889,7 @@ static const struct ScriptCommand s_gs1_g8_s0_station_sref_script[] = { /* 0x813 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g8_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g8_s0_station_sref_script }; /* 0x813ebd4 */ +static const ScriptRef s_gs1_g8_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g8_s0_station_sref_script }; /* 0x813ebd4 */ static const struct ScriptCommand s_gs1_g8_s0_lives0_dlg2[] = { /* 0x813ebe0 */ DEBUGINFO_O(1895), @@ -1990,7 +1990,7 @@ static const struct ScriptCommand s_gs1_g8_s1_station_sref_script[] = { /* 0x813 RET, }; -static const struct ScriptRef s_gs1_g8_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g8_s1_station_sref_script }; /* 0x813f0d0 */ +static const ScriptRef s_gs1_g8_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g8_s1_station_sref_script }; /* 0x813f0d0 */ static const struct ScriptCommand s_gs1_g8_s1_lives0_dlg0[] = { /* 0x813f0dc */ DEBUGINFO_O(1996), @@ -2100,7 +2100,7 @@ static const struct ScriptCommand s_gs1_g8_s2_evt0_sref_script[] = { /* 0x813f55 HALT, }; -static const struct ScriptRef s_gs1_g8_s2_evt0_sref = { NORMAL_EVENT, 7, NULL, s_gs1_g8_s2_evt0_sref_script }; /* 0x813f58c */ +static const ScriptRef s_gs1_g8_s2_evt0_sref = { NORMAL_EVENT, SCRIPT_TYPE_07, NULL, s_gs1_g8_s2_evt0_sref_script }; /* 0x813f58c */ static const struct ScriptCommand s_gs1_g9_s0_station_sref_script[] = { /* 0x813f598 */ DEBUGINFO_O(2106), @@ -2112,7 +2112,7 @@ static const struct ScriptCommand s_gs1_g9_s0_station_sref_script[] = { /* 0x813 RET, }; -static const struct ScriptRef s_gs1_g9_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g9_s0_station_sref_script }; /* 0x813f608 */ +static const ScriptRef s_gs1_g9_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g9_s0_station_sref_script }; /* 0x813f608 */ static const struct ScriptCommand s_gs1_g9_s0_lives0_dlg0[] = { /* 0x813f614 */ DEBUGINFO_O(2118), @@ -2406,7 +2406,7 @@ static const struct ScriptCommand s_gs1_g10_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g10_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g10_s0_station_sref_script }; /* 0x8141040 */ +static const ScriptRef s_gs1_g10_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g10_s0_station_sref_script }; /* 0x8141040 */ static const struct ScriptCommand s_gs1_g10_s0_eff0_script[] = { /* 0x814104c */ DEBUGINFO_O(2412), @@ -3111,7 +3111,7 @@ static const struct ScriptCommand s_gs1_g11_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g11_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g11_s0_station_sref_script }; /* 0x8144094 */ +static const ScriptRef s_gs1_g11_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g11_s0_station_sref_script }; /* 0x8144094 */ static const struct ScriptCommand s_gs1_g11_s0_lives0_dlg2[] = { /* 0x81440a0 */ DEBUGINFO_O(3117), @@ -3261,7 +3261,7 @@ static const struct ScriptCommand s_gs1_g12_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g12_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g12_s0_station_sref_script }; /* 0x8144c80 */ +static const ScriptRef s_gs1_g12_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g12_s0_station_sref_script }; /* 0x8144c80 */ static const struct ScriptCommand s_gs1_g12_s0_lives0_dlg0[] = { /* 0x8144c8c */ DEBUGINFO_O(3267), @@ -3347,7 +3347,7 @@ static const struct ScriptCommand s_gs1_g13_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g13_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g13_s0_station_sref_script }; /* 0x8144f8c */ +static const ScriptRef s_gs1_g13_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g13_s0_station_sref_script }; /* 0x8144f8c */ static const struct ScriptCommand s_gs1_g13_s0_lives0_dlg2[] = { /* 0x8144f98 */ DEBUGINFO_O(3353), @@ -3444,7 +3444,7 @@ static const struct ScriptCommand s_gs1_g14_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g14_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g14_s0_station_sref_script }; /* 0x8145488 */ +static const ScriptRef s_gs1_g14_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g14_s0_station_sref_script }; /* 0x8145488 */ static const struct ScriptCommand s_gs1_g14_s0_lives0_dlg2[] = { /* 0x8145494 */ DEBUGINFO_O(3450), @@ -3618,7 +3618,7 @@ static const struct ScriptCommand s_gs1_g15_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g15_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g15_s0_station_sref_script }; /* 0x8145d94 */ +static const ScriptRef s_gs1_g15_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g15_s0_station_sref_script }; /* 0x8145d94 */ static const struct ScriptCommand s_gs1_g15_s0_lives0_dlg2[] = { /* 0x8145da0 */ DEBUGINFO_O(3624), @@ -3734,7 +3734,7 @@ static const struct ScriptCommand s_gs1_g16_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g16_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g16_s0_station_sref_script }; /* 0x8146380 */ +static const ScriptRef s_gs1_g16_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g16_s0_station_sref_script }; /* 0x8146380 */ static const struct ScriptCommand s_gs1_g16_s0_lives0_dlg2[] = { /* 0x814638c */ DEBUGINFO_O(3740), @@ -3796,7 +3796,7 @@ static const struct ScriptCommand s_gs1_g16_s0_evt0_sref_script[] = { /* 0x81465 HALT, }; -static const struct ScriptRef s_gs1_g16_s0_evt0_sref = { NORMAL_EVENT, 7, NULL, s_gs1_g16_s0_evt0_sref_script }; /* 0x81465fc */ +static const ScriptRef s_gs1_g16_s0_evt0_sref = { NORMAL_EVENT, SCRIPT_TYPE_07, NULL, s_gs1_g16_s0_evt0_sref_script }; /* 0x81465fc */ static const struct ScriptCommand s_gs1_g17_s0_station_sref_script[] = { /* 0x8146608 */ DEBUGINFO_O(3802), @@ -3808,7 +3808,7 @@ static const struct ScriptCommand s_gs1_g17_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g17_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g17_s0_station_sref_script }; /* 0x8146678 */ +static const ScriptRef s_gs1_g17_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g17_s0_station_sref_script }; /* 0x8146678 */ static const struct ScriptCommand s_gs1_g17_s0_eff0_script[] = { /* 0x8146684 */ DEBUGINFO_O(3814), @@ -4022,7 +4022,7 @@ static const struct ScriptCommand s_gs1_g18_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g18_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g18_s0_station_sref_script }; /* 0x8147650 */ +static const ScriptRef s_gs1_g18_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g18_s0_station_sref_script }; /* 0x8147650 */ static const struct ScriptCommand s_gs1_g18_s0_lives0_dlg2[] = { /* 0x814765c */ DEBUGINFO_O(4028), @@ -4118,7 +4118,7 @@ static const struct ScriptCommand s_gs1_g19_s0_station_sref_script[] = { /* 0x81 HALT, }; -static const struct ScriptRef s_gs1_g19_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g19_s0_station_sref_script }; /* 0x8147ae8 */ +static const ScriptRef s_gs1_g19_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g19_s0_station_sref_script }; /* 0x8147ae8 */ static const struct ScriptCommand s_gs1_g19_s0_lives0_dlg0[] = { /* 0x8147af4 */ DEBUGINFO_O(4124), @@ -4177,7 +4177,7 @@ static const struct ScriptCommand s_gs1_g20_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g20_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g20_s0_station_sref_script }; /* 0x8147ea0 */ +static const ScriptRef s_gs1_g20_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g20_s0_station_sref_script }; /* 0x8147ea0 */ static const struct ScriptCommand s_gs1_g20_s0_eff0_script[] = { /* 0x8147eac */ DEBUGINFO_O(4183), @@ -4269,7 +4269,7 @@ static const struct ScriptCommand s_gs1_g21_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g21_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g21_s0_station_sref_script }; /* 0x81483f8 */ +static const ScriptRef s_gs1_g21_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g21_s0_station_sref_script }; /* 0x81483f8 */ static const struct ScriptCommand s_gs1_g21_s0_eff0_script[] = { /* 0x8148404 */ DEBUGINFO_O(4275), @@ -5463,7 +5463,7 @@ static const struct ScriptCommand s_gs1_g22_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g22_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g22_s0_station_sref_script }; /* 0x814d520 */ +static const ScriptRef s_gs1_g22_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g22_s0_station_sref_script }; /* 0x814d520 */ static const struct ScriptCommand s_gs1_g22_s0_lives0_dlg1[] = { /* 0x814d52c */ DEBUGINFO_O(5469), @@ -5616,7 +5616,7 @@ static const struct ScriptCommand s_gs1_g23_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g23_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g23_s0_station_sref_script }; /* 0x814db38 */ +static const ScriptRef s_gs1_g23_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g23_s0_station_sref_script }; /* 0x814db38 */ static const struct ScriptCommand s_gs1_g23_s0_eff0_script[] = { /* 0x814db44 */ @@ -6747,7 +6747,7 @@ static const struct ScriptCommand s_gs1_g24_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g24_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g24_s0_station_sref_script }; /* 0x8152c68 */ +static const ScriptRef s_gs1_g24_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g24_s0_station_sref_script }; /* 0x8152c68 */ static const struct ScriptCommand s_gs1_g24_s0_lives0_dlg2[] = { /* 0x8152c74 */ DEBUGINFO_O(6753), @@ -6909,7 +6909,7 @@ static const struct ScriptCommand s_gs1_g24_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g24_s1_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g24_s1_station_sref_script }; /* 0x8153888 */ +static const ScriptRef s_gs1_g24_s1_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g24_s1_station_sref_script }; /* 0x8153888 */ static const struct ScriptCommand s_gs1_g24_s1_lives0_dlg0[] = { /* 0x8153894 */ DEBUGINFO_O(6915), @@ -7013,7 +7013,7 @@ static const struct ScriptCommand s_gs1_g25_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g25_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g25_s0_station_sref_script }; /* 0x8153f54 */ +static const ScriptRef s_gs1_g25_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g25_s0_station_sref_script }; /* 0x8153f54 */ static const struct ScriptCommand s_gs1_g25_s0_lives0_dlg2[] = { /* 0x8153f60 */ DEBUGINFO_O(7019), @@ -7143,7 +7143,7 @@ static const struct ScriptCommand s_gs1_g26_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g26_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g26_s0_station_sref_script }; /* 0x8154678 */ +static const ScriptRef s_gs1_g26_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g26_s0_station_sref_script }; /* 0x8154678 */ static const struct ScriptCommand s_gs1_g26_s0_eff0_script[] = { /* 0x8154684 */ DEBUGINFO_O(7149), @@ -8498,7 +8498,7 @@ static const struct ScriptCommand s_gs1_g27_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g27_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g27_s0_station_sref_script }; /* 0x815a294 */ +static const ScriptRef s_gs1_g27_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g27_s0_station_sref_script }; /* 0x815a294 */ static const struct ScriptCommand s_gs1_g27_s0_lives0_dlg2[] = { /* 0x815a2a0 */ DEBUGINFO_O(8504), @@ -8626,7 +8626,7 @@ static const struct ScriptCommand s_gs1_g28_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g28_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g28_s0_station_sref_script }; /* 0x815a9a4 */ +static const ScriptRef s_gs1_g28_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g28_s0_station_sref_script }; /* 0x815a9a4 */ static const struct ScriptCommand s_gs1_g28_s0_eff0_script[] = { /* 0x815a9b0 */ DEBUGINFO_O(8632), @@ -10078,7 +10078,7 @@ static const struct ScriptCommand s_gs1_g29_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g29_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g29_s0_station_sref_script }; /* 0x8161048 */ +static const ScriptRef s_gs1_g29_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g29_s0_station_sref_script }; /* 0x8161048 */ static const struct ScriptCommand s_gs1_g29_s0_lives0_dlg2[] = { /* 0x8161054 */ DEBUGINFO_O(10084), @@ -10329,7 +10329,7 @@ static const struct ScriptCommand s_gs1_g29_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g29_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g29_s1_station_sref_script }; /* 0x8162184 */ +static const ScriptRef s_gs1_g29_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g29_s1_station_sref_script }; /* 0x8162184 */ static const struct ScriptCommand s_gs1_g29_s1_lives0_dlg0[] = { /* 0x8162190 */ DEBUGINFO_O(10335), @@ -10435,7 +10435,7 @@ static const struct ScriptCommand s_gs1_g30_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g30_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g30_s0_station_sref_script }; /* 0x8162800 */ +static const ScriptRef s_gs1_g30_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g30_s0_station_sref_script }; /* 0x8162800 */ static const struct ScriptCommand s_gs1_g30_s0_lives0_dlg2[] = { /* 0x816280c */ DEBUGINFO_O(10441), @@ -10723,7 +10723,7 @@ static const struct ScriptCommand s_gs1_g30_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g30_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g30_s1_station_sref_script }; /* 0x8163b18 */ +static const ScriptRef s_gs1_g30_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g30_s1_station_sref_script }; /* 0x8163b18 */ static const struct ScriptCommand s_gs1_g30_s1_lives0_dlg0[] = { /* 0x8163b24 */ DEBUGINFO_O(10729), @@ -10841,7 +10841,7 @@ static const struct ScriptCommand s_gs1_g31_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g31_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g31_s0_station_sref_script }; /* 0x816412c */ +static const ScriptRef s_gs1_g31_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g31_s0_station_sref_script }; /* 0x816412c */ static const struct ScriptCommand s_gs1_g31_s0_eff0_script[] = { /* 0x8164138 */ @@ -11525,7 +11525,7 @@ static const struct ScriptCommand s_gs1_g32_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g32_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g32_s0_station_sref_script }; /* 0x8166c74 */ +static const ScriptRef s_gs1_g32_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g32_s0_station_sref_script }; /* 0x8166c74 */ static const struct ScriptCommand s_gs1_g32_s0_lives0_dlg0[] = { /* 0x8166c80 */ DEBUGINFO_O(11531), @@ -11784,7 +11784,7 @@ static const struct ScriptCommand s_gs1_g33_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g33_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs1_g33_s0_station_sref_script }; /* 0x8167d34 */ +static const ScriptRef s_gs1_g33_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs1_g33_s0_station_sref_script }; /* 0x8167d34 */ static const struct ScriptCommand s_gs1_g33_s0_lives0_dlg0[] = { /* 0x8167d40 */ DEBUGINFO_O(11790), @@ -11799,7 +11799,7 @@ static const struct ScriptCommand s_gs1_g34_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs1_g34_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g34_s0_station_sref_script }; /* 0x8167db0 */ +static const ScriptRef s_gs1_g34_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g34_s0_station_sref_script }; /* 0x8167db0 */ static const struct ScriptCommand s_gs1_g34_s0_lives0_dlg2[] = { /* 0x8167dbc */ DEBUGINFO_O(11805), @@ -12020,7 +12020,7 @@ static const struct ScriptCommand s_gs1_g35_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g35_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g35_s0_station_sref_script }; /* 0x8168e58 */ +static const ScriptRef s_gs1_g35_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g35_s0_station_sref_script }; /* 0x8168e58 */ static const struct ScriptCommand s_gs1_g35_s0_lives0_dlg2[] = { /* 0x8168e64 */ DEBUGINFO_O(12026), @@ -12196,7 +12196,7 @@ static const struct ScriptCommand s_gs1_g36_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g36_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g36_s0_station_sref_script }; /* 0x81698ec */ +static const ScriptRef s_gs1_g36_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g36_s0_station_sref_script }; /* 0x81698ec */ static const struct ScriptCommand s_gs1_g36_s0_lives0_dlg2[] = { /* 0x81698f8 */ DEBUGINFO_O(12202), @@ -12376,7 +12376,7 @@ static const struct ScriptCommand s_gs1_g37_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g37_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g37_s0_station_sref_script }; /* 0x816a440 */ +static const ScriptRef s_gs1_g37_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g37_s0_station_sref_script }; /* 0x816a440 */ static const struct ScriptCommand s_gs1_g37_s0_eff0_script[] = { /* 0x816a44c */ DEBUGINFO_O(12382), @@ -12392,7 +12392,7 @@ static const struct ScriptCommand s_gs1_g38_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g38_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs1_g38_s0_station_sref_script }; /* 0x816a4cc */ +static const ScriptRef s_gs1_g38_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs1_g38_s0_station_sref_script }; /* 0x816a4cc */ static const struct ScriptCommand s_gs1_g38_s0_lives0_dlg2[] = { /* 0x816a4d8 */ DEBUGINFO_O(12398), @@ -12569,7 +12569,7 @@ static const struct ScriptCommand s_gs1_g38_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g38_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g38_s1_station_sref_script }; /* 0x816b144 */ +static const ScriptRef s_gs1_g38_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g38_s1_station_sref_script }; /* 0x816b144 */ static const struct ScriptCommand s_gs1_g38_s1_lives0_dlg0[] = { /* 0x816b150 */ DEBUGINFO_O(12575), @@ -12947,7 +12947,7 @@ static const struct ScriptCommand s_gs1_g42_s0_evt0_sref_script[] = { /* 0x816ce HALT, }; -static const struct ScriptRef s_gs1_g42_s0_evt0_sref = { NORMAL_EVENT, 7, NULL, s_gs1_g42_s0_evt0_sref_script }; /* 0x816ce64 */ +static const ScriptRef s_gs1_g42_s0_evt0_sref = { NORMAL_EVENT, SCRIPT_TYPE_07, NULL, s_gs1_g42_s0_evt0_sref_script }; /* 0x816ce64 */ static const struct ScriptCommand s_gs1_g43_s0_station_sref_script[] = { /* 0x816ce70 */ DEBUGINFO_O(12953), @@ -12960,7 +12960,7 @@ static const struct ScriptCommand s_gs1_g43_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g43_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g43_s0_station_sref_script }; /* 0x816cef0 */ +static const ScriptRef s_gs1_g43_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g43_s0_station_sref_script }; /* 0x816cef0 */ static const struct ScriptCommand s_gs1_g43_s0_eff0_script[] = { /* 0x816cefc */ DEBUGINFO_O(12966), @@ -13135,7 +13135,7 @@ static const struct ScriptCommand s_gs1_g45_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g45_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs1_g45_s1_station_sref_script }; /* 0x816d934 */ +static const ScriptRef s_gs1_g45_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs1_g45_s1_station_sref_script }; /* 0x816d934 */ static const struct ScriptCommand s_gs1_g45_s1_lives0_dlg0[] = { /* 0x816d940 */ DEBUGINFO_O(13141), @@ -13332,7 +13332,7 @@ static const struct ScriptCommand s_gs1_g46_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g46_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g46_s0_station_sref_script }; /* 0x816e97c */ +static const ScriptRef s_gs1_g46_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g46_s0_station_sref_script }; /* 0x816e97c */ static const struct ScriptCommand s_gs1_g46_s0_eff0_script[] = { /* 0x816e988 */ DEBUGINFO_O(13338), @@ -14034,7 +14034,7 @@ static const struct ScriptCommand s_gs1_g47_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g47_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g47_s0_station_sref_script }; /* 0x8171cdc */ +static const ScriptRef s_gs1_g47_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g47_s0_station_sref_script }; /* 0x8171cdc */ static const struct ScriptCommand s_gs1_g47_s0_eff0_script[] = { /* 0x8171ce8 */ DEBUGINFO_O(14040), @@ -14348,7 +14348,7 @@ static const struct ScriptCommand s_gs1_g48_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g48_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g48_s0_station_sref_script }; /* 0x8173358 */ +static const ScriptRef s_gs1_g48_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g48_s0_station_sref_script }; /* 0x8173358 */ static const struct ScriptCommand s_gs1_g48_s0_eff0_script[] = { /* 0x8173364 */ DEBUGINFO_O(14354), @@ -14777,7 +14777,7 @@ static const struct ScriptCommand s_gs1_g49_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs1_g49_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs1_g49_s0_station_sref_script }; /* 0x81757ec */ +static const ScriptRef s_gs1_g49_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs1_g49_s0_station_sref_script }; /* 0x81757ec */ static const struct ScriptCommand s_gs1_g49_s0_lives0_dlg0[] = { /* 0x81757f8 */ DEBUGINFO_O(14783), @@ -17417,7 +17417,7 @@ static const struct GroundEventData s_gs1_g42_s0_evts[] = { /* 0x817c1f0 */ /* 0 */ { 6, 9, 0, 0, { 71, 35, 0, 0 }, &s_gs1_g42_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x817c1fc */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x817c1fc */ &s_gs1_g0_s0_station_sref, &s_gs1_g1_s0_station_sref, &s_gs1_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_t01p02a_station.h b/src/data/ground/ground_data_t01p02a_station.h index 451803b1c..d95c57da1 100644 --- a/src/data/ground/ground_data_t01p02a_station.h +++ b/src/data/ground/ground_data_t01p02a_station.h @@ -166,7 +166,7 @@ static const struct ScriptCommand s_gs2_g0_s0_station_sref_script[] = { /* 0x817 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs2_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs2_g0_s0_station_sref_script }; /* 0x817de6c */ +static const ScriptRef s_gs2_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs2_g0_s0_station_sref_script }; /* 0x817de6c */ static const struct ScriptCommand s_gs2_g0_s0_evt0_sref_script[] = { /* 0x817de78 */ DEBUGINFO_O(172), @@ -174,7 +174,7 @@ static const struct ScriptCommand s_gs2_g0_s0_evt0_sref_script[] = { /* 0x817de7 HALT, }; -static const struct ScriptRef s_gs2_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs2_g0_s0_evt0_sref_script }; /* 0x817dea8 */ +static const ScriptRef s_gs2_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs2_g0_s0_evt0_sref_script }; /* 0x817dea8 */ static const struct ScriptCommand s_gs2_g0_s1_lives0_dlg0[] = { /* 0x817deb4 */ DEBUGINFO_O(180), @@ -202,7 +202,7 @@ static const struct ScriptCommand s_gs2_g0_s2_evt0_sref_script[] = { /* 0x817df3 RET, }; -static const struct ScriptRef s_gs2_g0_s2_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs2_g0_s2_evt0_sref_script }; /* 0x817e018 */ +static const ScriptRef s_gs2_g0_s2_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs2_g0_s2_evt0_sref_script }; /* 0x817e018 */ static const struct ScriptCommand s_gs2_g0_s2_lives0_dlg0[] = { /* 0x817e024 */ DEBUGINFO_O(208), @@ -225,7 +225,7 @@ static const struct ScriptCommand s_gs2_g1_s0_station_sref_script[] = { /* 0x817 RET, }; -static const struct ScriptRef s_gs2_g1_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g1_s0_station_sref_script }; /* 0x817e0e4 */ +static const ScriptRef s_gs2_g1_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g1_s0_station_sref_script }; /* 0x817e0e4 */ static const struct ScriptCommand s_gs2_g1_s0_lives0_dlg0[] = { /* 0x817e0f0 */ DEBUGINFO_O(231), @@ -339,7 +339,7 @@ static const struct ScriptCommand s_gs2_g2_s0_station_sref_script[] = { /* 0x817 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g2_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g2_s0_station_sref_script }; /* 0x817e7e8 */ +static const ScriptRef s_gs2_g2_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g2_s0_station_sref_script }; /* 0x817e7e8 */ static const struct ScriptCommand s_gs2_g3_s0_lives0_dlg0[] = { /* 0x817e7f4 */ DEBUGINFO_O(345), @@ -519,7 +519,7 @@ static const struct ScriptCommand s_gs2_g5_s0_evt0_sref_script[] = { /* 0x817f7e HALT, }; -static const struct ScriptRef s_gs2_g5_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs2_g5_s0_evt0_sref_script }; /* 0x817f818 */ +static const ScriptRef s_gs2_g5_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs2_g5_s0_evt0_sref_script }; /* 0x817f818 */ static const struct ScriptCommand s_gs2_g6_s0_station_sref_script[] = { /* 0x817f824 */ DEBUGINFO_O(525), @@ -531,7 +531,7 @@ static const struct ScriptCommand s_gs2_g6_s0_station_sref_script[] = { /* 0x817 RET, }; -static const struct ScriptRef s_gs2_g6_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs2_g6_s0_station_sref_script }; /* 0x817f894 */ +static const ScriptRef s_gs2_g6_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs2_g6_s0_station_sref_script }; /* 0x817f894 */ static const struct ScriptCommand s_gs2_g6_s0_eff0_script[] = { /* 0x817f8a0 */ DEBUGINFO_O(537), @@ -732,7 +732,7 @@ static const struct ScriptCommand s_gs2_g7_s0_evt0_sref_script[] = { /* 0x818055 HALT, }; -static const struct ScriptRef s_gs2_g7_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs2_g7_s0_evt0_sref_script }; /* 0x818058c */ +static const ScriptRef s_gs2_g7_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs2_g7_s0_evt0_sref_script }; /* 0x818058c */ static const struct ScriptCommand s_gs2_g8_s0_station_sref_script[] = { /* 0x8180598 */ DEBUGINFO_O(738), @@ -744,7 +744,7 @@ static const struct ScriptCommand s_gs2_g8_s0_station_sref_script[] = { /* 0x818 RET, }; -static const struct ScriptRef s_gs2_g8_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs2_g8_s0_station_sref_script }; /* 0x8180608 */ +static const ScriptRef s_gs2_g8_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs2_g8_s0_station_sref_script }; /* 0x8180608 */ static const struct ScriptCommand s_gs2_g8_s0_eff0_script[] = { /* 0x8180614 */ DEBUGINFO_O(750), @@ -935,7 +935,7 @@ static const struct ScriptCommand s_gs2_g9_s1_station_sref_script[] = { /* 0x818 RET, }; -static const struct ScriptRef s_gs2_g9_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs2_g9_s1_station_sref_script }; /* 0x81812b0 */ +static const ScriptRef s_gs2_g9_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs2_g9_s1_station_sref_script }; /* 0x81812b0 */ static const struct ScriptCommand s_gs2_g9_s1_eff0_script[] = { /* 0x81812bc */ DEBUGINFO_O(941), @@ -1022,7 +1022,7 @@ static const struct ScriptCommand s_gs2_g10_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g10_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g10_s0_station_sref_script }; /* 0x81818a0 */ +static const ScriptRef s_gs2_g10_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g10_s0_station_sref_script }; /* 0x81818a0 */ static const struct ScriptCommand s_gs2_g10_s0_lives0_dlg0[] = { /* 0x81818ac */ DEBUGINFO_O(1028), @@ -1054,7 +1054,7 @@ static const struct ScriptCommand s_gs2_g11_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g11_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g11_s0_station_sref_script }; /* 0x8181a80 */ +static const ScriptRef s_gs2_g11_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g11_s0_station_sref_script }; /* 0x8181a80 */ static const struct ScriptCommand s_gs2_g11_s0_lives0_dlg0[] = { /* 0x8181a8c */ DEBUGINFO_O(1060), @@ -1085,7 +1085,7 @@ static const struct ScriptCommand s_gs2_g12_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g12_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g12_s0_station_sref_script }; /* 0x8181c0c */ +static const ScriptRef s_gs2_g12_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g12_s0_station_sref_script }; /* 0x8181c0c */ static const struct ScriptCommand s_gs2_g12_s0_lives0_dlg0[] = { /* 0x8181c18 */ DEBUGINFO_O(1091), @@ -1130,7 +1130,7 @@ static const struct ScriptCommand s_gs2_g13_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g13_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g13_s0_station_sref_script }; /* 0x8181eec */ +static const ScriptRef s_gs2_g13_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g13_s0_station_sref_script }; /* 0x8181eec */ static const struct ScriptCommand s_gs2_g13_s0_lives0_dlg0[] = { /* 0x8181ef8 */ DEBUGINFO_O(1136), @@ -1162,7 +1162,7 @@ static const struct ScriptCommand s_gs2_g14_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g14_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g14_s0_station_sref_script }; /* 0x81820a4 */ +static const ScriptRef s_gs2_g14_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g14_s0_station_sref_script }; /* 0x81820a4 */ static const struct ScriptCommand s_gs2_g14_s0_lives0_dlg0[] = { /* 0x81820b0 */ DEBUGINFO_O(1168), @@ -1224,7 +1224,7 @@ static const struct ScriptCommand s_gs2_g15_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g15_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g15_s0_station_sref_script }; /* 0x8182618 */ +static const ScriptRef s_gs2_g15_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g15_s0_station_sref_script }; /* 0x8182618 */ static const struct ScriptCommand s_gs2_g15_s0_lives0_dlg0[] = { /* 0x8182624 */ DEBUGINFO_O(1230), @@ -1303,7 +1303,7 @@ static const struct ScriptCommand s_gs2_g16_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g16_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g16_s0_station_sref_script }; /* 0x8182a24 */ +static const ScriptRef s_gs2_g16_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g16_s0_station_sref_script }; /* 0x8182a24 */ static const struct ScriptCommand s_gs2_g16_s0_lives0_dlg0[] = { /* 0x8182a30 */ DEBUGINFO_O(1309), @@ -1382,7 +1382,7 @@ static const struct ScriptCommand s_gs2_g16_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g16_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs2_g16_s1_station_sref_script }; /* 0x8182f0c */ +static const ScriptRef s_gs2_g16_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs2_g16_s1_station_sref_script }; /* 0x8182f0c */ static const struct ScriptCommand s_gs2_g16_s1_lives0_dlg0[] = { /* 0x8182f18 */ DEBUGINFO_O(1388), @@ -1544,7 +1544,7 @@ static const struct ScriptCommand s_gs2_g17_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g17_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs2_g17_s0_station_sref_script }; /* 0x8183f10 */ +static const ScriptRef s_gs2_g17_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs2_g17_s0_station_sref_script }; /* 0x8183f10 */ static const struct ScriptCommand s_gs2_g18_s0_station_sref_script[] = { /* 0x8183f1c */ DEBUGINFO_O(1550), @@ -1556,7 +1556,7 @@ static const struct ScriptCommand s_gs2_g18_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g18_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs2_g18_s0_station_sref_script }; /* 0x8183f8c */ +static const ScriptRef s_gs2_g18_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs2_g18_s0_station_sref_script }; /* 0x8183f8c */ static const struct ScriptCommand s_gs2_g18_s0_lives0_dlg0[] = { /* 0x8183f98 */ DEBUGINFO_O(1562), @@ -1608,7 +1608,7 @@ static const struct ScriptCommand s_gs2_g19_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g19_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g19_s0_station_sref_script }; /* 0x81842b0 */ +static const ScriptRef s_gs2_g19_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g19_s0_station_sref_script }; /* 0x81842b0 */ static const struct ScriptCommand s_gs2_g19_s0_lives0_dlg0[] = { /* 0x81842bc */ DEBUGINFO_O(1614), @@ -1629,7 +1629,7 @@ static const struct ScriptCommand s_gs2_g20_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g20_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g20_s0_station_sref_script }; /* 0x818435c */ +static const ScriptRef s_gs2_g20_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g20_s0_station_sref_script }; /* 0x818435c */ static const struct ScriptCommand s_gs2_g20_s0_lives0_dlg0[] = { /* 0x8184368 */ DEBUGINFO_O(1635), @@ -1690,7 +1690,7 @@ static const struct ScriptCommand s_gs2_g21_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g21_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g21_s0_station_sref_script }; /* 0x8184708 */ +static const ScriptRef s_gs2_g21_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g21_s0_station_sref_script }; /* 0x8184708 */ static const struct ScriptCommand s_gs2_g21_s0_lives0_dlg0[] = { /* 0x8184714 */ DEBUGINFO_O(1696), @@ -1754,7 +1754,7 @@ static const struct ScriptCommand s_gs2_g22_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g22_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g22_s0_station_sref_script }; /* 0x8184b30 */ +static const ScriptRef s_gs2_g22_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g22_s0_station_sref_script }; /* 0x8184b30 */ static const struct ScriptCommand s_gs2_g22_s0_lives0_dlg0[] = { /* 0x8184b3c */ DEBUGINFO_O(1760), @@ -1815,7 +1815,7 @@ static const struct ScriptCommand s_gs2_g23_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g23_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g23_s0_station_sref_script }; /* 0x8184df8 */ +static const ScriptRef s_gs2_g23_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g23_s0_station_sref_script }; /* 0x8184df8 */ static const struct ScriptCommand s_gs2_g23_s0_lives0_dlg0[] = { /* 0x8184e04 */ DEBUGINFO_O(1821), @@ -1878,7 +1878,7 @@ static const struct ScriptCommand s_gs2_g24_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g24_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g24_s0_station_sref_script }; /* 0x81851c8 */ +static const ScriptRef s_gs2_g24_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g24_s0_station_sref_script }; /* 0x81851c8 */ static const struct ScriptCommand s_gs2_g24_s0_lives0_dlg0[] = { /* 0x81851d4 */ DEBUGINFO_O(1884), @@ -1942,7 +1942,7 @@ static const struct ScriptCommand s_gs2_g25_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs2_g25_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g25_s0_station_sref_script }; /* 0x8185688 */ +static const ScriptRef s_gs2_g25_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g25_s0_station_sref_script }; /* 0x8185688 */ static const struct ScriptCommand s_gs2_g25_s0_lives0_dlg0[] = { /* 0x8185694 */ DEBUGINFO_O(1948), @@ -1984,7 +1984,7 @@ static const struct ScriptCommand s_gs2_g26_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g26_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g26_s0_station_sref_script }; /* 0x8185950 */ +static const ScriptRef s_gs2_g26_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g26_s0_station_sref_script }; /* 0x8185950 */ static const struct ScriptCommand s_gs2_g26_s0_lives0_dlg0[] = { /* 0x818595c */ DEBUGINFO_O(1990), @@ -2047,7 +2047,7 @@ static const struct ScriptCommand s_gs2_g27_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g27_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g27_s0_station_sref_script }; /* 0x8185d44 */ +static const ScriptRef s_gs2_g27_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g27_s0_station_sref_script }; /* 0x8185d44 */ static const struct ScriptCommand s_gs2_g27_s0_lives0_dlg0[] = { /* 0x8185d50 */ DEBUGINFO_O(2053), @@ -2114,7 +2114,7 @@ static const struct ScriptCommand s_gs2_g28_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g28_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs2_g28_s0_station_sref_script }; /* 0x8186174 */ +static const ScriptRef s_gs2_g28_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs2_g28_s0_station_sref_script }; /* 0x8186174 */ static const struct ScriptCommand s_gs2_g28_s0_eff0_script[] = { /* 0x8186180 */ DEBUGINFO_O(2120), @@ -2149,7 +2149,7 @@ static const struct ScriptCommand s_gs2_g29_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g29_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs2_g29_s0_station_sref_script }; /* 0x8186300 */ +static const ScriptRef s_gs2_g29_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs2_g29_s0_station_sref_script }; /* 0x8186300 */ static const struct ScriptCommand s_gs2_g29_s0_eff0_script[] = { /* 0x818630c */ DEBUGINFO_O(2155), @@ -2605,7 +2605,7 @@ static const struct ScriptCommand s_gs2_g30_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs2_g30_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs2_g30_s0_station_sref_script }; /* 0x81883a8 */ +static const ScriptRef s_gs2_g30_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs2_g30_s0_station_sref_script }; /* 0x81883a8 */ static const struct ScriptCommand s_gs2_g30_s0_lives0_dlg2[] = { /* 0x81883b4 */ DEBUGINFO_O(2611), @@ -3206,7 +3206,7 @@ static const struct GroundEventData s_gs2_g7_s0_evts[] = { /* 0x8189198 */ /* 0 */ { 9, 5, 0, 0, { 14, 41, 0, 0 }, &s_gs2_g7_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x81891a4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x81891a4 */ &s_gs2_g0_s0_station_sref, &s_gs2_g1_s0_station_sref, &s_gs2_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_t01p03_station.h b/src/data/ground/ground_data_t01p03_station.h index 15fee8165..ba909d58f 100644 --- a/src/data/ground/ground_data_t01p03_station.h +++ b/src/data/ground/ground_data_t01p03_station.h @@ -155,7 +155,7 @@ static const struct ScriptCommand s_gs4_g0_s0_station_sref_script[] = { /* 0x818 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs4_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs4_g0_s0_station_sref_script }; /* 0x818a174 */ +static const ScriptRef s_gs4_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs4_g0_s0_station_sref_script }; /* 0x818a174 */ static const struct ScriptCommand s_gs4_g0_s0_evt0_sref_script[] = { /* 0x818a180 */ @@ -164,7 +164,7 @@ static const struct ScriptCommand s_gs4_g0_s0_evt0_sref_script[] = { /* 0x818a18 HALT, }; -static const struct ScriptRef s_gs4_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs4_g0_s0_evt0_sref_script }; /* 0x818a1b0 */ +static const ScriptRef s_gs4_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs4_g0_s0_evt0_sref_script }; /* 0x818a1b0 */ static const struct ScriptCommand s_gs4_g0_s0_evt1_sref_script[] = { /* 0x818a1bc */ DEBUGINFO_O(170), @@ -172,7 +172,7 @@ static const struct ScriptCommand s_gs4_g0_s0_evt1_sref_script[] = { /* 0x818a1b HALT, }; -static const struct ScriptRef s_gs4_g0_s0_evt1_sref = { GETOUT_NORMAL, 2, NULL, s_gs4_g0_s0_evt1_sref_script }; /* 0x818a1ec */ +static const ScriptRef s_gs4_g0_s0_evt1_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs4_g0_s0_evt1_sref_script }; /* 0x818a1ec */ static const struct ScriptCommand s_gs4_g0_s0_obj0_dlg2[] = { /* 0x818a1f8 */ DEBUGINFO_O(178), @@ -326,7 +326,7 @@ static const struct ScriptCommand s_gs4_g1_s0_station_sref_script[] = { /* 0x818 RET, }; -static const struct ScriptRef s_gs4_g1_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g1_s0_station_sref_script }; /* 0x818a938 */ +static const ScriptRef s_gs4_g1_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g1_s0_station_sref_script }; /* 0x818a938 */ static const struct ScriptCommand s_gs4_g1_s0_lives0_dlg2[] = { /* 0x818a944 */ DEBUGINFO_O(332), @@ -458,7 +458,7 @@ static const struct ScriptCommand s_gs4_g1_s1_station_sref_script[] = { /* 0x818 RET, }; -static const struct ScriptRef s_gs4_g1_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs4_g1_s1_station_sref_script }; /* 0x818b674 */ +static const ScriptRef s_gs4_g1_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs4_g1_s1_station_sref_script }; /* 0x818b674 */ static const struct ScriptCommand s_gs4_g1_s1_eff0_script[] = { /* 0x818b680 */ DEBUGINFO_O(464), @@ -713,7 +713,7 @@ static const struct ScriptCommand s_gs4_g1_s2_station_sref_script[] = { /* 0x818 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g1_s2_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g1_s2_station_sref_script }; /* 0x818c75c */ +static const ScriptRef s_gs4_g1_s2_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g1_s2_station_sref_script }; /* 0x818c75c */ static const struct ScriptCommand s_gs4_g1_s2_lives0_dlg2[] = { /* 0x818c768 */ DEBUGINFO_O(719), @@ -752,7 +752,7 @@ static const struct ScriptCommand s_gs4_g2_s0_station_sref_script[] = { /* 0x818 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g2_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g2_s0_station_sref_script }; /* 0x818c978 */ +static const ScriptRef s_gs4_g2_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g2_s0_station_sref_script }; /* 0x818c978 */ static const struct ScriptCommand s_gs4_g3_s0_station_sref_script[] = { /* 0x818c984 */ DEBUGINFO_O(758), @@ -765,7 +765,7 @@ static const struct ScriptCommand s_gs4_g3_s0_station_sref_script[] = { /* 0x818 RET, }; -static const struct ScriptRef s_gs4_g3_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs4_g3_s0_station_sref_script }; /* 0x818ca04 */ +static const ScriptRef s_gs4_g3_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs4_g3_s0_station_sref_script }; /* 0x818ca04 */ static const struct ScriptCommand s_gs4_g3_s0_eff0_script[] = { /* 0x818ca10 */ DEBUGINFO_O(771), @@ -967,7 +967,7 @@ static const struct ScriptCommand s_gs4_g5_s0_station_sref_script[] = { /* 0x818 RET, }; -static const struct ScriptRef s_gs4_g5_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs4_g5_s0_station_sref_script }; /* 0x818d74c */ +static const ScriptRef s_gs4_g5_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs4_g5_s0_station_sref_script }; /* 0x818d74c */ static const struct ScriptCommand s_gs4_g5_s0_lives0_dlg0[] = { /* 0x818d758 */ DEBUGINFO_O(973), @@ -1121,7 +1121,7 @@ static const struct ScriptCommand s_gs4_g7_s0_station_sref_script[] = { /* 0x818 RET, }; -static const struct ScriptRef s_gs4_g7_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs4_g7_s0_station_sref_script }; /* 0x818e458 */ +static const ScriptRef s_gs4_g7_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs4_g7_s0_station_sref_script }; /* 0x818e458 */ static const struct ScriptCommand s_gs4_g7_s0_lives0_dlg0[] = { /* 0x818e464 */ DEBUGINFO_O(1127), @@ -1225,7 +1225,7 @@ static const struct ScriptCommand s_gs4_g9_s0_station_sref_script[] = { /* 0x818 RET, }; -static const struct ScriptRef s_gs4_g9_s0_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs4_g9_s0_station_sref_script }; /* 0x818eaf0 */ +static const ScriptRef s_gs4_g9_s0_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs4_g9_s0_station_sref_script }; /* 0x818eaf0 */ static const struct ScriptCommand s_gs4_g9_s0_lives0_dlg0[] = { /* 0x818eafc */ DEBUGINFO_O(1231), @@ -1424,7 +1424,7 @@ static const struct ScriptCommand s_gs4_g11_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g11_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs4_g11_s0_station_sref_script }; /* 0x818f834 */ +static const ScriptRef s_gs4_g11_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs4_g11_s0_station_sref_script }; /* 0x818f834 */ static const struct ScriptCommand s_gs4_g11_s1_lives0_dlg0[] = { /* 0x818f840 */ @@ -1509,7 +1509,7 @@ static const struct ScriptCommand s_gs4_g12_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g12_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs4_g12_s0_station_sref_script }; /* 0x818fbe0 */ +static const ScriptRef s_gs4_g12_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs4_g12_s0_station_sref_script }; /* 0x818fbe0 */ static const struct ScriptCommand s_gs4_g12_s0_eff0_script[] = { /* 0x818fbec */ DEBUGINFO_O(1515), @@ -1670,7 +1670,7 @@ static const struct ScriptCommand s_gs4_g13_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g13_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g13_s0_station_sref_script }; /* 0x8190d0c */ +static const ScriptRef s_gs4_g13_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g13_s0_station_sref_script }; /* 0x8190d0c */ static const struct ScriptCommand s_gs4_g14_s0_station_sref_script[] = { /* 0x8190d18 */ DEBUGINFO_O(1676), @@ -1678,14 +1678,14 @@ static const struct ScriptCommand s_gs4_g14_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g14_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g14_s0_station_sref_script }; /* 0x8190d48 */ +static const ScriptRef s_gs4_g14_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g14_s0_station_sref_script }; /* 0x8190d48 */ static const struct ScriptCommand s_gs4_g15_s0_station_sref_script[] = { /* 0x8190d54 */ DEBUGINFO_O(1684), RET_DIRECT, }; -static const struct ScriptRef s_gs4_g15_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g15_s0_station_sref_script }; /* 0x8190d74 */ +static const ScriptRef s_gs4_g15_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g15_s0_station_sref_script }; /* 0x8190d74 */ static const struct ScriptCommand s_gs4_g16_s0_station_sref_script[] = { /* 0x8190d80 */ DEBUGINFO_O(1691), @@ -1693,7 +1693,7 @@ static const struct ScriptCommand s_gs4_g16_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g16_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g16_s0_station_sref_script }; /* 0x8190db0 */ +static const ScriptRef s_gs4_g16_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g16_s0_station_sref_script }; /* 0x8190db0 */ static const struct ScriptCommand s_gs4_g16_s0_lives0_dlg2[] = { /* 0x8190dbc */ DEBUGINFO_O(1699), @@ -1737,7 +1737,7 @@ static const struct ScriptCommand s_gs4_g16_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g16_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs4_g16_s1_station_sref_script }; /* 0x8190fc0 */ +static const ScriptRef s_gs4_g16_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs4_g16_s1_station_sref_script }; /* 0x8190fc0 */ static const struct ScriptCommand s_gs4_g16_s1_lives0_dlg0[] = { /* 0x8190fcc */ DEBUGINFO_O(1743), @@ -1816,7 +1816,7 @@ static const struct ScriptCommand s_gs4_g17_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g17_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g17_s0_station_sref_script }; /* 0x8191424 */ +static const ScriptRef s_gs4_g17_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g17_s0_station_sref_script }; /* 0x8191424 */ static const struct ScriptCommand s_gs4_g17_s0_lives0_dlg0[] = { /* 0x8191430 */ DEBUGINFO_O(1822), @@ -1850,7 +1850,7 @@ static const struct ScriptCommand s_gs4_g17_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g17_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs4_g17_s1_station_sref_script }; /* 0x8191540 */ +static const ScriptRef s_gs4_g17_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs4_g17_s1_station_sref_script }; /* 0x8191540 */ static const struct ScriptCommand s_gs4_g17_s1_lives0_dlg0[] = { /* 0x819154c */ DEBUGINFO_O(1856), @@ -1935,7 +1935,7 @@ static const struct ScriptCommand s_gs4_g18_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g18_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g18_s0_station_sref_script }; /* 0x819195c */ +static const ScriptRef s_gs4_g18_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g18_s0_station_sref_script }; /* 0x819195c */ static const struct ScriptCommand s_gs4_g18_s0_lives0_dlg2[] = { /* 0x8191968 */ DEBUGINFO_O(1941), @@ -2009,7 +2009,7 @@ static const struct ScriptCommand s_gs4_g19_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g19_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g19_s0_station_sref_script }; /* 0x81921d0 */ +static const ScriptRef s_gs4_g19_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g19_s0_station_sref_script }; /* 0x81921d0 */ static const struct ScriptCommand s_gs4_g19_s0_lives0_dlg0[] = { /* 0x81921dc */ DEBUGINFO_O(2015), @@ -2043,7 +2043,7 @@ static const struct ScriptCommand s_gs4_g19_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g19_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs4_g19_s1_station_sref_script }; /* 0x81922ec */ +static const ScriptRef s_gs4_g19_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs4_g19_s1_station_sref_script }; /* 0x81922ec */ static const struct ScriptCommand s_gs4_g19_s1_lives0_dlg0[] = { /* 0x81922f8 */ DEBUGINFO_O(2049), @@ -2122,7 +2122,7 @@ static const struct ScriptCommand s_gs4_g20_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g20_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g20_s0_station_sref_script }; /* 0x8192738 */ +static const ScriptRef s_gs4_g20_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g20_s0_station_sref_script }; /* 0x8192738 */ static const struct ScriptCommand s_gs4_g20_s0_lives0_dlg0[] = { /* 0x8192744 */ DEBUGINFO_O(2128), @@ -2173,7 +2173,7 @@ static const struct ScriptCommand s_gs4_g20_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g20_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs4_g20_s1_station_sref_script }; /* 0x8192934 */ +static const ScriptRef s_gs4_g20_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs4_g20_s1_station_sref_script }; /* 0x8192934 */ static const struct ScriptCommand s_gs4_g20_s1_eff0_script[] = { /* 0x8192940 */ DEBUGINFO_O(2179), @@ -2395,7 +2395,7 @@ static const struct ScriptCommand s_gs4_g21_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g21_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g21_s0_station_sref_script }; /* 0x81936d8 */ +static const ScriptRef s_gs4_g21_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g21_s0_station_sref_script }; /* 0x81936d8 */ static const struct ScriptCommand s_gs4_g21_s0_lives0_dlg0[] = { /* 0x81936e4 */ DEBUGINFO_O(2401), @@ -2430,7 +2430,7 @@ static const struct ScriptCommand s_gs4_g21_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g21_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs4_g21_s1_station_sref_script }; /* 0x8193804 */ +static const ScriptRef s_gs4_g21_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs4_g21_s1_station_sref_script }; /* 0x8193804 */ static const struct ScriptCommand s_gs4_g21_s1_eff0_script[] = { /* 0x8193810 */ DEBUGINFO_O(2436), @@ -2657,7 +2657,7 @@ static const struct ScriptCommand s_gs4_g22_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g22_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g22_s0_station_sref_script }; /* 0x819464c */ +static const ScriptRef s_gs4_g22_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g22_s0_station_sref_script }; /* 0x819464c */ static const struct ScriptCommand s_gs4_g22_s0_lives0_dlg0[] = { /* 0x8194658 */ DEBUGINFO_O(2663), @@ -2686,7 +2686,7 @@ static const struct ScriptCommand s_gs4_g22_s1_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g22_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs4_g22_s1_station_sref_script }; /* 0x8194748 */ +static const ScriptRef s_gs4_g22_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs4_g22_s1_station_sref_script }; /* 0x8194748 */ static const struct ScriptCommand s_gs4_g22_s1_eff0_script[] = { /* 0x8194754 */ DEBUGINFO_O(2692), @@ -2815,7 +2815,7 @@ static const struct ScriptCommand s_gs4_g23_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g23_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g23_s0_station_sref_script }; /* 0x8194f60 */ +static const ScriptRef s_gs4_g23_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g23_s0_station_sref_script }; /* 0x8194f60 */ static const struct ScriptCommand s_gs4_g23_s0_lives0_dlg1[] = { /* 0x8194f6c */ DEBUGINFO_O(2821), @@ -2857,7 +2857,7 @@ static const struct ScriptCommand s_gs4_g24_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g24_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g24_s0_station_sref_script }; /* 0x8195270 */ +static const ScriptRef s_gs4_g24_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g24_s0_station_sref_script }; /* 0x8195270 */ static const struct ScriptCommand s_gs4_g24_s0_lives0_dlg0[] = { /* 0x819527c */ DEBUGINFO_O(2863), @@ -2920,7 +2920,7 @@ static const struct ScriptCommand s_gs4_g25_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g25_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g25_s0_station_sref_script }; /* 0x8195704 */ +static const ScriptRef s_gs4_g25_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g25_s0_station_sref_script }; /* 0x8195704 */ static const struct ScriptCommand s_gs4_g25_s0_lives0_dlg0[] = { /* 0x8195710 */ DEBUGINFO_O(2926), @@ -2982,7 +2982,7 @@ static const struct ScriptCommand s_gs4_g26_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g26_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g26_s0_station_sref_script }; /* 0x8195a10 */ +static const ScriptRef s_gs4_g26_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g26_s0_station_sref_script }; /* 0x8195a10 */ static const struct ScriptCommand s_gs4_g26_s0_lives0_dlg0[] = { /* 0x8195a1c */ DEBUGINFO_O(2988), @@ -3048,7 +3048,7 @@ static const struct ScriptCommand s_gs4_g27_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g27_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs4_g27_s0_station_sref_script }; /* 0x8195d7c */ +static const ScriptRef s_gs4_g27_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs4_g27_s0_station_sref_script }; /* 0x8195d7c */ static const struct ScriptCommand s_gs4_g27_s0_eff0_script[] = { /* 0x8195d88 */ DEBUGINFO_O(3054), @@ -3063,7 +3063,7 @@ static const struct ScriptCommand s_gs4_g28_s0_station_sref_script[] = { /* 0x81 RET_DIRECT, }; -static const struct ScriptRef s_gs4_g28_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs4_g28_s0_station_sref_script }; /* 0x8195df8 */ +static const ScriptRef s_gs4_g28_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs4_g28_s0_station_sref_script }; /* 0x8195df8 */ static const struct ScriptCommand s_gs4_g28_s0_lives0_dlg1[] = { /* 0x8195e04 */ DEBUGINFO_O(3069), @@ -3157,7 +3157,7 @@ static const struct ScriptCommand s_gs4_g29_s0_station_sref_script[] = { /* 0x81 RET, }; -static const struct ScriptRef s_gs4_g29_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs4_g29_s0_station_sref_script }; /* 0x81964c8 */ +static const ScriptRef s_gs4_g29_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs4_g29_s0_station_sref_script }; /* 0x81964c8 */ static const struct ScriptCommand s_gs4_g29_s0_lives0_dlg0[] = { /* 0x81964d4 */ DEBUGINFO_O(3163), @@ -3719,7 +3719,7 @@ static const struct GroundEventData s_gs4_g0_s0_evts[] = { /* 0x8197030 */ /* 1 */ { 3, 3, 0, 0, { 48, 31, 0, 0 }, &s_gs4_g0_s0_evt1_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8197048 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8197048 */ &s_gs4_g0_s0_station_sref, &s_gs4_g1_s0_station_sref, &s_gs4_g1_s1_station_sref, diff --git a/src/data/ground/ground_data_t01p04_station.h b/src/data/ground/ground_data_t01p04_station.h index 566ec0fa2..9b284b418 100644 --- a/src/data/ground/ground_data_t01p04_station.h +++ b/src/data/ground/ground_data_t01p04_station.h @@ -45,7 +45,7 @@ static const struct ScriptCommand s_gs5_g0_s0_station_sref_script[] = { /* 0x819 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs5_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs5_g0_s0_station_sref_script }; /* 0x8197c28 */ +static const ScriptRef s_gs5_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs5_g0_s0_station_sref_script }; /* 0x8197c28 */ static const struct ScriptCommand s_gs5_g0_s0_evt0_sref_script[] = { /* 0x8197c34 */ @@ -54,7 +54,7 @@ static const struct ScriptCommand s_gs5_g0_s0_evt0_sref_script[] = { /* 0x8197c3 HALT, }; -static const struct ScriptRef s_gs5_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs5_g0_s0_evt0_sref_script }; /* 0x8197c64 */ +static const ScriptRef s_gs5_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs5_g0_s0_evt0_sref_script }; /* 0x8197c64 */ static const struct ScriptCommand s_gs5_g0_s1_lives0_dlg0[] = { /* 0x8197c70 */ DEBUGINFO_O(60), @@ -79,7 +79,7 @@ static const struct ScriptCommand s_gs5_g1_s0_station_sref_script[] = { /* 0x819 RET_DIRECT, }; -static const struct ScriptRef s_gs5_g1_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs5_g1_s0_station_sref_script }; /* 0x8197d50 */ +static const ScriptRef s_gs5_g1_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs5_g1_s0_station_sref_script }; /* 0x8197d50 */ static const struct ScriptCommand s_gs5_g1_s0_lives0_dlg2[] = { /* 0x8197d5c */ DEBUGINFO_O(85), @@ -136,7 +136,7 @@ static const struct ScriptCommand s_gs5_g2_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs5_g2_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs5_g2_s0_station_sref_script }; /* 0x8197fdc */ +static const ScriptRef s_gs5_g2_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs5_g2_s0_station_sref_script }; /* 0x8197fdc */ static const struct ScriptCommand s_gs5_g2_s0_lives0_dlg0[] = { /* 0x8197fe8 */ DEBUGINFO_O(142), @@ -186,7 +186,7 @@ static const struct ScriptCommand s_gs5_g3_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs5_g3_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs5_g3_s0_station_sref_script }; /* 0x8198228 */ +static const ScriptRef s_gs5_g3_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs5_g3_s0_station_sref_script }; /* 0x8198228 */ static const struct ScriptCommand s_gs5_g3_s0_lives0_dlg0[] = { /* 0x8198234 */ DEBUGINFO_O(192), @@ -239,7 +239,7 @@ static const struct ScriptCommand s_gs5_g4_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs5_g4_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs5_g4_s0_station_sref_script }; /* 0x81985ec */ +static const ScriptRef s_gs5_g4_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs5_g4_s0_station_sref_script }; /* 0x81985ec */ static const struct ScriptCommand s_gs5_g4_s0_lives0_dlg0[] = { /* 0x81985f8 */ DEBUGINFO_O(245), @@ -289,7 +289,7 @@ static const struct ScriptCommand s_gs5_g5_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs5_g5_s0_station_sref = { EVENT_CONTROL, 7, NULL, s_gs5_g5_s0_station_sref_script }; /* 0x8198868 */ +static const ScriptRef s_gs5_g5_s0_station_sref = { EVENT_CONTROL, SCRIPT_TYPE_07, NULL, s_gs5_g5_s0_station_sref_script }; /* 0x8198868 */ static const struct ScriptCommand s_gs5_g5_s0_eff0_script[] = { /* 0x8198874 */ DEBUGINFO_O(295), @@ -419,7 +419,7 @@ static const struct GroundEventData s_gs5_g0_s0_evts[] = { /* 0x8198c70 */ /* 0 */ { 8, 3, 0, 0, { 29, 48, 0, 0 }, &s_gs5_g0_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x8198c7c */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x8198c7c */ &s_gs5_g0_s0_station_sref, &s_gs5_g1_s0_station_sref, &s_gs5_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_t01p05_station.h b/src/data/ground/ground_data_t01p05_station.h index c46ba214b..aee6a0650 100644 --- a/src/data/ground/ground_data_t01p05_station.h +++ b/src/data/ground/ground_data_t01p05_station.h @@ -51,7 +51,7 @@ static const struct ScriptCommand s_gs6_g0_s0_station_sref_script[] = { /* 0x819 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs6_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs6_g0_s0_station_sref_script }; /* 0x81990ec */ +static const ScriptRef s_gs6_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs6_g0_s0_station_sref_script }; /* 0x81990ec */ static const struct ScriptCommand s_gs6_g0_s0_evt0_sref_script[] = { /* 0x81990f8 */ DEBUGINFO_O(57), @@ -59,7 +59,7 @@ static const struct ScriptCommand s_gs6_g0_s0_evt0_sref_script[] = { /* 0x81990f HALT, }; -static const struct ScriptRef s_gs6_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs6_g0_s0_evt0_sref_script }; /* 0x8199128 */ +static const ScriptRef s_gs6_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs6_g0_s0_evt0_sref_script }; /* 0x8199128 */ static const struct ScriptCommand s_gs6_g0_s1_lives0_dlg0[] = { /* 0x8199134 */ DEBUGINFO_O(65), @@ -105,7 +105,7 @@ static const struct ScriptCommand s_gs6_g0_s3_evt0_sref_script[] = { /* 0x819923 RET, }; -static const struct ScriptRef s_gs6_g0_s3_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs6_g0_s3_evt0_sref_script }; /* 0x8199304 */ +static const ScriptRef s_gs6_g0_s3_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs6_g0_s3_evt0_sref_script }; /* 0x8199304 */ static const struct ScriptCommand s_gs6_g1_s0_station_sref_script[] = { /* 0x8199310 */ @@ -120,7 +120,7 @@ static const struct ScriptCommand s_gs6_g1_s0_station_sref_script[] = { /* 0x819 RET_DIRECT, }; -static const struct ScriptRef s_gs6_g1_s0_station_sref = { STATION_CONTROL , 8, NULL, s_gs6_g1_s0_station_sref_script }; /* 0x81993a0 */ +static const ScriptRef s_gs6_g1_s0_station_sref = { STATION_CONTROL, SCRIPT_TYPE_08, NULL, s_gs6_g1_s0_station_sref_script }; /* 0x81993a0 */ static const struct ScriptCommand s_gs6_g1_s0_lives0_dlg1[] = { /* 0x81993ac */ DEBUGINFO_O(126), @@ -157,7 +157,7 @@ static const struct ScriptCommand s_gs6_g1_s0_evt0_sref_script[] = { /* 0x81994e HALT, }; -static const struct ScriptRef s_gs6_g1_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs6_g1_s0_evt0_sref_script }; /* 0x819951c */ +static const ScriptRef s_gs6_g1_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs6_g1_s0_evt0_sref_script }; /* 0x819951c */ static const struct ScriptCommand s_gs6_g1_s1_evt0_sref_script[] = { /* 0x8199528 */ DEBUGINFO_O(163), @@ -170,7 +170,7 @@ static const struct ScriptCommand s_gs6_g1_s1_evt0_sref_script[] = { /* 0x819952 JUMP_SCRIPT(END_TALK), }; -static const struct ScriptRef s_gs6_g1_s1_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs6_g1_s1_evt0_sref_script }; /* 0x8199640 */ +static const ScriptRef s_gs6_g1_s1_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs6_g1_s1_evt0_sref_script }; /* 0x8199640 */ static const struct ScriptCommand s_gs6_g2_s0_station_sref_script[] = { /* 0x819964c */ DEBUGINFO_O(176), @@ -185,7 +185,7 @@ static const struct ScriptCommand s_gs6_g2_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs6_g2_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs6_g2_s0_station_sref_script }; /* 0x81996ec */ +static const ScriptRef s_gs6_g2_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs6_g2_s0_station_sref_script }; /* 0x81996ec */ static const struct ScriptCommand s_gs6_g2_s0_lives0_dlg0[] = { /* 0x81996f8 */ DEBUGINFO_O(191), @@ -249,7 +249,7 @@ static const struct ScriptCommand s_gs6_g3_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs6_g3_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs6_g3_s0_station_sref_script }; /* 0x81999d8 */ +static const ScriptRef s_gs6_g3_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs6_g3_s0_station_sref_script }; /* 0x81999d8 */ static const struct ScriptCommand s_gs6_g3_s0_lives0_dlg0[] = { /* 0x81999e4 */ DEBUGINFO_O(255), @@ -299,7 +299,7 @@ static const struct ScriptCommand s_gs6_g4_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs6_g4_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs6_g4_s0_station_sref_script }; /* 0x8199c24 */ +static const ScriptRef s_gs6_g4_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs6_g4_s0_station_sref_script }; /* 0x8199c24 */ static const struct ScriptCommand s_gs6_g4_s0_lives0_dlg0[] = { /* 0x8199c30 */ DEBUGINFO_O(305), @@ -349,7 +349,7 @@ static const struct ScriptCommand s_gs6_g5_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs6_g5_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs6_g5_s0_station_sref_script }; /* 0x8199e70 */ +static const ScriptRef s_gs6_g5_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs6_g5_s0_station_sref_script }; /* 0x8199e70 */ static const struct ScriptCommand s_gs6_g5_s0_lives0_dlg0[] = { /* 0x8199e7c */ DEBUGINFO_O(355), @@ -476,7 +476,7 @@ static const struct GroundEventData s_gs6_g1_s1_evts[] = { /* 0x819a1d8 */ /* 0 */ { 3, 3, 0, 0, { 33, 26, 0, 0 }, &s_gs6_g1_s1_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x819a1e4 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x819a1e4 */ &s_gs6_g0_s0_station_sref, &s_gs6_g1_s0_station_sref, &s_gs6_g2_s0_station_sref, diff --git a/src/data/ground/ground_data_t01p06_station.h b/src/data/ground/ground_data_t01p06_station.h index c2231788a..09172687a 100644 --- a/src/data/ground/ground_data_t01p06_station.h +++ b/src/data/ground/ground_data_t01p06_station.h @@ -32,7 +32,7 @@ static const struct ScriptCommand s_gs7_g0_s0_station_sref_script[] = { /* 0x819 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs7_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs7_g0_s0_station_sref_script }; /* 0x819a574 */ +static const ScriptRef s_gs7_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs7_g0_s0_station_sref_script }; /* 0x819a574 */ static const struct ScriptCommand s_gs7_g0_s0_evt0_sref_script[] = { /* 0x819a580 */ DEBUGINFO_O(38), @@ -40,7 +40,7 @@ static const struct ScriptCommand s_gs7_g0_s0_evt0_sref_script[] = { /* 0x819a58 HALT, }; -static const struct ScriptRef s_gs7_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs7_g0_s0_evt0_sref_script }; /* 0x819a5b0 */ +static const ScriptRef s_gs7_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs7_g0_s0_evt0_sref_script }; /* 0x819a5b0 */ static const struct ScriptCommand s_gs7_g0_s1_lives0_dlg0[] = { /* 0x819a5bc */ DEBUGINFO_O(46), @@ -74,7 +74,7 @@ static const struct GroundEventData s_gs7_g0_s0_evts[] = { /* 0x819a69c */ /* 0 */ { 9, 3, 0, 0, { 27, 38, 0, 0 }, &s_gs7_g0_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x819a6a8 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x819a6a8 */ &s_gs7_g0_s0_station_sref, }; diff --git a/src/data/ground/ground_data_t01p07_station.h b/src/data/ground/ground_data_t01p07_station.h index 74a1d5b7c..25c2003ef 100644 --- a/src/data/ground/ground_data_t01p07_station.h +++ b/src/data/ground/ground_data_t01p07_station.h @@ -21,7 +21,7 @@ static const struct ScriptCommand s_gs8_g0_s0_station_sref_script[] = { /* 0x819 JUMP_SCRIPT(COMMON_ENTER), }; -static const struct ScriptRef s_gs8_g0_s0_station_sref = { ENTER_CONTROL , 1, NULL, s_gs8_g0_s0_station_sref_script }; /* 0x819a83c */ +static const ScriptRef s_gs8_g0_s0_station_sref = { ENTER_CONTROL, SCRIPT_TYPE_01, NULL, s_gs8_g0_s0_station_sref_script }; /* 0x819a83c */ static const struct ScriptCommand s_gs8_g0_s0_evt0_sref_script[] = { /* 0x819a848 */ @@ -30,7 +30,7 @@ static const struct ScriptCommand s_gs8_g0_s0_evt0_sref_script[] = { /* 0x819a84 HALT, }; -static const struct ScriptRef s_gs8_g0_s0_evt0_sref = { GETOUT_NORMAL, 2, NULL, s_gs8_g0_s0_evt0_sref_script }; /* 0x819a878 */ +static const ScriptRef s_gs8_g0_s0_evt0_sref = { GETOUT_NORMAL, SCRIPT_TYPE_02, NULL, s_gs8_g0_s0_evt0_sref_script }; /* 0x819a878 */ static const struct ScriptCommand s_gs8_g0_s1_lives0_dlg0[] = { /* 0x819a884 */ DEBUGINFO_O(36), @@ -57,7 +57,7 @@ static const struct ScriptCommand s_gs8_g1_s0_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs8_g1_s0_station_sref = { EVENT_STATION , 7, NULL, s_gs8_g1_s0_station_sref_script }; /* 0x819a984 */ +static const ScriptRef s_gs8_g1_s0_station_sref = { EVENT_STATION, SCRIPT_TYPE_07, NULL, s_gs8_g1_s0_station_sref_script }; /* 0x819a984 */ static const struct ScriptCommand s_gs8_g1_s0_eff0_script[] = { /* 0x819a990 */ DEBUGINFO_O(63), @@ -88,7 +88,7 @@ static const struct ScriptCommand s_gs8_g1_s1_station_sref_script[] = { /* 0x819 RET, }; -static const struct ScriptRef s_gs8_g1_s1_station_sref = { EVENT_WAKEUP, 7, NULL, s_gs8_g1_s1_station_sref_script }; /* 0x819aad0 */ +static const ScriptRef s_gs8_g1_s1_station_sref = { EVENT_WAKEUP, SCRIPT_TYPE_07, NULL, s_gs8_g1_s1_station_sref_script }; /* 0x819aad0 */ static const struct ScriptCommand s_gs8_g1_s1_eff0_script[] = { /* 0x819aadc */ DEBUGINFO_O(94), @@ -143,7 +143,7 @@ static const struct GroundEventData s_gs8_g0_s0_evts[] = { /* 0x819ac34 */ /* 0 */ { 9, 3, 0, 0, { 21, 30, 0, 0 }, &s_gs8_g0_s0_evt0_sref }, }; -static const struct ScriptRef * const (sStationScripts[]) = { /* 0x819ac40 */ +static const ScriptRef * const (sStationScripts[]) = { /* 0x819ac40 */ &s_gs8_g0_s0_station_sref, &s_gs8_g1_s0_station_sref, &s_gs8_g1_s1_station_sref, diff --git a/src/data/ground/ground_event_data.h b/src/data/ground/ground_event_data.h index 7b48e9550..8e4861680 100644 --- a/src/data/ground/ground_event_data.h +++ b/src/data/ground/ground_event_data.h @@ -5261,412 +5261,413 @@ static const struct ScriptCommand s_script_MOVE_DEBUG_CAMERA[] = { /* 0x812f198 END_DELETE, }; -const struct ScriptRef gFunctionScriptTable[NUM_SCRIPT_IDS] = { /* R = 0x812F1F8 | B = arm9.bin::020E7BE4 */ - [END_TALK] = { END_TALK, 4, _("END_TALK"), s_script_END_TALK }, - [WAIT_END_TALK_FUNC] = { WAIT_END_TALK_FUNC, 4, _("WAIT_END_TALK_FUNC"), s_script_WAIT_END_TALK_FUNC }, - [WAIT_END_EVENT_FUNC] = { WAIT_END_EVENT_FUNC, 4, _("WAIT_END_EVENT_FUNC"), s_script_WAIT_END_EVENT_FUNC }, - [WAIT_START_FUNC] = { WAIT_START_FUNC, 4, _("WAIT_START_FUNC"), s_script_WAIT_START_FUNC }, - [INCOMPLETE_TALK] = { INCOMPLETE_TALK, 4, _("INCOMPLETE_TALK"), s_script_INCOMPLETE_TALK }, - [NORMAL_WAIT_END_TALK] = { NORMAL_WAIT_END_TALK, 4, _("NORMAL_WAIT_END_TALK"), s_script_NORMAL_WAIT_END_TALK }, - [LIVES_REPLY_NORMAL] = { LIVES_REPLY_NORMAL, 4, _("LIVES_REPLY_NORMAL"), s_script_LIVES_REPLY_NORMAL }, - [LIVES_REPLY] = { LIVES_REPLY, 4, _("LIVES_REPLY"), s_script_LIVES_REPLY }, - [OBJECT_REPLY_NORMAL] = { OBJECT_REPLY_NORMAL, 4, _("OBJECT_REPLY_NORMAL"), s_script_OBJECT_REPLY_NORMAL }, - [EXAMINE_MISS] = { EXAMINE_MISS, 4, _("EXAMINE_MISS"), s_script_EXAMINE_MISS }, - [ENTER_WAIT_FUNC] = { ENTER_WAIT_FUNC, 4, _("ENTER_WAIT_FUNC"), s_script_ENTER_WAIT_FUNC }, - [UNIT_TALK] = { UNIT_TALK, 4, _("UNIT_TALK"), s_script_UNIT_TALK }, - [HABITAT_TALK] = { HABITAT_TALK, 4, _("HABITAT_TALK"), s_script_HABITAT_TALK }, - [HABITAT_TALK_S01E02A] = { HABITAT_TALK_S01E02A, 4, _("HABITAT_TALK_S01E02A"), s_script_HABITAT_TALK_S01E02A }, - [HABITAT_MOVE1] = { HABITAT_MOVE1, 5, _("HABITAT_MOVE1"), s_script_HABITAT_MOVE1 }, - [HABITAT_MOVE2] = { HABITAT_MOVE2, 5, _("HABITAT_MOVE2"), s_script_HABITAT_MOVE2 }, - [HABITAT_MOVE_PAUSE] = { HABITAT_MOVE_PAUSE, 5, _("HABITAT_MOVE_PAUSE"), s_script_HABITAT_MOVE_PAUSE }, - [HABITAT_MOVE_STAY_FIX] = { HABITAT_MOVE_STAY_FIX, 5, _("HABITAT_MOVE_STAY_FIX"), s_script_HABITAT_MOVE_STAY_FIX }, - [HABITAT_MOVE_STAY_TURN] = { HABITAT_MOVE_STAY_TURN, 5, _("HABITAT_MOVE_STAY_TURN"), s_script_HABITAT_MOVE_STAY_TURN }, - [LIVES_MOVE_NORMAL] = { LIVES_MOVE_NORMAL, 5, _("LIVES_MOVE_NORMAL"), s_script_LIVES_MOVE_NORMAL }, - [LIVES_MOVE_CHANGE] = { LIVES_MOVE_CHANGE, 5, _("LIVES_MOVE_CHANGE"), s_script_LIVES_MOVE_CHANGE }, - [OBJECT_MOVE_NORMAL] = { OBJECT_MOVE_NORMAL, 5, _("OBJECT_MOVE_NORMAL"), s_script_OBJECT_MOVE_NORMAL }, - [OBJECT_MOVE_CHANGE] = { OBJECT_MOVE_CHANGE, 5, _("OBJECT_MOVE_CHANGE"), s_script_OBJECT_MOVE_CHANGE }, - [EFFECT_MOVE_NORMAL] = { EFFECT_MOVE_NORMAL, 5, _("EFFECT_MOVE_NORMAL"), s_script_EFFECT_MOVE_NORMAL }, - [EFFECT_MOVE_CHANGE] = { EFFECT_MOVE_CHANGE, 5, _("EFFECT_MOVE_CHANGE"), s_script_EFFECT_MOVE_CHANGE }, - [MOVE_INIT] = { MOVE_INIT, 5, _("MOVE_INIT"), s_script_MOVE_INIT }, - [MOVE_PAUSE] = { MOVE_PAUSE, 5, _("MOVE_PAUSE"), s_script_MOVE_PAUSE }, - [MOVE_STAY] = { MOVE_STAY, 5, _("MOVE_STAY"), s_script_MOVE_STAY }, - [MOVE_SLEEP] = { MOVE_SLEEP, 5, _("MOVE_SLEEP"), s_script_MOVE_SLEEP }, - [MOVE_RANDOM] = { MOVE_RANDOM, 5, _("MOVE_RANDOM"), s_script_MOVE_RANDOM }, - [MOVE_BOY] = { MOVE_BOY, 5, _("MOVE_BOY"), s_script_MOVE_BOY }, - [MOVE_GIRL] = { MOVE_GIRL, 5, _("MOVE_GIRL"), s_script_MOVE_GIRL }, - [WAKEUP_FUNC] = { WAKEUP_FUNC, 9, _("WAKEUP_FUNC"), s_script_WAKEUP_FUNC }, - [LOOK_AROUND_FUNC] = { LOOK_AROUND_FUNC, 9, _("LOOK_AROUND_FUNC"), s_script_LOOK_AROUND_FUNC }, - [LOOK_AROUND_DOWN_FUNC] = { LOOK_AROUND_DOWN_FUNC, 9, _("LOOK_AROUND_DOWN_FUNC"), s_script_LOOK_AROUND_DOWN_FUNC }, - [LOOK_AROUND_RIGHT_FUNC] = { LOOK_AROUND_RIGHT_FUNC, 9, _("LOOK_AROUND_RIGHT_FUNC"), s_script_LOOK_AROUND_RIGHT_FUNC }, - [LOOK_AROUND_LEFT_FUNC] = { LOOK_AROUND_LEFT_FUNC, 9, _("LOOK_AROUND_LEFT_FUNC"), s_script_LOOK_AROUND_LEFT_FUNC }, - [JUMP_HAPPY_FUNC] = { JUMP_HAPPY_FUNC, 9, _("JUMP_HAPPY_FUNC"), s_script_JUMP_HAPPY_FUNC }, - [JUMP_SURPRISE_FUNC] = { JUMP_SURPRISE_FUNC, 9, _("JUMP_SURPRISE_FUNC"), s_script_JUMP_SURPRISE_FUNC }, - [JUMP_ANGRY_FUNC] = { JUMP_ANGRY_FUNC, 9, _("JUMP_ANGRY_FUNC"), s_script_JUMP_ANGRY_FUNC }, - [NOTICE_FUNC] = { NOTICE_FUNC, 9, _("NOTICE_FUNC"), s_script_NOTICE_FUNC }, - [QUESTION_FUNC] = { QUESTION_FUNC, 9, _("QUESTION_FUNC"), s_script_QUESTION_FUNC }, - [SWEAT_FUNC] = { SWEAT_FUNC, 9, _("SWEAT_FUNC"), s_script_SWEAT_FUNC }, - [SHOCK_FUNC] = { SHOCK_FUNC, 9, _("SHOCK_FUNC"), s_script_SHOCK_FUNC }, - [SPREE_START_FUNC] = { SPREE_START_FUNC, 9, _("SPREE_START_FUNC"), s_script_SPREE_START_FUNC }, - [SPREE_END_FUNC] = { SPREE_END_FUNC, 9, _("SPREE_END_FUNC"), s_script_SPREE_END_FUNC }, - [SMILE_START_FUNC] = { SMILE_START_FUNC, 9, _("SMILE_START_FUNC"), s_script_SMILE_START_FUNC }, - [SMILE_END_FUNC] = { SMILE_END_FUNC, 9, _("SMILE_END_FUNC"), s_script_SMILE_END_FUNC }, - [ANGRY_START_FUNC] = { ANGRY_START_FUNC, 9, _("ANGRY_START_FUNC"), s_script_ANGRY_START_FUNC }, - [ANGRY_END_FUNC] = { ANGRY_END_FUNC, 9, _("ANGRY_END_FUNC"), s_script_ANGRY_END_FUNC }, - [MOVE_PLAZA_SLEEP] = { MOVE_PLAZA_SLEEP, 5, _("MOVE_PLAZA_SLEEP"), s_script_MOVE_PLAZA_SLEEP }, - [INIT_PLAZA_SLEEP_STAY_FUNC] = { INIT_PLAZA_SLEEP_STAY_FUNC, 9, _("INIT_PLAZA_SLEEP_STAY_FUNC"), s_script_INIT_PLAZA_SLEEP_STAY_FUNC }, - [INIT_PLAZA_SLEEP_TALK_FUNC] = { INIT_PLAZA_SLEEP_TALK_FUNC, 9, _("INIT_PLAZA_SLEEP_TALK_FUNC"), s_script_INIT_PLAZA_SLEEP_TALK_FUNC }, - [INIT_SLEEP_FUNC] = { INIT_SLEEP_FUNC, 8, _("INIT_SLEEP_FUNC"), s_script_INIT_SLEEP_FUNC }, - [INIT_BASE_FUNC] = { INIT_BASE_FUNC, 8, _("INIT_BASE_FUNC"), s_script_INIT_BASE_FUNC }, - [INIT_DEBUG_HABITAT] = { INIT_DEBUG_HABITAT, 8, _("INIT_DEBUG_HABITAT"), s_script_INIT_DEBUG_HABITAT }, - [NORMAL_MESSAGE] = { NORMAL_MESSAGE, 7, _("NORMAL_MESSAGE"), NULL }, - [NORMAL_EVENT] = { NORMAL_EVENT, 7, _("NORMAL_EVENT"), NULL }, - [NORMAL_CAMERA] = { NORMAL_CAMERA, 7, _("NORMAL_CAMERA"), s_script_NORMAL_CAMERA }, - [DISMISSAL_SALLY_MEMBER_FUNC] = { DISMISSAL_SALLY_MEMBER_FUNC, 7, _("DISMISSAL_SALLY_MEMBER_FUNC"), s_script_DISMISSAL_SALLY_MEMBER_FUNC }, - [DISMISSAL_SALLY_MEMBER2_FUNC] = { DISMISSAL_SALLY_MEMBER2_FUNC, 7, _("DISMISSAL_SALLY_MEMBER2_FUNC"), s_script_DISMISSAL_SALLY_MEMBER2_FUNC }, - [DISMISSAL_SALLY_MEMBER3_FUNC] = { DISMISSAL_SALLY_MEMBER3_FUNC, 7, _("DISMISSAL_SALLY_MEMBER3_FUNC"), s_script_DISMISSAL_SALLY_MEMBER3_FUNC }, - [DISMISSAL_SALLY_MEMBER4_FUNC] = { DISMISSAL_SALLY_MEMBER4_FUNC, 7, _("DISMISSAL_SALLY_MEMBER4_FUNC"), s_script_DISMISSAL_SALLY_MEMBER4_FUNC }, - [NEXT_SAVE_FUNC] = { NEXT_SAVE_FUNC, 7, _("NEXT_SAVE_FUNC"), s_script_NEXT_SAVE_FUNC }, - [NEXT_SAVE2_FUNC] = { NEXT_SAVE2_FUNC, 7, _("NEXT_SAVE2_FUNC"), s_script_NEXT_SAVE2_FUNC }, - [SAVE_POINT] = { SAVE_POINT, 7, _("SAVE_POINT"), s_script_SAVE_POINT }, - [WAREHOUSE_POINT] = { WAREHOUSE_POINT, 7, _("WAREHOUSE_POINT"), s_script_WAREHOUSE_POINT }, - [SAVE_AND_WAREHOUSE_POINT] = { SAVE_AND_WAREHOUSE_POINT, 7, _("SAVE_AND_WAREHOUSE_POINT"), s_script_SAVE_AND_WAREHOUSE_POINT }, - [WORLD_MAP_POINT] = { WORLD_MAP_POINT, 7, _("WORLD_MAP_POINT"), s_script_WORLD_MAP_POINT }, - [FORMATION_HERO] = { FORMATION_HERO, 7, _("FORMATION_HERO"), s_script_FORMATION_HERO }, - [EVOLUTION_HERO] = { EVOLUTION_HERO, 7, _("EVOLUTION_HERO"), s_script_EVOLUTION_HERO }, - [WARP_LIVES_START] = { WARP_LIVES_START, 7, _("WARP_LIVES_START"), s_script_WARP_LIVES_START }, - [WARP_LIVES_START2] = { WARP_LIVES_START2, 7, _("WARP_LIVES_START2"), s_script_WARP_LIVES_START2 }, - [WARP_LIVES_START3] = { WARP_LIVES_START3, 7, _("WARP_LIVES_START3"), s_script_WARP_LIVES_START3 }, - [WARP_LIVES_ARRIVE] = { WARP_LIVES_ARRIVE, 7, _("WARP_LIVES_ARRIVE"), s_script_WARP_LIVES_ARRIVE }, - [WARP_LIVES_ARRIVE2] = { WARP_LIVES_ARRIVE2, 7, _("WARP_LIVES_ARRIVE2"), s_script_WARP_LIVES_ARRIVE2 }, - [WARP_LIVES_ARRIVE3] = { WARP_LIVES_ARRIVE3, 7, _("WARP_LIVES_ARRIVE3"), s_script_WARP_LIVES_ARRIVE3 }, - [LIVES_WARP_START_FUNC] = { LIVES_WARP_START_FUNC, 7, _("LIVES_WARP_START_FUNC"), s_script_LIVES_WARP_START_FUNC }, - [LIVES_WARP_START2_FUNC] = { LIVES_WARP_START2_FUNC, 7, _("LIVES_WARP_START2_FUNC"), s_script_LIVES_WARP_START2_FUNC }, - [LIVES_WARP_START3_FUNC] = { LIVES_WARP_START3_FUNC, 7, _("LIVES_WARP_START3_FUNC"), s_script_LIVES_WARP_START3_FUNC }, - [LIVES_WARP_START_SUB] = { LIVES_WARP_START_SUB, 7, _("LIVES_WARP_START_SUB"), s_script_LIVES_WARP_START_SUB }, - [LIVES_WARP_ARRIVE_FUNC] = { LIVES_WARP_ARRIVE_FUNC, 7, _("LIVES_WARP_ARRIVE_FUNC"), s_script_LIVES_WARP_ARRIVE_FUNC }, - [LIVES_WARP_ARRIVE2_FUNC] = { LIVES_WARP_ARRIVE2_FUNC, 7, _("LIVES_WARP_ARRIVE2_FUNC"), s_script_LIVES_WARP_ARRIVE2_FUNC }, - [LIVES_WARP_ARRIVE3_FUNC] = { LIVES_WARP_ARRIVE3_FUNC, 7, _("LIVES_WARP_ARRIVE3_FUNC"), s_script_LIVES_WARP_ARRIVE3_FUNC }, - [LIVES_WARP_ARRIVE_SUB] = { LIVES_WARP_ARRIVE_SUB, 7, _("LIVES_WARP_ARRIVE_SUB"), s_script_LIVES_WARP_ARRIVE_SUB }, - [GET_ITEM_FUNC] = { GET_ITEM_FUNC, 7, _("GET_ITEM_FUNC"), s_script_GET_ITEM_FUNC }, - [GET_ITEM_WAIT_FUNC] = { GET_ITEM_WAIT_FUNC, 7, _("GET_ITEM_WAIT_FUNC"), s_script_GET_ITEM_WAIT_FUNC }, - [GET_ITEM2_FUNC] = { GET_ITEM2_FUNC, 7, _("GET_ITEM2_FUNC"), s_script_GET_ITEM2_FUNC }, - [GET_ITEM2_WAIT_FUNC] = { GET_ITEM2_WAIT_FUNC, 7, _("GET_ITEM2_WAIT_FUNC"), s_script_GET_ITEM2_WAIT_FUNC }, - [JOIN_FUNC] = { JOIN_FUNC, 7, _("JOIN_FUNC"), s_script_JOIN_FUNC }, - [LODGE_START_FUNC] = { LODGE_START_FUNC, 7, _("LODGE_START_FUNC"), s_script_LODGE_START_FUNC }, - [LODGE_WAIT_FUNC] = { LODGE_WAIT_FUNC, 7, _("LODGE_WAIT_FUNC"), s_script_LODGE_WAIT_FUNC }, - [LODGE_END_FUNC] = { LODGE_END_FUNC, 7, _("LODGE_END_FUNC"), s_script_LODGE_END_FUNC }, - [LODGE_SOUND_FUNC] = { LODGE_SOUND_FUNC, 7, _("LODGE_SOUND_FUNC"), s_script_LODGE_SOUND_FUNC }, - [SAVE_START_FUNC] = { SAVE_START_FUNC, 7, _("SAVE_START_FUNC"), s_script_SAVE_START_FUNC }, - [SAVE_WAIT_FUNC] = { SAVE_WAIT_FUNC, 7, _("SAVE_WAIT_FUNC"), s_script_SAVE_WAIT_FUNC }, - [SAVE_END_FUNC] = { SAVE_END_FUNC, 7, _("SAVE_END_FUNC"), s_script_SAVE_END_FUNC }, - [SAVE_SOUND_FUNC] = { SAVE_SOUND_FUNC, 7, _("SAVE_SOUND_FUNC"), s_script_SAVE_SOUND_FUNC }, - [EFFECT_TEST1] = { EFFECT_TEST1, 9, _("EFFECT_TEST1"), s_script_EFFECT_TEST1 }, - [EFFECT_TEST2] = { EFFECT_TEST2, 9, _("EFFECT_TEST2"), s_script_EFFECT_TEST2 }, - [EFFECT_MOVE_DIVE] = { EFFECT_MOVE_DIVE, 9, _("EFFECT_MOVE_DIVE"), s_script_EFFECT_MOVE_DIVE }, - [EFFECT_MOVE_WAVE] = { EFFECT_MOVE_WAVE, 9, _("EFFECT_MOVE_WAVE"), s_script_EFFECT_MOVE_WAVE }, - [EVENT_DIVIDE] = { EVENT_DIVIDE, 7, _("EVENT_DIVIDE"), s_script_EVENT_DIVIDE }, - [EVENT_DIVIDE_NEXT] = { EVENT_DIVIDE_NEXT, 7, _("EVENT_DIVIDE_NEXT"), s_script_EVENT_DIVIDE_NEXT }, - [EVENT_DIVIDE_INIT_FUNC] = { EVENT_DIVIDE_INIT_FUNC, 7, _("EVENT_DIVIDE_INIT_FUNC"), s_script_EVENT_DIVIDE_INIT_FUNC }, - [EVENT_DIVIDE_NEXT_DAY_FUNC] = { EVENT_DIVIDE_NEXT_DAY_FUNC, 7, _("EVENT_DIVIDE_NEXT_DAY_FUNC"), s_script_EVENT_DIVIDE_NEXT_DAY_FUNC }, - [EVENT_DIVIDE_NEXT_DAY2_FUNC] = { EVENT_DIVIDE_NEXT_DAY2_FUNC, 7, _("EVENT_DIVIDE_NEXT_DAY2_FUNC"), s_script_EVENT_DIVIDE_NEXT_DAY2_FUNC }, - [EVENT_DIVIDE_FIRST] = { EVENT_DIVIDE_FIRST, 7, _("EVENT_DIVIDE_FIRST"), s_script_EVENT_DIVIDE_FIRST }, - [EVENT_DIVIDE_SECOND] = { EVENT_DIVIDE_SECOND, 7, _("EVENT_DIVIDE_SECOND"), s_script_EVENT_DIVIDE_SECOND }, - [EVENT_DIVIDE_AFTER] = { EVENT_DIVIDE_AFTER, 7, _("EVENT_DIVIDE_AFTER"), s_script_EVENT_DIVIDE_AFTER }, - [EVENT_DIVIDE_WARP_LOCK_FUNC] = { EVENT_DIVIDE_WARP_LOCK_FUNC, 7, _("EVENT_DIVIDE_WARP_LOCK_FUNC"), s_script_EVENT_DIVIDE_WARP_LOCK_FUNC }, - [EVENT_RESCUE_ENTER_CHECK] = { EVENT_RESCUE_ENTER_CHECK, 7, _("EVENT_RESCUE_ENTER_CHECK"), s_script_EVENT_RESCUE_ENTER_CHECK }, - [EVENT_RESCUE] = { EVENT_RESCUE, 7, _("EVENT_RESCUE"), s_script_EVENT_RESCUE }, - [DEBUG_SCRIPT] = { DEBUG_SCRIPT, 7, _("DEBUG_SCRIPT"), s_script_DEBUG_SCRIPT }, - [DEMO_CANCEL] = { DEMO_CANCEL, 7, _("DEMO_CANCEL"), s_script_DEMO_CANCEL }, - [DEMO_01] = { DEMO_01, 10, _("DEMO_01"), s_script_DEMO_01 }, - [DEMO_02] = { DEMO_02, 10, _("DEMO_02"), s_script_DEMO_02 }, - [DEMO_03] = { DEMO_03, 10, _("DEMO_03"), s_script_DEMO_03 }, - [DEMO_04] = { DEMO_04, 10, _("DEMO_04"), s_script_DEMO_04 }, - [EVENT_M00E01A_L001] = { EVENT_M00E01A_L001, 10, _("EVENT_M00E01A_L001"), s_script_EVENT_M00E01A_L001 }, - [EVENT_M01E01A_L001] = { EVENT_M01E01A_L001, 10, _("EVENT_M01E01A_L001"), s_script_EVENT_M01E01A_L001 }, - [EVENT_M01E01A_L002] = { EVENT_M01E01A_L002, 10, _("EVENT_M01E01A_L002"), s_script_EVENT_M01E01A_L002 }, - [EVENT_M01E01A_L003] = { EVENT_M01E01A_L003, 10, _("EVENT_M01E01A_L003"), s_script_EVENT_M01E01A_L003 }, - [EVENT_M01E02A_L001] = { EVENT_M01E02A_L001, 10, _("EVENT_M01E02A_L001"), s_script_EVENT_M01E02A_L001 }, - [EVENT_M01E02A_L001B] = { EVENT_M01E02A_L001B, 12, _("EVENT_M01E02A_L001B"), s_script_EVENT_M01E02A_L001B }, - [EVENT_M01E02A_L001C] = { EVENT_M01E02A_L001C, 10, _("EVENT_M01E02A_L001C"), s_script_EVENT_M01E02A_L001C }, - [EVENT_M01E02A_L002] = { EVENT_M01E02A_L002, 10, _("EVENT_M01E02A_L002"), s_script_EVENT_M01E02A_L002 }, - [EVENT_M01E02A_L003] = { EVENT_M01E02A_L003, 10, _("EVENT_M01E02A_L003"), s_script_EVENT_M01E02A_L003 }, - [EVENT_M01E02A_L004] = { EVENT_M01E02A_L004, 10, _("EVENT_M01E02A_L004"), s_script_EVENT_M01E02A_L004 }, - [EVENT_M01E02A_L005] = { EVENT_M01E02A_L005, 10, _("EVENT_M01E02A_L005"), s_script_EVENT_M01E02A_L005 }, - [EVENT_M01E02A_L006] = { EVENT_M01E02A_L006, 10, _("EVENT_M01E02A_L006"), s_script_EVENT_M01E02A_L006 }, - [EVENT_M01E02B_L001] = { EVENT_M01E02B_L001, 10, _("EVENT_M01E02B_L001"), s_script_EVENT_M01E02B_L001 }, - [EVENT_M01E02B_L002] = { EVENT_M01E02B_L002, 10, _("EVENT_M01E02B_L002"), s_script_EVENT_M01E02B_L002 }, - [EVENT_M01E02B_L003] = { EVENT_M01E02B_L003, 10, _("EVENT_M01E02B_L003"), s_script_EVENT_M01E02B_L003 }, - [EVENT_M01E02B_L004] = { EVENT_M01E02B_L004, 10, _("EVENT_M01E02B_L004"), s_script_EVENT_M01E02B_L004 }, - [EVENT_M01E02B_L004B] = { EVENT_M01E02B_L004B, 10, _("EVENT_M01E02B_L004B"), s_script_EVENT_M01E02B_L004B }, - [EVENT_M01E02B_L005] = { EVENT_M01E02B_L005, 10, _("EVENT_M01E02B_L005"), s_script_EVENT_M01E02B_L005 }, - [EVENT_M01E02B_L006] = { EVENT_M01E02B_L006, 10, _("EVENT_M01E02B_L006"), s_script_EVENT_M01E02B_L006 }, - [EVENT_M01E02B_L007] = { EVENT_M01E02B_L007, 10, _("EVENT_M01E02B_L007"), s_script_EVENT_M01E02B_L007 }, - [EVENT_M01E02B_L008] = { EVENT_M01E02B_L008, 10, _("EVENT_M01E02B_L008"), s_script_EVENT_M01E02B_L008 }, - [EVENT_M01E03A_L000] = { EVENT_M01E03A_L000, 10, _("EVENT_M01E03A_L000"), s_script_EVENT_M01E03A_L000 }, - [EVENT_M01E03A_L001] = { EVENT_M01E03A_L001, 10, _("EVENT_M01E03A_L001"), s_script_EVENT_M01E03A_L001 }, - [EVENT_M01E03A_L002] = { EVENT_M01E03A_L002, 10, _("EVENT_M01E03A_L002"), s_script_EVENT_M01E03A_L002 }, - [EVENT_M01E03A_L003] = { EVENT_M01E03A_L003, 10, _("EVENT_M01E03A_L003"), s_script_EVENT_M01E03A_L003 }, - [EVENT_M01E03A_L004] = { EVENT_M01E03A_L004, 10, _("EVENT_M01E03A_L004"), s_script_EVENT_M01E03A_L004 }, - [EVENT_M01E03A_L005] = { EVENT_M01E03A_L005, 10, _("EVENT_M01E03A_L005"), s_script_EVENT_M01E03A_L005 }, - [EVENT_M01E03A_L006] = { EVENT_M01E03A_L006, 10, _("EVENT_M01E03A_L006"), s_script_EVENT_M01E03A_L006 }, - [EVENT_M01E03A_L007] = { EVENT_M01E03A_L007, 10, _("EVENT_M01E03A_L007"), s_script_EVENT_M01E03A_L007 }, - [EVENT_M01E03A_L008] = { EVENT_M01E03A_L008, 10, _("EVENT_M01E03A_L008"), s_script_EVENT_M01E03A_L008 }, - [EVENT_M01E03A_L009] = { EVENT_M01E03A_L009, 10, _("EVENT_M01E03A_L009"), s_script_EVENT_M01E03A_L009 }, - [EVENT_M01E03A_L010] = { EVENT_M01E03A_L010, 10, _("EVENT_M01E03A_L010"), s_script_EVENT_M01E03A_L010 }, - [EVENT_M01E03A_L011] = { EVENT_M01E03A_L011, 10, _("EVENT_M01E03A_L011"), s_script_EVENT_M01E03A_L011 }, - [EVENT_M01E04A_L000] = { EVENT_M01E04A_L000, 10, _("EVENT_M01E04A_L000"), s_script_EVENT_M01E04A_L000 }, - [EVENT_M01E04A_L001] = { EVENT_M01E04A_L001, 10, _("EVENT_M01E04A_L001"), s_script_EVENT_M01E04A_L001 }, - [EVENT_M01E04A_L002] = { EVENT_M01E04A_L002, 10, _("EVENT_M01E04A_L002"), s_script_EVENT_M01E04A_L002 }, - [EVENT_M01E04A_L003] = { EVENT_M01E04A_L003, 10, _("EVENT_M01E04A_L003"), s_script_EVENT_M01E04A_L003 }, - [EVENT_M01E04A_L004] = { EVENT_M01E04A_L004, 10, _("EVENT_M01E04A_L004"), s_script_EVENT_M01E04A_L004 }, - [EVENT_M01E04A_L005] = { EVENT_M01E04A_L005, 12, _("EVENT_M01E04A_L005"), s_script_EVENT_M01E04A_L005 }, - [EVENT_M01E04A_L006] = { EVENT_M01E04A_L006, 10, _("EVENT_M01E04A_L006"), s_script_EVENT_M01E04A_L006 }, - [EVENT_M01E04B_L000] = { EVENT_M01E04B_L000, 10, _("EVENT_M01E04B_L000"), s_script_EVENT_M01E04B_L000 }, - [EVENT_M01E04B_L001] = { EVENT_M01E04B_L001, 10, _("EVENT_M01E04B_L001"), s_script_EVENT_M01E04B_L001 }, - [EVENT_M01E04B_L002] = { EVENT_M01E04B_L002, 10, _("EVENT_M01E04B_L002"), s_script_EVENT_M01E04B_L002 }, - [EVENT_M01E04B_L003] = { EVENT_M01E04B_L003, 10, _("EVENT_M01E04B_L003"), s_script_EVENT_M01E04B_L003 }, - [EVENT_M01E04B_L004] = { EVENT_M01E04B_L004, 10, _("EVENT_M01E04B_L004"), s_script_EVENT_M01E04B_L004 }, - [EVENT_M01E04B_L005] = { EVENT_M01E04B_L005, 10, _("EVENT_M01E04B_L005"), s_script_EVENT_M01E04B_L005 }, - [EVENT_M01E04B_L006] = { EVENT_M01E04B_L006, 10, _("EVENT_M01E04B_L006"), s_script_EVENT_M01E04B_L006 }, - [EVENT_M01E04B_L007] = { EVENT_M01E04B_L007, 10, _("EVENT_M01E04B_L007"), s_script_EVENT_M01E04B_L007 }, - [EVENT_M01E05A_L000] = { EVENT_M01E05A_L000, 10, _("EVENT_M01E05A_L000"), s_script_EVENT_M01E05A_L000 }, - [EVENT_M01E05A_L001] = { EVENT_M01E05A_L001, 10, _("EVENT_M01E05A_L001"), s_script_EVENT_M01E05A_L001 }, - [EVENT_M01E05A_L002] = { EVENT_M01E05A_L002, 10, _("EVENT_M01E05A_L002"), s_script_EVENT_M01E05A_L002 }, - [EVENT_M01E05A_L003] = { EVENT_M01E05A_L003, 10, _("EVENT_M01E05A_L003"), s_script_EVENT_M01E05A_L003 }, - [EVENT_M01E05A_L004] = { EVENT_M01E05A_L004, 10, _("EVENT_M01E05A_L004"), s_script_EVENT_M01E05A_L004 }, - [EVENT_M01E05A_L005] = { EVENT_M01E05A_L005, 10, _("EVENT_M01E05A_L005"), s_script_EVENT_M01E05A_L005 }, - [EVENT_M01E05A_L006] = { EVENT_M01E05A_L006, 10, _("EVENT_M01E05A_L006"), s_script_EVENT_M01E05A_L006 }, - [EVENT_M01E05B_L000] = { EVENT_M01E05B_L000, 10, _("EVENT_M01E05B_L000"), s_script_EVENT_M01E05B_L000 }, - [EVENT_M01E05B_L001] = { EVENT_M01E05B_L001, 10, _("EVENT_M01E05B_L001"), s_script_EVENT_M01E05B_L001 }, - [EVENT_M01E05B_L002] = { EVENT_M01E05B_L002, 10, _("EVENT_M01E05B_L002"), s_script_EVENT_M01E05B_L002 }, - [EVENT_M01E05B_L003] = { EVENT_M01E05B_L003, 12, _("EVENT_M01E05B_L003"), s_script_EVENT_M01E05B_L003 }, - [EVENT_M01E05B_L004] = { EVENT_M01E05B_L004, 10, _("EVENT_M01E05B_L004"), s_script_EVENT_M01E05B_L004 }, - [EVENT_M01E05B_L005] = { EVENT_M01E05B_L005, 10, _("EVENT_M01E05B_L005"), s_script_EVENT_M01E05B_L005 }, - [EVENT_M01E06A_L001] = { EVENT_M01E06A_L001, 10, _("EVENT_M01E06A_L001"), s_script_EVENT_M01E06A_L001 }, - [EVENT_M01E06A_L002] = { EVENT_M01E06A_L002, 10, _("EVENT_M01E06A_L002"), s_script_EVENT_M01E06A_L002 }, - [EVENT_M01E06A_L003] = { EVENT_M01E06A_L003, 10, _("EVENT_M01E06A_L003"), s_script_EVENT_M01E06A_L003 }, - [EVENT_M01E07A_L001] = { EVENT_M01E07A_L001, 10, _("EVENT_M01E07A_L001"), s_script_EVENT_M01E07A_L001 }, - [EVENT_M01E07A_L002] = { EVENT_M01E07A_L002, 10, _("EVENT_M01E07A_L002"), s_script_EVENT_M01E07A_L002 }, - [EVENT_M01E07A_L003] = { EVENT_M01E07A_L003, 10, _("EVENT_M01E07A_L003"), s_script_EVENT_M01E07A_L003 }, - [EVENT_M01E07A_L004] = { EVENT_M01E07A_L004, 10, _("EVENT_M01E07A_L004"), s_script_EVENT_M01E07A_L004 }, - [EVENT_M01E07A_L005] = { EVENT_M01E07A_L005, 10, _("EVENT_M01E07A_L005"), s_script_EVENT_M01E07A_L005 }, - [EVENT_M01E07A_T001] = { EVENT_M01E07A_T001, 10, _("EVENT_M01E07A_T001"), s_script_EVENT_M01E07A_T001 }, - [EVENT_M01E07A_T002] = { EVENT_M01E07A_T002, 10, _("EVENT_M01E07A_T002"), s_script_EVENT_M01E07A_T002 }, - [EVENT_M01E07B_L001] = { EVENT_M01E07B_L001, 10, _("EVENT_M01E07B_L001"), s_script_EVENT_M01E07B_L001 }, - [EVENT_M01E07B_L002] = { EVENT_M01E07B_L002, 10, _("EVENT_M01E07B_L002"), s_script_EVENT_M01E07B_L002 }, - [EVENT_M01E07B_L003] = { EVENT_M01E07B_L003, 10, _("EVENT_M01E07B_L003"), s_script_EVENT_M01E07B_L003 }, - [EVENT_M01E07B_L004] = { EVENT_M01E07B_L004, 10, _("EVENT_M01E07B_L004"), s_script_EVENT_M01E07B_L004 }, - [EVENT_M01E07B_L005] = { EVENT_M01E07B_L005, 10, _("EVENT_M01E07B_L005"), s_script_EVENT_M01E07B_L005 }, - [EVENT_M01E07B_T001] = { EVENT_M01E07B_T001, 10, _("EVENT_M01E07B_T001"), s_script_EVENT_M01E07B_T001 }, - [EVENT_M01E07B_T002] = { EVENT_M01E07B_T002, 10, _("EVENT_M01E07B_T002"), s_script_EVENT_M01E07B_T002 }, - [EVENT_M01E08A_L001] = { EVENT_M01E08A_L001, 10, _("EVENT_M01E08A_L001"), s_script_EVENT_M01E08A_L001 }, - [EVENT_M01E08A_L002] = { EVENT_M01E08A_L002, 10, _("EVENT_M01E08A_L002"), s_script_EVENT_M01E08A_L002 }, - [EVENT_M01E08A_L003] = { EVENT_M01E08A_L003, 10, _("EVENT_M01E08A_L003"), s_script_EVENT_M01E08A_L003 }, - [EVENT_M01E08A_L004] = { EVENT_M01E08A_L004, 10, _("EVENT_M01E08A_L004"), s_script_EVENT_M01E08A_L004 }, - [EVENT_M01E08A_L005] = { EVENT_M01E08A_L005, 10, _("EVENT_M01E08A_L005"), s_script_EVENT_M01E08A_L005 }, - [EVENT_M01E08A_T001] = { EVENT_M01E08A_T001, 10, _("EVENT_M01E08A_T001"), s_script_EVENT_M01E08A_T001 }, - [EVENT_M01E08A_T002] = { EVENT_M01E08A_T002, 10, _("EVENT_M01E08A_T002"), s_script_EVENT_M01E08A_T002 }, - [EVENT_M01E08B_L001] = { EVENT_M01E08B_L001, 10, _("EVENT_M01E08B_L001"), s_script_EVENT_M01E08B_L001 }, - [EVENT_M01E08B_L002] = { EVENT_M01E08B_L002, 10, _("EVENT_M01E08B_L002"), s_script_EVENT_M01E08B_L002 }, - [EVENT_M01E08B_L003] = { EVENT_M01E08B_L003, 10, _("EVENT_M01E08B_L003"), s_script_EVENT_M01E08B_L003 }, - [EVENT_M01E08B_L004] = { EVENT_M01E08B_L004, 10, _("EVENT_M01E08B_L004"), s_script_EVENT_M01E08B_L004 }, - [EVENT_M01E08B_L005] = { EVENT_M01E08B_L005, 10, _("EVENT_M01E08B_L005"), s_script_EVENT_M01E08B_L005 }, - [EVENT_M01E08B_L006] = { EVENT_M01E08B_L006, 10, _("EVENT_M01E08B_L006"), s_script_EVENT_M01E08B_L006 }, - [EVENT_M01E08B_T001] = { EVENT_M01E08B_T001, 10, _("EVENT_M01E08B_T001"), s_script_EVENT_M01E08B_T001 }, - [EVENT_M01E08B_T002] = { EVENT_M01E08B_T002, 10, _("EVENT_M01E08B_T002"), s_script_EVENT_M01E08B_T002 }, - [EVENT_M01E09A_L001] = { EVENT_M01E09A_L001, 10, _("EVENT_M01E09A_L001"), s_script_EVENT_M01E09A_L001 }, - [EVENT_M01E09A_L002] = { EVENT_M01E09A_L002, 10, _("EVENT_M01E09A_L002"), s_script_EVENT_M01E09A_L002 }, - [EVENT_M01E09A_L003] = { EVENT_M01E09A_L003, 10, _("EVENT_M01E09A_L003"), s_script_EVENT_M01E09A_L003 }, - [EVENT_M01E09A_L004] = { EVENT_M01E09A_L004, 10, _("EVENT_M01E09A_L004"), s_script_EVENT_M01E09A_L004 }, - [EVENT_M01E09A_L005] = { EVENT_M01E09A_L005, 10, _("EVENT_M01E09A_L005"), s_script_EVENT_M01E09A_L005 }, - [EVENT_M01E09A_L006] = { EVENT_M01E09A_L006, 10, _("EVENT_M01E09A_L006"), s_script_EVENT_M01E09A_L006 }, - [EVENT_M01E09A_L007] = { EVENT_M01E09A_L007, 10, _("EVENT_M01E09A_L007"), s_script_EVENT_M01E09A_L007 }, - [EVENT_M01E09A_L008] = { EVENT_M01E09A_L008, 10, _("EVENT_M01E09A_L008"), s_script_EVENT_M01E09A_L008 }, - [EVENT_M01E09A_L009] = { EVENT_M01E09A_L009, 10, _("EVENT_M01E09A_L009"), s_script_EVENT_M01E09A_L009 }, - [EVENT_M01E09A_L010] = { EVENT_M01E09A_L010, 10, _("EVENT_M01E09A_L010"), s_script_EVENT_M01E09A_L010 }, - [EVENT_M01E09A_L011] = { EVENT_M01E09A_L011, 10, _("EVENT_M01E09A_L011"), s_script_EVENT_M01E09A_L011 }, - [EVENT_M01E09A_L012] = { EVENT_M01E09A_L012, 10, _("EVENT_M01E09A_L012"), s_script_EVENT_M01E09A_L012 }, - [EVENT_M01E09A_L013] = { EVENT_M01E09A_L013, 10, _("EVENT_M01E09A_L013"), s_script_EVENT_M01E09A_L013 }, - [EVENT_M01E09A_L014] = { EVENT_M01E09A_L014, 10, _("EVENT_M01E09A_L014"), s_script_EVENT_M01E09A_L014 }, - [EVENT_M01E09A_L015] = { EVENT_M01E09A_L015, 10, _("EVENT_M01E09A_L015"), s_script_EVENT_M01E09A_L015 }, - [EVENT_M01E10A_L001] = { EVENT_M01E10A_L001, 10, _("EVENT_M01E10A_L001"), s_script_EVENT_M01E10A_L001 }, - [EVENT_M01E10A_L002] = { EVENT_M01E10A_L002, 10, _("EVENT_M01E10A_L002"), s_script_EVENT_M01E10A_L002 }, - [EVENT_M01E10A_L003] = { EVENT_M01E10A_L003, 10, _("EVENT_M01E10A_L003"), s_script_EVENT_M01E10A_L003 }, - [EVENT_M01E10A_L004] = { EVENT_M01E10A_L004, 10, _("EVENT_M01E10A_L004"), s_script_EVENT_M01E10A_L004 }, - [EVENT_M01E10A_L005] = { EVENT_M01E10A_L005, 10, _("EVENT_M01E10A_L005"), s_script_EVENT_M01E10A_L005 }, - [EVENT_M01E10A_L006] = { EVENT_M01E10A_L006, 10, _("EVENT_M01E10A_L006"), s_script_EVENT_M01E10A_L006 }, - [EVENT_M01E10A_L007] = { EVENT_M01E10A_L007, 10, _("EVENT_M01E10A_L007"), s_script_EVENT_M01E10A_L007 }, - [EVENT_M01E10A_L008] = { EVENT_M01E10A_L008, 10, _("EVENT_M01E10A_L008"), s_script_EVENT_M01E10A_L008 }, - [EVENT_M01END_L001] = { EVENT_M01END_L001, 10, _("EVENT_M01END_L001"), s_script_EVENT_M01END_L001 }, - [EVENT_M01END_L002] = { EVENT_M01END_L002, 10, _("EVENT_M01END_L002"), s_script_EVENT_M01END_L002 }, - [EVENT_M02E01A_L001] = { EVENT_M02E01A_L001, 10, _("EVENT_M02E01A_L001"), s_script_EVENT_M02E01A_L001 }, - [EVENT_M02E01A_L002] = { EVENT_M02E01A_L002, 10, _("EVENT_M02E01A_L002"), s_script_EVENT_M02E01A_L002 }, - [EVENT_M02E01A_L003] = { EVENT_M02E01A_L003, 10, _("EVENT_M02E01A_L003"), s_script_EVENT_M02E01A_L003 }, - [EVENT_M02E02A_L001] = { EVENT_M02E02A_L001, 10, _("EVENT_M02E02A_L001"), s_script_EVENT_M02E02A_L001 }, - [EVENT_M02E02B_L001] = { EVENT_M02E02B_L001, 10, _("EVENT_M02E02B_L001"), s_script_EVENT_M02E02B_L001 }, - [EVENT_M02E02C_L001] = { EVENT_M02E02C_L001, 10, _("EVENT_M02E02C_L001"), s_script_EVENT_M02E02C_L001 }, - [EVENT_M02E02D_L001] = { EVENT_M02E02D_L001, 10, _("EVENT_M02E02D_L001"), s_script_EVENT_M02E02D_L001 }, - [EVENT_M02E02E_L001] = { EVENT_M02E02E_L001, 10, _("EVENT_M02E02E_L001"), s_script_EVENT_M02E02E_L001 }, - [EVENT_M02E02F_L001] = { EVENT_M02E02F_L001, 10, _("EVENT_M02E02F_L001"), s_script_EVENT_M02E02F_L001 }, - [EVENT_M02E02G_L001] = { EVENT_M02E02G_L001, 10, _("EVENT_M02E02G_L001"), s_script_EVENT_M02E02G_L001 }, - [EVENT_M02E02H_L001] = { EVENT_M02E02H_L001, 10, _("EVENT_M02E02H_L001"), s_script_EVENT_M02E02H_L001 }, - [EVENT_M02END_L001] = { EVENT_M02END_L001, 10, _("EVENT_M02END_L001"), s_script_EVENT_M02END_L001 }, - [EVENT_S00E01A_L001] = { EVENT_S00E01A_L001, 10, _("EVENT_S00E01A_L001"), s_script_EVENT_S00E01A_L001 }, - [EVENT_S00E01A_L002] = { EVENT_S00E01A_L002, 10, _("EVENT_S00E01A_L002"), s_script_EVENT_S00E01A_L002 }, - [EVENT_S00E01A_L003] = { EVENT_S00E01A_L003, 10, _("EVENT_S00E01A_L003"), s_script_EVENT_S00E01A_L003 }, - [EVENT_S00E01A_L004] = { EVENT_S00E01A_L004, 10, _("EVENT_S00E01A_L004"), s_script_EVENT_S00E01A_L004 }, - [EVENT_S01E01A_START] = { EVENT_S01E01A_START, 11, _("EVENT_S01E01A_START"), s_script_EVENT_S01E01A_START }, - [EVENT_S01E01A_CONTINUE] = { EVENT_S01E01A_CONTINUE, 11, _("EVENT_S01E01A_CONTINUE"), s_script_EVENT_S01E01A_CONTINUE }, - [EVENT_S01E01A_END] = { EVENT_S01E01A_END, 11, _("EVENT_S01E01A_END"), s_script_EVENT_S01E01A_END }, - [EVENT_S01E01A_L001] = { EVENT_S01E01A_L001, 12, _("EVENT_S01E01A_L001"), s_script_EVENT_S01E01A_L001 }, - [EVENT_S01E01A_L002] = { EVENT_S01E01A_L002, 10, _("EVENT_S01E01A_L002"), s_script_EVENT_S01E01A_L002 }, - [EVENT_S01E01A_L003] = { EVENT_S01E01A_L003, 10, _("EVENT_S01E01A_L003"), s_script_EVENT_S01E01A_L003 }, - [EVENT_S01E01B_L001] = { EVENT_S01E01B_L001, 10, _("EVENT_S01E01B_L001"), s_script_EVENT_S01E01B_L001 }, - [EVENT_S01E01B_L001L] = { EVENT_S01E01B_L001L, 12, _("EVENT_S01E01B_L001L"), s_script_EVENT_S01E01B_L001L }, - [EVENT_S01E01C_L001] = { EVENT_S01E01C_L001, 10, _("EVENT_S01E01C_L001"), s_script_EVENT_S01E01C_L001 }, - [EVENT_S01E02A_START] = { EVENT_S01E02A_START, 11, _("EVENT_S01E02A_START"), s_script_EVENT_S01E02A_START }, - [EVENT_S01E02A_END] = { EVENT_S01E02A_END, 11, _("EVENT_S01E02A_END"), s_script_EVENT_S01E02A_END }, - [EVENT_S01E02A_L001] = { EVENT_S01E02A_L001, 10, _("EVENT_S01E02A_L001"), s_script_EVENT_S01E02A_L001 }, - [EVENT_S01E02A_L002] = { EVENT_S01E02A_L002, 10, _("EVENT_S01E02A_L002"), s_script_EVENT_S01E02A_L002 }, - [EVENT_S01E02A_L002L] = { EVENT_S01E02A_L002L, 12, _("EVENT_S01E02A_L002L"), s_script_EVENT_S01E02A_L002L }, - [EVENT_S01E02B_L001] = { EVENT_S01E02B_L001, 12, _("EVENT_S01E02B_L001"), s_script_EVENT_S01E02B_L001 }, - [EVENT_S01E02B_L002] = { EVENT_S01E02B_L002, 12, _("EVENT_S01E02B_L002"), s_script_EVENT_S01E02B_L002 }, - [EVENT_S02E01A_START] = { EVENT_S02E01A_START, 11, _("EVENT_S02E01A_START"), s_script_EVENT_S02E01A_START }, - [EVENT_S02E01A_END] = { EVENT_S02E01A_END, 11, _("EVENT_S02E01A_END"), s_script_EVENT_S02E01A_END }, - [EVENT_S02E01A_L001] = { EVENT_S02E01A_L001, 12, _("EVENT_S02E01A_L001"), s_script_EVENT_S02E01A_L001 }, - [EVENT_S02E01A_L002] = { EVENT_S02E01A_L002, 12, _("EVENT_S02E01A_L002"), s_script_EVENT_S02E01A_L002 }, - [EVENT_S02E01A_L003] = { EVENT_S02E01A_L003, 12, _("EVENT_S02E01A_L003"), s_script_EVENT_S02E01A_L003 }, - [EVENT_S02E01A_L004] = { EVENT_S02E01A_L004, 12, _("EVENT_S02E01A_L004"), s_script_EVENT_S02E01A_L004 }, - [EVENT_S02E01A_L004L] = { EVENT_S02E01A_L004L, 12, _("EVENT_S02E01A_L004L"), s_script_EVENT_S02E01A_L004L }, - [EVENT_S02E02A_START] = { EVENT_S02E02A_START, 11, _("EVENT_S02E02A_START"), s_script_EVENT_S02E02A_START }, - [EVENT_S02E02A_END] = { EVENT_S02E02A_END, 11, _("EVENT_S02E02A_END"), s_script_EVENT_S02E02A_END }, - [EVENT_S02E02A_L001] = { EVENT_S02E02A_L001, 12, _("EVENT_S02E02A_L001"), s_script_EVENT_S02E02A_L001 }, - [EVENT_S02E02A_L002] = { EVENT_S02E02A_L002, 10, _("EVENT_S02E02A_L002"), s_script_EVENT_S02E02A_L002 }, - [EVENT_S02E02A_L003] = { EVENT_S02E02A_L003, 12, _("EVENT_S02E02A_L003"), s_script_EVENT_S02E02A_L003 }, - [EVENT_S02E02A_L003L] = { EVENT_S02E02A_L003L, 12, _("EVENT_S02E02A_L003L"), s_script_EVENT_S02E02A_L003L }, - [EVENT_S03E01A_START] = { EVENT_S03E01A_START, 11, _("EVENT_S03E01A_START"), s_script_EVENT_S03E01A_START }, - [EVENT_S03E01A_CONTINUE] = { EVENT_S03E01A_CONTINUE, 11, _("EVENT_S03E01A_CONTINUE"), s_script_EVENT_S03E01A_CONTINUE }, - [EVENT_S03E01A_END] = { EVENT_S03E01A_END, 11, _("EVENT_S03E01A_END"), s_script_EVENT_S03E01A_END }, - [EVENT_S03E01A_L001] = { EVENT_S03E01A_L001, 10, _("EVENT_S03E01A_L001"), s_script_EVENT_S03E01A_L001 }, - [EVENT_S03E01A_L002] = { EVENT_S03E01A_L002, 12, _("EVENT_S03E01A_L002"), s_script_EVENT_S03E01A_L002 }, - [EVENT_S03E01A_L002L] = { EVENT_S03E01A_L002L, 12, _("EVENT_S03E01A_L002L"), s_script_EVENT_S03E01A_L002L }, - [EVENT_S04E01A_START] = { EVENT_S04E01A_START, 11, _("EVENT_S04E01A_START"), s_script_EVENT_S04E01A_START }, - [EVENT_S04E01A_LAST] = { EVENT_S04E01A_LAST, 11, _("EVENT_S04E01A_LAST"), s_script_EVENT_S04E01A_LAST }, - [EVENT_S04E01A_END] = { EVENT_S04E01A_END, 11, _("EVENT_S04E01A_END"), s_script_EVENT_S04E01A_END }, - [EVENT_S04E01A_L001] = { EVENT_S04E01A_L001, 10, _("EVENT_S04E01A_L001"), s_script_EVENT_S04E01A_L001 }, - [EVENT_S04E01A_L002] = { EVENT_S04E01A_L002, 10, _("EVENT_S04E01A_L002"), s_script_EVENT_S04E01A_L002 }, - [EVENT_S04E01A_L002L] = { EVENT_S04E01A_L002L, 12, _("EVENT_S04E01A_L002L"), s_script_EVENT_S04E01A_L002L }, - [EVENT_S04E01B_L001] = { EVENT_S04E01B_L001, 10, _("EVENT_S04E01B_L001"), s_script_EVENT_S04E01B_L001 }, - [EVENT_S04E01B_L001L] = { EVENT_S04E01B_L001L, 12, _("EVENT_S04E01B_L001L"), s_script_EVENT_S04E01B_L001L }, - [EVENT_S04E01C_L001] = { EVENT_S04E01C_L001, 10, _("EVENT_S04E01C_L001"), s_script_EVENT_S04E01C_L001 }, - [EVENT_S04E01C_L001L] = { EVENT_S04E01C_L001L, 12, _("EVENT_S04E01C_L001L"), s_script_EVENT_S04E01C_L001L }, - [EVENT_S04E01D_L001] = { EVENT_S04E01D_L001, 10, _("EVENT_S04E01D_L001"), s_script_EVENT_S04E01D_L001 }, - [EVENT_S04E01D_L001L] = { EVENT_S04E01D_L001L, 12, _("EVENT_S04E01D_L001L"), s_script_EVENT_S04E01D_L001L }, - [EVENT_S04E01E_L001] = { EVENT_S04E01E_L001, 10, _("EVENT_S04E01E_L001"), s_script_EVENT_S04E01E_L001 }, - [EVENT_S04E01E_L001L] = { EVENT_S04E01E_L001L, 12, _("EVENT_S04E01E_L001L"), s_script_EVENT_S04E01E_L001L }, - [EVENT_S04E01F_L001] = { EVENT_S04E01F_L001, 12, _("EVENT_S04E01F_L001"), s_script_EVENT_S04E01F_L001 }, - [EVENT_S05E01A_START] = { EVENT_S05E01A_START, 11, _("EVENT_S05E01A_START"), s_script_EVENT_S05E01A_START }, - [EVENT_S05E01A_CONTINUE] = { EVENT_S05E01A_CONTINUE, 11, _("EVENT_S05E01A_CONTINUE"), s_script_EVENT_S05E01A_CONTINUE }, - [EVENT_S05E01A_END] = { EVENT_S05E01A_END, 11, _("EVENT_S05E01A_END"), s_script_EVENT_S05E01A_END }, - [EVENT_S05E01A_L001] = { EVENT_S05E01A_L001, 10, _("EVENT_S05E01A_L001"), s_script_EVENT_S05E01A_L001 }, - [EVENT_S05E01A_L002] = { EVENT_S05E01A_L002, 12, _("EVENT_S05E01A_L002"), s_script_EVENT_S05E01A_L002 }, - [EVENT_S05E01A_L002L] = { EVENT_S05E01A_L002L, 12, _("EVENT_S05E01A_L002L"), s_script_EVENT_S05E01A_L002L }, - [EVENT_S06E01A_START] = { EVENT_S06E01A_START, 11, _("EVENT_S06E01A_START"), s_script_EVENT_S06E01A_START }, - [EVENT_S06E01A_CONTINUE] = { EVENT_S06E01A_CONTINUE, 11, _("EVENT_S06E01A_CONTINUE"), s_script_EVENT_S06E01A_CONTINUE }, - [EVENT_S06E01A_END] = { EVENT_S06E01A_END, 11, _("EVENT_S06E01A_END"), s_script_EVENT_S06E01A_END }, - [EVENT_S06E01A_L001] = { EVENT_S06E01A_L001, 10, _("EVENT_S06E01A_L001"), s_script_EVENT_S06E01A_L001 }, - [EVENT_S06E01A_L002] = { EVENT_S06E01A_L002, 10, _("EVENT_S06E01A_L002"), s_script_EVENT_S06E01A_L002 }, - [EVENT_S06E01A_L002L] = { EVENT_S06E01A_L002L, 12, _("EVENT_S06E01A_L002L"), s_script_EVENT_S06E01A_L002L }, - [EVENT_S06E01B_L001] = { EVENT_S06E01B_L001, 10, _("EVENT_S06E01B_L001"), s_script_EVENT_S06E01B_L001 }, - [EVENT_S06E01B_L002] = { EVENT_S06E01B_L002, 10, _("EVENT_S06E01B_L002"), s_script_EVENT_S06E01B_L002 }, - [EVENT_S06E01B_L002L] = { EVENT_S06E01B_L002L, 12, _("EVENT_S06E01B_L002L"), s_script_EVENT_S06E01B_L002L }, - [EVENT_S07E01A_START] = { EVENT_S07E01A_START, 11, _("EVENT_S07E01A_START"), s_script_EVENT_S07E01A_START }, - [EVENT_S07E01A_END] = { EVENT_S07E01A_END, 11, _("EVENT_S07E01A_END"), s_script_EVENT_S07E01A_END }, - [EVENT_S07E01A_L001] = { EVENT_S07E01A_L001, 12, _("EVENT_S07E01A_L001"), s_script_EVENT_S07E01A_L001 }, - [EVENT_S07E01A_L002] = { EVENT_S07E01A_L002, 12, _("EVENT_S07E01A_L002"), s_script_EVENT_S07E01A_L002 }, - [EVENT_S07E01A_L003] = { EVENT_S07E01A_L003, 12, _("EVENT_S07E01A_L003"), s_script_EVENT_S07E01A_L003 }, - [EVENT_S07E01A_L003L] = { EVENT_S07E01A_L003L, 12, _("EVENT_S07E01A_L003L"), s_script_EVENT_S07E01A_L003L }, - [EVENT_S08E01A_START] = { EVENT_S08E01A_START, 11, _("EVENT_S08E01A_START"), s_script_EVENT_S08E01A_START }, - [EVENT_S08E01A_END] = { EVENT_S08E01A_END, 11, _("EVENT_S08E01A_END"), s_script_EVENT_S08E01A_END }, - [EVENT_S08E01A_L001] = { EVENT_S08E01A_L001, 12, _("EVENT_S08E01A_L001"), s_script_EVENT_S08E01A_L001 }, - [EVENT_S08E01A_L002] = { EVENT_S08E01A_L002, 12, _("EVENT_S08E01A_L002"), s_script_EVENT_S08E01A_L002 }, - [EVENT_S08E01A_L003] = { EVENT_S08E01A_L003, 12, _("EVENT_S08E01A_L003"), s_script_EVENT_S08E01A_L003 }, - [EVENT_S08E01A_L004] = { EVENT_S08E01A_L004, 12, _("EVENT_S08E01A_L004"), s_script_EVENT_S08E01A_L004 }, - [EVENT_S08E01A_L005] = { EVENT_S08E01A_L005, 12, _("EVENT_S08E01A_L005"), s_script_EVENT_S08E01A_L005 }, - [EVENT_S08E01A_L005B] = { EVENT_S08E01A_L005B, 10, _("EVENT_S08E01A_L005B"), s_script_EVENT_S08E01A_L005B }, - [EVENT_S08E01A_L006] = { EVENT_S08E01A_L006, 10, _("EVENT_S08E01A_L006"), s_script_EVENT_S08E01A_L006 }, - [EVENT_S08E01A_L006L] = { EVENT_S08E01A_L006L, 12, _("EVENT_S08E01A_L006L"), s_script_EVENT_S08E01A_L006L }, - [EVENT_S08E01A_L007] = { EVENT_S08E01A_L007, 12, _("EVENT_S08E01A_L007"), s_script_EVENT_S08E01A_L007 }, - [EVENT_S08E01A_L008] = { EVENT_S08E01A_L008, 10, _("EVENT_S08E01A_L008"), s_script_EVENT_S08E01A_L008 }, - [EVENT_S08E01A_L008L] = { EVENT_S08E01A_L008L, 12, _("EVENT_S08E01A_L008L"), s_script_EVENT_S08E01A_L008L }, - [EVENT_S08E01A_L008A] = { EVENT_S08E01A_L008A, 10, _("EVENT_S08E01A_L008A"), s_script_EVENT_S08E01A_L008A }, - [EVENT_S08E01A_L008B] = { EVENT_S08E01A_L008B, 10, _("EVENT_S08E01A_L008B"), s_script_EVENT_S08E01A_L008B }, - [EVENT_S08E01A_L008C] = { EVENT_S08E01A_L008C, 10, _("EVENT_S08E01A_L008C"), s_script_EVENT_S08E01A_L008C }, - [EVENT_S09E01A_START] = { EVENT_S09E01A_START, 11, _("EVENT_S09E01A_START"), s_script_EVENT_S09E01A_START }, - [EVENT_S09E01A_END] = { EVENT_S09E01A_END, 11, _("EVENT_S09E01A_END"), s_script_EVENT_S09E01A_END }, - [EVENT_S09E01A_L001] = { EVENT_S09E01A_L001, 12, _("EVENT_S09E01A_L001"), s_script_EVENT_S09E01A_L001 }, - [EVENT_S09E01A_L002] = { EVENT_S09E01A_L002, 12, _("EVENT_S09E01A_L002"), s_script_EVENT_S09E01A_L002 }, - [EVENT_S09E01A_L003] = { EVENT_S09E01A_L003, 12, _("EVENT_S09E01A_L003"), s_script_EVENT_S09E01A_L003 }, - [EVENT_S09E01A_L004] = { EVENT_S09E01A_L004, 10, _("EVENT_S09E01A_L004"), s_script_EVENT_S09E01A_L004 }, - [EVENT_S09E01A_L004B] = { EVENT_S09E01A_L004B, 10, _("EVENT_S09E01A_L004B"), s_script_EVENT_S09E01A_L004B }, - [EVENT_S09E01A_L005] = { EVENT_S09E01A_L005, 10, _("EVENT_S09E01A_L005"), s_script_EVENT_S09E01A_L005 }, - [EVENT_S09E01A_L005L] = { EVENT_S09E01A_L005L, 12, _("EVENT_S09E01A_L005L"), s_script_EVENT_S09E01A_L005L }, - [EVENT_S09E01B_L001] = { EVENT_S09E01B_L001, 10, _("EVENT_S09E01B_L001"), s_script_EVENT_S09E01B_L001 }, - [EVENT_S09E01B_L001B] = { EVENT_S09E01B_L001B, 10, _("EVENT_S09E01B_L001B"), s_script_EVENT_S09E01B_L001B }, - [EVENT_S09E01B_L002] = { EVENT_S09E01B_L002, 10, _("EVENT_S09E01B_L002"), s_script_EVENT_S09E01B_L002 }, - [EVENT_S09E01B_L002L] = { EVENT_S09E01B_L002L, 12, _("EVENT_S09E01B_L002L"), s_script_EVENT_S09E01B_L002L }, - [EVENT_S09E01C_L001] = { EVENT_S09E01C_L001, 12, _("EVENT_S09E01C_L001"), s_script_EVENT_S09E01C_L001 }, - [EVENT_R00E01A_L001] = { EVENT_R00E01A_L001, 7, _("EVENT_R00E01A_L001"), s_script_EVENT_R00E01A_L001 }, - [COMMON_ENTER] = { COMMON_ENTER, 1, _("COMMON_ENTER"), s_script_COMMON_ENTER }, - [DEBUG_ENTER] = { DEBUG_ENTER, 1, _("DEBUG_ENTER"), s_script_DEBUG_ENTER }, - [GETOUT_NORMAL] = { GETOUT_NORMAL, 2, _("GETOUT_NORMAL"), NULL }, - [GETOUT_HABITAT] = { GETOUT_HABITAT, 2, _("GETOUT_HABITAT"), s_script_GETOUT_HABITAT }, - [GETOUT_M01E01A] = { GETOUT_M01E01A, 2, _("GETOUT_M01E01A"), s_script_GETOUT_M01E01A }, - [GETOUT_M01E02A] = { GETOUT_M01E02A, 2, _("GETOUT_M01E02A"), s_script_GETOUT_M01E02A }, - [GETOUT_M01E02B] = { GETOUT_M01E02B, 2, _("GETOUT_M01E02B"), s_script_GETOUT_M01E02B }, - [GETOUT_M01E03A] = { GETOUT_M01E03A, 2, _("GETOUT_M01E03A"), s_script_GETOUT_M01E03A }, - [GETOUT_M01E04A] = { GETOUT_M01E04A, 2, _("GETOUT_M01E04A"), s_script_GETOUT_M01E04A }, - [GETOUT_M01E04B] = { GETOUT_M01E04B, 2, _("GETOUT_M01E04B"), s_script_GETOUT_M01E04B }, - [GETOUT_M01E05A] = { GETOUT_M01E05A, 2, _("GETOUT_M01E05A"), s_script_GETOUT_M01E05A }, - [GETOUT_M01E07A] = { GETOUT_M01E07A, 2, _("GETOUT_M01E07A"), s_script_GETOUT_M01E07A }, - [GETOUT_M01E07B] = { GETOUT_M01E07B, 2, _("GETOUT_M01E07B"), s_script_GETOUT_M01E07B }, - [GETOUT_M01E08A] = { GETOUT_M01E08A, 2, _("GETOUT_M01E08A"), s_script_GETOUT_M01E08A }, - [GETOUT_M01E08B] = { GETOUT_M01E08B, 2, _("GETOUT_M01E08B"), s_script_GETOUT_M01E08B }, - [GETOUT_M01E09A] = { GETOUT_M01E09A, 2, _("GETOUT_M01E09A"), s_script_GETOUT_M01E09A }, - [GETOUT_M01E10A] = { GETOUT_M01E10A, 2, _("GETOUT_M01E10A"), s_script_GETOUT_M01E10A }, - [GETOUT_S00E01A] = { GETOUT_S00E01A, 2, _("GETOUT_S00E01A"), s_script_GETOUT_S00E01A }, - [GETOUT_S01E01A] = { GETOUT_S01E01A, 2, _("GETOUT_S01E01A"), s_script_GETOUT_S01E01A }, - [GETOUT_S01E02A] = { GETOUT_S01E02A, 2, _("GETOUT_S01E02A"), s_script_GETOUT_S01E02A }, - [GETOUT_S02E01A] = { GETOUT_S02E01A, 2, _("GETOUT_S02E01A"), s_script_GETOUT_S02E01A }, - [GETOUT_S02E02A] = { GETOUT_S02E02A, 2, _("GETOUT_S02E02A"), s_script_GETOUT_S02E02A }, - [GETOUT_S03E01A] = { GETOUT_S03E01A, 2, _("GETOUT_S03E01A"), s_script_GETOUT_S03E01A }, - [GETOUT_S04E01A] = { GETOUT_S04E01A, 2, _("GETOUT_S04E01A"), s_script_GETOUT_S04E01A }, - [GETOUT_S04E01B] = { GETOUT_S04E01B, 2, _("GETOUT_S04E01B"), s_script_GETOUT_S04E01B }, - [GETOUT_S04E01C] = { GETOUT_S04E01C, 2, _("GETOUT_S04E01C"), s_script_GETOUT_S04E01C }, - [GETOUT_S04E01D] = { GETOUT_S04E01D, 2, _("GETOUT_S04E01D"), s_script_GETOUT_S04E01D }, - [GETOUT_S04E01E] = { GETOUT_S04E01E, 2, _("GETOUT_S04E01E"), s_script_GETOUT_S04E01E }, - [GETOUT_S05E01A] = { GETOUT_S05E01A, 2, _("GETOUT_S05E01A"), s_script_GETOUT_S05E01A }, - [GETOUT_S06E01A] = { GETOUT_S06E01A, 2, _("GETOUT_S06E01A"), s_script_GETOUT_S06E01A }, - [GETOUT_S06E01B] = { GETOUT_S06E01B, 2, _("GETOUT_S06E01B"), s_script_GETOUT_S06E01B }, - [GETOUT_S07E01A] = { GETOUT_S07E01A, 2, _("GETOUT_S07E01A"), s_script_GETOUT_S07E01A }, - [GETOUT_S08E01A] = { GETOUT_S08E01A, 2, _("GETOUT_S08E01A"), s_script_GETOUT_S08E01A }, - [GETOUT_S09E01A] = { GETOUT_S09E01A, 2, _("GETOUT_S09E01A"), s_script_GETOUT_S09E01A }, - [GETOUT_S09E01B] = { GETOUT_S09E01B, 2, _("GETOUT_S09E01B"), s_script_GETOUT_S09E01B }, - [GETOUT_D62E01A] = { GETOUT_D62E01A, 2, _("GETOUT_D62E01A"), s_script_GETOUT_D62E01A }, - [GETOUT_D43E01A] = { GETOUT_D43E01A, 2, _("GETOUT_D43E01A"), s_script_GETOUT_D43E01A }, - [GETOUT_D44E01A] = { GETOUT_D44E01A, 2, _("GETOUT_D44E01A"), s_script_GETOUT_D44E01A }, - [GETOUT_D45E01A] = { GETOUT_D45E01A, 2, _("GETOUT_D45E01A"), s_script_GETOUT_D45E01A }, - [GETOUT_D46E01A] = { GETOUT_D46E01A, 2, _("GETOUT_D46E01A"), s_script_GETOUT_D46E01A }, - [GETOUT_U00E01A] = { GETOUT_U00E01A, 2, _("GETOUT_U00E01A"), s_script_GETOUT_U00E01A }, - [GETOUT_R00E01A] = { GETOUT_R00E01A, 2, _("GETOUT_R00E01A"), s_script_GETOUT_R00E01A }, - [GETOUT_T00E01A] = { GETOUT_T00E01A, 2, _("GETOUT_T00E01A"), s_script_GETOUT_T00E01A }, - [GETOUT_M01E07T] = { GETOUT_M01E07T, 2, _("GETOUT_M01E07T"), s_script_GETOUT_M01E07T }, - [GETOUT_M01E08T] = { GETOUT_M01E08T, 2, _("GETOUT_M01E08T"), s_script_GETOUT_M01E08T }, - [EVENT_CONTROL] = { EVENT_CONTROL, 7, _("EVENT_CONTROL"), NULL }, - [EVENT_WAKEUP] = { EVENT_WAKEUP, 7, _("EVENT_WAKEUP"), NULL }, - [EVENT_STATION] = { EVENT_STATION, 7, _("EVENT_STATION"), NULL }, - [STATION_CONTROL] = { STATION_CONTROL, 8, _("STATION_CONTROL"), NULL }, - [ENTER_CONTROL] = { ENTER_CONTROL, 1, _("ENTER_CONTROL"), NULL }, - [SETUP_DEBUG_CAMERA] = { SETUP_DEBUG_CAMERA, 7, _("SETUP_DEBUG_CAMERA"), s_script_SETUP_DEBUG_CAMERA }, - [MOVE_DEBUG_CAMERA] = { MOVE_DEBUG_CAMERA, 5, _("MOVE_DEBUG_CAMERA"), s_script_MOVE_DEBUG_CAMERA }, +// R = 0x812F1F8 | B = arm9.bin::020E7BE4 +const ScriptRef gFunctionScriptTable[NUM_SCRIPT_IDS] = { + [END_TALK] = { END_TALK, SCRIPT_TYPE_04, _("END_TALK"), s_script_END_TALK }, + [WAIT_END_TALK_FUNC] = { WAIT_END_TALK_FUNC, SCRIPT_TYPE_04, _("WAIT_END_TALK_FUNC"), s_script_WAIT_END_TALK_FUNC }, + [WAIT_END_EVENT_FUNC] = { WAIT_END_EVENT_FUNC, SCRIPT_TYPE_04, _("WAIT_END_EVENT_FUNC"), s_script_WAIT_END_EVENT_FUNC }, + [WAIT_START_FUNC] = { WAIT_START_FUNC, SCRIPT_TYPE_04, _("WAIT_START_FUNC"), s_script_WAIT_START_FUNC }, + [INCOMPLETE_TALK] = { INCOMPLETE_TALK, SCRIPT_TYPE_04, _("INCOMPLETE_TALK"), s_script_INCOMPLETE_TALK }, + [NORMAL_WAIT_END_TALK] = { NORMAL_WAIT_END_TALK, SCRIPT_TYPE_04, _("NORMAL_WAIT_END_TALK"), s_script_NORMAL_WAIT_END_TALK }, + [LIVES_REPLY_NORMAL] = { LIVES_REPLY_NORMAL, SCRIPT_TYPE_04, _("LIVES_REPLY_NORMAL"), s_script_LIVES_REPLY_NORMAL }, + [LIVES_REPLY] = { LIVES_REPLY, SCRIPT_TYPE_04, _("LIVES_REPLY"), s_script_LIVES_REPLY }, + [OBJECT_REPLY_NORMAL] = { OBJECT_REPLY_NORMAL, SCRIPT_TYPE_04, _("OBJECT_REPLY_NORMAL"), s_script_OBJECT_REPLY_NORMAL }, + [EXAMINE_MISS] = { EXAMINE_MISS, SCRIPT_TYPE_04, _("EXAMINE_MISS"), s_script_EXAMINE_MISS }, + [ENTER_WAIT_FUNC] = { ENTER_WAIT_FUNC, SCRIPT_TYPE_04, _("ENTER_WAIT_FUNC"), s_script_ENTER_WAIT_FUNC }, + [UNIT_TALK] = { UNIT_TALK, SCRIPT_TYPE_04, _("UNIT_TALK"), s_script_UNIT_TALK }, + [HABITAT_TALK] = { HABITAT_TALK, SCRIPT_TYPE_04, _("HABITAT_TALK"), s_script_HABITAT_TALK }, + [HABITAT_TALK_S01E02A] = { HABITAT_TALK_S01E02A, SCRIPT_TYPE_04, _("HABITAT_TALK_S01E02A"), s_script_HABITAT_TALK_S01E02A }, + [HABITAT_MOVE1] = { HABITAT_MOVE1, SCRIPT_TYPE_05, _("HABITAT_MOVE1"), s_script_HABITAT_MOVE1 }, + [HABITAT_MOVE2] = { HABITAT_MOVE2, SCRIPT_TYPE_05, _("HABITAT_MOVE2"), s_script_HABITAT_MOVE2 }, + [HABITAT_MOVE_PAUSE] = { HABITAT_MOVE_PAUSE, SCRIPT_TYPE_05, _("HABITAT_MOVE_PAUSE"), s_script_HABITAT_MOVE_PAUSE }, + [HABITAT_MOVE_STAY_FIX] = { HABITAT_MOVE_STAY_FIX, SCRIPT_TYPE_05, _("HABITAT_MOVE_STAY_FIX"), s_script_HABITAT_MOVE_STAY_FIX }, + [HABITAT_MOVE_STAY_TURN] = { HABITAT_MOVE_STAY_TURN, SCRIPT_TYPE_05, _("HABITAT_MOVE_STAY_TURN"), s_script_HABITAT_MOVE_STAY_TURN }, + [LIVES_MOVE_NORMAL] = { LIVES_MOVE_NORMAL, SCRIPT_TYPE_05, _("LIVES_MOVE_NORMAL"), s_script_LIVES_MOVE_NORMAL }, + [LIVES_MOVE_CHANGE] = { LIVES_MOVE_CHANGE, SCRIPT_TYPE_05, _("LIVES_MOVE_CHANGE"), s_script_LIVES_MOVE_CHANGE }, + [OBJECT_MOVE_NORMAL] = { OBJECT_MOVE_NORMAL, SCRIPT_TYPE_05, _("OBJECT_MOVE_NORMAL"), s_script_OBJECT_MOVE_NORMAL }, + [OBJECT_MOVE_CHANGE] = { OBJECT_MOVE_CHANGE, SCRIPT_TYPE_05, _("OBJECT_MOVE_CHANGE"), s_script_OBJECT_MOVE_CHANGE }, + [EFFECT_MOVE_NORMAL] = { EFFECT_MOVE_NORMAL, SCRIPT_TYPE_05, _("EFFECT_MOVE_NORMAL"), s_script_EFFECT_MOVE_NORMAL }, + [EFFECT_MOVE_CHANGE] = { EFFECT_MOVE_CHANGE, SCRIPT_TYPE_05, _("EFFECT_MOVE_CHANGE"), s_script_EFFECT_MOVE_CHANGE }, + [MOVE_INIT] = { MOVE_INIT, SCRIPT_TYPE_05, _("MOVE_INIT"), s_script_MOVE_INIT }, + [MOVE_PAUSE] = { MOVE_PAUSE, SCRIPT_TYPE_05, _("MOVE_PAUSE"), s_script_MOVE_PAUSE }, + [MOVE_STAY] = { MOVE_STAY, SCRIPT_TYPE_05, _("MOVE_STAY"), s_script_MOVE_STAY }, + [MOVE_SLEEP] = { MOVE_SLEEP, SCRIPT_TYPE_05, _("MOVE_SLEEP"), s_script_MOVE_SLEEP }, + [MOVE_RANDOM] = { MOVE_RANDOM, SCRIPT_TYPE_05, _("MOVE_RANDOM"), s_script_MOVE_RANDOM }, + [MOVE_BOY] = { MOVE_BOY, SCRIPT_TYPE_05, _("MOVE_BOY"), s_script_MOVE_BOY }, + [MOVE_GIRL] = { MOVE_GIRL, SCRIPT_TYPE_05, _("MOVE_GIRL"), s_script_MOVE_GIRL }, + [WAKEUP_FUNC] = { WAKEUP_FUNC, SCRIPT_TYPE_09, _("WAKEUP_FUNC"), s_script_WAKEUP_FUNC }, + [LOOK_AROUND_FUNC] = { LOOK_AROUND_FUNC, SCRIPT_TYPE_09, _("LOOK_AROUND_FUNC"), s_script_LOOK_AROUND_FUNC }, + [LOOK_AROUND_DOWN_FUNC] = { LOOK_AROUND_DOWN_FUNC, SCRIPT_TYPE_09, _("LOOK_AROUND_DOWN_FUNC"), s_script_LOOK_AROUND_DOWN_FUNC }, + [LOOK_AROUND_RIGHT_FUNC] = { LOOK_AROUND_RIGHT_FUNC, SCRIPT_TYPE_09, _("LOOK_AROUND_RIGHT_FUNC"), s_script_LOOK_AROUND_RIGHT_FUNC }, + [LOOK_AROUND_LEFT_FUNC] = { LOOK_AROUND_LEFT_FUNC, SCRIPT_TYPE_09, _("LOOK_AROUND_LEFT_FUNC"), s_script_LOOK_AROUND_LEFT_FUNC }, + [JUMP_HAPPY_FUNC] = { JUMP_HAPPY_FUNC, SCRIPT_TYPE_09, _("JUMP_HAPPY_FUNC"), s_script_JUMP_HAPPY_FUNC }, + [JUMP_SURPRISE_FUNC] = { JUMP_SURPRISE_FUNC, SCRIPT_TYPE_09, _("JUMP_SURPRISE_FUNC"), s_script_JUMP_SURPRISE_FUNC }, + [JUMP_ANGRY_FUNC] = { JUMP_ANGRY_FUNC, SCRIPT_TYPE_09, _("JUMP_ANGRY_FUNC"), s_script_JUMP_ANGRY_FUNC }, + [NOTICE_FUNC] = { NOTICE_FUNC, SCRIPT_TYPE_09, _("NOTICE_FUNC"), s_script_NOTICE_FUNC }, + [QUESTION_FUNC] = { QUESTION_FUNC, SCRIPT_TYPE_09, _("QUESTION_FUNC"), s_script_QUESTION_FUNC }, + [SWEAT_FUNC] = { SWEAT_FUNC, SCRIPT_TYPE_09, _("SWEAT_FUNC"), s_script_SWEAT_FUNC }, + [SHOCK_FUNC] = { SHOCK_FUNC, SCRIPT_TYPE_09, _("SHOCK_FUNC"), s_script_SHOCK_FUNC }, + [SPREE_START_FUNC] = { SPREE_START_FUNC, SCRIPT_TYPE_09, _("SPREE_START_FUNC"), s_script_SPREE_START_FUNC }, + [SPREE_END_FUNC] = { SPREE_END_FUNC, SCRIPT_TYPE_09, _("SPREE_END_FUNC"), s_script_SPREE_END_FUNC }, + [SMILE_START_FUNC] = { SMILE_START_FUNC, SCRIPT_TYPE_09, _("SMILE_START_FUNC"), s_script_SMILE_START_FUNC }, + [SMILE_END_FUNC] = { SMILE_END_FUNC, SCRIPT_TYPE_09, _("SMILE_END_FUNC"), s_script_SMILE_END_FUNC }, + [ANGRY_START_FUNC] = { ANGRY_START_FUNC, SCRIPT_TYPE_09, _("ANGRY_START_FUNC"), s_script_ANGRY_START_FUNC }, + [ANGRY_END_FUNC] = { ANGRY_END_FUNC, SCRIPT_TYPE_09, _("ANGRY_END_FUNC"), s_script_ANGRY_END_FUNC }, + [MOVE_PLAZA_SLEEP] = { MOVE_PLAZA_SLEEP, SCRIPT_TYPE_05, _("MOVE_PLAZA_SLEEP"), s_script_MOVE_PLAZA_SLEEP }, + [INIT_PLAZA_SLEEP_STAY_FUNC] = { INIT_PLAZA_SLEEP_STAY_FUNC, SCRIPT_TYPE_09, _("INIT_PLAZA_SLEEP_STAY_FUNC"), s_script_INIT_PLAZA_SLEEP_STAY_FUNC }, + [INIT_PLAZA_SLEEP_TALK_FUNC] = { INIT_PLAZA_SLEEP_TALK_FUNC, SCRIPT_TYPE_09, _("INIT_PLAZA_SLEEP_TALK_FUNC"), s_script_INIT_PLAZA_SLEEP_TALK_FUNC }, + [INIT_SLEEP_FUNC] = { INIT_SLEEP_FUNC, SCRIPT_TYPE_08, _("INIT_SLEEP_FUNC"), s_script_INIT_SLEEP_FUNC }, + [INIT_BASE_FUNC] = { INIT_BASE_FUNC, SCRIPT_TYPE_08, _("INIT_BASE_FUNC"), s_script_INIT_BASE_FUNC }, + [INIT_DEBUG_HABITAT] = { INIT_DEBUG_HABITAT, SCRIPT_TYPE_08, _("INIT_DEBUG_HABITAT"), s_script_INIT_DEBUG_HABITAT }, + [NORMAL_MESSAGE] = { NORMAL_MESSAGE, SCRIPT_TYPE_07, _("NORMAL_MESSAGE"), NULL }, + [NORMAL_EVENT] = { NORMAL_EVENT, SCRIPT_TYPE_07, _("NORMAL_EVENT"), NULL }, + [NORMAL_CAMERA] = { NORMAL_CAMERA, SCRIPT_TYPE_07, _("NORMAL_CAMERA"), s_script_NORMAL_CAMERA }, + [DISMISSAL_SALLY_MEMBER_FUNC] = { DISMISSAL_SALLY_MEMBER_FUNC, SCRIPT_TYPE_07, _("DISMISSAL_SALLY_MEMBER_FUNC"), s_script_DISMISSAL_SALLY_MEMBER_FUNC }, + [DISMISSAL_SALLY_MEMBER2_FUNC] = { DISMISSAL_SALLY_MEMBER2_FUNC, SCRIPT_TYPE_07, _("DISMISSAL_SALLY_MEMBER2_FUNC"), s_script_DISMISSAL_SALLY_MEMBER2_FUNC }, + [DISMISSAL_SALLY_MEMBER3_FUNC] = { DISMISSAL_SALLY_MEMBER3_FUNC, SCRIPT_TYPE_07, _("DISMISSAL_SALLY_MEMBER3_FUNC"), s_script_DISMISSAL_SALLY_MEMBER3_FUNC }, + [DISMISSAL_SALLY_MEMBER4_FUNC] = { DISMISSAL_SALLY_MEMBER4_FUNC, SCRIPT_TYPE_07, _("DISMISSAL_SALLY_MEMBER4_FUNC"), s_script_DISMISSAL_SALLY_MEMBER4_FUNC }, + [NEXT_SAVE_FUNC] = { NEXT_SAVE_FUNC, SCRIPT_TYPE_07, _("NEXT_SAVE_FUNC"), s_script_NEXT_SAVE_FUNC }, + [NEXT_SAVE2_FUNC] = { NEXT_SAVE2_FUNC, SCRIPT_TYPE_07, _("NEXT_SAVE2_FUNC"), s_script_NEXT_SAVE2_FUNC }, + [SAVE_POINT] = { SAVE_POINT, SCRIPT_TYPE_07, _("SAVE_POINT"), s_script_SAVE_POINT }, + [WAREHOUSE_POINT] = { WAREHOUSE_POINT, SCRIPT_TYPE_07, _("WAREHOUSE_POINT"), s_script_WAREHOUSE_POINT }, + [SAVE_AND_WAREHOUSE_POINT] = { SAVE_AND_WAREHOUSE_POINT, SCRIPT_TYPE_07, _("SAVE_AND_WAREHOUSE_POINT"), s_script_SAVE_AND_WAREHOUSE_POINT }, + [WORLD_MAP_POINT] = { WORLD_MAP_POINT, SCRIPT_TYPE_07, _("WORLD_MAP_POINT"), s_script_WORLD_MAP_POINT }, + [FORMATION_HERO] = { FORMATION_HERO, SCRIPT_TYPE_07, _("FORMATION_HERO"), s_script_FORMATION_HERO }, + [EVOLUTION_HERO] = { EVOLUTION_HERO, SCRIPT_TYPE_07, _("EVOLUTION_HERO"), s_script_EVOLUTION_HERO }, + [WARP_LIVES_START] = { WARP_LIVES_START, SCRIPT_TYPE_07, _("WARP_LIVES_START"), s_script_WARP_LIVES_START }, + [WARP_LIVES_START2] = { WARP_LIVES_START2, SCRIPT_TYPE_07, _("WARP_LIVES_START2"), s_script_WARP_LIVES_START2 }, + [WARP_LIVES_START3] = { WARP_LIVES_START3, SCRIPT_TYPE_07, _("WARP_LIVES_START3"), s_script_WARP_LIVES_START3 }, + [WARP_LIVES_ARRIVE] = { WARP_LIVES_ARRIVE, SCRIPT_TYPE_07, _("WARP_LIVES_ARRIVE"), s_script_WARP_LIVES_ARRIVE }, + [WARP_LIVES_ARRIVE2] = { WARP_LIVES_ARRIVE2, SCRIPT_TYPE_07, _("WARP_LIVES_ARRIVE2"), s_script_WARP_LIVES_ARRIVE2 }, + [WARP_LIVES_ARRIVE3] = { WARP_LIVES_ARRIVE3, SCRIPT_TYPE_07, _("WARP_LIVES_ARRIVE3"), s_script_WARP_LIVES_ARRIVE3 }, + [LIVES_WARP_START_FUNC] = { LIVES_WARP_START_FUNC, SCRIPT_TYPE_07, _("LIVES_WARP_START_FUNC"), s_script_LIVES_WARP_START_FUNC }, + [LIVES_WARP_START2_FUNC] = { LIVES_WARP_START2_FUNC, SCRIPT_TYPE_07, _("LIVES_WARP_START2_FUNC"), s_script_LIVES_WARP_START2_FUNC }, + [LIVES_WARP_START3_FUNC] = { LIVES_WARP_START3_FUNC, SCRIPT_TYPE_07, _("LIVES_WARP_START3_FUNC"), s_script_LIVES_WARP_START3_FUNC }, + [LIVES_WARP_START_SUB] = { LIVES_WARP_START_SUB, SCRIPT_TYPE_07, _("LIVES_WARP_START_SUB"), s_script_LIVES_WARP_START_SUB }, + [LIVES_WARP_ARRIVE_FUNC] = { LIVES_WARP_ARRIVE_FUNC, SCRIPT_TYPE_07, _("LIVES_WARP_ARRIVE_FUNC"), s_script_LIVES_WARP_ARRIVE_FUNC }, + [LIVES_WARP_ARRIVE2_FUNC] = { LIVES_WARP_ARRIVE2_FUNC, SCRIPT_TYPE_07, _("LIVES_WARP_ARRIVE2_FUNC"), s_script_LIVES_WARP_ARRIVE2_FUNC }, + [LIVES_WARP_ARRIVE3_FUNC] = { LIVES_WARP_ARRIVE3_FUNC, SCRIPT_TYPE_07, _("LIVES_WARP_ARRIVE3_FUNC"), s_script_LIVES_WARP_ARRIVE3_FUNC }, + [LIVES_WARP_ARRIVE_SUB] = { LIVES_WARP_ARRIVE_SUB, SCRIPT_TYPE_07, _("LIVES_WARP_ARRIVE_SUB"), s_script_LIVES_WARP_ARRIVE_SUB }, + [GET_ITEM_FUNC] = { GET_ITEM_FUNC, SCRIPT_TYPE_07, _("GET_ITEM_FUNC"), s_script_GET_ITEM_FUNC }, + [GET_ITEM_WAIT_FUNC] = { GET_ITEM_WAIT_FUNC, SCRIPT_TYPE_07, _("GET_ITEM_WAIT_FUNC"), s_script_GET_ITEM_WAIT_FUNC }, + [GET_ITEM2_FUNC] = { GET_ITEM2_FUNC, SCRIPT_TYPE_07, _("GET_ITEM2_FUNC"), s_script_GET_ITEM2_FUNC }, + [GET_ITEM2_WAIT_FUNC] = { GET_ITEM2_WAIT_FUNC, SCRIPT_TYPE_07, _("GET_ITEM2_WAIT_FUNC"), s_script_GET_ITEM2_WAIT_FUNC }, + [JOIN_FUNC] = { JOIN_FUNC, SCRIPT_TYPE_07, _("JOIN_FUNC"), s_script_JOIN_FUNC }, + [LODGE_START_FUNC] = { LODGE_START_FUNC, SCRIPT_TYPE_07, _("LODGE_START_FUNC"), s_script_LODGE_START_FUNC }, + [LODGE_WAIT_FUNC] = { LODGE_WAIT_FUNC, SCRIPT_TYPE_07, _("LODGE_WAIT_FUNC"), s_script_LODGE_WAIT_FUNC }, + [LODGE_END_FUNC] = { LODGE_END_FUNC, SCRIPT_TYPE_07, _("LODGE_END_FUNC"), s_script_LODGE_END_FUNC }, + [LODGE_SOUND_FUNC] = { LODGE_SOUND_FUNC, SCRIPT_TYPE_07, _("LODGE_SOUND_FUNC"), s_script_LODGE_SOUND_FUNC }, + [SAVE_START_FUNC] = { SAVE_START_FUNC, SCRIPT_TYPE_07, _("SAVE_START_FUNC"), s_script_SAVE_START_FUNC }, + [SAVE_WAIT_FUNC] = { SAVE_WAIT_FUNC, SCRIPT_TYPE_07, _("SAVE_WAIT_FUNC"), s_script_SAVE_WAIT_FUNC }, + [SAVE_END_FUNC] = { SAVE_END_FUNC, SCRIPT_TYPE_07, _("SAVE_END_FUNC"), s_script_SAVE_END_FUNC }, + [SAVE_SOUND_FUNC] = { SAVE_SOUND_FUNC, SCRIPT_TYPE_07, _("SAVE_SOUND_FUNC"), s_script_SAVE_SOUND_FUNC }, + [EFFECT_TEST1] = { EFFECT_TEST1, SCRIPT_TYPE_09, _("EFFECT_TEST1"), s_script_EFFECT_TEST1 }, + [EFFECT_TEST2] = { EFFECT_TEST2, SCRIPT_TYPE_09, _("EFFECT_TEST2"), s_script_EFFECT_TEST2 }, + [EFFECT_MOVE_DIVE] = { EFFECT_MOVE_DIVE, SCRIPT_TYPE_09, _("EFFECT_MOVE_DIVE"), s_script_EFFECT_MOVE_DIVE }, + [EFFECT_MOVE_WAVE] = { EFFECT_MOVE_WAVE, SCRIPT_TYPE_09, _("EFFECT_MOVE_WAVE"), s_script_EFFECT_MOVE_WAVE }, + [EVENT_DIVIDE] = { EVENT_DIVIDE, SCRIPT_TYPE_07, _("EVENT_DIVIDE"), s_script_EVENT_DIVIDE }, + [EVENT_DIVIDE_NEXT] = { EVENT_DIVIDE_NEXT, SCRIPT_TYPE_07, _("EVENT_DIVIDE_NEXT"), s_script_EVENT_DIVIDE_NEXT }, + [EVENT_DIVIDE_INIT_FUNC] = { EVENT_DIVIDE_INIT_FUNC, SCRIPT_TYPE_07, _("EVENT_DIVIDE_INIT_FUNC"), s_script_EVENT_DIVIDE_INIT_FUNC }, + [EVENT_DIVIDE_NEXT_DAY_FUNC] = { EVENT_DIVIDE_NEXT_DAY_FUNC, SCRIPT_TYPE_07, _("EVENT_DIVIDE_NEXT_DAY_FUNC"), s_script_EVENT_DIVIDE_NEXT_DAY_FUNC }, + [EVENT_DIVIDE_NEXT_DAY2_FUNC] = { EVENT_DIVIDE_NEXT_DAY2_FUNC, SCRIPT_TYPE_07, _("EVENT_DIVIDE_NEXT_DAY2_FUNC"), s_script_EVENT_DIVIDE_NEXT_DAY2_FUNC }, + [EVENT_DIVIDE_FIRST] = { EVENT_DIVIDE_FIRST, SCRIPT_TYPE_07, _("EVENT_DIVIDE_FIRST"), s_script_EVENT_DIVIDE_FIRST }, + [EVENT_DIVIDE_SECOND] = { EVENT_DIVIDE_SECOND, SCRIPT_TYPE_07, _("EVENT_DIVIDE_SECOND"), s_script_EVENT_DIVIDE_SECOND }, + [EVENT_DIVIDE_AFTER] = { EVENT_DIVIDE_AFTER, SCRIPT_TYPE_07, _("EVENT_DIVIDE_AFTER"), s_script_EVENT_DIVIDE_AFTER }, + [EVENT_DIVIDE_WARP_LOCK_FUNC] = { EVENT_DIVIDE_WARP_LOCK_FUNC, SCRIPT_TYPE_07, _("EVENT_DIVIDE_WARP_LOCK_FUNC"), s_script_EVENT_DIVIDE_WARP_LOCK_FUNC }, + [EVENT_RESCUE_ENTER_CHECK] = { EVENT_RESCUE_ENTER_CHECK, SCRIPT_TYPE_07, _("EVENT_RESCUE_ENTER_CHECK"), s_script_EVENT_RESCUE_ENTER_CHECK }, + [EVENT_RESCUE] = { EVENT_RESCUE, SCRIPT_TYPE_07, _("EVENT_RESCUE"), s_script_EVENT_RESCUE }, + [DEBUG_SCRIPT] = { DEBUG_SCRIPT, SCRIPT_TYPE_07, _("DEBUG_SCRIPT"), s_script_DEBUG_SCRIPT }, + [DEMO_CANCEL] = { DEMO_CANCEL, SCRIPT_TYPE_07, _("DEMO_CANCEL"), s_script_DEMO_CANCEL }, + [DEMO_01] = { DEMO_01, SCRIPT_TYPE_10, _("DEMO_01"), s_script_DEMO_01 }, + [DEMO_02] = { DEMO_02, SCRIPT_TYPE_10, _("DEMO_02"), s_script_DEMO_02 }, + [DEMO_03] = { DEMO_03, SCRIPT_TYPE_10, _("DEMO_03"), s_script_DEMO_03 }, + [DEMO_04] = { DEMO_04, SCRIPT_TYPE_10, _("DEMO_04"), s_script_DEMO_04 }, + [EVENT_M00E01A_L001] = { EVENT_M00E01A_L001, SCRIPT_TYPE_10, _("EVENT_M00E01A_L001"), s_script_EVENT_M00E01A_L001 }, + [EVENT_M01E01A_L001] = { EVENT_M01E01A_L001, SCRIPT_TYPE_10, _("EVENT_M01E01A_L001"), s_script_EVENT_M01E01A_L001 }, + [EVENT_M01E01A_L002] = { EVENT_M01E01A_L002, SCRIPT_TYPE_10, _("EVENT_M01E01A_L002"), s_script_EVENT_M01E01A_L002 }, + [EVENT_M01E01A_L003] = { EVENT_M01E01A_L003, SCRIPT_TYPE_10, _("EVENT_M01E01A_L003"), s_script_EVENT_M01E01A_L003 }, + [EVENT_M01E02A_L001] = { EVENT_M01E02A_L001, SCRIPT_TYPE_10, _("EVENT_M01E02A_L001"), s_script_EVENT_M01E02A_L001 }, + [EVENT_M01E02A_L001B] = { EVENT_M01E02A_L001B, SCRIPT_TYPE_12, _("EVENT_M01E02A_L001B"), s_script_EVENT_M01E02A_L001B }, + [EVENT_M01E02A_L001C] = { EVENT_M01E02A_L001C, SCRIPT_TYPE_10, _("EVENT_M01E02A_L001C"), s_script_EVENT_M01E02A_L001C }, + [EVENT_M01E02A_L002] = { EVENT_M01E02A_L002, SCRIPT_TYPE_10, _("EVENT_M01E02A_L002"), s_script_EVENT_M01E02A_L002 }, + [EVENT_M01E02A_L003] = { EVENT_M01E02A_L003, SCRIPT_TYPE_10, _("EVENT_M01E02A_L003"), s_script_EVENT_M01E02A_L003 }, + [EVENT_M01E02A_L004] = { EVENT_M01E02A_L004, SCRIPT_TYPE_10, _("EVENT_M01E02A_L004"), s_script_EVENT_M01E02A_L004 }, + [EVENT_M01E02A_L005] = { EVENT_M01E02A_L005, SCRIPT_TYPE_10, _("EVENT_M01E02A_L005"), s_script_EVENT_M01E02A_L005 }, + [EVENT_M01E02A_L006] = { EVENT_M01E02A_L006, SCRIPT_TYPE_10, _("EVENT_M01E02A_L006"), s_script_EVENT_M01E02A_L006 }, + [EVENT_M01E02B_L001] = { EVENT_M01E02B_L001, SCRIPT_TYPE_10, _("EVENT_M01E02B_L001"), s_script_EVENT_M01E02B_L001 }, + [EVENT_M01E02B_L002] = { EVENT_M01E02B_L002, SCRIPT_TYPE_10, _("EVENT_M01E02B_L002"), s_script_EVENT_M01E02B_L002 }, + [EVENT_M01E02B_L003] = { EVENT_M01E02B_L003, SCRIPT_TYPE_10, _("EVENT_M01E02B_L003"), s_script_EVENT_M01E02B_L003 }, + [EVENT_M01E02B_L004] = { EVENT_M01E02B_L004, SCRIPT_TYPE_10, _("EVENT_M01E02B_L004"), s_script_EVENT_M01E02B_L004 }, + [EVENT_M01E02B_L004B] = { EVENT_M01E02B_L004B, SCRIPT_TYPE_10, _("EVENT_M01E02B_L004B"), s_script_EVENT_M01E02B_L004B }, + [EVENT_M01E02B_L005] = { EVENT_M01E02B_L005, SCRIPT_TYPE_10, _("EVENT_M01E02B_L005"), s_script_EVENT_M01E02B_L005 }, + [EVENT_M01E02B_L006] = { EVENT_M01E02B_L006, SCRIPT_TYPE_10, _("EVENT_M01E02B_L006"), s_script_EVENT_M01E02B_L006 }, + [EVENT_M01E02B_L007] = { EVENT_M01E02B_L007, SCRIPT_TYPE_10, _("EVENT_M01E02B_L007"), s_script_EVENT_M01E02B_L007 }, + [EVENT_M01E02B_L008] = { EVENT_M01E02B_L008, SCRIPT_TYPE_10, _("EVENT_M01E02B_L008"), s_script_EVENT_M01E02B_L008 }, + [EVENT_M01E03A_L000] = { EVENT_M01E03A_L000, SCRIPT_TYPE_10, _("EVENT_M01E03A_L000"), s_script_EVENT_M01E03A_L000 }, + [EVENT_M01E03A_L001] = { EVENT_M01E03A_L001, SCRIPT_TYPE_10, _("EVENT_M01E03A_L001"), s_script_EVENT_M01E03A_L001 }, + [EVENT_M01E03A_L002] = { EVENT_M01E03A_L002, SCRIPT_TYPE_10, _("EVENT_M01E03A_L002"), s_script_EVENT_M01E03A_L002 }, + [EVENT_M01E03A_L003] = { EVENT_M01E03A_L003, SCRIPT_TYPE_10, _("EVENT_M01E03A_L003"), s_script_EVENT_M01E03A_L003 }, + [EVENT_M01E03A_L004] = { EVENT_M01E03A_L004, SCRIPT_TYPE_10, _("EVENT_M01E03A_L004"), s_script_EVENT_M01E03A_L004 }, + [EVENT_M01E03A_L005] = { EVENT_M01E03A_L005, SCRIPT_TYPE_10, _("EVENT_M01E03A_L005"), s_script_EVENT_M01E03A_L005 }, + [EVENT_M01E03A_L006] = { EVENT_M01E03A_L006, SCRIPT_TYPE_10, _("EVENT_M01E03A_L006"), s_script_EVENT_M01E03A_L006 }, + [EVENT_M01E03A_L007] = { EVENT_M01E03A_L007, SCRIPT_TYPE_10, _("EVENT_M01E03A_L007"), s_script_EVENT_M01E03A_L007 }, + [EVENT_M01E03A_L008] = { EVENT_M01E03A_L008, SCRIPT_TYPE_10, _("EVENT_M01E03A_L008"), s_script_EVENT_M01E03A_L008 }, + [EVENT_M01E03A_L009] = { EVENT_M01E03A_L009, SCRIPT_TYPE_10, _("EVENT_M01E03A_L009"), s_script_EVENT_M01E03A_L009 }, + [EVENT_M01E03A_L010] = { EVENT_M01E03A_L010, SCRIPT_TYPE_10, _("EVENT_M01E03A_L010"), s_script_EVENT_M01E03A_L010 }, + [EVENT_M01E03A_L011] = { EVENT_M01E03A_L011, SCRIPT_TYPE_10, _("EVENT_M01E03A_L011"), s_script_EVENT_M01E03A_L011 }, + [EVENT_M01E04A_L000] = { EVENT_M01E04A_L000, SCRIPT_TYPE_10, _("EVENT_M01E04A_L000"), s_script_EVENT_M01E04A_L000 }, + [EVENT_M01E04A_L001] = { EVENT_M01E04A_L001, SCRIPT_TYPE_10, _("EVENT_M01E04A_L001"), s_script_EVENT_M01E04A_L001 }, + [EVENT_M01E04A_L002] = { EVENT_M01E04A_L002, SCRIPT_TYPE_10, _("EVENT_M01E04A_L002"), s_script_EVENT_M01E04A_L002 }, + [EVENT_M01E04A_L003] = { EVENT_M01E04A_L003, SCRIPT_TYPE_10, _("EVENT_M01E04A_L003"), s_script_EVENT_M01E04A_L003 }, + [EVENT_M01E04A_L004] = { EVENT_M01E04A_L004, SCRIPT_TYPE_10, _("EVENT_M01E04A_L004"), s_script_EVENT_M01E04A_L004 }, + [EVENT_M01E04A_L005] = { EVENT_M01E04A_L005, SCRIPT_TYPE_12, _("EVENT_M01E04A_L005"), s_script_EVENT_M01E04A_L005 }, + [EVENT_M01E04A_L006] = { EVENT_M01E04A_L006, SCRIPT_TYPE_10, _("EVENT_M01E04A_L006"), s_script_EVENT_M01E04A_L006 }, + [EVENT_M01E04B_L000] = { EVENT_M01E04B_L000, SCRIPT_TYPE_10, _("EVENT_M01E04B_L000"), s_script_EVENT_M01E04B_L000 }, + [EVENT_M01E04B_L001] = { EVENT_M01E04B_L001, SCRIPT_TYPE_10, _("EVENT_M01E04B_L001"), s_script_EVENT_M01E04B_L001 }, + [EVENT_M01E04B_L002] = { EVENT_M01E04B_L002, SCRIPT_TYPE_10, _("EVENT_M01E04B_L002"), s_script_EVENT_M01E04B_L002 }, + [EVENT_M01E04B_L003] = { EVENT_M01E04B_L003, SCRIPT_TYPE_10, _("EVENT_M01E04B_L003"), s_script_EVENT_M01E04B_L003 }, + [EVENT_M01E04B_L004] = { EVENT_M01E04B_L004, SCRIPT_TYPE_10, _("EVENT_M01E04B_L004"), s_script_EVENT_M01E04B_L004 }, + [EVENT_M01E04B_L005] = { EVENT_M01E04B_L005, SCRIPT_TYPE_10, _("EVENT_M01E04B_L005"), s_script_EVENT_M01E04B_L005 }, + [EVENT_M01E04B_L006] = { EVENT_M01E04B_L006, SCRIPT_TYPE_10, _("EVENT_M01E04B_L006"), s_script_EVENT_M01E04B_L006 }, + [EVENT_M01E04B_L007] = { EVENT_M01E04B_L007, SCRIPT_TYPE_10, _("EVENT_M01E04B_L007"), s_script_EVENT_M01E04B_L007 }, + [EVENT_M01E05A_L000] = { EVENT_M01E05A_L000, SCRIPT_TYPE_10, _("EVENT_M01E05A_L000"), s_script_EVENT_M01E05A_L000 }, + [EVENT_M01E05A_L001] = { EVENT_M01E05A_L001, SCRIPT_TYPE_10, _("EVENT_M01E05A_L001"), s_script_EVENT_M01E05A_L001 }, + [EVENT_M01E05A_L002] = { EVENT_M01E05A_L002, SCRIPT_TYPE_10, _("EVENT_M01E05A_L002"), s_script_EVENT_M01E05A_L002 }, + [EVENT_M01E05A_L003] = { EVENT_M01E05A_L003, SCRIPT_TYPE_10, _("EVENT_M01E05A_L003"), s_script_EVENT_M01E05A_L003 }, + [EVENT_M01E05A_L004] = { EVENT_M01E05A_L004, SCRIPT_TYPE_10, _("EVENT_M01E05A_L004"), s_script_EVENT_M01E05A_L004 }, + [EVENT_M01E05A_L005] = { EVENT_M01E05A_L005, SCRIPT_TYPE_10, _("EVENT_M01E05A_L005"), s_script_EVENT_M01E05A_L005 }, + [EVENT_M01E05A_L006] = { EVENT_M01E05A_L006, SCRIPT_TYPE_10, _("EVENT_M01E05A_L006"), s_script_EVENT_M01E05A_L006 }, + [EVENT_M01E05B_L000] = { EVENT_M01E05B_L000, SCRIPT_TYPE_10, _("EVENT_M01E05B_L000"), s_script_EVENT_M01E05B_L000 }, + [EVENT_M01E05B_L001] = { EVENT_M01E05B_L001, SCRIPT_TYPE_10, _("EVENT_M01E05B_L001"), s_script_EVENT_M01E05B_L001 }, + [EVENT_M01E05B_L002] = { EVENT_M01E05B_L002, SCRIPT_TYPE_10, _("EVENT_M01E05B_L002"), s_script_EVENT_M01E05B_L002 }, + [EVENT_M01E05B_L003] = { EVENT_M01E05B_L003, SCRIPT_TYPE_12, _("EVENT_M01E05B_L003"), s_script_EVENT_M01E05B_L003 }, + [EVENT_M01E05B_L004] = { EVENT_M01E05B_L004, SCRIPT_TYPE_10, _("EVENT_M01E05B_L004"), s_script_EVENT_M01E05B_L004 }, + [EVENT_M01E05B_L005] = { EVENT_M01E05B_L005, SCRIPT_TYPE_10, _("EVENT_M01E05B_L005"), s_script_EVENT_M01E05B_L005 }, + [EVENT_M01E06A_L001] = { EVENT_M01E06A_L001, SCRIPT_TYPE_10, _("EVENT_M01E06A_L001"), s_script_EVENT_M01E06A_L001 }, + [EVENT_M01E06A_L002] = { EVENT_M01E06A_L002, SCRIPT_TYPE_10, _("EVENT_M01E06A_L002"), s_script_EVENT_M01E06A_L002 }, + [EVENT_M01E06A_L003] = { EVENT_M01E06A_L003, SCRIPT_TYPE_10, _("EVENT_M01E06A_L003"), s_script_EVENT_M01E06A_L003 }, + [EVENT_M01E07A_L001] = { EVENT_M01E07A_L001, SCRIPT_TYPE_10, _("EVENT_M01E07A_L001"), s_script_EVENT_M01E07A_L001 }, + [EVENT_M01E07A_L002] = { EVENT_M01E07A_L002, SCRIPT_TYPE_10, _("EVENT_M01E07A_L002"), s_script_EVENT_M01E07A_L002 }, + [EVENT_M01E07A_L003] = { EVENT_M01E07A_L003, SCRIPT_TYPE_10, _("EVENT_M01E07A_L003"), s_script_EVENT_M01E07A_L003 }, + [EVENT_M01E07A_L004] = { EVENT_M01E07A_L004, SCRIPT_TYPE_10, _("EVENT_M01E07A_L004"), s_script_EVENT_M01E07A_L004 }, + [EVENT_M01E07A_L005] = { EVENT_M01E07A_L005, SCRIPT_TYPE_10, _("EVENT_M01E07A_L005"), s_script_EVENT_M01E07A_L005 }, + [EVENT_M01E07A_T001] = { EVENT_M01E07A_T001, SCRIPT_TYPE_10, _("EVENT_M01E07A_T001"), s_script_EVENT_M01E07A_T001 }, + [EVENT_M01E07A_T002] = { EVENT_M01E07A_T002, SCRIPT_TYPE_10, _("EVENT_M01E07A_T002"), s_script_EVENT_M01E07A_T002 }, + [EVENT_M01E07B_L001] = { EVENT_M01E07B_L001, SCRIPT_TYPE_10, _("EVENT_M01E07B_L001"), s_script_EVENT_M01E07B_L001 }, + [EVENT_M01E07B_L002] = { EVENT_M01E07B_L002, SCRIPT_TYPE_10, _("EVENT_M01E07B_L002"), s_script_EVENT_M01E07B_L002 }, + [EVENT_M01E07B_L003] = { EVENT_M01E07B_L003, SCRIPT_TYPE_10, _("EVENT_M01E07B_L003"), s_script_EVENT_M01E07B_L003 }, + [EVENT_M01E07B_L004] = { EVENT_M01E07B_L004, SCRIPT_TYPE_10, _("EVENT_M01E07B_L004"), s_script_EVENT_M01E07B_L004 }, + [EVENT_M01E07B_L005] = { EVENT_M01E07B_L005, SCRIPT_TYPE_10, _("EVENT_M01E07B_L005"), s_script_EVENT_M01E07B_L005 }, + [EVENT_M01E07B_T001] = { EVENT_M01E07B_T001, SCRIPT_TYPE_10, _("EVENT_M01E07B_T001"), s_script_EVENT_M01E07B_T001 }, + [EVENT_M01E07B_T002] = { EVENT_M01E07B_T002, SCRIPT_TYPE_10, _("EVENT_M01E07B_T002"), s_script_EVENT_M01E07B_T002 }, + [EVENT_M01E08A_L001] = { EVENT_M01E08A_L001, SCRIPT_TYPE_10, _("EVENT_M01E08A_L001"), s_script_EVENT_M01E08A_L001 }, + [EVENT_M01E08A_L002] = { EVENT_M01E08A_L002, SCRIPT_TYPE_10, _("EVENT_M01E08A_L002"), s_script_EVENT_M01E08A_L002 }, + [EVENT_M01E08A_L003] = { EVENT_M01E08A_L003, SCRIPT_TYPE_10, _("EVENT_M01E08A_L003"), s_script_EVENT_M01E08A_L003 }, + [EVENT_M01E08A_L004] = { EVENT_M01E08A_L004, SCRIPT_TYPE_10, _("EVENT_M01E08A_L004"), s_script_EVENT_M01E08A_L004 }, + [EVENT_M01E08A_L005] = { EVENT_M01E08A_L005, SCRIPT_TYPE_10, _("EVENT_M01E08A_L005"), s_script_EVENT_M01E08A_L005 }, + [EVENT_M01E08A_T001] = { EVENT_M01E08A_T001, SCRIPT_TYPE_10, _("EVENT_M01E08A_T001"), s_script_EVENT_M01E08A_T001 }, + [EVENT_M01E08A_T002] = { EVENT_M01E08A_T002, SCRIPT_TYPE_10, _("EVENT_M01E08A_T002"), s_script_EVENT_M01E08A_T002 }, + [EVENT_M01E08B_L001] = { EVENT_M01E08B_L001, SCRIPT_TYPE_10, _("EVENT_M01E08B_L001"), s_script_EVENT_M01E08B_L001 }, + [EVENT_M01E08B_L002] = { EVENT_M01E08B_L002, SCRIPT_TYPE_10, _("EVENT_M01E08B_L002"), s_script_EVENT_M01E08B_L002 }, + [EVENT_M01E08B_L003] = { EVENT_M01E08B_L003, SCRIPT_TYPE_10, _("EVENT_M01E08B_L003"), s_script_EVENT_M01E08B_L003 }, + [EVENT_M01E08B_L004] = { EVENT_M01E08B_L004, SCRIPT_TYPE_10, _("EVENT_M01E08B_L004"), s_script_EVENT_M01E08B_L004 }, + [EVENT_M01E08B_L005] = { EVENT_M01E08B_L005, SCRIPT_TYPE_10, _("EVENT_M01E08B_L005"), s_script_EVENT_M01E08B_L005 }, + [EVENT_M01E08B_L006] = { EVENT_M01E08B_L006, SCRIPT_TYPE_10, _("EVENT_M01E08B_L006"), s_script_EVENT_M01E08B_L006 }, + [EVENT_M01E08B_T001] = { EVENT_M01E08B_T001, SCRIPT_TYPE_10, _("EVENT_M01E08B_T001"), s_script_EVENT_M01E08B_T001 }, + [EVENT_M01E08B_T002] = { EVENT_M01E08B_T002, SCRIPT_TYPE_10, _("EVENT_M01E08B_T002"), s_script_EVENT_M01E08B_T002 }, + [EVENT_M01E09A_L001] = { EVENT_M01E09A_L001, SCRIPT_TYPE_10, _("EVENT_M01E09A_L001"), s_script_EVENT_M01E09A_L001 }, + [EVENT_M01E09A_L002] = { EVENT_M01E09A_L002, SCRIPT_TYPE_10, _("EVENT_M01E09A_L002"), s_script_EVENT_M01E09A_L002 }, + [EVENT_M01E09A_L003] = { EVENT_M01E09A_L003, SCRIPT_TYPE_10, _("EVENT_M01E09A_L003"), s_script_EVENT_M01E09A_L003 }, + [EVENT_M01E09A_L004] = { EVENT_M01E09A_L004, SCRIPT_TYPE_10, _("EVENT_M01E09A_L004"), s_script_EVENT_M01E09A_L004 }, + [EVENT_M01E09A_L005] = { EVENT_M01E09A_L005, SCRIPT_TYPE_10, _("EVENT_M01E09A_L005"), s_script_EVENT_M01E09A_L005 }, + [EVENT_M01E09A_L006] = { EVENT_M01E09A_L006, SCRIPT_TYPE_10, _("EVENT_M01E09A_L006"), s_script_EVENT_M01E09A_L006 }, + [EVENT_M01E09A_L007] = { EVENT_M01E09A_L007, SCRIPT_TYPE_10, _("EVENT_M01E09A_L007"), s_script_EVENT_M01E09A_L007 }, + [EVENT_M01E09A_L008] = { EVENT_M01E09A_L008, SCRIPT_TYPE_10, _("EVENT_M01E09A_L008"), s_script_EVENT_M01E09A_L008 }, + [EVENT_M01E09A_L009] = { EVENT_M01E09A_L009, SCRIPT_TYPE_10, _("EVENT_M01E09A_L009"), s_script_EVENT_M01E09A_L009 }, + [EVENT_M01E09A_L010] = { EVENT_M01E09A_L010, SCRIPT_TYPE_10, _("EVENT_M01E09A_L010"), s_script_EVENT_M01E09A_L010 }, + [EVENT_M01E09A_L011] = { EVENT_M01E09A_L011, SCRIPT_TYPE_10, _("EVENT_M01E09A_L011"), s_script_EVENT_M01E09A_L011 }, + [EVENT_M01E09A_L012] = { EVENT_M01E09A_L012, SCRIPT_TYPE_10, _("EVENT_M01E09A_L012"), s_script_EVENT_M01E09A_L012 }, + [EVENT_M01E09A_L013] = { EVENT_M01E09A_L013, SCRIPT_TYPE_10, _("EVENT_M01E09A_L013"), s_script_EVENT_M01E09A_L013 }, + [EVENT_M01E09A_L014] = { EVENT_M01E09A_L014, SCRIPT_TYPE_10, _("EVENT_M01E09A_L014"), s_script_EVENT_M01E09A_L014 }, + [EVENT_M01E09A_L015] = { EVENT_M01E09A_L015, SCRIPT_TYPE_10, _("EVENT_M01E09A_L015"), s_script_EVENT_M01E09A_L015 }, + [EVENT_M01E10A_L001] = { EVENT_M01E10A_L001, SCRIPT_TYPE_10, _("EVENT_M01E10A_L001"), s_script_EVENT_M01E10A_L001 }, + [EVENT_M01E10A_L002] = { EVENT_M01E10A_L002, SCRIPT_TYPE_10, _("EVENT_M01E10A_L002"), s_script_EVENT_M01E10A_L002 }, + [EVENT_M01E10A_L003] = { EVENT_M01E10A_L003, SCRIPT_TYPE_10, _("EVENT_M01E10A_L003"), s_script_EVENT_M01E10A_L003 }, + [EVENT_M01E10A_L004] = { EVENT_M01E10A_L004, SCRIPT_TYPE_10, _("EVENT_M01E10A_L004"), s_script_EVENT_M01E10A_L004 }, + [EVENT_M01E10A_L005] = { EVENT_M01E10A_L005, SCRIPT_TYPE_10, _("EVENT_M01E10A_L005"), s_script_EVENT_M01E10A_L005 }, + [EVENT_M01E10A_L006] = { EVENT_M01E10A_L006, SCRIPT_TYPE_10, _("EVENT_M01E10A_L006"), s_script_EVENT_M01E10A_L006 }, + [EVENT_M01E10A_L007] = { EVENT_M01E10A_L007, SCRIPT_TYPE_10, _("EVENT_M01E10A_L007"), s_script_EVENT_M01E10A_L007 }, + [EVENT_M01E10A_L008] = { EVENT_M01E10A_L008, SCRIPT_TYPE_10, _("EVENT_M01E10A_L008"), s_script_EVENT_M01E10A_L008 }, + [EVENT_M01END_L001] = { EVENT_M01END_L001, SCRIPT_TYPE_10, _("EVENT_M01END_L001"), s_script_EVENT_M01END_L001 }, + [EVENT_M01END_L002] = { EVENT_M01END_L002, SCRIPT_TYPE_10, _("EVENT_M01END_L002"), s_script_EVENT_M01END_L002 }, + [EVENT_M02E01A_L001] = { EVENT_M02E01A_L001, SCRIPT_TYPE_10, _("EVENT_M02E01A_L001"), s_script_EVENT_M02E01A_L001 }, + [EVENT_M02E01A_L002] = { EVENT_M02E01A_L002, SCRIPT_TYPE_10, _("EVENT_M02E01A_L002"), s_script_EVENT_M02E01A_L002 }, + [EVENT_M02E01A_L003] = { EVENT_M02E01A_L003, SCRIPT_TYPE_10, _("EVENT_M02E01A_L003"), s_script_EVENT_M02E01A_L003 }, + [EVENT_M02E02A_L001] = { EVENT_M02E02A_L001, SCRIPT_TYPE_10, _("EVENT_M02E02A_L001"), s_script_EVENT_M02E02A_L001 }, + [EVENT_M02E02B_L001] = { EVENT_M02E02B_L001, SCRIPT_TYPE_10, _("EVENT_M02E02B_L001"), s_script_EVENT_M02E02B_L001 }, + [EVENT_M02E02C_L001] = { EVENT_M02E02C_L001, SCRIPT_TYPE_10, _("EVENT_M02E02C_L001"), s_script_EVENT_M02E02C_L001 }, + [EVENT_M02E02D_L001] = { EVENT_M02E02D_L001, SCRIPT_TYPE_10, _("EVENT_M02E02D_L001"), s_script_EVENT_M02E02D_L001 }, + [EVENT_M02E02E_L001] = { EVENT_M02E02E_L001, SCRIPT_TYPE_10, _("EVENT_M02E02E_L001"), s_script_EVENT_M02E02E_L001 }, + [EVENT_M02E02F_L001] = { EVENT_M02E02F_L001, SCRIPT_TYPE_10, _("EVENT_M02E02F_L001"), s_script_EVENT_M02E02F_L001 }, + [EVENT_M02E02G_L001] = { EVENT_M02E02G_L001, SCRIPT_TYPE_10, _("EVENT_M02E02G_L001"), s_script_EVENT_M02E02G_L001 }, + [EVENT_M02E02H_L001] = { EVENT_M02E02H_L001, SCRIPT_TYPE_10, _("EVENT_M02E02H_L001"), s_script_EVENT_M02E02H_L001 }, + [EVENT_M02END_L001] = { EVENT_M02END_L001, SCRIPT_TYPE_10, _("EVENT_M02END_L001"), s_script_EVENT_M02END_L001 }, + [EVENT_S00E01A_L001] = { EVENT_S00E01A_L001, SCRIPT_TYPE_10, _("EVENT_S00E01A_L001"), s_script_EVENT_S00E01A_L001 }, + [EVENT_S00E01A_L002] = { EVENT_S00E01A_L002, SCRIPT_TYPE_10, _("EVENT_S00E01A_L002"), s_script_EVENT_S00E01A_L002 }, + [EVENT_S00E01A_L003] = { EVENT_S00E01A_L003, SCRIPT_TYPE_10, _("EVENT_S00E01A_L003"), s_script_EVENT_S00E01A_L003 }, + [EVENT_S00E01A_L004] = { EVENT_S00E01A_L004, SCRIPT_TYPE_10, _("EVENT_S00E01A_L004"), s_script_EVENT_S00E01A_L004 }, + [EVENT_S01E01A_START] = { EVENT_S01E01A_START, SCRIPT_TYPE_11, _("EVENT_S01E01A_START"), s_script_EVENT_S01E01A_START }, + [EVENT_S01E01A_CONTINUE] = { EVENT_S01E01A_CONTINUE, SCRIPT_TYPE_11, _("EVENT_S01E01A_CONTINUE"), s_script_EVENT_S01E01A_CONTINUE }, + [EVENT_S01E01A_END] = { EVENT_S01E01A_END, SCRIPT_TYPE_11, _("EVENT_S01E01A_END"), s_script_EVENT_S01E01A_END }, + [EVENT_S01E01A_L001] = { EVENT_S01E01A_L001, SCRIPT_TYPE_12, _("EVENT_S01E01A_L001"), s_script_EVENT_S01E01A_L001 }, + [EVENT_S01E01A_L002] = { EVENT_S01E01A_L002, SCRIPT_TYPE_10, _("EVENT_S01E01A_L002"), s_script_EVENT_S01E01A_L002 }, + [EVENT_S01E01A_L003] = { EVENT_S01E01A_L003, SCRIPT_TYPE_10, _("EVENT_S01E01A_L003"), s_script_EVENT_S01E01A_L003 }, + [EVENT_S01E01B_L001] = { EVENT_S01E01B_L001, SCRIPT_TYPE_10, _("EVENT_S01E01B_L001"), s_script_EVENT_S01E01B_L001 }, + [EVENT_S01E01B_L001L] = { EVENT_S01E01B_L001L, SCRIPT_TYPE_12, _("EVENT_S01E01B_L001L"), s_script_EVENT_S01E01B_L001L }, + [EVENT_S01E01C_L001] = { EVENT_S01E01C_L001, SCRIPT_TYPE_10, _("EVENT_S01E01C_L001"), s_script_EVENT_S01E01C_L001 }, + [EVENT_S01E02A_START] = { EVENT_S01E02A_START, SCRIPT_TYPE_11, _("EVENT_S01E02A_START"), s_script_EVENT_S01E02A_START }, + [EVENT_S01E02A_END] = { EVENT_S01E02A_END, SCRIPT_TYPE_11, _("EVENT_S01E02A_END"), s_script_EVENT_S01E02A_END }, + [EVENT_S01E02A_L001] = { EVENT_S01E02A_L001, SCRIPT_TYPE_10, _("EVENT_S01E02A_L001"), s_script_EVENT_S01E02A_L001 }, + [EVENT_S01E02A_L002] = { EVENT_S01E02A_L002, SCRIPT_TYPE_10, _("EVENT_S01E02A_L002"), s_script_EVENT_S01E02A_L002 }, + [EVENT_S01E02A_L002L] = { EVENT_S01E02A_L002L, SCRIPT_TYPE_12, _("EVENT_S01E02A_L002L"), s_script_EVENT_S01E02A_L002L }, + [EVENT_S01E02B_L001] = { EVENT_S01E02B_L001, SCRIPT_TYPE_12, _("EVENT_S01E02B_L001"), s_script_EVENT_S01E02B_L001 }, + [EVENT_S01E02B_L002] = { EVENT_S01E02B_L002, SCRIPT_TYPE_12, _("EVENT_S01E02B_L002"), s_script_EVENT_S01E02B_L002 }, + [EVENT_S02E01A_START] = { EVENT_S02E01A_START, SCRIPT_TYPE_11, _("EVENT_S02E01A_START"), s_script_EVENT_S02E01A_START }, + [EVENT_S02E01A_END] = { EVENT_S02E01A_END, SCRIPT_TYPE_11, _("EVENT_S02E01A_END"), s_script_EVENT_S02E01A_END }, + [EVENT_S02E01A_L001] = { EVENT_S02E01A_L001, SCRIPT_TYPE_12, _("EVENT_S02E01A_L001"), s_script_EVENT_S02E01A_L001 }, + [EVENT_S02E01A_L002] = { EVENT_S02E01A_L002, SCRIPT_TYPE_12, _("EVENT_S02E01A_L002"), s_script_EVENT_S02E01A_L002 }, + [EVENT_S02E01A_L003] = { EVENT_S02E01A_L003, SCRIPT_TYPE_12, _("EVENT_S02E01A_L003"), s_script_EVENT_S02E01A_L003 }, + [EVENT_S02E01A_L004] = { EVENT_S02E01A_L004, SCRIPT_TYPE_12, _("EVENT_S02E01A_L004"), s_script_EVENT_S02E01A_L004 }, + [EVENT_S02E01A_L004L] = { EVENT_S02E01A_L004L, SCRIPT_TYPE_12, _("EVENT_S02E01A_L004L"), s_script_EVENT_S02E01A_L004L }, + [EVENT_S02E02A_START] = { EVENT_S02E02A_START, SCRIPT_TYPE_11, _("EVENT_S02E02A_START"), s_script_EVENT_S02E02A_START }, + [EVENT_S02E02A_END] = { EVENT_S02E02A_END, SCRIPT_TYPE_11, _("EVENT_S02E02A_END"), s_script_EVENT_S02E02A_END }, + [EVENT_S02E02A_L001] = { EVENT_S02E02A_L001, SCRIPT_TYPE_12, _("EVENT_S02E02A_L001"), s_script_EVENT_S02E02A_L001 }, + [EVENT_S02E02A_L002] = { EVENT_S02E02A_L002, SCRIPT_TYPE_10, _("EVENT_S02E02A_L002"), s_script_EVENT_S02E02A_L002 }, + [EVENT_S02E02A_L003] = { EVENT_S02E02A_L003, SCRIPT_TYPE_12, _("EVENT_S02E02A_L003"), s_script_EVENT_S02E02A_L003 }, + [EVENT_S02E02A_L003L] = { EVENT_S02E02A_L003L, SCRIPT_TYPE_12, _("EVENT_S02E02A_L003L"), s_script_EVENT_S02E02A_L003L }, + [EVENT_S03E01A_START] = { EVENT_S03E01A_START, SCRIPT_TYPE_11, _("EVENT_S03E01A_START"), s_script_EVENT_S03E01A_START }, + [EVENT_S03E01A_CONTINUE] = { EVENT_S03E01A_CONTINUE, SCRIPT_TYPE_11, _("EVENT_S03E01A_CONTINUE"), s_script_EVENT_S03E01A_CONTINUE }, + [EVENT_S03E01A_END] = { EVENT_S03E01A_END, SCRIPT_TYPE_11, _("EVENT_S03E01A_END"), s_script_EVENT_S03E01A_END }, + [EVENT_S03E01A_L001] = { EVENT_S03E01A_L001, SCRIPT_TYPE_10, _("EVENT_S03E01A_L001"), s_script_EVENT_S03E01A_L001 }, + [EVENT_S03E01A_L002] = { EVENT_S03E01A_L002, SCRIPT_TYPE_12, _("EVENT_S03E01A_L002"), s_script_EVENT_S03E01A_L002 }, + [EVENT_S03E01A_L002L] = { EVENT_S03E01A_L002L, SCRIPT_TYPE_12, _("EVENT_S03E01A_L002L"), s_script_EVENT_S03E01A_L002L }, + [EVENT_S04E01A_START] = { EVENT_S04E01A_START, SCRIPT_TYPE_11, _("EVENT_S04E01A_START"), s_script_EVENT_S04E01A_START }, + [EVENT_S04E01A_LAST] = { EVENT_S04E01A_LAST, SCRIPT_TYPE_11, _("EVENT_S04E01A_LAST"), s_script_EVENT_S04E01A_LAST }, + [EVENT_S04E01A_END] = { EVENT_S04E01A_END, SCRIPT_TYPE_11, _("EVENT_S04E01A_END"), s_script_EVENT_S04E01A_END }, + [EVENT_S04E01A_L001] = { EVENT_S04E01A_L001, SCRIPT_TYPE_10, _("EVENT_S04E01A_L001"), s_script_EVENT_S04E01A_L001 }, + [EVENT_S04E01A_L002] = { EVENT_S04E01A_L002, SCRIPT_TYPE_10, _("EVENT_S04E01A_L002"), s_script_EVENT_S04E01A_L002 }, + [EVENT_S04E01A_L002L] = { EVENT_S04E01A_L002L, SCRIPT_TYPE_12, _("EVENT_S04E01A_L002L"), s_script_EVENT_S04E01A_L002L }, + [EVENT_S04E01B_L001] = { EVENT_S04E01B_L001, SCRIPT_TYPE_10, _("EVENT_S04E01B_L001"), s_script_EVENT_S04E01B_L001 }, + [EVENT_S04E01B_L001L] = { EVENT_S04E01B_L001L, SCRIPT_TYPE_12, _("EVENT_S04E01B_L001L"), s_script_EVENT_S04E01B_L001L }, + [EVENT_S04E01C_L001] = { EVENT_S04E01C_L001, SCRIPT_TYPE_10, _("EVENT_S04E01C_L001"), s_script_EVENT_S04E01C_L001 }, + [EVENT_S04E01C_L001L] = { EVENT_S04E01C_L001L, SCRIPT_TYPE_12, _("EVENT_S04E01C_L001L"), s_script_EVENT_S04E01C_L001L }, + [EVENT_S04E01D_L001] = { EVENT_S04E01D_L001, SCRIPT_TYPE_10, _("EVENT_S04E01D_L001"), s_script_EVENT_S04E01D_L001 }, + [EVENT_S04E01D_L001L] = { EVENT_S04E01D_L001L, SCRIPT_TYPE_12, _("EVENT_S04E01D_L001L"), s_script_EVENT_S04E01D_L001L }, + [EVENT_S04E01E_L001] = { EVENT_S04E01E_L001, SCRIPT_TYPE_10, _("EVENT_S04E01E_L001"), s_script_EVENT_S04E01E_L001 }, + [EVENT_S04E01E_L001L] = { EVENT_S04E01E_L001L, SCRIPT_TYPE_12, _("EVENT_S04E01E_L001L"), s_script_EVENT_S04E01E_L001L }, + [EVENT_S04E01F_L001] = { EVENT_S04E01F_L001, SCRIPT_TYPE_12, _("EVENT_S04E01F_L001"), s_script_EVENT_S04E01F_L001 }, + [EVENT_S05E01A_START] = { EVENT_S05E01A_START, SCRIPT_TYPE_11, _("EVENT_S05E01A_START"), s_script_EVENT_S05E01A_START }, + [EVENT_S05E01A_CONTINUE] = { EVENT_S05E01A_CONTINUE, SCRIPT_TYPE_11, _("EVENT_S05E01A_CONTINUE"), s_script_EVENT_S05E01A_CONTINUE }, + [EVENT_S05E01A_END] = { EVENT_S05E01A_END, SCRIPT_TYPE_11, _("EVENT_S05E01A_END"), s_script_EVENT_S05E01A_END }, + [EVENT_S05E01A_L001] = { EVENT_S05E01A_L001, SCRIPT_TYPE_10, _("EVENT_S05E01A_L001"), s_script_EVENT_S05E01A_L001 }, + [EVENT_S05E01A_L002] = { EVENT_S05E01A_L002, SCRIPT_TYPE_12, _("EVENT_S05E01A_L002"), s_script_EVENT_S05E01A_L002 }, + [EVENT_S05E01A_L002L] = { EVENT_S05E01A_L002L, SCRIPT_TYPE_12, _("EVENT_S05E01A_L002L"), s_script_EVENT_S05E01A_L002L }, + [EVENT_S06E01A_START] = { EVENT_S06E01A_START, SCRIPT_TYPE_11, _("EVENT_S06E01A_START"), s_script_EVENT_S06E01A_START }, + [EVENT_S06E01A_CONTINUE] = { EVENT_S06E01A_CONTINUE, SCRIPT_TYPE_11, _("EVENT_S06E01A_CONTINUE"), s_script_EVENT_S06E01A_CONTINUE }, + [EVENT_S06E01A_END] = { EVENT_S06E01A_END, SCRIPT_TYPE_11, _("EVENT_S06E01A_END"), s_script_EVENT_S06E01A_END }, + [EVENT_S06E01A_L001] = { EVENT_S06E01A_L001, SCRIPT_TYPE_10, _("EVENT_S06E01A_L001"), s_script_EVENT_S06E01A_L001 }, + [EVENT_S06E01A_L002] = { EVENT_S06E01A_L002, SCRIPT_TYPE_10, _("EVENT_S06E01A_L002"), s_script_EVENT_S06E01A_L002 }, + [EVENT_S06E01A_L002L] = { EVENT_S06E01A_L002L, SCRIPT_TYPE_12, _("EVENT_S06E01A_L002L"), s_script_EVENT_S06E01A_L002L }, + [EVENT_S06E01B_L001] = { EVENT_S06E01B_L001, SCRIPT_TYPE_10, _("EVENT_S06E01B_L001"), s_script_EVENT_S06E01B_L001 }, + [EVENT_S06E01B_L002] = { EVENT_S06E01B_L002, SCRIPT_TYPE_10, _("EVENT_S06E01B_L002"), s_script_EVENT_S06E01B_L002 }, + [EVENT_S06E01B_L002L] = { EVENT_S06E01B_L002L, SCRIPT_TYPE_12, _("EVENT_S06E01B_L002L"), s_script_EVENT_S06E01B_L002L }, + [EVENT_S07E01A_START] = { EVENT_S07E01A_START, SCRIPT_TYPE_11, _("EVENT_S07E01A_START"), s_script_EVENT_S07E01A_START }, + [EVENT_S07E01A_END] = { EVENT_S07E01A_END, SCRIPT_TYPE_11, _("EVENT_S07E01A_END"), s_script_EVENT_S07E01A_END }, + [EVENT_S07E01A_L001] = { EVENT_S07E01A_L001, SCRIPT_TYPE_12, _("EVENT_S07E01A_L001"), s_script_EVENT_S07E01A_L001 }, + [EVENT_S07E01A_L002] = { EVENT_S07E01A_L002, SCRIPT_TYPE_12, _("EVENT_S07E01A_L002"), s_script_EVENT_S07E01A_L002 }, + [EVENT_S07E01A_L003] = { EVENT_S07E01A_L003, SCRIPT_TYPE_12, _("EVENT_S07E01A_L003"), s_script_EVENT_S07E01A_L003 }, + [EVENT_S07E01A_L003L] = { EVENT_S07E01A_L003L, SCRIPT_TYPE_12, _("EVENT_S07E01A_L003L"), s_script_EVENT_S07E01A_L003L }, + [EVENT_S08E01A_START] = { EVENT_S08E01A_START, SCRIPT_TYPE_11, _("EVENT_S08E01A_START"), s_script_EVENT_S08E01A_START }, + [EVENT_S08E01A_END] = { EVENT_S08E01A_END, SCRIPT_TYPE_11, _("EVENT_S08E01A_END"), s_script_EVENT_S08E01A_END }, + [EVENT_S08E01A_L001] = { EVENT_S08E01A_L001, SCRIPT_TYPE_12, _("EVENT_S08E01A_L001"), s_script_EVENT_S08E01A_L001 }, + [EVENT_S08E01A_L002] = { EVENT_S08E01A_L002, SCRIPT_TYPE_12, _("EVENT_S08E01A_L002"), s_script_EVENT_S08E01A_L002 }, + [EVENT_S08E01A_L003] = { EVENT_S08E01A_L003, SCRIPT_TYPE_12, _("EVENT_S08E01A_L003"), s_script_EVENT_S08E01A_L003 }, + [EVENT_S08E01A_L004] = { EVENT_S08E01A_L004, SCRIPT_TYPE_12, _("EVENT_S08E01A_L004"), s_script_EVENT_S08E01A_L004 }, + [EVENT_S08E01A_L005] = { EVENT_S08E01A_L005, SCRIPT_TYPE_12, _("EVENT_S08E01A_L005"), s_script_EVENT_S08E01A_L005 }, + [EVENT_S08E01A_L005B] = { EVENT_S08E01A_L005B, SCRIPT_TYPE_10, _("EVENT_S08E01A_L005B"), s_script_EVENT_S08E01A_L005B }, + [EVENT_S08E01A_L006] = { EVENT_S08E01A_L006, SCRIPT_TYPE_10, _("EVENT_S08E01A_L006"), s_script_EVENT_S08E01A_L006 }, + [EVENT_S08E01A_L006L] = { EVENT_S08E01A_L006L, SCRIPT_TYPE_12, _("EVENT_S08E01A_L006L"), s_script_EVENT_S08E01A_L006L }, + [EVENT_S08E01A_L007] = { EVENT_S08E01A_L007, SCRIPT_TYPE_12, _("EVENT_S08E01A_L007"), s_script_EVENT_S08E01A_L007 }, + [EVENT_S08E01A_L008] = { EVENT_S08E01A_L008, SCRIPT_TYPE_10, _("EVENT_S08E01A_L008"), s_script_EVENT_S08E01A_L008 }, + [EVENT_S08E01A_L008L] = { EVENT_S08E01A_L008L, SCRIPT_TYPE_12, _("EVENT_S08E01A_L008L"), s_script_EVENT_S08E01A_L008L }, + [EVENT_S08E01A_L008A] = { EVENT_S08E01A_L008A, SCRIPT_TYPE_10, _("EVENT_S08E01A_L008A"), s_script_EVENT_S08E01A_L008A }, + [EVENT_S08E01A_L008B] = { EVENT_S08E01A_L008B, SCRIPT_TYPE_10, _("EVENT_S08E01A_L008B"), s_script_EVENT_S08E01A_L008B }, + [EVENT_S08E01A_L008C] = { EVENT_S08E01A_L008C, SCRIPT_TYPE_10, _("EVENT_S08E01A_L008C"), s_script_EVENT_S08E01A_L008C }, + [EVENT_S09E01A_START] = { EVENT_S09E01A_START, SCRIPT_TYPE_11, _("EVENT_S09E01A_START"), s_script_EVENT_S09E01A_START }, + [EVENT_S09E01A_END] = { EVENT_S09E01A_END, SCRIPT_TYPE_11, _("EVENT_S09E01A_END"), s_script_EVENT_S09E01A_END }, + [EVENT_S09E01A_L001] = { EVENT_S09E01A_L001, SCRIPT_TYPE_12, _("EVENT_S09E01A_L001"), s_script_EVENT_S09E01A_L001 }, + [EVENT_S09E01A_L002] = { EVENT_S09E01A_L002, SCRIPT_TYPE_12, _("EVENT_S09E01A_L002"), s_script_EVENT_S09E01A_L002 }, + [EVENT_S09E01A_L003] = { EVENT_S09E01A_L003, SCRIPT_TYPE_12, _("EVENT_S09E01A_L003"), s_script_EVENT_S09E01A_L003 }, + [EVENT_S09E01A_L004] = { EVENT_S09E01A_L004, SCRIPT_TYPE_10, _("EVENT_S09E01A_L004"), s_script_EVENT_S09E01A_L004 }, + [EVENT_S09E01A_L004B] = { EVENT_S09E01A_L004B, SCRIPT_TYPE_10, _("EVENT_S09E01A_L004B"), s_script_EVENT_S09E01A_L004B }, + [EVENT_S09E01A_L005] = { EVENT_S09E01A_L005, SCRIPT_TYPE_10, _("EVENT_S09E01A_L005"), s_script_EVENT_S09E01A_L005 }, + [EVENT_S09E01A_L005L] = { EVENT_S09E01A_L005L, SCRIPT_TYPE_12, _("EVENT_S09E01A_L005L"), s_script_EVENT_S09E01A_L005L }, + [EVENT_S09E01B_L001] = { EVENT_S09E01B_L001, SCRIPT_TYPE_10, _("EVENT_S09E01B_L001"), s_script_EVENT_S09E01B_L001 }, + [EVENT_S09E01B_L001B] = { EVENT_S09E01B_L001B, SCRIPT_TYPE_10, _("EVENT_S09E01B_L001B"), s_script_EVENT_S09E01B_L001B }, + [EVENT_S09E01B_L002] = { EVENT_S09E01B_L002, SCRIPT_TYPE_10, _("EVENT_S09E01B_L002"), s_script_EVENT_S09E01B_L002 }, + [EVENT_S09E01B_L002L] = { EVENT_S09E01B_L002L, SCRIPT_TYPE_12, _("EVENT_S09E01B_L002L"), s_script_EVENT_S09E01B_L002L }, + [EVENT_S09E01C_L001] = { EVENT_S09E01C_L001, SCRIPT_TYPE_12, _("EVENT_S09E01C_L001"), s_script_EVENT_S09E01C_L001 }, + [EVENT_R00E01A_L001] = { EVENT_R00E01A_L001, SCRIPT_TYPE_07, _("EVENT_R00E01A_L001"), s_script_EVENT_R00E01A_L001 }, + [COMMON_ENTER] = { COMMON_ENTER, SCRIPT_TYPE_01, _("COMMON_ENTER"), s_script_COMMON_ENTER }, + [DEBUG_ENTER] = { DEBUG_ENTER, SCRIPT_TYPE_01, _("DEBUG_ENTER"), s_script_DEBUG_ENTER }, + [GETOUT_NORMAL] = { GETOUT_NORMAL, SCRIPT_TYPE_02, _("GETOUT_NORMAL"), NULL }, + [GETOUT_HABITAT] = { GETOUT_HABITAT, SCRIPT_TYPE_02, _("GETOUT_HABITAT"), s_script_GETOUT_HABITAT }, + [GETOUT_M01E01A] = { GETOUT_M01E01A, SCRIPT_TYPE_02, _("GETOUT_M01E01A"), s_script_GETOUT_M01E01A }, + [GETOUT_M01E02A] = { GETOUT_M01E02A, SCRIPT_TYPE_02, _("GETOUT_M01E02A"), s_script_GETOUT_M01E02A }, + [GETOUT_M01E02B] = { GETOUT_M01E02B, SCRIPT_TYPE_02, _("GETOUT_M01E02B"), s_script_GETOUT_M01E02B }, + [GETOUT_M01E03A] = { GETOUT_M01E03A, SCRIPT_TYPE_02, _("GETOUT_M01E03A"), s_script_GETOUT_M01E03A }, + [GETOUT_M01E04A] = { GETOUT_M01E04A, SCRIPT_TYPE_02, _("GETOUT_M01E04A"), s_script_GETOUT_M01E04A }, + [GETOUT_M01E04B] = { GETOUT_M01E04B, SCRIPT_TYPE_02, _("GETOUT_M01E04B"), s_script_GETOUT_M01E04B }, + [GETOUT_M01E05A] = { GETOUT_M01E05A, SCRIPT_TYPE_02, _("GETOUT_M01E05A"), s_script_GETOUT_M01E05A }, + [GETOUT_M01E07A] = { GETOUT_M01E07A, SCRIPT_TYPE_02, _("GETOUT_M01E07A"), s_script_GETOUT_M01E07A }, + [GETOUT_M01E07B] = { GETOUT_M01E07B, SCRIPT_TYPE_02, _("GETOUT_M01E07B"), s_script_GETOUT_M01E07B }, + [GETOUT_M01E08A] = { GETOUT_M01E08A, SCRIPT_TYPE_02, _("GETOUT_M01E08A"), s_script_GETOUT_M01E08A }, + [GETOUT_M01E08B] = { GETOUT_M01E08B, SCRIPT_TYPE_02, _("GETOUT_M01E08B"), s_script_GETOUT_M01E08B }, + [GETOUT_M01E09A] = { GETOUT_M01E09A, SCRIPT_TYPE_02, _("GETOUT_M01E09A"), s_script_GETOUT_M01E09A }, + [GETOUT_M01E10A] = { GETOUT_M01E10A, SCRIPT_TYPE_02, _("GETOUT_M01E10A"), s_script_GETOUT_M01E10A }, + [GETOUT_S00E01A] = { GETOUT_S00E01A, SCRIPT_TYPE_02, _("GETOUT_S00E01A"), s_script_GETOUT_S00E01A }, + [GETOUT_S01E01A] = { GETOUT_S01E01A, SCRIPT_TYPE_02, _("GETOUT_S01E01A"), s_script_GETOUT_S01E01A }, + [GETOUT_S01E02A] = { GETOUT_S01E02A, SCRIPT_TYPE_02, _("GETOUT_S01E02A"), s_script_GETOUT_S01E02A }, + [GETOUT_S02E01A] = { GETOUT_S02E01A, SCRIPT_TYPE_02, _("GETOUT_S02E01A"), s_script_GETOUT_S02E01A }, + [GETOUT_S02E02A] = { GETOUT_S02E02A, SCRIPT_TYPE_02, _("GETOUT_S02E02A"), s_script_GETOUT_S02E02A }, + [GETOUT_S03E01A] = { GETOUT_S03E01A, SCRIPT_TYPE_02, _("GETOUT_S03E01A"), s_script_GETOUT_S03E01A }, + [GETOUT_S04E01A] = { GETOUT_S04E01A, SCRIPT_TYPE_02, _("GETOUT_S04E01A"), s_script_GETOUT_S04E01A }, + [GETOUT_S04E01B] = { GETOUT_S04E01B, SCRIPT_TYPE_02, _("GETOUT_S04E01B"), s_script_GETOUT_S04E01B }, + [GETOUT_S04E01C] = { GETOUT_S04E01C, SCRIPT_TYPE_02, _("GETOUT_S04E01C"), s_script_GETOUT_S04E01C }, + [GETOUT_S04E01D] = { GETOUT_S04E01D, SCRIPT_TYPE_02, _("GETOUT_S04E01D"), s_script_GETOUT_S04E01D }, + [GETOUT_S04E01E] = { GETOUT_S04E01E, SCRIPT_TYPE_02, _("GETOUT_S04E01E"), s_script_GETOUT_S04E01E }, + [GETOUT_S05E01A] = { GETOUT_S05E01A, SCRIPT_TYPE_02, _("GETOUT_S05E01A"), s_script_GETOUT_S05E01A }, + [GETOUT_S06E01A] = { GETOUT_S06E01A, SCRIPT_TYPE_02, _("GETOUT_S06E01A"), s_script_GETOUT_S06E01A }, + [GETOUT_S06E01B] = { GETOUT_S06E01B, SCRIPT_TYPE_02, _("GETOUT_S06E01B"), s_script_GETOUT_S06E01B }, + [GETOUT_S07E01A] = { GETOUT_S07E01A, SCRIPT_TYPE_02, _("GETOUT_S07E01A"), s_script_GETOUT_S07E01A }, + [GETOUT_S08E01A] = { GETOUT_S08E01A, SCRIPT_TYPE_02, _("GETOUT_S08E01A"), s_script_GETOUT_S08E01A }, + [GETOUT_S09E01A] = { GETOUT_S09E01A, SCRIPT_TYPE_02, _("GETOUT_S09E01A"), s_script_GETOUT_S09E01A }, + [GETOUT_S09E01B] = { GETOUT_S09E01B, SCRIPT_TYPE_02, _("GETOUT_S09E01B"), s_script_GETOUT_S09E01B }, + [GETOUT_D62E01A] = { GETOUT_D62E01A, SCRIPT_TYPE_02, _("GETOUT_D62E01A"), s_script_GETOUT_D62E01A }, + [GETOUT_D43E01A] = { GETOUT_D43E01A, SCRIPT_TYPE_02, _("GETOUT_D43E01A"), s_script_GETOUT_D43E01A }, + [GETOUT_D44E01A] = { GETOUT_D44E01A, SCRIPT_TYPE_02, _("GETOUT_D44E01A"), s_script_GETOUT_D44E01A }, + [GETOUT_D45E01A] = { GETOUT_D45E01A, SCRIPT_TYPE_02, _("GETOUT_D45E01A"), s_script_GETOUT_D45E01A }, + [GETOUT_D46E01A] = { GETOUT_D46E01A, SCRIPT_TYPE_02, _("GETOUT_D46E01A"), s_script_GETOUT_D46E01A }, + [GETOUT_U00E01A] = { GETOUT_U00E01A, SCRIPT_TYPE_02, _("GETOUT_U00E01A"), s_script_GETOUT_U00E01A }, + [GETOUT_R00E01A] = { GETOUT_R00E01A, SCRIPT_TYPE_02, _("GETOUT_R00E01A"), s_script_GETOUT_R00E01A }, + [GETOUT_T00E01A] = { GETOUT_T00E01A, SCRIPT_TYPE_02, _("GETOUT_T00E01A"), s_script_GETOUT_T00E01A }, + [GETOUT_M01E07T] = { GETOUT_M01E07T, SCRIPT_TYPE_02, _("GETOUT_M01E07T"), s_script_GETOUT_M01E07T }, + [GETOUT_M01E08T] = { GETOUT_M01E08T, SCRIPT_TYPE_02, _("GETOUT_M01E08T"), s_script_GETOUT_M01E08T }, + [EVENT_CONTROL] = { EVENT_CONTROL, SCRIPT_TYPE_07, _("EVENT_CONTROL"), NULL }, + [EVENT_WAKEUP] = { EVENT_WAKEUP, SCRIPT_TYPE_07, _("EVENT_WAKEUP"), NULL }, + [EVENT_STATION] = { EVENT_STATION, SCRIPT_TYPE_07, _("EVENT_STATION"), NULL }, + [STATION_CONTROL] = { STATION_CONTROL, SCRIPT_TYPE_08, _("STATION_CONTROL"), NULL }, + [ENTER_CONTROL] = { ENTER_CONTROL, SCRIPT_TYPE_01, _("ENTER_CONTROL"), NULL }, + [SETUP_DEBUG_CAMERA] = { SETUP_DEBUG_CAMERA, SCRIPT_TYPE_07, _("SETUP_DEBUG_CAMERA"), s_script_SETUP_DEBUG_CAMERA }, + [MOVE_DEBUG_CAMERA] = { MOVE_DEBUG_CAMERA, SCRIPT_TYPE_05, _("MOVE_DEBUG_CAMERA"), s_script_MOVE_DEBUG_CAMERA }, }; diff --git a/src/dungeon_8041AD0.c b/src/dungeon_8041AD0.c index 393a24be8..a2e2d09b1 100644 --- a/src/dungeon_8041AD0.c +++ b/src/dungeon_8041AD0.c @@ -10,6 +10,7 @@ #include "code_800558C.h" #include "effect_main.h" #include "effect_sub_1.h" +#include "effect_sub_2.h" #include "dungeon_vram.h" #include "dungeon_tilemap.h" #include "dungeon_mon_sprite_render.h" @@ -35,13 +36,6 @@ // Unknown dungeon file. File split is correct. -extern void sub_800DBBC(void); -extern void sub_800EF28(u8); -extern void sub_800F15C(s32); -extern void sub_800EF40(u8 r0, u8 r1); -extern s32 sub_800E6D8(s32); -extern void sub_800EB24(s32 param_1, DungeonPos *param_2, DungeonPos *param_3, s32 param_4, s32 param_5); - struct UnkStruct_80F6624 { s16 unk0; @@ -259,7 +253,7 @@ static s32 sub_80416A4(DungeonPos *pos_1, u32 param_2, bool8 param_3) s32 sub_80416E0(PixelPos *pos, u32 param_2, bool8 param_3) { - int counter; + s32 counter; s32 ret; unkStruct_80416E0 auStack_10; diff --git a/src/dungeon_action.c b/src/dungeon_action.c index 8d989608d..d58648ee5 100644 --- a/src/dungeon_action.c +++ b/src/dungeon_action.c @@ -199,7 +199,7 @@ void sub_8044DF0(Entity *entity, s32 index, u32 unused) } } -void sub_8044E24(Entity *entity,int index,u32 unused) +void sub_8044E24(Entity *entity,s32 index,u32 unused) { Item *itemPtr; EntityInfo *info; @@ -257,7 +257,7 @@ bool8 CanSubMenuItemBeChosen(s32 itemId) void AddActionToDungeonSubMenu(u16 actionId, u8 param_2) { - int index; + s32 index; if (gDungeonSubMenuItemsCount < 10) { for(index = 0; index < gDungeonSubMenuItemsCount; index++) @@ -275,7 +275,7 @@ void AddActionToDungeonSubMenu(u16 actionId, u8 param_2) s32 ActionToDungeonSubMenuId(u16 actionId) { - int index; + s32 index; for(index = 0; index < gDungeonSubMenuItemsCount; index++) { @@ -288,7 +288,7 @@ s32 ActionToDungeonSubMenuId(u16 actionId) void SetActionUnusableInDungeonSubMenu(u16 actionId) { - int index; + s32 index; for(index = 0; index < gDungeonSubMenuItemsCount; index++) { diff --git a/src/dungeon_action_execution.c b/src/dungeon_action_execution.c index 4e2908f64..d3a8d3168 100644 --- a/src/dungeon_action_execution.c +++ b/src/dungeon_action_execution.c @@ -400,7 +400,7 @@ _increase: static void HandleSnore(void) { - int index; + s32 index; s32 moveIndex; Move *move; EntityInfo *info; diff --git a/src/dungeon_cutscene.c b/src/dungeon_cutscene.c index f1d195919..f38c1d2c4 100644 --- a/src/dungeon_cutscene.c +++ b/src/dungeon_cutscene.c @@ -1181,7 +1181,7 @@ void sub_8085B4C(struct_8085B80 a0[], s16 *a1[], Entity *a2[], s32 a3) bool8 sub_8085B80(struct_8085B80 *a0) { s16 *unkCPtr; - int i; + s32 i; bool8 ret = FALSE; for (i = 0; i < gUnknown_202F3D8; i++) { diff --git a/src/dungeon_cutscene_articuno.c b/src/dungeon_cutscene_articuno.c index bacdb23b5..aaef27458 100644 --- a/src/dungeon_cutscene_articuno.c +++ b/src/dungeon_cutscene_articuno.c @@ -239,7 +239,7 @@ void ArticunoPostStoryPreFightDialogue(void) static void sub_8088484(Entity *param_1) { - int iVar1; + s32 iVar1; GetEntInfo(param_1)->unk15C = 1; GetEntInfo(param_1)->unk15E = 0; @@ -254,7 +254,7 @@ static void sub_8088484(Entity *param_1) static void ArticunoScreenFlash(void) { - int iVar1; + s32 iVar1; PlaySoundEffect(0x2ad); for(iVar1 = 250; iVar1 > 0x95; iVar1 -= 10) @@ -280,7 +280,7 @@ static void ArticunoScreenFlash(void) static void sub_8088574(void) { - int iVar1; + s32 iVar1; for(iVar1 = 0; iVar1 <= 80; iVar1 += 8) { diff --git a/src/dungeon_cutscene_groudon.c b/src/dungeon_cutscene_groudon.c index 5f9a2ebc4..86be3904d 100644 --- a/src/dungeon_cutscene_groudon.c +++ b/src/dungeon_cutscene_groudon.c @@ -275,7 +275,7 @@ void GroudonPostStoryPreFightDialogue(void) // Moves Groudon down in a walking fashion static void SceneGroudonMovement(Entity * groudonEntity) { - int iVar1; + s32 iVar1; sub_8086848(0x18,0x10); sub_806CDD4(groudonEntity,0,DIRECTION_SOUTH); diff --git a/src/dungeon_cutscene_mewtwo.c b/src/dungeon_cutscene_mewtwo.c index 8ea6d23d0..c7a76c84a 100644 --- a/src/dungeon_cutscene_mewtwo.c +++ b/src/dungeon_cutscene_mewtwo.c @@ -162,7 +162,7 @@ static void MewtwoDropInEffect(Entity *mewtwoEntity) static void MewtwoScreenFlash(void) { - int iVar1; + s32 iVar1; PlaySoundEffect(0x1f6); for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) diff --git a/src/dungeon_cutscene_moltres.c b/src/dungeon_cutscene_moltres.c index 02fa8b0dc..8f56eef3a 100644 --- a/src/dungeon_cutscene_moltres.c +++ b/src/dungeon_cutscene_moltres.c @@ -306,7 +306,7 @@ static void MoltresScreenFlash2(s32 xArg, s32 yArg) static void MoltresScreenFlash3(void) { - int iVar1; + s32 iVar1; PlaySoundEffect(0x1ed); iVar1 = 0xfa; diff --git a/src/dungeon_cutscene_zapdos.c b/src/dungeon_cutscene_zapdos.c index ab48a5136..45b68124f 100644 --- a/src/dungeon_cutscene_zapdos.c +++ b/src/dungeon_cutscene_zapdos.c @@ -234,7 +234,7 @@ void ZapdosPostStoryPreFightDialogue(void) static void ZapdosDropInEffect(Entity *zapdosEntity) { - int iVar1; + s32 iVar1; GetEntInfo(zapdosEntity)->unk15C = 1; GetEntInfo(zapdosEntity)->unk15E = 0; diff --git a/src/dungeon_damage.c b/src/dungeon_damage.c index ee92e4ad3..ad4b70a07 100644 --- a/src/dungeon_damage.c +++ b/src/dungeon_damage.c @@ -1559,7 +1559,7 @@ static void sub_806F500(void) static const s32 gUnknown_8106F7C[] = {0, 0, 0, 1}; -s32 sub_806F62C(int param_1) +s32 sub_806F62C(s32 param_1) { return gUnknown_8106F7C[param_1]; } diff --git a/src/dungeon_entity_movement.c b/src/dungeon_entity_movement.c index 46a2b1929..2f7f7f0fa 100644 --- a/src/dungeon_entity_movement.c +++ b/src/dungeon_entity_movement.c @@ -315,7 +315,7 @@ bool8 DisplayActions_Async(Entity *a0) void sub_8075680(bool8 unused) { u32 direction; - int i; + s32 i; for (i = 0; i < DUNGEON_MAX_POKEMON; i++) { Entity *entity = gDungeon->activePokemon[i]; diff --git a/src/dungeon_info.c b/src/dungeon_info.c index 1adbe113b..2c633dc93 100644 --- a/src/dungeon_info.c +++ b/src/dungeon_info.c @@ -2452,7 +2452,7 @@ s16 GetRandomMovementChance(u8 dungeon) bool8 sub_809017C(DungeonLocation* a1) { DungeonLocation location; - int i; + s32 i; GeneralizeMazeDungeonLoc(&location, a1); for (i = 0; i < 999 && gUnknown_8107828[i].id != DUNGEON_OUT_ON_RESCUE; ++i) { if (location.id == gUnknown_8107828[i].id && diff --git a/src/dungeon_item_action.c b/src/dungeon_item_action.c index 32991adcc..997771dd3 100644 --- a/src/dungeon_item_action.c +++ b/src/dungeon_item_action.c @@ -696,7 +696,7 @@ bool8 sub_8048950(Entity *param_1,Item *item) Entity *entity2; Entity *entity; EntityInfo *entityInfo; - int index; + s32 index; moveID = GetItemMoveID(item->id); if ((item->flags & ITEM_FLAG_STICKY)) { diff --git a/src/dungeon_items.c b/src/dungeon_items.c index 07c46294e..d4cc36bf4 100644 --- a/src/dungeon_items.c +++ b/src/dungeon_items.c @@ -145,7 +145,7 @@ void CreateFloorItems(void) void TryLeaderItemPickUp_Async(struct DungeonPos *pos, bool8 printMsg) { Item *tileItem; - int inventoryIds[INVENTORY_SIZE + 1]; + s32 inventoryIds[INVENTORY_SIZE + 1]; Item *inventoryItems[INVENTORY_SIZE + 1]; Entity *leader = GetLeader(); EntityInfo *leaderInfo = GetEntInfo(leader); diff --git a/src/dungeon_jobs.c b/src/dungeon_jobs.c index 84581c485..2ab52e799 100644 --- a/src/dungeon_jobs.c +++ b/src/dungeon_jobs.c @@ -82,7 +82,7 @@ void sub_8084424(void) void sub_8084448(Entity *pokemon) { - int i; + s32 i; const u8 *str; EntityInfo *entInfo = GetEntInfo(pokemon); @@ -144,7 +144,7 @@ void sub_8084448(Entity *pokemon) void sub_80845E0(Entity *pokemon) { - int i; + s32 i; EntityInfo *info1 = GetEntInfo(pokemon); Entity *entity = NULL; EntityInfo *info2 = NULL; diff --git a/src/dungeon_leveling.c b/src/dungeon_leveling.c index 5297a8945..9d719922c 100644 --- a/src/dungeon_leveling.c +++ b/src/dungeon_leveling.c @@ -69,7 +69,7 @@ void AddExpPoints(Entity *pokemon, Entity *target, s32 exp) void EnemyEvolution(Entity *entity) { - int counter; + s32 counter; s16 *id; Entity EStack_f4; u8 tacticsBuffer1[NUM_TACTICS]; @@ -737,8 +737,8 @@ void sub_8072AC8(s16 *param_1, s32 species, s32 param_3) static void sub_8072B24(Entity *entity, Move *moves) { - int index; - int count; + s32 index; + s32 count; count = 0; for(index = 0; index < 8; index++) @@ -766,7 +766,7 @@ static void sub_8072B78(Entity *pokemon, Entity *target, s16 id) { OpenedFile *file; const Tile *tile; - int index; + s32 index; s32 id_s32; EntityInfo *entityInfo; LevelData levelData; diff --git a/src/dungeon_map_access.c b/src/dungeon_map_access.c index fea8faaee..fd5541f71 100644 --- a/src/dungeon_map_access.c +++ b/src/dungeon_map_access.c @@ -167,7 +167,7 @@ void sub_80498A8(s32 x,s32 y) volatile u32 sp_0x1C; u32 r1; u16 sp_0x20; // sp 0x20 - int r4; + s32 r4; s32 r7; // r7 if (x < 0) { @@ -956,8 +956,8 @@ void sub_804AAD4(void) struct RoomData *room1; struct RoomData *room2; s32 roomIndex; - int x; - int y; + s32 x; + s32 y; s32 maxRooms; s32 index; diff --git a/src/dungeon_menu_items.c b/src/dungeon_menu_items.c index 17270847a..342c9fa5c 100644 --- a/src/dungeon_menu_items.c +++ b/src/dungeon_menu_items.c @@ -306,7 +306,7 @@ bool8 ShowDungeonItemsMenu(Entity * a0, struct UnkMenuBitsStruct *a1) if (inputAction != 1 || var_30 != 0) { if (a0Info->action.action == ACTION_TAKE_ITEM || a0Info->action.action == ACTION_USE_ITEM || a0Info->action.action == ACTION_UNK3E) { // Hm... - int newAction = sUnknownActionUnk4.actionUseIndex - 0x90; + s32 newAction = sUnknownActionUnk4.actionUseIndex - 0x90; a0Info->action.actionParameters[0].actionUseIndex = newAction; sub_803EAF0(0, NULL); inputAction = 0; diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c index 2e7729549..39d3f1bf0 100644 --- a/src/dungeon_misc.c +++ b/src/dungeon_misc.c @@ -184,8 +184,8 @@ void CloseAllSpriteFiles(void) void SetDungeonMonsFromTeam(void) { - int index; - int recruitedId; + s32 index; + s32 recruitedId; index = 0; for (recruitedId = 0; recruitedId < NUM_MONSTERS; recruitedId++) { @@ -194,7 +194,7 @@ void SetDungeonMonsFromTeam(void) if (PokemonExists(pokeStruct) && PokemonIsOnTeam(pokeStruct)) { RecruitedPokemonToDungeonMon(&gRecruitedPokemonRef->dungeonTeam[index],recruitedId); if (IsLevelResetDungeon(gDungeon->unk644.dungeonLocation.id)) { - struct DungeonLocation dungeonLoc = {.id = DUNGEON_TINY_WOODS, .floor = 1}; + DungeonLocation dungeonLoc = { .id = DUNGEON_TINY_WOODS, .floor = 1 }; CreateLevel1Pokemon(&lvl1Mon,pokeStruct->speciesNum,0,0,&dungeonLoc,0); gRecruitedPokemonRef->dungeonTeam[index].level = lvl1Mon.level; gRecruitedPokemonRef->dungeonTeam[index].IQ = lvl1Mon.IQ; @@ -685,7 +685,7 @@ void sub_80694C0(Entity *target,s32 x,s32 y,u8 param_4) return; } -void sub_80695EC(Entity *param_1,int x,int y) +void sub_80695EC(Entity *param_1,s32 x,s32 y) { EntityInfo *info; @@ -788,7 +788,7 @@ Entity * sub_806977C(Entity *target) void SetMonSummaryInfoFromEntity(struct MonSummaryInfo *param_1, Entity *target) { - int index; + s32 index; u8 *atkPtr; u8 *spAtkPtr; u8 *defPtr; diff --git a/src/dungeon_mon_recruit.c b/src/dungeon_mon_recruit.c index 3b9820641..ed474c7f3 100644 --- a/src/dungeon_mon_recruit.c +++ b/src/dungeon_mon_recruit.c @@ -155,7 +155,7 @@ static void nullsub_96(Entity *pokemon,Entity *target) static void sub_806F910(void) { s32 i, j; - int totalSize; + s32 totalSize; s32 unkMaybeTimer; totalSize = 0; @@ -225,7 +225,7 @@ bool8 IsMonsterRecruitable(s32 species) bool8 MonsterJoinSequence_Async(Entity *entity1, Entity *entity2, struct unkStruct_8069D4C *param_3) { DungeonMon *dungeonMon; - int pokeIndex; + s32 pokeIndex; Entity *local_2c; s32 i; @@ -367,7 +367,7 @@ bool8 HandleSpecialEntityJoinSequence(Entity *entity1,Entity *entity2,Entity **e { u8 friendArea; DungeonMon *dungeonMon; - int index; + s32 index; struct unkStruct_8069D4C local_74; Entity *local_2c; s32 i; diff --git a/src/dungeon_move.c b/src/dungeon_move.c index 1e84be40f..054901bee 100644 --- a/src/dungeon_move.c +++ b/src/dungeon_move.c @@ -6,6 +6,7 @@ #include "constants/iq_skill.h" #include "constants/status.h" #include "constants/weather.h" +#include "code_8040094_1.h" #include "dungeon_move_util.h" #include "effect_main.h" #include "effect_data.h" @@ -44,8 +45,6 @@ #include "warp_target.h" #include "dungeon_ai_attack.h" -extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *); - static s32 TryHitTarget_Async(Entity *attacker, Entity *target, Move *move, struct DamageStruct *dmgStruct, s16 unk_); EWRAM_DATA s32 gUnknown_202F208 = 0; diff --git a/src/dungeon_move_util.c b/src/dungeon_move_util.c index 5884eede7..2e0ac4f39 100644 --- a/src/dungeon_move_util.c +++ b/src/dungeon_move_util.c @@ -5,6 +5,7 @@ #include "constants/iq_skill.h" #include "constants/status.h" #include "constants/weather.h" +#include "code_8040094_1.h" #include "dungeon_move_util.h" #include "effect_main.h" #include "effect_data.h" @@ -44,15 +45,10 @@ #include "dungeon_damage.h" #include "dungeon_leveling.h" -extern bool8 sub_8040BB0(Entity *entity, Move *move, bool8); -extern void sub_8040DA0(Entity *entity, Move *move); -extern u16 GetEffectiveMoveId(u16 moveId, u8 weather, u8 hasSpecialEffect); -extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *); +static EWRAM_INIT Entity *gUnknown_203B438 = NULL; static u8 ToItemID(u32 itemID); -static EWRAM_INIT Entity *gUnknown_203B438 = NULL; - bool32 sub_8055A00(Entity *attacker, s32 firstMoveId, s32 var_34, s32 itemId, s32 arg_0) { s32 i, j; @@ -1083,7 +1079,7 @@ bool8 IsChargingAnyTwoTurnMove(Entity *pokemon, bool8 checkCharge) else { EntityInfo *pokemonInfo = GetEntInfo(pokemon); - int i = 0; + s32 i = 0; u8 *bideClassStatusPointer = &pokemonInfo->bideClassStatus.status; u8 *bideClassStatusPointer2; u8 chargeStatus = STATUS_CHARGING; @@ -1114,7 +1110,7 @@ bool8 IsChargingAnyTwoTurnMove(Entity *pokemon, bool8 checkCharge) u32 sub_8057144(Entity * pokemon) { Move *moveStack[80]; - int i, j, nMoves; + s32 i, j, nMoves; nMoves = 0; for (i = 0; i < DUNGEON_MAX_POKEMON; i++) diff --git a/src/dungeon_projectile_throw.c b/src/dungeon_projectile_throw.c index 0eb7af0fe..2793e67dd 100644 --- a/src/dungeon_projectile_throw.c +++ b/src/dungeon_projectile_throw.c @@ -31,10 +31,10 @@ struct ProjectileHitEntry void HandleStraightProjectileThrow(Entity *thrower, Item *item, DungeonPos *pos, s32 dir, struct ProjectileThrowInfo *a4) { const Tile *tile; - int i; + s32 i; u32 stepResult; - int remainingSteps; - int count; + s32 remainingSteps; + s32 count; bool8 hallucinating = gDungeon->unk181e8.hallucinating; struct ProjectileHitEntry hitList[64]; bool8 lockOnActive; diff --git a/src/dungeon_tilemap.c b/src/dungeon_tilemap.c index dab23d3b7..7f3912adc 100644 --- a/src/dungeon_tilemap.c +++ b/src/dungeon_tilemap.c @@ -693,8 +693,8 @@ static void sub_803FF18(s32 a0, u16 *a1, bool8 a2) void HandleLuminousOrbAction(Entity *pokemon) { - int XCoord; - int YCoord; + s32 XCoord; + s32 YCoord; gDungeon->unk181e8.allTilesRevealed = TRUE; diff --git a/src/effect_main.c b/src/effect_main.c index de4f96b00..4f25a54b0 100644 --- a/src/effect_main.c +++ b/src/effect_main.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "code_8099360.h" #include "effect_main.h" #include "effect_sub_1.h" #include "effect_sub_2.h" @@ -79,10 +80,6 @@ struct unkStruct_800F18C extern s16 gUnknown_2026E4E; - -extern void sub_8009BE4(void); -extern void sub_809971C(u16 a0, const RGB_Struct *a1, int a2); - static s32 sub_800E900(s32 a0); static s32 sub_800E2C0(s32); static s32 sub_800E2B8(OpenedFile *a0); @@ -514,7 +511,7 @@ static bool8 sub_800DE8C(struct unkStruct_203B0CC_sub *a0, DungeonPos *unused) if (r8->unk20 != 0) { switch (gUnknown_203B0CC->fileSelection) { case 1: - sub_809971C(224, &GetFileEfo(a0)->unk10->pal[224],16); + sub_809971C(224, (RGB_Array*)&GetFileEfo(a0)->unk10->pal[224],16); break; case 0: { s32 i; diff --git a/src/effect_sub_1.c b/src/effect_sub_1.c index 76f761d4a..c5cc86cc5 100644 --- a/src/effect_sub_1.c +++ b/src/effect_sub_1.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "code_8099360.h" #include "effect_sub_1.h" #include "effect_sub_2.h" #include "bg_control.h" @@ -38,8 +39,6 @@ struct unkStruct_203B0D0 { static EWRAM_INIT struct unkStruct_203B0D0 *gUnknown_203B0D0 = NULL; -extern void sub_809971C(u16 a0, const RGB_Struct *a1, int a2); - void sub_800ED38(s32 r0) { if (gUnknown_203B0D0 == NULL) { @@ -198,7 +197,7 @@ void sub_800EF64(void) switch (gUnknown_203B0D0->unk0) { case 1: { const RGB_Struct *pal = sub->fileData->pal; - sub_809971C((sub->unkC + 16) * 16, pal, 0x10); + sub_809971C((sub->unkC + 16) * 16, (RGB_Array*)pal, 0x10); break; } case 0: { diff --git a/src/explosion.c b/src/explosion.c index ce0355f70..ae6d9109f 100644 --- a/src/explosion.c +++ b/src/explosion.c @@ -87,9 +87,9 @@ void HandleExplosion(Entity *pokemon,Entity *target,DungeonPos *param_3,s32 para Tile *tile; Entity * entity1; Entity *entity2; - int x; - int y; - int index; + s32 x; + s32 y; + s32 index; DungeonPos pos; u32 dungeonExitReason; diff --git a/src/expose_trap.c b/src/expose_trap.c index b5988ea14..45cbc999e 100644 --- a/src/expose_trap.c +++ b/src/expose_trap.c @@ -29,8 +29,8 @@ void sub_807D3CC(Entity *param_1) { u32 room; u8 flag; - int x; - int y; + s32 x; + s32 y; s32 range; RoomData *roomData; diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index 9952a4054..a54f0a4fc 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -234,7 +234,7 @@ void sub_8027274(void) void CreateFriendActionMenu(void) { - int index; + s32 index; s32 loopMax; Pokemon *pokeStruct; @@ -324,7 +324,7 @@ void CreateFriendActionMenu(void) void sub_80276A8(void) { - int index; + s32 index; s32 loopMax; loopMax = 0; diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c index 9672c5f7a..50f794f77 100644 --- a/src/friend_list_menu.c +++ b/src/friend_list_menu.c @@ -316,7 +316,7 @@ static void sub_8025518(void) static void sub_8025728(void) { - int index; + s32 index; Pokemon *pokeStruct; s32 loopMax = 0; @@ -389,7 +389,7 @@ static void sub_8025728(void) static void sub_802591C(void) { - int index; + s32 index; s32 loopMax = 0; diff --git a/src/friend_rescue.c b/src/friend_rescue.c index e670e7277..fc9501c58 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -29,8 +29,7 @@ #include "wonder_mail_5.h" #include "naming_screen.h" #include "code_803C1B4.h" - -extern void SetFriendRescueMenuState(u32); +#include "code_8031D70.h" // NOTE: MenuItems and WindowTemplate defined in here.. #include "data/friend_rescue_menus.h" @@ -579,18 +578,14 @@ void sub_80353BC(void); void sub_8035424(void); void sub_8035430(void); -extern u32 sub_8031DCC(void); -extern void sub_8031E00(void); -extern u32 sub_8039068(u32, u8 *passwordBuffer, unkStruct_203B480 *r0); - -extern void sub_8031E10(void); extern u8 sub_800D588(void); -extern bool8 sub_8031D70(u32 mailIndex, s32); + +static void SetFriendRescueMenuState(u32 newState); u32 CreateFriendRescueMenu(void) { - char *monName; - int counter; + u8 *monName; + s32 counter; ResetUnusedInputStruct(); ShowWindows(NULL, TRUE, TRUE); @@ -1608,8 +1603,7 @@ void sub_8032828(void) } } - -void SetFriendRescueMenuState(u32 newState) +static void SetFriendRescueMenuState(u32 newState) { gUnknown_203B33C->state = newState; nullsub_40(); diff --git a/src/ground_bg.c b/src/ground_bg.c index e966f4d92..946936901 100644 --- a/src/ground_bg.c +++ b/src/ground_bg.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "code_8099360.h" #include "ground_bg.h" #include "ground_map.h" #include "text_1.h" @@ -20,7 +21,7 @@ extern const FileArchive gGroundFileArchive; static void CloseOpenedFiles(GroundBg *groundBg); static void CallMapTilemapRenderFunc(MapRender *mapRender); -static const u8 *BmaLayerNrlDecompressor(u16 **dstArray, const void *bmaData, SubStruct_52C *a2, BmaHeader *bmaHeader); +static const u8 *BmaLayerNrlDecompressor(u16 **dstArray, const u8 *bmaData, SubStruct_52C *a2, BmaHeader *bmaHeader); static void CopyBpcTilesToVram(void *vramDst, const u16 *src_, SubStruct_52C *a2, LayerSpecs *a3); static void _UncompressCell(void * a0, u16 *a1, const void * a2, SubStruct_52C *a3, LayerSpecs *a4); static void InitMapTilemapRenderContext(MapRender *mapRender, GroundBg *groundBg, s32 a2, s32 numBgs, bool8 a4); @@ -33,8 +34,6 @@ static void ClearDoubleBgTilemaps(MapRender *mapRender); static void RenderChunksToBgTilemaps_2x2(MapRender *mapRender); static void RenderChunksToBgTilemaps_3x3(MapRender *mapRender); -extern void sub_809971C(u16 idx, const RGB_Array *strPtrs, s32 n); - static const PixelPos sPositionZero = {0, 0}; void GroundBg_Init(GroundBg *groundBg, const SubStruct_52C *a1) @@ -68,7 +67,7 @@ void GroundBg_Init(GroundBg *groundBg, const SubStruct_52C *a1) groundBg->unk440 = NULL; groundBg->unk52A = 0; groundBg->mapFileId = -1; - groundBg->unk468 = 0; + groundBg->decompressedBMAData = NULL; groundBg->bmaHeader.mapWidthTiles = 0; groundBg->bmaHeader.mapHeightTiles = 0; groundBg->bmaHeader.tilingWidth = 0; @@ -134,7 +133,7 @@ void sub_80A2D88(GroundBg *groundBg) if (groundBg->unk52C.unk14 != NULL) { BmaHeader *bmaHeader = &groundBg->bmaHeader; groundBg->unk544 = MemoryAlloc(groundBg->unk52C.unkE * 256, 6); - groundBg->unk52C.unk14(groundBg->unk544, groundBg->unk468, bmaHeader, groundBg->unk52C.unkE); + groundBg->unk52C.unk14(groundBg->unk544, groundBg->decompressedBMAData, bmaHeader, groundBg->unk52C.unkE); } } @@ -222,7 +221,7 @@ void sub_80A2FBC(GroundBg *groundBg, s32 mapFileId_) BplHeader *bplHeader; LayerSpecs *layerSpecs; const u16 *bpcData; - const void *bmaData; + const u8 *bmaData; const void *bplData; BmaHeader *bmaHeader; RGB_Array str2; @@ -266,15 +265,15 @@ void sub_80A2FBC(GroundBg *groundBg, s32 mapFileId_) } layerSpecs->numChunks = *bpcData++; - bmaHeader->mapWidthTiles = *(u8 *)(bmaData); bmaData += 1; - bmaHeader->mapHeightTiles = *(u8 *)(bmaData); bmaData += 1; - bmaHeader->tilingWidth = *(u8 *)(bmaData); bmaData += 1; - bmaHeader->tilingHeight = *(u8 *)(bmaData); bmaData += 1; - bmaHeader->mapWidthChunks = *(u8 *)(bmaData); bmaData += 1; - bmaHeader->mapHeightChunks = *(u8 *)(bmaData); bmaData += 1; - bmaHeader->numLayers = *(u8 *)(bmaData); bmaData += 2; - bmaHeader->hasDataLayer = *(u8 *)(bmaData); bmaData += 2; - bmaHeader->hasCollision = *(u8 *)(bmaData); bmaData += 2; + bmaHeader->mapWidthTiles = *bmaData; bmaData += 1; + bmaHeader->mapHeightTiles = *bmaData; bmaData += 1; + bmaHeader->tilingWidth = *bmaData; bmaData += 1; + bmaHeader->tilingHeight = *bmaData; bmaData += 1; + bmaHeader->mapWidthChunks = *bmaData; bmaData += 1; + bmaHeader->mapHeightChunks = *bmaData; bmaData += 1; + bmaHeader->numLayers = *bmaData; bmaData += 2; + bmaHeader->hasDataLayer = *bmaData; bmaData += 2; + bmaHeader->hasCollision = *bmaData; bmaData += 2; rgbPal = bplData; r5 = groundBg->unk52C.unk0 * 16; @@ -285,7 +284,7 @@ void sub_80A2FBC(GroundBg *groundBg, s32 mapFileId_) str1.c[RGB_UNK] = 0; for (i = 0; i < bplHeader->numPalettes && i < groundBg->unk52C.unk2; i++) { sub_8003810(r5++, str2); - sub_809971C(r5, rgbPal, 15); + sub_809971C(r5, (RGB_Array*)rgbPal, 15); r5 += 15; rgbPal += 15; } @@ -299,7 +298,7 @@ void sub_80A2FBC(GroundBg *groundBg, s32 mapFileId_) CopyBpcTilesToVram((void *)(VRAM + 0x8000 + groundBg->unk52C.unk4 * 32), bpcData, &groundBg->unk52C, &groundBg->layerSpecs); _UncompressCell(groundBg->tileMappings, &groundBg->chunkDimensions, bpcData + ((layerSpecs->numTiles - 1) * 16), &groundBg->unk52C, &groundBg->layerSpecs); bmaData = BmaLayerNrlDecompressor(groundBg->chunkMappings, bmaData, &groundBg->unk52C, &groundBg->bmaHeader); - groundBg->unk468 = bmaData; + groundBg->decompressedBMAData = bmaData; if (groundBg->unk544 != NULL) { groundBg->unk52C.unk14(groundBg->unk544, bmaData, bmaHeader, groundBg->unk52C.unkE); } @@ -457,7 +456,7 @@ void sub_80A3440(GroundBg *groundBg, s32 mapFileId_, const DungeonLocation *dung unkPtrArray[0] = groundBg->unk544; unkPtrArray[1] = NULL; bmaData = BmaLayerNrlDecompressor(unkPtrArray, bmaData, &groundBg->unk52C, &groundBg->bmaHeader); - groundBg->unk468 = bmaData; + groundBg->decompressedBMAData = bmaData; sub_80ADD9C(&groundBg->unk43C, &groundBg->unk440, (void *)(VRAM + 0x8000), groundBg->tileMappings, groundBg->chunkMappings[0], dungLoc, a3, 0x40, bmaHeader->mapHeightChunks, groundBg->unk544, 0); // Unused return values GetFileDataPtr(groundBg->unk43C, 0); @@ -599,7 +598,7 @@ static void _UncompressCell(void *dst_, u16 *chunkDimensions, const void *src_, } } -static const u8 *BmaLayerNrlDecompressor(u16 **dstArray, const void *bmaData, SubStruct_52C *a2, BmaHeader *bmaHeader) +static const u8 *BmaLayerNrlDecompressor(u16 **dstArray, const u8 *bmaData, SubStruct_52C *a2, BmaHeader *bmaHeader) { s32 i, k, j, l; const u8 *src = bmaData; @@ -1362,7 +1361,7 @@ void sub_80A4764(GroundBg *groundBg) if (sub0Ptr->unk8 != NULL) { RGB_Array empty = {0}; sub_8003810(r6, empty); - sub_809971C(r6 + 1, sub0Ptr->unk8, 15); + sub_809971C(r6 + 1, (RGB_Array*)sub0Ptr->unk8, 15); sub0Ptr->unk8 += 60; } } diff --git a/src/ground_effect.c b/src/ground_effect.c index 6956f8c0d..e3c8aedf9 100644 --- a/src/ground_effect.c +++ b/src/ground_effect.c @@ -739,25 +739,25 @@ void GroundEffect_Action(void) { GroundEffect *objectPtr; s32 i; - s32 ret; - for (objectPtr = &gGroundEffects[0], i = 0; i < NUM_GROUND_EFFECTS; i = (s16)(i + 1), objectPtr++) - { + for (objectPtr = &gGroundEffects[0], i = 0; i < NUM_GROUND_EFFECTS; i = (s16)(i + 1), objectPtr++) { if (objectPtr->kind != -1) { - ret = HandleAction(&objectPtr->action, DEBUG_LOC_PTR(gUnknown_81185D8, 0x560, "GroundEffect_Action")); - switch(ret) - { - case 4: + s32 ret = HandleAction(&objectPtr->action, DEBUG_LOC_PTR(gUnknown_81185D8, 1376, "GroundEffect_Action")); + + switch (ret) { + case ESC_RET_04: { GroundEffect_Delete(i); continue; - case 0: - ExecutePredefinedScript(&objectPtr->action, NULL, 1, DEBUG_LOC_PTR(gUnknown_81185D8, 0x56A, "GroundEffect_Action")); + } + case ESC_RET_00: { + ExecutePredefinedScript(&objectPtr->action, NULL, 1, DEBUG_LOC_PTR(gUnknown_81185D8, 1386, "GroundEffect_Action")); break; + } } if (objectPtr->directionRelated) { objectPtr->directionRelated = FALSE; - sub_80A6EFC(&objectPtr->unk144,objectPtr->unk13E & 0x1f00,(s8)objectPtr->unk13E); + sub_80A6EFC(&objectPtr->unk144, objectPtr->unk13E & 0x1F00, (s8)objectPtr->unk13E); } } } @@ -779,7 +779,7 @@ void sub_80AD7AC(void) if ((sub_80A66D4(&objectPtr->unk144))) { objectPtr->directionRelated = FALSE; - sub_80A6EFC(&objectPtr->unk144,objectPtr->unk13E & 0x1f00,(s8)objectPtr->unk13E); + sub_80A6EFC(&objectPtr->unk144,objectPtr->unk13E & 0x1F00,(s8)objectPtr->unk13E); } if (objectPtr->unk140 != 0) { sub_80A7040(&objectPtr->unk144,objectPtr->unk140,objectPtr->direction,0); diff --git a/src/ground_event.c b/src/ground_event.c index c2fdbe423..437a45f37 100644 --- a/src/ground_event.c +++ b/src/ground_event.c @@ -155,14 +155,16 @@ static s32 GroundEvent_Add(s32 id, const GroundEventData *eventData, s32 group, ptr->unk4 = group_s32; ptr->unk6 = sector_s32; switch (script->type) { - case 1: - case 2: + case SCRIPT_TYPE_01: + case SCRIPT_TYPE_02: { ptr->unk8 = 0x60; break; - case 7: - default: + } + case SCRIPT_TYPE_07: + default: { ptr->unk8 = 0x20; break; + } } pos = (PixelPos) {eventData->kind << 11, eventData->unk1 << 11}; diff --git a/src/ground_lives.c b/src/ground_lives.c index 2643e0e57..c95683d69 100644 --- a/src/ground_lives.c +++ b/src/ground_lives.c @@ -213,7 +213,7 @@ void AllocGroundLives(void) void DeleteGroundLives(void) { - int i; + s32 i; struct GroundLive *iVar4; iVar4 = &gGroundLives->array[0]; @@ -841,7 +841,7 @@ static s32 GroundLives_Add(s32 id_, const GroundLivesData *ptr, s32 group_, s32 u16 *ptrToUnk24; s8 *ptrToStoredDir; - if (livesPtr->action.scriptData2.savedState != 0) { + if (livesPtr->action.scriptData2.savedState != ESC_RET_00) { bakUnk24 = livesPtr->action.scriptData2.unk24; bakStoredDir = livesPtr->action.scriptData2.storedDir; @@ -1023,7 +1023,7 @@ UNUSED static bool8 sub_80A88A0(s32 id_) struct GroundLive *livesPtr = &gGroundLives->array[id]; if (livesPtr->unk2 != -1) { - return sub_809D678(&livesPtr->action); + return Action_SavedStateIsNot0(&livesPtr->action); } return FALSE; @@ -2699,12 +2699,14 @@ void GroundLives_Action(void) for (livesPtr = &gGroundLives->array[0], i = 0; i < UNK_3001B84_ARR_COUNT; i = (s16)(i + 1), livesPtr++) { if (livesPtr->unk2 != -1) { - s32 actionResult = (s16) HandleAction(&livesPtr->action, DEBUG_LOC_PTR("../ground/ground_lives.c", 4514, "GroundLives_Action")); + s32 actionResult = (s16)HandleAction(&livesPtr->action, DEBUG_LOC_PTR("../ground/ground_lives.c", 4514, "GroundLives_Action")); + switch (actionResult) { - case 4: + case ESC_RET_04: { GroundLives_Delete(i); continue; - case 0: + } + case ESC_RET_00: { if (livesPtr->flags & 0x800) { PixelPos var_44; u32 var_4C = actionResult; @@ -2772,6 +2774,7 @@ void GroundLives_Action(void) ExecutePredefinedScript(&livesPtr->action, NULL, 1, DEBUG_LOC_PTR("../ground/ground_lives.c", 4622, "GroundLives_Action")); } break; + } } if (livesPtr->directionRelated) { livesPtr->directionRelated = FALSE; diff --git a/src/ground_main.c b/src/ground_main.c index edaa01dd7..21d18fc73 100644 --- a/src/ground_main.c +++ b/src/ground_main.c @@ -1,129 +1,173 @@ #include "global.h" #include "globaldata.h" -#include "ground_main.h" #include "constants/dungeon.h" #include "constants/move_id.h" #include "structs/str_wonder_mail.h" #include "structs/str_dungeon_setup.h" -#include "graphics_memory.h" +#include "adventure_info.h" +#include "code_800558C.h" #include "code_800C9CC.h" -#include "music_util.h" +#include "code_8094F88.h" #include "code_80958E8.h" #include "code_8099360.h" +#include "code_809D148.h" #include "code_80A26CC.h" -#include "ground_place.h" +#include "decompress_sir.h" #include "debug.h" #include "event_flag.h" +#include "graphics_memory.h" +#include "ground_effect.h" +#include "ground_event.h" +#include "ground_lives.h" +#include "ground_lives_helper.h" +#include "ground_main.h" #include "ground_map.h" +#include "ground_map_conversion_table.h" +#include "ground_object.h" +#include "ground_place.h" +#include "ground_script.h" +#include "ground_script_file.h" +#include "ground_sprite.h" +#include "input.h" +#include "music_util.h" +#include "palette_util.h" #include "play_time.h" #include "pokemon.h" -#include "text_util.h" -#include "ground_map_conversion_table.h" -#include "ground_lives_helper.h" -#include "ground_script_file.h" #include "script_item.h" -#include "unk_ds_only_feature.h" +#include "text_1.h" +#include "text_util.h" #include "textbox.h" -#include "ground_lives.h" -#include "ground_event.h" -#include "ground_sprite.h" -#include "ground_effect.h" -#include "ground_object.h" -#include "ground_script.h" -#include "code_809D148.h" -#include "adventure_info.h" -#include "palette_util.h" -#include "code_800558C.h" +#include "unk_ds_only_feature.h" -EWRAM_DATA u32 gUnknown_20398A8 = {0}; -EWRAM_DATA s32 gUnknown_20398AC = {0}; -EWRAM_DATA u32 gUnknown_20398B0 = {0}; -EWRAM_DATA u32 gUnknown_20398B4 = {0}; -EWRAM_DATA u8 gUnknown_20398B8 = {0}; -EWRAM_DATA bool8 gUnknown_20398B9 = {0}; -EWRAM_DATA bool8 gScriptMode = {0}; -UNUSED EWRAM_DATA static u8 gUnknown_20398BB = {0}; -EWRAM_DATA u16 gUnknown_20398BC = {0}; -EWRAM_DATA s16 gUnknown_20398BE = {0}; -EWRAM_DATA u32 gUnknown_20398C0 = {0}; -EWRAM_DATA s16 gUnknown_20398C4 = {0}; // See enum "ScriptDungeonId" -EWRAM_DATA struct DungeonSetupInfo gUnknown_20398C8 = {0}; -EWRAM_DATA u8 gUnknown_2039950 = 0; +enum Unk_20398A8_Kind +{ + Unk_20398A8_UNK0, + Unk_20398A8_UNK1, + Unk_20398A8_UNK2, + Unk_20398A8_UNK3, + Unk_20398A8_UNK4, + Unk_20398A8_UNK5, + Unk_20398A8_UNK6, + Unk_20398A8_UNK7, + Unk_20398A8_UNK8, + Unk_20398A8_UNK9, + Unk_20398A8_UNK10, +}; -EWRAM_INIT bool8 gUnknown_203B49C = {0}; -EWRAM_INIT u8 gUnknown_203B49D = {0}; +static EWRAM_DATA u32 sUnknown_20398A8 = { Unk_20398A8_UNK0 }; // See enum "Unk_20398A8_Kind" +static EWRAM_DATA s32 sUnknown_20398AC = { 0 }; +static EWRAM_DATA u32 sUnknown_20398B0 = { 0 }; +static EWRAM_DATA u32 sUnknown_20398B4 = { STARTMODE_NEW_GAME }; // See enum "StartModeVal" +static EWRAM_DATA bool8 sUnknown_20398B8 = { FALSE }; +static EWRAM_DATA bool8 sUnknown_20398B9 = { FALSE }; +static EWRAM_DATA bool8 sScriptMode = { FALSE }; +UNUSED static EWRAM_DATA u8 sUnused1 = { 0 }; +static EWRAM_DATA u16 sUnknown_20398BC = { MAP_SQUARE }; // See enum "GroundMapID". Set but never read +static EWRAM_DATA s16 sUnknown_20398BE = { MAP_SQUARE }; // See enum "GroundMapID" +static EWRAM_DATA u32 sUnknown_20398C0 = { 0 }; // Related to GROUND_ENTER_LINK +static EWRAM_DATA s16 sUnknown_20398C4 = { SCRIPT_DUNGEON_TINY_WOODS }; // See enum "ScriptDungeonId" +static EWRAM_DATA DungeonSetupInfo sUnknown_20398C8 = { 0 }; +static EWRAM_DATA u8 sUnknown_2039950 = 0; // Related to DUNGEON_ENTER_INDEX -extern void sub_809D25C(); -extern void sub_809CA20(); -extern void sub_80A6E80(); -extern void nullsub_106(); -extern void sub_80A73EC(); -extern void sub_8095494(DungeonMailSeed *param_1, u8 index); - -// TODO: Move these externs to headers -extern bool8 sub_80048BC(void); -extern void sub_8099768(void); -extern void sub_809975C(void); -extern void sub_8099BE4(void); -extern void nullsub_16(void); -extern void sub_80060EC(void); -extern void sub_809977C(void); -extern void UpdateFadeInTile(s32); +static EWRAM_INIT bool8 sUnknown_203B49C = { FALSE }; +static EWRAM_INIT bool8 sUnknown_203B49D = { FALSE }; static s16 sub_8098FCC(u32 unused); -UNUSED static const u8 sUnusedConstData[] = { - 0, 0, 0, 0, 0x01, 0, 0, 0, 0x69, 0, 0, 0, 0x09, 0, 0, 0, 0x0c, 0, 0, 0, 0x01, 0, 0, 0, 0xb2, 0, 0, 0, - 0xb4, 0, 0, 0, 0xb6, 0, 0, 0, 0xb8, 0, 0, 0, 0xba, 0, 0, 0, 0xbc, 0, 0, 0, 0xbf, 0, 0, 0, 0xc1, 0, 0, 0, 0xc3, - 0, 0, 0, 0xc6, 0, 0, 0, 0xc9, 0, 0, 0, 0xcc, 0, 0, 0, 0xcf, 0, 0, 0, 0xa2, 0, 0, 0, 0xa2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +UNUSED static const u8 sUnusedConstData[154] = { + 0, 0, 0, 0, + 1, 0, 0, 0, + 105, 0, 0, 0, + 9, 0, 0, 0, + 12, 0, 0, 0, + 1, 0, 0, 0, + 178, 0, 0, 0, + 180, 0, 0, 0, + 182, 0, 0, 0, + 184, 0, 0, 0, + 186, 0, 0, 0, + 188, 0, 0, 0, + 191, 0, 0, 0, + 193, 0, 0, 0, + 195, 0, 0, 0, + 198, 0, 0, 0, + 201, 0, 0, 0, + 204, 0, 0, 0, + 207, 0, 0, 0, + 162, 0, 0, 0, + 162, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0 }; -u32 xxx_script_related_8098468(s32 param_1) +u32 xxx_script_related_8098468(s32 startMode) { s32 scriptID; s32 varE; - gUnknown_20398B4 = param_1; - gUnknown_20398B9 = 0; - gUnknown_20398B8 = 1; - gScriptMode = 0; + sUnknown_20398B4 = startMode; + sUnknown_20398B9 = FALSE; + sUnknown_20398B8 = TRUE; + sScriptMode = FALSE; - switch (param_1) { - case 0xd: - gScriptMode = 1; - gUnknown_20398B8 = 0; - gUnknown_20398B9 = 1; - break; - case 0xe: - gUnknown_20398B8 = 1; - gUnknown_20398B9 = 1; - break; - case 0xf: - gUnknown_20398B8 = 1; - gUnknown_20398B9 = 1; - break; - case 0x10: { - s32 local_1c; - u32 auStack24; - - GetScriptVarScenario(SCENARIO_MAIN,&local_1c,&auStack24); - gUnknown_20398B8 = local_1c == 0; - gUnknown_20398B9 = 1; + switch (startMode) { + case STARTMODE_13: { + sScriptMode = TRUE; + sUnknown_20398B8 = FALSE; + sUnknown_20398B9 = TRUE; break; } - case 0x11: - gUnknown_20398B8 = 0; - gUnknown_20398B9 = 1; + case STARTMODE_14: { + sUnknown_20398B8 = TRUE; + sUnknown_20398B9 = TRUE; break; - default: + } + case STARTMODE_15: { + sUnknown_20398B8 = TRUE; + sUnknown_20398B9 = TRUE; break; + } + case STARTMODE_16: { + s32 main; + u32 sub; + + GetScriptVarScenario(SCENARIO_MAIN, &main, &sub); + sUnknown_20398B8 = main == 0; // Basically checking new game + sUnknown_20398B9 = TRUE; + break; + } + case STARTMODE_17: { + sUnknown_20398B8 = FALSE; + sUnknown_20398B9 = TRUE; + break; + } + default: { + break; + } } + ResetSoundEffectCounters(); - if (gUnknown_20398B9 == 0 && !CheckQuest(QUEST_IN_WORLD_CALAMITY)) { - FadeOutAllMusic(0x10); + + if (!sUnknown_20398B9 && !CheckQuest(QUEST_IN_WORLD_CALAMITY)) { + FadeOutAllMusic(16); } + gUnknown_2026E4E = 0x808; UpdateFadeInTile(0); sub_8099648(); @@ -142,39 +186,40 @@ u32 xxx_script_related_8098468(s32 param_1) AllocGroundObjects(); AllocGroundEffects(); TextboxResetAll(); - gUnknown_203B49C = 0; - gUnknown_203B49D = 0; - gUnknown_20398A8 = 1; - gUnknown_20398AC = 0; - gUnknown_20398B0 = -1; - gUnknown_20398BE = GetScriptVarValue(NULL,GROUND_ENTER); - varE = GetScriptVarValue(NULL,GROUND_ENTER_LINK); - gUnknown_20398C0 = varE; - gUnknown_20398C4 = -1; + sUnknown_203B49C = FALSE; + sUnknown_203B49D = FALSE; + sUnknown_20398A8 = Unk_20398A8_UNK1; + sUnknown_20398AC = 0; + sUnknown_20398B0 = -1; + sUnknown_20398BE = GetScriptVarValue(NULL, GROUND_ENTER); + varE = GetScriptVarValue(NULL, GROUND_ENTER_LINK); + sUnknown_20398C0 = varE; + sUnknown_20398C4 = -1; scriptID = -1; - while (gUnknown_20398A8 - 1 <= 1) { + + while (sUnknown_20398A8 == Unk_20398A8_UNK1 || sUnknown_20398A8 == Unk_20398A8_UNK2) { SetAutoPressTextboxFrames(-1); ScriptClearTextbox(); sub_809977C(); - switch (gUnknown_20398B4) { - case 0: + switch (sUnknown_20398B4) { + case STARTMODE_NEW_GAME: sub_8098C58(); - gUnknown_20398B4 = 1; + sUnknown_20398B4 = STARTMODE_CONTINUE_GAME; break; - case 2: - case 3: + case STARTMODE_GROUND: + case STARTMODE_3: sub_8001D88(); break; - case 5: + case STARTMODE_DUNGEON_FROM_WORLD_MAP: scriptID = EVENT_RESCUE; break; - case 9: - case 10: - case 11: - case 12: { + case STARTMODE_DUNGEON_WON: + case STARTMODE_10: + case STARTMODE_11: + case STARTMODE_DUNGEON_LOST: { s32 scriptVar13; - SetScriptVarValue(NULL,DUNGEON_RESULT,gUnknown_20398B4); + SetScriptVarValue(NULL,DUNGEON_RESULT,sUnknown_20398B4); SetScriptVarValue(NULL,WARP_LOCK,0); sub_8098C58(); UpdateScriptVarWithImmediate(0,DUNGEON_ENTER_FREQUENCY,1,2); @@ -189,59 +234,59 @@ u32 xxx_script_related_8098468(s32 param_1) dungInfo = GetScriptDungeonInfo(scriptVar13); } scriptID = dungInfo->scriptID3; - if (gUnknown_20398B4 == 9) { + if (sUnknown_20398B4 == STARTMODE_DUNGEON_WON) { SetScriptVarArrayValue(NULL,DUNGEON_CLEAR_LIST,(u16) scriptVar13,1); } - var = sub_8098FCC(gUnknown_20398B4); + var = sub_8098FCC(sUnknown_20398B4); if (var != -1) { - gUnknown_20398BE = var; - gUnknown_20398C0 = 0; + sUnknown_20398BE = var; + sUnknown_20398C0 = 0; } } break; } - case 13: + case STARTMODE_13: sub_8098C58(); - gUnknown_20398B4 = 1; + sUnknown_20398B4 = STARTMODE_CONTINUE_GAME; SetScriptVarValue(NULL,START_MODE,1); SetScriptVarValue(NULL,GROUND_GETOUT,0); SetScriptVarValue(NULL,GROUND_ENTER,0); SetScriptVarValue(NULL,GROUND_ENTER_LINK,0); scriptID = DEBUG_SCRIPT; break; - case 14: + case STARTMODE_14: scriptID = DEMO_01; break; - case 15: + case STARTMODE_15: scriptID = DEMO_02; break; - case 16: + case STARTMODE_16: scriptID = DEMO_03; break; - case 17: + case STARTMODE_17: scriptID = DEMO_04; break; } - if (gUnknown_20398B9 == 0) { + if (!sUnknown_20398B9) { s32 var = GetScriptVarValue(NULL,GROUND_ENTER); - SetScriptVarValue(NULL,START_MODE,gUnknown_20398B4); - if (gUnknown_20398B4 != 1) { - if (gUnknown_20398B4 == 3) { - SetScriptVarValue(NULL,GROUND_GETOUT,gUnknown_20398BE); + SetScriptVarValue(NULL,START_MODE,sUnknown_20398B4); + if (sUnknown_20398B4 != STARTMODE_CONTINUE_GAME) { + if (sUnknown_20398B4 == STARTMODE_3) { + SetScriptVarValue(NULL, GROUND_GETOUT, sUnknown_20398BE); } else { - SetScriptVarValue(NULL,GROUND_GETOUT,var); + SetScriptVarValue(NULL, GROUND_GETOUT, var); } } - SetScriptVarValue(NULL,GROUND_ENTER,gUnknown_20398BE); - SetScriptVarValue(NULL,GROUND_ENTER_LINK,gUnknown_20398C0); + SetScriptVarValue(NULL, GROUND_ENTER, sUnknown_20398BE); + SetScriptVarValue(NULL, GROUND_ENTER_LINK, sUnknown_20398C0); } - gUnknown_20398B4 = 2; - gUnknown_20398A8 = 0; - gUnknown_20398AC = 0; - gUnknown_20398B0 = -1; - gUnknown_20398BC = gUnknown_20398BE; - gUnknown_20398BE = -1; + sUnknown_20398B4 = STARTMODE_GROUND; + sUnknown_20398A8 = Unk_20398A8_UNK0; + sUnknown_20398AC = 0; + sUnknown_20398B0 = -1; + sUnknown_20398BC = sUnknown_20398BE; + sUnknown_20398BE = -1; sub_809977C(); sub_809D4B0(); GroundSprite_Reset(-1); @@ -269,11 +314,11 @@ u32 xxx_script_related_8098468(s32 param_1) while ( 1 ) { xxx_call_update_bg_sound_input(); sub_80A6E68(); - if (gUnknown_20398A8 != 0) { - if (gUnknown_20398AC > 0) { - gUnknown_20398AC--; - if (gUnknown_20398AC < 1) { - sub_80999D4(gUnknown_20398B0); + if (sUnknown_20398A8 != Unk_20398A8_UNK0) { + if (sUnknown_20398AC > 0) { + sUnknown_20398AC--; + if (sUnknown_20398AC < 1) { + sub_80999D4(sUnknown_20398B0); } } else if (!sub_8099B94()) { @@ -281,7 +326,7 @@ u32 xxx_script_related_8098468(s32 param_1) break; } } - else if (gUnknown_20398B9 != 0 && gUnknown_20398B8 == 0 && !sub_809AFAC()) { + else if (sUnknown_20398B9 && !sUnknown_20398B8 && !sub_809AFAC()) { u16 pressed = gRealInputs.pressed; if ((pressed & (A_BUTTON | B_BUTTON | SELECT_BUTTON | START_BUTTON | R_BUTTON | L_BUTTON)) || sub_80048BC()) { GroundMap_ExecuteEvent(DEMO_CANCEL, FALSE); @@ -337,12 +382,13 @@ u32 xxx_script_related_8098468(s32 param_1) sub_8099768(); nullsub_103(); nullsub_16(); - if (gUnknown_20398B9 != 0) { - if (gUnknown_20398A8 == 9) { + + if (sUnknown_20398B9) { + if (sUnknown_20398A8 == Unk_20398A8_UNK9) { FadeOutAllMusic(30); return 15; } - else if (gUnknown_20398A8 == 10) { + else if (sUnknown_20398A8 == Unk_20398A8_UNK10) { return 16; } else { @@ -351,25 +397,25 @@ u32 xxx_script_related_8098468(s32 param_1) } } else { - switch (gUnknown_20398A8) { - case 3: + switch (sUnknown_20398A8) { + case Unk_20398A8_UNK3: SetScriptVarValue(NULL,DUNGEON_ENTER,-1); SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX,-1); SetScriptVarValue(NULL,START_MODE,4); SetScriptVarValue(NULL,DUNGEON_RESULT,4); SetScriptVarValue(NULL,GROUND_GETOUT,GetScriptVarValue(NULL,GROUND_ENTER)); return 5; - case 4: + case Unk_20398A8_UNK4: SetScriptVarValue(NULL,DUNGEON_ENTER,0); SetScriptVarValue(NULL,START_MODE,5); SetScriptVarValue(NULL,DUNGEON_RESULT,5); SetScriptVarValue(NULL,DUNGEON_ENTER,-1); return 6; - case 5: { - s32 rescueDungeonID = ScriptDungeonIDToRescueDungeonID(gUnknown_20398C4); - SetScriptVarValue(NULL,DUNGEON_ENTER,gUnknown_20398C4); + case Unk_20398A8_UNK5: { + s32 rescueDungeonID = ScriptDungeonIDToRescueDungeonID(sUnknown_20398C4); + SetScriptVarValue(NULL,DUNGEON_ENTER,sUnknown_20398C4); SetScriptVarValue(NULL, DUNGEON_ENTER_INDEX, rescueDungeonID); - SetScriptVarArrayValue(NULL,DUNGEON_ENTER_LIST,(u16) gUnknown_20398C4,1); + SetScriptVarArrayValue(NULL,DUNGEON_ENTER_LIST,(u16) sUnknown_20398C4,1); SetScriptVarValue(NULL,START_MODE,7); SetScriptVarValue(NULL,DUNGEON_RESULT,7); if ((s16)GetScriptVarValue(NULL,GROUND_PLACE) == 10) { @@ -377,24 +423,24 @@ u32 xxx_script_related_8098468(s32 param_1) } return 7; } - case 6: + case Unk_20398A8_UNK6: SetScriptVarValue(NULL,DUNGEON_ENTER,81); - SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX,gUnknown_20398C4); + SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX,sUnknown_20398C4); SetScriptVarValue(NULL,START_MODE,7); SetScriptVarValue(NULL,DUNGEON_RESULT,7); if ((s16)GetScriptVarValue(NULL,GROUND_PLACE) == 10) { SetScriptVarValue(NULL,GROUND_PLACE,0); } return 8; - case 7: + case Unk_20398A8_UNK7: SetScriptVarValue(NULL,DUNGEON_ENTER,80); - SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX,gUnknown_2039950); + SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX, sUnknown_2039950); SetScriptVarValue(NULL,START_MODE,7); SetScriptVarValue(NULL,DUNGEON_RESULT,7); return 9; - case 8: + case Unk_20398A8_UNK8: SetScriptVarValue(NULL,DUNGEON_ENTER,82); - SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX,gUnknown_20398C4); + SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX,sUnknown_20398C4); SetScriptVarValue(NULL,START_MODE,7); SetScriptVarValue(NULL,DUNGEON_RESULT,7); return 10; @@ -490,134 +536,141 @@ void sub_8098CC8(void) } // arm9.bin::0206C1A4 +// r0: enum "GroundMapID" bool8 GroundMainGroundRequest(s32 r0, s32 r1, s32 r2) { s32 temp = (s16) r0; // force a asr shift - if(gUnknown_20398A8 == 0) - { + + if (sUnknown_20398A8 == Unk_20398A8_UNK0) { Log(0, "GroundMain ground request %3d %3d", temp, r2); - gUnknown_20398A8 = 1; - gUnknown_20398AC = 1; - gUnknown_20398B0 = r2; - gUnknown_20398B4 = 2; - gUnknown_20398BE = temp; - gUnknown_20398C0 = r1; + + sUnknown_20398A8 = Unk_20398A8_UNK1; + sUnknown_20398AC = 1; + sUnknown_20398B0 = r2; + sUnknown_20398B4 = STARTMODE_GROUND; + sUnknown_20398BE = temp; + sUnknown_20398C0 = r1; return TRUE; } + return FALSE; } bool8 sub_8098D80(u32 speed) { - if(gUnknown_20398A8 == 0) - { - gUnknown_20398A8 = 3; - gUnknown_20398AC = 1; - gUnknown_20398B0 = speed; + if (sUnknown_20398A8 == Unk_20398A8_UNK0) { + sUnknown_20398A8 = Unk_20398A8_UNK3; + sUnknown_20398AC = 1; + sUnknown_20398B0 = speed; sub_809C730(); - if(!CheckQuest(QUEST_IN_WORLD_CALAMITY)) - { + + if (!CheckQuest(QUEST_IN_WORLD_CALAMITY)) FadeOutAllMusic(speed); - } + return TRUE; } + return FALSE; } bool8 sub_8098DCC(u32 speed) { - if(gUnknown_20398A8 == 0) - { - gUnknown_20398A8 = 4; - gUnknown_20398AC = 1; - gUnknown_20398B0 = speed; + if (sUnknown_20398A8 == Unk_20398A8_UNK0) { + sUnknown_20398A8 = Unk_20398A8_UNK4; + sUnknown_20398AC = 1; + sUnknown_20398B0 = speed; sub_809C730(); + if(!CheckQuest(QUEST_IN_WORLD_CALAMITY)) - { FadeOutAllMusic(speed); - } + return TRUE; } + return FALSE; } -bool8 GroundMainRescueRequest(s32 dungeonId_, s32 r1) +bool8 GroundMainRescueRequest(s32 scriptDungeon, s32 r1) { // Needed to match - s32 dungeonId = (s16) dungeonId_; + s32 dungeonId = (s16)scriptDungeon; s32 _dungeonId = dungeonId; - if (gUnknown_20398A8 == 0) { + + if (sUnknown_20398A8 == Unk_20398A8_UNK0) { Log(0, "GroundMain recue request %3d %3d", dungeonId, r1); - if (gUnknown_203B49D != 0) { - gUnknown_20398A8 = 7; + if (sUnknown_203B49D) { + sUnknown_20398A8 = Unk_20398A8_UNK7; } else { - if (!gUnknown_203B49C) { - gUnknown_20398C4 = _dungeonId; - } - switch (sub_80A2750(gUnknown_20398C4)) { - case 4: gUnknown_20398A8 = 8; break; - case 1: gUnknown_20398A8 = 5; break; - case 2: gUnknown_20398A8 = 6; break; + if (!sUnknown_203B49C) + sUnknown_20398C4 = _dungeonId; + + switch (sub_80A2750(sUnknown_20398C4)) { + case 4: sUnknown_20398A8 = Unk_20398A8_UNK8; break; + case 1: sUnknown_20398A8 = Unk_20398A8_UNK5; break; + case 2: sUnknown_20398A8 = Unk_20398A8_UNK6; break; } } - gUnknown_20398AC = 1; - gUnknown_20398B0 = r1; + + sUnknown_20398AC = 1; + sUnknown_20398B0 = r1; sub_809C730(); return TRUE; } + return FALSE; } UNUSED static bool8 GroundMainUserRescueRequest(u32 r0) { - if (gUnknown_20398A8 == 0) { - if(gUnknown_203B49D != 0) { - Log(0, "GroundMain user rescue request %3d", r0); - gUnknown_20398A8 = 7; - gUnknown_20398AC = 1; - gUnknown_20398B0 = r0; - sub_809C730(); - return TRUE; - } + if (sUnknown_20398A8 == Unk_20398A8_UNK0 && sUnknown_203B49D) { + Log(0, "GroundMain user rescue request %3d", r0); + sUnknown_20398A8 = Unk_20398A8_UNK7; + sUnknown_20398AC = 1; + sUnknown_20398B0 = r0; + sub_809C730(); + return TRUE; } + return FALSE; } bool32 GroundMainGameEndRequest(u32 r0) { - if (gUnknown_20398A8 == 0) { + if (sUnknown_20398A8 == Unk_20398A8_UNK0) { Log(0, "GroundMain game end request %3d", r0); - gUnknown_20398A8 = 9; - gUnknown_20398AC = 1; - gUnknown_20398B0 = r0; + sUnknown_20398A8 = Unk_20398A8_UNK9; + sUnknown_20398AC = 1; + sUnknown_20398B0 = r0; sub_809C730(); return TRUE; } + return FALSE; } bool32 GroundMainGameCancelRequest(u32 r0) { - if (gUnknown_20398A8 == 0) { + if (sUnknown_20398A8 == Unk_20398A8_UNK0) { Log(0, "GroundMain game cancel request %3d", r0); - gUnknown_20398A8 = 10; - gUnknown_20398AC = 1; - gUnknown_20398B0 = r0; + sUnknown_20398A8 = Unk_20398A8_UNK10; + sUnknown_20398AC = 1; + sUnknown_20398B0 = r0; sub_809C730(); return TRUE; } + return FALSE; } bool8 sub_8098F88(void) { - return gUnknown_20398B9; + return sUnknown_20398B9; } bool8 GetScriptMode(void) { - return gScriptMode; + return sScriptMode; } UNUSED static s16 sub_8098FA0(void) @@ -649,7 +702,7 @@ static s16 sub_8098FCC(u32 unused) scriptDungeon = scriptDungeon_; di = GetScriptDungeonInfo(scriptDungeon); - if (gUnknown_20398B4 == 9) + if (sUnknown_20398B4 == STARTMODE_DUNGEON_WON) return di->mapID2; switch (di->mapID3) { @@ -684,25 +737,28 @@ UNUSED static const char *sub_80990B8(void) } } -static inline bool8 sub_80990EC_sub(struct DungeonSetupInfo *iVar1, u32 iVar2) +static inline bool8 sub_80990EC_sub(DungeonSetupInfo *iVar1, u32 scriptDungeon) { bool8 flag = FALSE; iVar1->sub0.missionKind = DUNGEON_MISSION_UNK0; - if ((u16)(iVar2 - 37) < 3) + /*if (scriptDungeon == SCRIPT_DUNGEON_MT_FREEZE_2 + || scriptDungeon == SCRIPT_DUNGEON_MT_FREEZE_PEAK_2 + || scriptDungeon == SCRIPT_DUNGEON_MURKY_CAVE)*/ + if ((u16)(scriptDungeon - SCRIPT_DUNGEON_MT_FREEZE_2) < 3) flag = TRUE; else flag = FALSE; return flag; } -u8 sub_80990EC(struct DungeonSetupInfo *param_1, s32 param_2) +u8 sub_80990EC(DungeonSetupInfo *param_1, s32 scriptDungeon) { const DungeonInfo *iVar1; u8 auStack_98 [24]; u8 nameBuffer [24]; u8 dungeonIndex; - s32 param2 = (s16) param_2; + s32 param2 = (s16)scriptDungeon; iVar1 = GetScriptDungeonInfo(param2); dungeonIndex = iVar1->dungeonID; @@ -749,47 +805,47 @@ u8 sub_80990EC(struct DungeonSetupInfo *param_1, s32 param_2) return iVar1->unk11; } -u8 sub_80991E0(struct DungeonSetupInfo *param_1, s16 *param_2) +u8 sub_80991E0(DungeonSetupInfo *param_1, s16 *scriptDungeon) { - *param_2 = gUnknown_20398C4; - if (gUnknown_203B49C) { - memcpy(param_1, &gUnknown_20398C8, sizeof(struct DungeonSetupInfo)); + *scriptDungeon = sUnknown_20398C4; + if (sUnknown_203B49C) { + memcpy(param_1, &sUnknown_20398C8, sizeof(DungeonSetupInfo)); return TRUE; } else { - return sub_80990EC(param_1,gUnknown_20398C4); + return sub_80990EC(param_1,sUnknown_20398C4); } } -void sub_8099220(struct DungeonSetupInfo *param_1, s32 param_2) +void sub_8099220(DungeonSetupInfo *param_1, s32 scriptDungeon) { - s32 param_2_s32 = (s16) param_2; + s32 param_2_s32 = (s16)scriptDungeon; if (param_1 != NULL) { - gUnknown_203B49C = TRUE; - gUnknown_203B49D = 0; - gUnknown_20398C4 = param_2_s32; - memcpy(&gUnknown_20398C8, param_1, sizeof(struct DungeonSetupInfo)); + sUnknown_203B49C = TRUE; + sUnknown_203B49D = FALSE; + sUnknown_20398C4 = param_2_s32; + memcpy(&sUnknown_20398C8, param_1, sizeof(DungeonSetupInfo)); } else { - gUnknown_203B49C = FALSE; - gUnknown_203B49D = 0; - gUnknown_20398C4 = -1; + sUnknown_203B49C = FALSE; + sUnknown_203B49D = FALSE; + sUnknown_20398C4 = -1; } } void sub_809927C(u8 param_1) { - gUnknown_203B49C = 1; - gUnknown_203B49D = 1; - gUnknown_20398C4 = 80; - gUnknown_2039950 = param_1; - SetScriptVarValue(NULL,DUNGEON_ENTER,80); - SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX,gUnknown_2039950); - sub_8095494(&gUnknown_20398C8.dungeonSeed,param_1); - gUnknown_20398C8.sub0.missionKind = DUNGEON_MISSION_OUTONRESCUE; - gUnknown_20398C8.sub0.unkC = 0; - gUnknown_20398C8.sub0.unk4 = 0; - gUnknown_20398C8.sub0.unkD = 0; + sUnknown_203B49C = TRUE; + sUnknown_203B49D = TRUE; + sUnknown_20398C4 = SCRIPT_DUNGEON_80; + sUnknown_2039950 = param_1; + SetScriptVarValue(NULL,DUNGEON_ENTER,sUnknown_20398C4); + SetScriptVarValue(NULL,DUNGEON_ENTER_INDEX,sUnknown_2039950); + sub_8095494(&sUnknown_20398C8.dungeonSeed, param_1); + sUnknown_20398C8.sub0.missionKind = DUNGEON_MISSION_OUTONRESCUE; + sUnknown_20398C8.sub0.unkC = 0; + sUnknown_20398C8.sub0.unk4 = 0; + sUnknown_20398C8.sub0.unkD = 0; } bool8 sub_80992E0(s16 *param_1, s16 *rescueDungeonId) @@ -854,7 +910,7 @@ bool8 sub_8099394(u8 *param) void sub_80993C0(bool8 param) { - gUnknown_20398B8 = (param == FALSE); + sUnknown_20398B8 = (param == FALSE); } void sub_80993D8(void) diff --git a/src/ground_map.c b/src/ground_map.c index ea68be8ca..0b47a4c98 100644 --- a/src/ground_map.c +++ b/src/ground_map.c @@ -18,7 +18,7 @@ IWRAM_INIT GroundMapAction *gGroundMapAction = {NULL}; IWRAM_INIT GroundBg *gGroundMapDungeon_3001B70 = {NULL}; -static void sub_80A5204(void *, const void *, BmaHeader *, s32); +static u8* sub_80A5204(void *, const u8 *, BmaHeader *, s32); static void sub_80A56D8(const PixelPos *pos); static const SubStruct_52C gUnknown_8117324 = { @@ -345,7 +345,7 @@ void GroundMap_ExecuteEnter(s16 param_1) UNUSED static bool8 sub_80A4D14(void) { - return sub_809D678(&gGroundMapAction->action); + return Action_SavedStateIsNot0(&gGroundMapAction->action); } bool8 GroundMapNotifyAll(s16 param_1) @@ -493,6 +493,7 @@ void GroundMap_Select(s32 mapId_) sub_80A56D8(&(const PixelPos) {0}); } +// overlay_0000.bin::0215556C void GroundMap_SelectDungeon(s32 mapId_, const DungeonLocation *loc, u32 param_2) { const GroundConversionStruct *ptr; @@ -534,8 +535,9 @@ void GroundMap_SelectDungeon(s32 mapId_, const DungeonLocation *loc, u32 param_2 sub_80A56D8(&(const PixelPos) {0, 0}); } +// overlay_0000.bin::02154FAC NAKED -static void sub_80A5204(void *a, const void *b, BmaHeader *c, s32 d) +static u8* sub_80A5204(void *a, const u8 *b, BmaHeader *c, s32 d) { asm_unified( " push {r4-r7,lr} \n" @@ -1305,7 +1307,7 @@ bool8 sub_80A579C(PixelPos *pos1, PixelPos *pos2) bool8 CheckMapCollision_80A585C(PixelPos *pixPos1, PixelPos *boundary) { u8 *currPtr; - int i, j; + s32 i, j; u8 *ptr; ptr = (void *)gGroundMapDungeon_3001B70->unk544 + ((pixPos1->y * 256) + pixPos1->x + 0x405); @@ -1329,7 +1331,7 @@ bool8 CheckMapCollision_80A585C(PixelPos *pixPos1, PixelPos *boundary) bool8 sub_80A58C8(PixelPos *pixPos1, PixelPos *boundary) { u8 *currPtr; - int i, j; + s32 i, j; u8 *ptr; ptr = (void *)gGroundMapDungeon_3001B70->unk544 + ((pixPos1->y * 256) + pixPos1->x + 0x405); @@ -1373,7 +1375,7 @@ void sub_80A59A0(s32 param_1, PixelPos *param_2, u16 param_3) void GroundMap_Action(void) { nullsub_123(); - HandleAction(&gGroundMapAction->action, DEBUG_LOC_PTR("../ground/ground_map.c", 0x57F, "GroundMap_Action")); + HandleAction(&gGroundMapAction->action, DEBUG_LOC_PTR("../ground/ground_map.c", 1407, "GroundMap_Action")); } void sub_80A59DC(void) diff --git a/src/ground_object.c b/src/ground_object.c index e4c3c4f4f..98476e1d5 100644 --- a/src/ground_object.c +++ b/src/ground_object.c @@ -271,12 +271,12 @@ s32 GroundObject_Add(s32 id_, const GroundObjectData *objectData, s32 group_, s3 s32 sVar3; s32 sVar4; - int index; + s32 index; s32 kind; GroundObject *parent; - register s32 id; - register s32 group; - register s32 sector; + s32 id; + s32 group; + s32 sector; bool8 bVar12; struct GroundObjectTypeData *typeDataPtr; @@ -926,25 +926,25 @@ void GroundObject_Action(void) { GroundObject *objectPtr; s32 i; - s32 ret; - for (objectPtr = &gGroundObjects[0], i = 0; i < NUM_GROUND_OBJECTS; i = (s16)(i + 1), objectPtr++) - { + for (objectPtr = &gGroundObjects[0], i = 0; i < NUM_GROUND_OBJECTS; i = (s16)(i + 1), objectPtr++) { if (objectPtr->kind != -1) { - ret = HandleAction(&objectPtr->action, DEBUG_LOC_PTR(gGroundObjectFileName, 0x60D, "GroundObject_Action")); - switch(ret) - { - case 4: + s32 ret = HandleAction(&objectPtr->action, DEBUG_LOC_PTR(gGroundObjectFileName, 1549, "GroundObject_Action")); + + switch (ret) { + case ESC_RET_04: { GroundObject_Delete(i); continue; - case 0: - ExecutePredefinedScript(&objectPtr->action, NULL, 1, DEBUG_LOC_PTR(gGroundObjectFileName, 0x617, "GroundObject_Action")); + } + case ESC_RET_00: { + ExecutePredefinedScript(&objectPtr->action, NULL, 1, DEBUG_LOC_PTR(gGroundObjectFileName, 1559, "GroundObject_Action")); break; + } } if (objectPtr->directionRelated) { objectPtr->directionRelated = FALSE; - sub_80A6EFC(&objectPtr->unk144,objectPtr->unk13E & 0x1f00,(s8)objectPtr->unk13E); + sub_80A6EFC(&objectPtr->unk144, objectPtr->unk13E & 0x1F00, (s8)objectPtr->unk13E); } } } @@ -953,7 +953,7 @@ void GroundObject_Action(void) void sub_80ACAD4(void) { GroundObject *objectPtr; - int i; + s32 i; // s16 memes s32 minus1; @@ -964,7 +964,7 @@ void sub_80ACAD4(void) s32 num = objectPtr->unk134.x + objectPtr->unk134.y; if ((sub_80A66D4(&objectPtr->unk144))) { objectPtr->directionRelated = 0; - sub_80A6EFC(&objectPtr->unk144,objectPtr->unk13E & 0x1f00,(s8)objectPtr->unk13E); + sub_80A6EFC(&objectPtr->unk144,objectPtr->unk13E & 0x1F00,(s8)objectPtr->unk13E); } if (objectPtr->unk140 != 0) { sub_80A7040(&objectPtr->unk144,objectPtr->unk140,objectPtr->direction,0); diff --git a/src/ground_script.c b/src/ground_script.c index 250cca8cc..57c84f909 100644 --- a/src/ground_script.c +++ b/src/ground_script.c @@ -173,7 +173,7 @@ static void InitScriptData(ScriptData *a0) s32 i; a0->state = -1; - a0->savedState = 0; + a0->savedState = ESC_RET_00; a0->script.ptr2 = 0; a0->script.ptr = 0; a0->savedScript.ptr2 = 0; @@ -235,49 +235,49 @@ void InitAction2(Action *action) InitAction(action); } -UNUSED static s16 sub_809D654(Action *action) +UNUSED static s16 Action_GetSavedState(Action *action) { return action->scriptData.savedState; } UNUSED static s16 sub_809D65C(Action *action) { - if(action->scriptData.savedState != 0) + if (action->scriptData.savedState != ESC_RET_00) return action->scriptData.state; else return -1; } -bool8 sub_809D678(Action *action) +bool8 Action_SavedStateIsNot0(Action *action) { - return action->scriptData.savedState == 0 ? FALSE : TRUE; + return action->scriptData.savedState == ESC_RET_00 ? FALSE : TRUE; } bool8 sub_809D684(Action *action, ScriptInfoSmall *scriptInfo) { - if(action->scriptData.savedState != 0) - { - if(action->scriptData.savedScript.ptr != 0) - { - if(action->scriptData.savedScript.ptr2 == scriptInfo->ptr) return 1; + if (action->scriptData.savedState != ESC_RET_00) { + if(action->scriptData.savedScript.ptr != NULL) { + if (action->scriptData.savedScript.ptr2 == scriptInfo->ptr) + return TRUE; } - else - { - if(action->scriptData.script.ptr2 == scriptInfo->ptr) return 1; + else { + if (action->scriptData.script.ptr2 == scriptInfo->ptr) + return TRUE; } } - if(action->scriptData2.savedState != 0) - { - if(action->scriptData2.savedScript.ptr != 0) - { - if(action->scriptData2.savedScript.ptr2 == scriptInfo->ptr) return 1; + + if (action->scriptData2.savedState != ESC_RET_00) { + if (action->scriptData2.savedScript.ptr != NULL) { + if (action->scriptData2.savedScript.ptr2 == scriptInfo->ptr) + return TRUE; } - else - { - if(action->scriptData2.script.ptr2 == scriptInfo->ptr) return 1; + else { + if (action->scriptData2.script.ptr2 == scriptInfo->ptr) + return TRUE; } } - return 0; + + return FALSE; } void SetPredefinedScript(Action *param_1, s16 index, const ScriptCommand *param_3) @@ -324,7 +324,7 @@ static bool8 ActionResetScriptDataForDeletion(Action *param_1, const DebugLocati { InitScriptData(¶m_1->scriptData); InitScriptData(¶m_1->scriptData2); - param_1->scriptData.savedState = 4; + param_1->scriptData.savedState = ESC_RET_04; return TRUE; } @@ -375,7 +375,7 @@ bool8 GroundScript_ExecutePP(Action *action, ActionUnkIds *param_2, ScriptInfoSm sub_809D520(&action->unkC); } action->scriptData.state = param_3->state; - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; action->scriptData.script.group = param_3->group; action->scriptData.script.sector = param_3->sector; action->scriptData.script.ptr = param_3->ptr; @@ -409,7 +409,7 @@ static bool8 GroundScriptCheckLockCondition(Action *param_1, s16 param_2) } else { param_1->scriptData.unk22 = param_2_s32; - param_1->scriptData.savedState = 2; + param_1->scriptData.savedState = ESC_RET_02; gAnyScriptLocked = 1; return TRUE; } @@ -484,7 +484,7 @@ static bool8 GroundScriptLockCond(Action *param_1, s16 index, s32 param_3) gScriptLocks[index_s32] = 1; gScriptLockConds[index_s32] = 1; } - param_1->scriptData.savedState = 2; + param_1->scriptData.savedState = ESC_RET_02; gAnyScriptLocked = 1; return TRUE; } @@ -493,11 +493,11 @@ s16 HandleAction(Action *action, const DebugLocation *debug) { ScriptCommand cmd; - if (action->scriptData.savedState) { + if (action->scriptData.savedState != ESC_RET_00) { bool8 loopContinue = TRUE; while (loopContinue) { switch (action->scriptData.savedState) { - case 2: { + case ESC_RET_02: { switch (action->scriptData.curScriptOp) { // handled cases (all hex) // 03, 04, 05, 06, 07, 22..28, 2c, 30..38, 39, 3a, 3b, 3c, 3d, 3e, 3f, @@ -527,7 +527,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } break; } @@ -535,7 +535,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) if (action->callbacks->func4C_spriteRelatedCheck(action->parentObject)) loopContinue = FALSE; else - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } @@ -543,7 +543,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) if (action->callbacks->func50_spriteRelated(action->parentObject)) loopContinue = FALSE; else - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } @@ -558,7 +558,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) if (sub_8099B94()) loopContinue = FALSE; else - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } @@ -568,10 +568,10 @@ s16 HandleAction(Action *action, const DebugLocation *debug) if (action->scriptData.unk2C++ < 180 * 60) loopContinue = FALSE; else - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } break; } @@ -582,10 +582,10 @@ s16 HandleAction(Action *action, const DebugLocation *debug) if (action->scriptData.unk2C++ < 60 * 60) loopContinue = FALSE; else - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } break; } @@ -603,12 +603,12 @@ s16 HandleAction(Action *action, const DebugLocation *debug) ClampPixelPos(&pos2, action->scriptData.unk30); if (pos2.x == 0 && pos2.y == 0) { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } if (action->callbacks->moveRelative(action->parentObject, &pos2) & 9) { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } @@ -620,7 +620,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } } else { @@ -645,7 +645,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) pos2.y = action->scriptData.pos2.y - pos.y; ClampPixelPos(&pos2, action->scriptData.unk30); if (pos2.x == 0 && pos2.y == 0) { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } res = action->callbacks->moveRelative(action->parentObject, &pos2); @@ -655,7 +655,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) action->scriptData.storedDir = dirS8; action->callbacks->setDirection(action->parentObject, dir); if (res & 9) { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } action->callbacks->setEventIndex(action->parentObject, 0x1000); @@ -666,7 +666,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } } else { @@ -696,7 +696,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } break; } @@ -734,7 +734,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } break; } @@ -745,7 +745,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) action->callbacks->getPosHeightAndUnk(action->parentObject, &height, &unk); delta = action->scriptData.unk48 - height; if (delta == 0) { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } // oh wow, cmn instruction @@ -763,7 +763,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) pos = SetVecFromDirectionSpeed(dir, action->scriptData.unk30); if (action->callbacks->moveRelative(action->parentObject, &pos) & 9) { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } action->callbacks->setEventIndex(action->parentObject, 0x1000); @@ -773,7 +773,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } break; } @@ -841,7 +841,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } } if (tmp2 == -1 || tmp2 == dir) { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } @@ -864,7 +864,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) if (sub_809D234()) loopContinue = FALSE; else - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } @@ -875,7 +875,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } else { action->scriptData.script.ptr = ResolveJump(action, gUnlockBranchLabels[action->scriptData.branchDiscriminant]); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } break; } @@ -893,7 +893,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); } break; @@ -906,7 +906,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); } break; @@ -919,7 +919,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) loopContinue = FALSE; } else { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; action->scriptData.script.ptr = ResolveJump(action, tmp); } break; @@ -931,7 +931,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } else { action->scriptData.script.ptr = ResolveJump(action, val); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); } break; @@ -947,7 +947,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) GroundMainGroundRequest((s16)FriendAreaIdToMapId((u8)val), 0, cmd.argShort); } action->scriptData.script.ptr = ResolveJump(action, val); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); break; } @@ -977,7 +977,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) sub_8098DCC(cmd.argShort); action->scriptData.script.ptr = ResolveJump(action, 0); sub_80A87AC(0, 0); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } SetScriptVarValue(NULL, 19, 19); @@ -1006,13 +1006,13 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } case CMD_BYTE_07: { if (action->scriptData.branchDiscriminant == 1) { - s32 dungeonEnter; + s32 scriptDungeon; u32 res; - struct DungeonSetupInfo unkStruct; - dungeonEnter = (s16)GetScriptVarValue(NULL, 19); - if (sub_80990EC(&unkStruct, dungeonEnter)) { + DungeonSetupInfo unkStruct; + scriptDungeon = (s16)GetScriptVarValue(NULL, 19); + if (sub_80990EC(&unkStruct, scriptDungeon)) { s32 val; - sub_8099220(&unkStruct, dungeonEnter); + sub_8099220(&unkStruct, scriptDungeon); val = CheckQuest(QUEST_REACHED_POSTGAME); res = BufferDungeonRequirementsText(unkStruct.sub0.unk0.id, 0, gUnknown_203B4B0, val, FALSE); gUnknown_2039DA4 = res; @@ -1108,7 +1108,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } if (action->scriptData.branchDiscriminant == 3) { cmd = *action->scriptData.curPtr; - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80999FC(cmd.argShort); GroundMap_ExecuteEvent(EVENT_RESCUE, FALSE); if (action->unk8.unk0 == 0) continue; @@ -1127,10 +1127,10 @@ s16 HandleAction(Action *action, const DebugLocation *debug) break; } - sub_8099220(0, 0); + sub_8099220(0, SCRIPT_DUNGEON_TINY_WOODS); SetScriptVarValue(NULL, 19, -1); action->scriptData.script.ptr = ResolveJump(action, -1); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } case CMD_BYTE_3D: { @@ -1151,7 +1151,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } } action->scriptData.script.ptr = ResolveJump(action, val); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); break; } @@ -1165,7 +1165,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) SetRescueTeamName(sPokeNameBuffer); } action->scriptData.script.ptr = ResolveJump(action, val); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); break; } @@ -1193,7 +1193,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } } action->scriptData.script.ptr = ResolveJump(action, val); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); } else { @@ -1217,7 +1217,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) cmd = *action->scriptData.curPtr; action->scriptData.script.ptr = FindLabel(action, cmd.argShort); } - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); } else { @@ -1232,7 +1232,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) bool8 flag = FALSE; if (action->scriptData.branchDiscriminant < 0) { if (action->scriptData.script.ptr->op != CMD_BYTE_D1) { - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } } @@ -1248,7 +1248,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) while (action->scriptData.script.ptr->op == CMD_BYTE_D1) { action->scriptData.script.ptr++; } - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; break; } } @@ -1292,7 +1292,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) cmd = *(action->scriptData.curPtr + action->scriptData.branchDiscriminant + tmp); action->scriptData.script.ptr = FindLabel(action, cmd.argShort); } - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; sub_80A87AC(0, 0); } else { @@ -1306,7 +1306,7 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } else { action->scriptData.script.ptr = ResolveJump(action, gUnlockBranchLabels[1]); - action->scriptData.savedState = 3; + action->scriptData.savedState = ESC_RET_03; } break; } @@ -1436,12 +1436,12 @@ s16 HandleAction(Action *action, const DebugLocation *debug) } break; } - case 3: { + case ESC_RET_03: { s32 state = ExecuteScriptCommand(action); action->scriptData.savedState = state; switch ((s16)state) { - case 0: { - if (action->scriptData2.savedState) { + case ESC_RET_00: { + if (action->scriptData2.savedState != ESC_RET_00) { action->scriptData = action->scriptData2; if (action->callbacks->setDirection && action->scriptData.storedDir != -1) { u32 tmp; @@ -1458,29 +1458,37 @@ s16 HandleAction(Action *action, const DebugLocation *debug) else { InitScriptData(&action->scriptData); } - return 3; + return ESC_RET_03; } - case 3: return 3; - case 4: return 4; - case 1: return 1; - case 2: default: { + case ESC_RET_03:{ + return ESC_RET_03; + } + case ESC_RET_04:{ + return ESC_RET_04; + } + case ESC_RET_01:{ + return ESC_RET_01; + } + case ESC_RET_02: + default: { action->scriptData.unk2C = 0; break; } } break; } - case 0: - case 1: - case 4: { + case ESC_RET_00: + case ESC_RET_01: + case ESC_RET_04: { return action->scriptData.savedState; } } } - return 3; + + return ESC_RET_03; } - return 0; + return ESC_RET_00; } #define MapValueOrDefault(curCmd, defaultVal, dst) \ @@ -1489,32 +1497,20 @@ s16 HandleAction(Action *action, const DebugLocation *debug) *(dst) = tmp; \ } -#define SectorValueOrDefault(curCmd, defaultVal, dst) \ +#define SectorValueOrDefault(curCmd, defaultVal, dst) \ { \ s32 tmp = (s8)(curCmd)->argByte < 0 ? (defaultVal) : (s8)(curCmd)->argByte; \ *(dst) = tmp; \ } -#define GroupValueOrDefault(curCmd, defaultVal, dst) \ +#define GroupValueOrDefault(curCmd, defaultVal, dst) \ { \ s32 tmp = (curCmd)->argShort < 0 ? (defaultVal) : (curCmd)->argShort; \ *(dst) = tmp; \ } // overlay_0000.bin::021497FC -// Return values: -// This function returns what's likely an enum, which controls the state of the script engine state machine, and possibly provides information to code calling the engine. -// The enum is shared at least with HandleAction. -// This value is saved into the state field of the Action when returned from this function. -// - Value 0 indicates a RET on script engine level, HandleAction copies action->scriptData2 onto action->scriptData, and reinitializes scriptData2. -// If there is no active scriptData2 it clears and reinits scriptData. -// Ultimately returns code 3 to the script engine caller. -// Caveat: If the scripting engine is in state 0, HandleAction will immediately return 0 without performing any work. -// - Value 1 is a terminal state (script success? error?), no further scripting progress will happen. This code is always returned to the caller from now on. -// - Value 2 gives control back to the HandleAction function (entry point into the scripting engine state machine) -// This is the only return value that does not return to the script engine caller -// - Value 3 returns to the caller, but will give control back to ExecuteScriptCommand when reentering the script ("script not finished") -// - Value 4 is some kind of fatal error state, no further scripting progress will happen. This code is always returned to the caller from now on. +// Return value is enum "ESC_RetID" static s32 ExecuteScriptCommand(Action *action) { ScriptCommand curCmd; @@ -1525,25 +1521,33 @@ static s32 ExecuteScriptCommand(Action *action) curCmd = *scriptData->script.ptr++; switch (scriptData->curScriptOp = curCmd.op) { case CMD_BYTE_01: { - u32 arg = (s16)curCmd.arg1; - u32 argCopy = arg; + u32 groundMap_ = (s16)curCmd.arg1; + u32 groundMap = groundMap_; u32 byte = (u8)curCmd.argByte; + if (ScriptLoggingEnabled(TRUE)) { - Log(1, " ground select %3d[%s] %3d", arg, gGroundMapConversionTable[arg].text, byte); + Log(1, " ground select %3d[%s] %3d", + groundMap_, gGroundMapConversionTable[groundMap_].text, byte); } - GroundMainGroundRequest(argCopy, byte, curCmd.argShort); + + GroundMainGroundRequest(groundMap, byte, curCmd.argShort); break; } case CMD_BYTE_02: { - s32 dungeonId = (s16)curCmd.arg1; - if (dungeonId == -1) dungeonId = (s16)GetScriptVarValue(NULL, DUNGEON_ENTER); + s32 scriptDungeon = (s16)curCmd.arg1; + + if (scriptDungeon == -1) + scriptDungeon = (s16)GetScriptVarValue(NULL, DUNGEON_ENTER); + if (ScriptLoggingEnabled(TRUE)) { - Log(1, " dungeon select %3d", dungeonId); + Log(1, " dungeon select %3d", scriptDungeon); } - if (dungeonId != -1) { - GroundMainRescueRequest(dungeonId, curCmd.argShort); + + if (scriptDungeon != -1) { + GroundMainRescueRequest(scriptDungeon, curCmd.argShort); action->scriptData.script.ptr = ResolveJump(action, 1); - } else { + } + else { action->scriptData.script.ptr = ResolveJump(action, 0); } break; @@ -1565,11 +1569,11 @@ static s32 ExecuteScriptCommand(Action *action) } else { action->scriptData.branchDiscriminant = -1; } - return 2; // do action + return ESC_RET_02; } else { SetScriptVarValue(NULL, DUNGEON_SELECT, RescueDungeonToScriptDungeonId((s16)curCmd.arg1)); action->scriptData.branchDiscriminant = 1; - return 2; // do action + return ESC_RET_02; } break; } @@ -1578,20 +1582,20 @@ static s32 ExecuteScriptCommand(Action *action) if (ScriptSpecialTextHandler2(SPECIAL_TEXT_DOJO_ENTER, 0, NULL_MONORSTRPTR)) { sub_80A87AC(0, 11); action->scriptData.branchDiscriminant = 0; - return 2; + return ESC_RET_02; } else { action->scriptData.branchDiscriminant = -1; - return 2; + return ESC_RET_02; } } else { SetScriptVarValue(NULL, DUNGEON_ENTER, curCmd.arg1); action->scriptData.branchDiscriminant = 1; - return 2; + return ESC_RET_02; } } case CMD_BYTE_05: { action->scriptData.branchDiscriminant = 1; - return 2; + return ESC_RET_02; } case CMD_BYTE_07: { s32 tmp = (s16)curCmd.arg1; @@ -1605,10 +1609,10 @@ static s32 ExecuteScriptCommand(Action *action) } if (tmp != -1) { action->scriptData.branchDiscriminant = 1; - return 2; + return ESC_RET_02; } else { action->scriptData.branchDiscriminant = -1; - return 2; + return ESC_RET_02; } } case CMD_BYTE_08: // SELECT_MAP @@ -1828,7 +1832,7 @@ static s32 ExecuteScriptCommand(Action *action) gUnknown_2039A34 = map; GroundCancelAllEntities(); if (action->unk8.unk0 != 0) - return 4; // Fatal? + return ESC_RET_04; } break; } @@ -1836,9 +1840,9 @@ static s32 ExecuteScriptCommand(Action *action) s32 a = (s16)GetScriptVarValue(NULL, DUNGEON_ENTER); const DungeonInfo *ret1 = GetScriptDungeonInfo(a); s32 scriptIndex = GetScriptVarArrayValue(NULL, DUNGEON_ENTER_LIST, (u16)a) == 0 ? ret1->scriptID1 : ret1->scriptID2; - // fakematch: this is almost certainly a range check of the form 0x37 <= a && a < 0x48 + // fakematch: this is almost certainly a range check of the form SCRIPT_DUNGEON_NORMAL_MAZE_2 <= a && a <= SCRIPT_DUNGEON_STEEL_MAZE // but that loses the s32 -> u16 cast. Inlines, macros, or other shenanigans are likely involved - if (!((u16)(a - 0x37) < 0x11) && (s16)sub_80A2750(a) == 1) { + if (!((u16)(a - SCRIPT_DUNGEON_NORMAL_MAZE_2) < 17) && (s16)sub_80A2750(a) == 1) { if (scriptIndex == -1) { if (ScriptLoggingEnabled(TRUE)) Log(1, " dungeon rescue select %3d", a); @@ -1902,38 +1906,38 @@ static s32 ExecuteScriptCommand(Action *action) } } GroundLives_ExecutePlayerScriptActionLives(action->unk8.unk2, ret); - return 3; + return ESC_RET_03; } break; } case CMD_BYTE_22: { sub_80999E8(curCmd.argShort); if (curCmd.argByte != 0) - return 2; + return ESC_RET_02; break; } case CMD_BYTE_23: { sub_80999FC(curCmd.argShort); if (curCmd.argByte != 0) - return 2; + return ESC_RET_02; break; } case CMD_BYTE_24: { sub_8099A10(curCmd.argShort, curCmd.arg1, curCmd.arg2); if (curCmd.argByte != 0) - return 2; + return ESC_RET_02; break; } case CMD_BYTE_25: { sub_8099A34(curCmd.argShort); if (curCmd.argByte != 0) - return 2; + return ESC_RET_02; break; } case CMD_BYTE_26: { sub_8099A48(curCmd.argShort); if (curCmd.argByte != 0) - return 2; + return ESC_RET_02; break; } case CMD_BYTE_27: // FLASH_FROM @@ -1948,7 +1952,7 @@ static s32 ExecuteScriptCommand(Action *action) break; } if (curCmd.argByte != FALSE) - return 2; + return ESC_RET_02; break; } case CMD_BYTE_29: { @@ -1968,7 +1972,7 @@ static s32 ExecuteScriptCommand(Action *action) break; sub_80A87AC(0, 10); if (GroundScriptCheckLockCondition(action, 0)) - return 2; + return ESC_RET_02; break; } case CMD_BYTE_30: { @@ -2105,7 +2109,7 @@ static s32 ExecuteScriptCommand(Action *action) if (ret) { sub_80A87AC(0, 10); if (GroundScriptCheckLockCondition(action, 0)) - return 2; + return ESC_RET_02; } break; } @@ -2113,7 +2117,7 @@ static s32 ExecuteScriptCommand(Action *action) if ((s8)ScriptPrintTextOnBgAuto(curCmd.argShort, curCmd.argPtr) && curCmd.argShort >= 0) { sub_80A87AC(0, 10); if (GroundScriptCheckLockCondition(action, 0)) - return 2; + return ESC_RET_02; } break; } @@ -2121,18 +2125,18 @@ static s32 ExecuteScriptCommand(Action *action) sub_809AFC8((u8)curCmd.argByte > 0, curCmd.arg1, (s16)curCmd.arg2, curCmd.argPtr); if (GroundScriptCheckLockCondition(action, 1)) { sub_80A87AC(0, 11); - return 2; + return ESC_RET_02; } break; } case CMD_BYTE_3C: { // SPECIAL_TEXT ScriptSpecialTextHandler(curCmd.argByte, curCmd.arg1, curCmd.arg2, STR_TO_MONORSTRPTR((u8*)curCmd.argPtr)); sub_80A87AC(0, 11); - return 2; + return ESC_RET_02; } case CMD_BYTE_3B: { scriptData->unk2A = 0; - return 2; + return ESC_RET_02; } case CMD_BYTE_3D: { s32 i; @@ -2145,13 +2149,13 @@ static s32 ExecuteScriptCommand(Action *action) sPokeNameBuffer[POKEMON_NAME_LENGTH] = 0; ScriptSpecialTextHandler2(SPECIAL_TEXT_PLAYER_NAME_INPUT, 0, STR_TO_MONORSTRPTR(sPokeNameBuffer)); sub_80A87AC(0, 11); - return 2; + return ESC_RET_02; } break; } else { ScriptSpecialTextHandler2(SPECIAL_TEXT_PLAYER_NAME_INPUT, 1, STR_TO_MONORSTRPTR(sPokeNameBuffer)); sub_80A87AC(0, 11); - return 2; + return ESC_RET_02; } } case CMD_BYTE_3E: { @@ -2159,7 +2163,7 @@ static s32 ExecuteScriptCommand(Action *action) sPokeNameBuffer[10] = '\0'; ScriptSpecialTextHandler2(SPECIAL_TEXT_TEAM_NAME_INPUT, 0, STR_TO_MONORSTRPTR(sPokeNameBuffer)); sub_80A87AC(0, 11); - return 2; + return ESC_RET_02; } case CMD_BYTE_3F: { s32 i; @@ -2168,7 +2172,7 @@ static s32 ExecuteScriptCommand(Action *action) ScriptSpecialTextHandler2(SPECIAL_TEXT_PASSWORD_INPUT, (u8)curCmd.argByte, STR_TO_MONORSTRPTR(sPokeNameBuffer)); sub_80A87AC(0, 11); - return 2; + return ESC_RET_02; } case CMD_BYTE_42: { StopAllMusic_1(); @@ -2297,7 +2301,7 @@ static s32 ExecuteScriptCommand(Action *action) unk.y = curCmd.arg2 << 8; action->callbacks->moveReal(action->parentObject, &unk); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_59: { PixelPos unk; @@ -2305,7 +2309,7 @@ static s32 ExecuteScriptCommand(Action *action) unk.y = curCmd.arg1 << 8; action->callbacks->moveRelative(action->parentObject, &unk); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_5A: { PixelPos unk; @@ -2313,7 +2317,7 @@ static s32 ExecuteScriptCommand(Action *action) unk.y = OtherRandInt(curCmd.arg1) << 8; action->callbacks->moveRelative(action->parentObject, &unk); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_5B: { PixelPos unk; @@ -2321,7 +2325,7 @@ static s32 ExecuteScriptCommand(Action *action) GroundLink_GetPos((s16)curCmd.arg1, &unk); action->callbacks->moveReal(action->parentObject, &unk); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_5C: { PixelPos pos, pos1, pos2; @@ -2331,7 +2335,7 @@ static s32 ExecuteScriptCommand(Action *action) pos.y = pos1.y + OtherRandInt(pos2.y - pos1.y); action->callbacks->moveReal(action->parentObject, &pos); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_5D: { PixelPos unk; @@ -2340,7 +2344,7 @@ static s32 ExecuteScriptCommand(Action *action) sub_80A8FD8(res, &unk); action->callbacks->moveReal(action->parentObject, &unk); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } break; } @@ -2357,7 +2361,7 @@ static s32 ExecuteScriptCommand(Action *action) action->scriptData.storedDir = dir; action->callbacks->setDirection(action->parentObject, dir); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_5F: { PixelPos pos; @@ -2376,7 +2380,7 @@ static s32 ExecuteScriptCommand(Action *action) case CMD_BYTE_60: { action->callbacks->setPosHeight(action->parentObject, curCmd.arg1 << 8); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_61: case CMD_BYTE_69: { @@ -2384,7 +2388,7 @@ static s32 ExecuteScriptCommand(Action *action) scriptData->pos2.y = curCmd.arg2 << 8; scriptData->unk30 = curCmd.argShort; scriptData->unk2A = -1; - return 2; + return ESC_RET_02; } case CMD_BYTE_62: case CMD_BYTE_6A: { @@ -2394,7 +2398,7 @@ static s32 ExecuteScriptCommand(Action *action) scriptData->pos2.y = pos.y + (curCmd.arg2 << 8); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = -1; - return 2; + return ESC_RET_02; } case CMD_BYTE_63: case CMD_BYTE_6B: { @@ -2402,7 +2406,7 @@ static s32 ExecuteScriptCommand(Action *action) GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = -1; - return 2; + return ESC_RET_02; } case CMD_BYTE_64: case CMD_BYTE_6C: { @@ -2410,7 +2414,7 @@ static s32 ExecuteScriptCommand(Action *action) GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_65: case CMD_BYTE_6D: { @@ -2418,7 +2422,7 @@ static s32 ExecuteScriptCommand(Action *action) GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = OtherRandInt((u8)curCmd.argByte); - return 2; + return ESC_RET_02; } case CMD_BYTE_66: case CMD_BYTE_67: @@ -2429,7 +2433,7 @@ static s32 ExecuteScriptCommand(Action *action) sub_80A8FD8(ret, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } break; } @@ -2450,7 +2454,7 @@ static s32 ExecuteScriptCommand(Action *action) } else { scriptData->unk2A = curCmd.argShort; } - return 2; + return ESC_RET_02; } case CMD_BYTE_72: case CMD_BYTE_78: @@ -2466,7 +2470,7 @@ static s32 ExecuteScriptCommand(Action *action) } else { scriptData->unk2A = curCmd.argShort; } - return 2; + return ESC_RET_02; } case CMD_BYTE_73: case CMD_BYTE_79: @@ -2495,7 +2499,7 @@ static s32 ExecuteScriptCommand(Action *action) } else { scriptData->unk2A = curCmd.argShort; } - return 2; + return ESC_RET_02; } case CMD_BYTE_74: case CMD_BYTE_7A: @@ -2511,7 +2515,7 @@ static s32 ExecuteScriptCommand(Action *action) } else { scriptData->unk2A = curCmd.argShort; } - return 2; + return ESC_RET_02; } case CMD_BYTE_75: case CMD_BYTE_7B: @@ -2529,7 +2533,7 @@ static s32 ExecuteScriptCommand(Action *action) } else { scriptData->unk2A = curCmd.argShort; } - return 2; + return ESC_RET_02; } case CMD_BYTE_76: case CMD_BYTE_7C: @@ -2546,7 +2550,7 @@ static s32 ExecuteScriptCommand(Action *action) } else { scriptData->unk2A = curCmd.argShort; } - return 2; + return ESC_RET_02; } break; } @@ -2555,14 +2559,14 @@ static s32 ExecuteScriptCommand(Action *action) scriptData->unk48 = curCmd.arg1 << 8; scriptData->unk30 = curCmd.argShort; scriptData->unk2A = -1; - return 2; + return ESC_RET_02; } case CMD_BYTE_89: { action->scriptData.storedDir = curCmd.arg1; action->callbacks->setDirection(action->parentObject, (s8) curCmd.arg1); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_8A: { // CMD_UNK_8A s8 dir; @@ -2571,13 +2575,13 @@ static s32 ExecuteScriptCommand(Action *action) action->callbacks->setDirection(action->parentObject, action->scriptData.storedDir); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_8B: { // SET_DIR_WAIT action->scriptData.storedDir = curCmd.argShort; action->callbacks->setDirection(action->parentObject, action->scriptData.storedDir); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_8C: { // CMD_UNK_8C s32 ret = (s16)sub_80A7AE8((s16)curCmd.arg1); @@ -2588,7 +2592,7 @@ static s32 ExecuteScriptCommand(Action *action) action->callbacks->setDirection(action->parentObject, action->scriptData.storedDir); } scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_8D: { // CMD_UNK_8D s8 dir; @@ -2596,7 +2600,7 @@ static s32 ExecuteScriptCommand(Action *action) action->scriptData.storedDir = TransformDirection1(dir, (u8)curCmd.argShort); action->callbacks->setDirection(action->parentObject, action->scriptData.storedDir); scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_8E: // CMD_UNK_8E case CMD_BYTE_8F: // CMD_UNK_8F @@ -2650,25 +2654,25 @@ static s32 ExecuteScriptCommand(Action *action) action->callbacks->setDirection(action->parentObject, action->scriptData.storedDir); } scriptData->unk2A = (u8)curCmd.argByte; - return 2; + return ESC_RET_02; } case CMD_BYTE_93: // CMD_UNK_93 case CMD_BYTE_94: // CMD_UNK_94 case CMD_BYTE_95: { // CMD_UNK_95 scriptData->unk2A = 0; - return 2; + return ESC_RET_02; } case CMD_BYTE_91: { // ROTATE_TO action->scriptData.unk4D = (s8)curCmd.arg1; scriptData->unk2A = 0; - return 2; + return ESC_RET_02; } case CMD_BYTE_92: { // CMD_UNK_92 s8 unk; action->callbacks->getDirection(action->parentObject, &unk); action->scriptData.unk4D = TransformDirection1(unk, (u8)curCmd.arg1); scriptData->unk2A = 0; - return 2; + return ESC_RET_02; } case CMD_BYTE_97: { sub_809D124(curCmd.argShort, curCmd.arg1, curCmd.arg2); @@ -2719,13 +2723,13 @@ static s32 ExecuteScriptCommand(Action *action) switch (action->unk8.unk0) { case 1: sub_809D1A8(1, id, curCmd.argShort); - return 2; + return ESC_RET_02; case 2: sub_809D1A8(2, id, curCmd.argShort); - return 2; + return ESC_RET_02; case 3: sub_809D1A8(3, id, curCmd.argShort); - return 2; + return ESC_RET_02; } break; } @@ -2736,21 +2740,21 @@ static s32 ExecuteScriptCommand(Action *action) case 1: sub_80A8FD8(id, &unk); sub_809D190(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; case 2: sub_80AC448(id, &unk); sub_809D190(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; case 3: sub_80AD360(id, &unk); sub_809D190(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; } break; } case CMD_BYTE_9D: { sub_809D1A8(1, 0, curCmd.argShort); - return 2; + return ESC_RET_02; } case CMD_BYTE_9E: { s32 id = action->callbacks->getIndex(action->parentObject); @@ -2759,13 +2763,13 @@ static s32 ExecuteScriptCommand(Action *action) switch (action->unk8.unk0) { case 1: sub_809D1E4(1, id, curCmd.argShort); - return 2; + return ESC_RET_02; case 2: sub_809D1E4(2, id, curCmd.argShort); - return 2; + return ESC_RET_02; case 3: sub_809D1E4(3, id, curCmd.argShort); - return 2; + return ESC_RET_02; } break; } @@ -2776,21 +2780,21 @@ static s32 ExecuteScriptCommand(Action *action) case 1: sub_80A8FD8(id, &unk); sub_809D1CC(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; case 2: sub_80AC448(id, &unk); sub_809D1CC(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; case 3: sub_80AD360(id, &unk); sub_809D1CC(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; } break; } case CMD_BYTE_A0: { sub_809D1E4(1, 0, curCmd.argShort); - return 2; + return ESC_RET_02; } case CMD_BYTE_A1: { s32 id = action->callbacks->getIndex(action->parentObject); @@ -2799,13 +2803,13 @@ static s32 ExecuteScriptCommand(Action *action) switch (action->unk8.unk0) { case 1: sub_809D220(1, id, curCmd.argShort); - return 2; + return ESC_RET_02; case 2: sub_809D220(2, id, curCmd.argShort); - return 2; + return ESC_RET_02; case 3: sub_809D220(3, id, curCmd.argShort); - return 2; + return ESC_RET_02; } break; } @@ -2816,21 +2820,21 @@ static s32 ExecuteScriptCommand(Action *action) case 1: sub_80A8FD8(id, &unk); sub_809D208(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; case 2: sub_80AC448(id, &unk); sub_809D208(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; case 3: sub_80AD360(id, &unk); sub_809D208(0, &unk, curCmd.argShort); - return 2; + return ESC_RET_02; } break; } case CMD_BYTE_A3: { sub_809D220(1, 0, curCmd.argShort); - return 2; + return ESC_RET_02; } case CMD_BYTE_A4: { ResetScriptVarArray(scriptData->localVars.buf, curCmd.argShort); @@ -3084,12 +3088,12 @@ static s32 ExecuteScriptCommand(Action *action) scriptData->branchDiscriminant = GetScriptVarValue(scriptData->localVars.buf, curCmd.argShort); while (scriptData->script.ptr->op == CMD_BYTE_D0) { if (scriptData->script.ptr->argShort == scriptData->branchDiscriminant) - return 2; + return ESC_RET_02; scriptData->script.ptr++; } if (scriptData->script.ptr->op == CMD_BYTE_D1) { scriptData->branchDiscriminant = -1; - return 2; + return ESC_RET_02; } break; } @@ -3151,23 +3155,23 @@ static s32 ExecuteScriptCommand(Action *action) } if (GroundScriptCheckLockCondition(action, 1)) { sub_80A87AC(0, 11); - return 2; + return ESC_RET_02; } break; } case CMD_BYTE_DA: { if (GroundScriptCheckLockCondition(action, 1)) - return 2; + return ESC_RET_02; break; } case CMD_BYTE_DB: { // WAIT scriptData->unk2A = curCmd.argShort; - return 2; + return ESC_RET_02; } case CMD_BYTE_DC: { scriptData->unk2A = curCmd.argShort + OtherRandInt(curCmd.arg1 - curCmd.argShort); - return 2; + return ESC_RET_02; } case CMD_BYTE_DD: case CMD_BYTE_DE: @@ -3175,13 +3179,13 @@ static s32 ExecuteScriptCommand(Action *action) case CMD_BYTE_E0: case CMD_BYTE_E1: // WAIT_FANFARE1 case CMD_BYTE_E2: { // WAIT_FANFARE2 - return 2; + return ESC_RET_02; } case CMD_BYTE_E3: { scriptData->branchDiscriminant = curCmd.argShort; if (GroundScriptCheckLockCondition(action, curCmd.argShort)) - return 2; + return ESC_RET_02; break; } @@ -3193,7 +3197,7 @@ static s32 ExecuteScriptCommand(Action *action) scriptData->branchDiscriminant = curCmd.argShort; if (GroundScriptLockCond(action, curCmd.argShort, curCmd.argByte)) - return 2; + return ESC_RET_02; break; } @@ -3246,7 +3250,7 @@ static s32 ExecuteScriptCommand(Action *action) case CMD_BYTE_EE: { // RET_DIRECT if (scriptData->savedScript.ptr == NULL) { // DS: Assert(FALSE, "Script return stack error"); - return 0; + return ESC_RET_00; } scriptData->script = scriptData->savedScript; @@ -3256,11 +3260,11 @@ static s32 ExecuteScriptCommand(Action *action) } case CMD_BYTE_EF: // RET // DS: if (scriptData->savedScript.ptr != NULL) Assert(FALSE, "Script end stack error"); - return 0; + return ESC_RET_00; case CMD_BYTE_F0: // HALT - return 1; + return ESC_RET_01; case CMD_BYTE_F1: // END_DELETE - return 4; // fatal error? + return ESC_RET_04; case CMD_BYTE_F2: // CMD_F2 case CMD_BYTE_F3: // CMD_F3 case CMD_BYTE_F4: // LABEL @@ -3287,7 +3291,7 @@ UNUSED static bool8 GroundScript_ExecuteTrigger(s16 scriptID) ptr = &gFunctionScriptTable[scriptID]; - if (ptr->type != 11) + if (ptr->type != SCRIPT_TYPE_11) return FALSE; InitActionWithParams(&action, &sNullCallbackData, NULL, 0, 0); @@ -3300,7 +3304,7 @@ UNUSED static bool8 GroundScript_ExecuteTrigger(s16 scriptID) ret = HandleAction(&action, DEBUG_LOC_PTR("../ground/ground_script.c", 4558, "GroundScript_ExecuteTrigger")); InitAction2(&action); - if (ret == 0) + if (ret == ESC_RET_00) return TRUE; return FALSE; @@ -4066,7 +4070,7 @@ static s32 sub_80A14E8(Action *action, u8 idx, u32 r2, s32 r3) break; case 0x40: - sub_80993C0(r2 == 0 ? 0 : 1); + sub_80993C0(r2 != 0); return 0; case 0x42: sub_8011C28(1); diff --git a/src/ground_sprite.c b/src/ground_sprite.c index c08691ceb..d6583c40e 100644 --- a/src/ground_sprite.c +++ b/src/ground_sprite.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "code_8099360.h" #include "ground_sprite.h" #include "structs/axdata.h" #include "effect_main.h" @@ -12,6 +13,7 @@ #include "memory.h" #include "sprite.h" #include "effect_sub_1.h" +#include "palette_util.h" #include "pokemon.h" #include "ground_effect.h" #include "ground_object.h" @@ -42,8 +44,6 @@ typedef struct unkStruct_3001B7C unkStruct_3001B7C_sub108 unk108[UNK_3001B7C_SUB108_COUNT]; } unkStruct_3001B7C; -static IWRAM_INIT unkStruct_3001B7C *gUnknown_3001B7C = {NULL}; - static EWRAM_DATA unkStruct_2039DB0 gUnknown_2039DB0 = {0}; UNUSED static EWRAM_DATA u32 sUnknown_2039DBC = {0}; // Unused, for alignment static EWRAM_DATA unkStruct_2039DB0 gUnknown_2039DC0 = {0}; @@ -55,10 +55,7 @@ static EWRAM_DATA PixelPos gUnknown_2039DD8 = {0}; static EWRAM_INIT OpenedFile *gUnknown_203B4B4 = {NULL}; -// code_8098BDC.s -extern void sub_809971C(u16, const u8 *, s16); -extern void sub_80997F4(u16, u16); -extern void sub_800E970(void); +static IWRAM_INIT unkStruct_3001B7C *gUnknown_3001B7C = {NULL}; static bool8 sub_80A68F8(struct UnkGroundSpriteStruct *ptr, struct UnkGroundSpriteSubStructx48 *a1, s32 a2); static bool8 sub_80A6CF4(struct UnkGroundSpriteSubStructx48 *a0); @@ -143,7 +140,7 @@ static void sub_80A6460(void) data = file->data; for (i = 0; i < 13; i++) { - sub_809971C(something, data, 0x10); + sub_809971C(something, (RGB_Array*)data, 0x10); something += 0x10; data += 0x40; } @@ -192,7 +189,7 @@ UNUSED static void sub_80A64A4(void) if (flag) r4 |= 2; - sub_809971C(r9, r2, 16); + sub_809971C(r9, (RGB_Array*)r2, 16); sub_80997F4(sl, r4); if (file != NULL) @@ -545,7 +542,7 @@ void GroundSprite_ExtendPaletteAdd(struct UnkGroundSpriteStruct *ptr, u16 a1) } sub_80997F4(var_28, r6); - sub_809971C(var_24, r7, 16); + sub_809971C(var_24, (RGB_Array*)r7, 16); sub108Ptr->unk0 = a1; sub108Ptr->unk2 = 1; r2 = var_28 - 16; diff --git a/src/kangaskhan_storage2.c b/src/kangaskhan_storage2.c index 361c63581..dc6928017 100644 --- a/src/kangaskhan_storage2.c +++ b/src/kangaskhan_storage2.c @@ -225,7 +225,7 @@ static void sub_8018280(void) static void BuildKangaskhanStorage2MainMenu(void) { - int index; + s32 index; s32 loopMax; loopMax = 0; diff --git a/src/mailbox.c b/src/mailbox.c index c5afd52e6..3a34a447e 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -225,7 +225,7 @@ void sub_802E1AC(void) void CreateMailboxMenu(void) { - int index; + s32 index; s32 loopMax; loopMax = 0; diff --git a/src/main_loops.c b/src/main_loops.c index 30044e03d..eb08da710 100644 --- a/src/main_loops.c +++ b/src/main_loops.c @@ -83,7 +83,7 @@ static u8 sub_8001170(void); static void RemoveMoneyAndRandomItems(void); static void RemoveAllMoneyAndItems(void); static void LoadAndRunDungeon_Async(DungeonSetupStruct *r0); -static u32 xxx_script_related_8001334(u32 r0); +static u32 xxx_script_related_8001334(u32 startMode); static void MainLoops_RunFrameActions(u32 unused); extern bool8 sub_8096A08(u8 dungeon, Pokemon *pokemon); @@ -153,13 +153,13 @@ void GameLoop_Async(void) if (ReadSaveFromPak(&tmp)) ThoroughlyResetScriptVars(); - xxx_script_related_8001334(14); - xxx_script_related_8001334(15); + xxx_script_related_8001334(STARTMODE_14); + xxx_script_related_8001334(STARTMODE_15); ClearScriptVarArray(NULL, EVENT_LOCAL); - xxx_script_related_8001334(16); + xxx_script_related_8001334(STARTMODE_16); if (GetScriptVarValue(NULL, EVENT_LOCAL) == 0) - xxx_script_related_8001334(17); + xxx_script_related_8001334(STARTMODE_17); while (TRUE) { sUnknown_203B03C = 0; @@ -570,7 +570,7 @@ static u32 RunGameMode_Async(u32 a0) struct FriendAreasMapSetupStruct friendAreasSetup; struct WorldMapSetupStruct worldMapSetup; DungeonSetupStruct dungeonSetup; - s16 sp552; + s16 scriptDungeon; if (mode == STARTMODE_FRIEND_AREAS) { u8 friendAreaId = MapIdToFriendAreaId(GetScriptVarValue(NULL,GROUND_ENTER)); @@ -639,7 +639,7 @@ static u32 RunGameMode_Async(u32 a0) SetScriptVarValue(NULL, DUNGEON_ENTER, scriptDungeonId); sUnknown_203B03C = 2; sub_800A8F8(4); - r5 = xxx_script_related_8001334(5); + r5 = xxx_script_related_8001334(STARTMODE_DUNGEON_FROM_WORLD_MAP); } else if (mode == STARTMODE_8) { r5 = 0; @@ -675,13 +675,13 @@ static u32 RunGameMode_Async(u32 a0) MemoryFill8(&dungeonSetup.info.mon, 0, sizeof(dungeonSetup.info.mon)); dungeonSetup.info.mon.speciesNum = 0; if (r5 == 7) { - if (!sub_80991E0(&dungeonSetup.info, &sp552)) { + if (!sub_80991E0(&dungeonSetup.info, &scriptDungeon)) { r5 = 13; mode = STARTMODE_DUNGEON_WON; } } else if (r5 == 8) { - if (!sub_80991E0(&dungeonSetup.info, &sp552)) { + if (!sub_80991E0(&dungeonSetup.info, &scriptDungeon)) { r5 = 13; mode = STARTMODE_DUNGEON_WON; } @@ -690,13 +690,13 @@ static u32 RunGameMode_Async(u32 a0) } } else if (r5 == 10) { - if (!sub_80991E0(&dungeonSetup.info, &sp552)) { + if (!sub_80991E0(&dungeonSetup.info, &scriptDungeon)) { r5 = 13; mode = STARTMODE_DUNGEON_WON; } } else if (r5 == 9) { - if (!sub_80991E0(&dungeonSetup.info, &sp552)) { + if (!sub_80991E0(&dungeonSetup.info, &scriptDungeon)) { r5 = 11; mode = STARTMODE_DUNGEON_LOST; } @@ -1096,9 +1096,10 @@ static void nullsub_2(DungeonSetupStruct *r0) } // arm9.bin::0200CAD0 -static u32 xxx_script_related_8001334(u32 r0) +// startMode: See enum "StartModeVal" +static u32 xxx_script_related_8001334(u32 startMode) { - return xxx_script_related_8098468(r0); + return xxx_script_related_8098468(startMode); } // arm9.bin::0200CA1C diff --git a/src/mission_reward.c b/src/mission_reward.c index e11c699e8..4e7475bc0 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -192,7 +192,7 @@ void sub_802F300(void) void HandleMissionReward(void) { - int moneyReward; + s32 moneyReward; const u8 *rankString; u8 itemID; struct unkStruct_8090F58 local_20; diff --git a/src/move_orb_actions_2.c b/src/move_orb_actions_2.c index 26174fe1c..97cd7a883 100644 --- a/src/move_orb_actions_2.c +++ b/src/move_orb_actions_2.c @@ -1,12 +1,5 @@ #include "global.h" #include "globaldata.h" -#include "move_orb_actions_2.h" -#include "move_orb_effects_2.h" -#include "dungeon_move_util.h" -#include "dungeon_vram.h" -#include "dungeon_tilemap.h" -#include "dungeon_mon_sprite_render.h" -#include "dungeon_random.h" #include "constants/ability.h" #include "constants/dungeon_exit.h" #include "constants/residual_damage.h" @@ -14,33 +7,37 @@ #include "constants/targeting.h" #include "constants/type.h" #include "constants/weather.h" -#include "dungeon_logic.h" -#include "dungeon_items.h" -#include "dungeon_map_access.h" -#include "dungeon_message.h" -#include "dungeon_random.h" -#include "dungeon_util.h" -#include "dungeon_move.h" -#include "dungeon_misc.h" -#include "move_orb_effects_1.h" -#include "moves.h" -#include "number_util.h" -#include "pokemon.h" -#include "move_orb_actions_1.h" #include "structs/dungeon_entity.h" #include "structs/map.h" #include "structs/str_dungeon.h" -#include "weather.h" +#include "dungeon_8041AD0.h" #include "dungeon_config.h" -#include "dungeon_misc.h" -#include "dungeon_strings.h" #include "dungeon_damage.h" -#include "warp_target.h" +#include "dungeon_items.h" +#include "dungeon_logic.h" +#include "dungeon_map_access.h" +#include "dungeon_message.h" +#include "dungeon_misc.h" +#include "dungeon_mon_sprite_render.h" +#include "dungeon_move.h" +#include "dungeon_move_util.h" +#include "dungeon_random.h" +#include "dungeon_strings.h" +#include "dungeon_tilemap.h" +#include "dungeon_util.h" +#include "dungeon_vram.h" #include "explosion.h" +#include "move_orb_actions_1.h" +#include "move_orb_actions_2.h" +#include "move_orb_effects_1.h" +#include "move_orb_effects_2.h" #include "move_orb_effects_3.h" #include "move_orb_effects_4.h" - -extern void nullsub_92(Entity *); +#include "moves.h" +#include "number_util.h" +#include "pokemon.h" +#include "warp_target.h" +#include "weather.h" bool8 SkyAttackMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId) { @@ -224,8 +221,8 @@ bool8 PsychUpMoveAction(Entity * pokemon, Entity * target, Move * move, s32 item bool8 sub_8058E5C(Entity *pokemon, Entity *target, Move *move, s32 itemId) { - int iVar2; - int iVar3; + s32 iVar2; + s32 iVar3; bool8 flag; flag = FALSE; diff --git a/src/move_orb_actions_3.c b/src/move_orb_actions_3.c index 70ee38f35..92467e230 100644 --- a/src/move_orb_actions_3.c +++ b/src/move_orb_actions_3.c @@ -563,9 +563,9 @@ static void sub_805A7D4(Entity * pokemon, Entity * target, Item *item, bool8 SplashMoveAction(Entity * pokemon, Entity * target, Move *move, s32 itemId) { - int x; - int y; - int counter; + s32 x; + s32 y; + s32 counter; DungeonPos *r9; DungeonPos pos1; Move stackMove; diff --git a/src/move_orb_actions_5.c b/src/move_orb_actions_5.c index d789e679b..45bdbc13d 100644 --- a/src/move_orb_actions_5.c +++ b/src/move_orb_actions_5.c @@ -23,9 +23,9 @@ bool8 FillInOrbAction(Entity *pokemon,Entity *target, Move *move, s32 itemId) { Tile *tileToFill; EntityInfo *targetInfo; - int y; + s32 y; bool8 filledInTile; - int x; + s32 x; DungeonPos tileCoords; filledInTile = FALSE; diff --git a/src/move_orb_effects_2.c b/src/move_orb_effects_2.c index 05109214d..d94d86329 100644 --- a/src/move_orb_effects_2.c +++ b/src/move_orb_effects_2.c @@ -650,7 +650,7 @@ void PerishSongTarget(Entity * pokemon, Entity * target) void EncoreStatusTarget(Entity *pokemon,Entity *target) { Move *movePtr; - int index; + s32 index; EntityInfo *EntityInfo; EntityInfo = GetEntInfo(target); diff --git a/src/moves.c b/src/moves.c index 2b9be4c56..19803cc67 100644 --- a/src/moves.c +++ b/src/moves.c @@ -581,8 +581,8 @@ UNUSED static s32 unk_SetMoveToFirstInLinkedSequence8(Move *moves, s32 index) Move* move; Move linkedSequence[8][8]; s32 startIndex, prevIndex; - int result; - int i; + s32 result; + s32 i; result = index; @@ -1137,8 +1137,8 @@ static void unk_GetLinkedSequences8_v2(Move *moves, Move linkedSequences[8][8]) // instead of [4][4] linkedSequences static void unk_LinkedSequencesToMoves8(Move *moves, Move linkedSequences[8][8]) { - int i, j; - int movesCopied; + s32 i, j; + s32 movesCopied; bool8 moveFlags8[8]; bool8 moveFlags4[8]; diff --git a/src/pelipper_board.c b/src/pelipper_board.c index 94125eee8..e12653356 100644 --- a/src/pelipper_board.c +++ b/src/pelipper_board.c @@ -212,7 +212,7 @@ void sub_802EA58(void) void CreatePelipperBoardMenu(void) { - int index; + s32 index; s32 loopMax; loopMax = 0; diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index bb9a9422d..a2218708b 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -2,6 +2,7 @@ #include "globaldata.h" #include "constants/main_menu.h" #include "code_803D0D8.h" +#include "code_8031D70.h" #include "code_8094F88.h" #include "dungeon_info.h" #include "input.h" @@ -243,15 +244,9 @@ const MenuItem gUnknown_80E75A0[4] = { ALIGNED(4) const u8 sUnknown_80E75C0[] = _("{CENTER_ALIGN}new mail."); ALIGNED(4) const u8 sUnknown_80E75CC[] = _("{CENTER_ALIGN}There is no space for receiving"); -extern void sub_8031D70(u32, u32); -extern void sub_8031E10(void); -extern u32 sub_8031DCC(void); -extern void sub_8031E00(void); - void DisplayRescuePasswordError(u32 error); void sub_8039174(void); void DisplayPasswordAcceptScreen(void); -u32 sub_8039068(u32, u8 *passwordBuffer, unkStruct_203B480 *r0); void sub_80391F8(void); u32 ConvertMenutoRescuePasswordState(u32); diff --git a/src/run_dungeon.c b/src/run_dungeon.c index 775e2091f..0e5ad1a5a 100644 --- a/src/run_dungeon.c +++ b/src/run_dungeon.c @@ -63,6 +63,7 @@ #include "ground_main.h" #include "dungeon_mon_sprite_render.h" #include "adventure_info.h" +#include "decompress_sir.h" EWRAM_INIT struct UnkStruct_203B414 *gUnknown_203B414 = NULL; EWRAM_INIT Dungeon *gDungeon = NULL; @@ -75,7 +76,6 @@ extern void sub_8043D60(void); extern void sub_80840A4(void); extern void sub_806AB2C(void); extern void sub_807E5AC(void); -extern void nullsub_16(void); extern void sub_80521D0(void); extern void sub_8068A84(Pokemon *pokemon); extern void sub_806AA70(void); diff --git a/src/save.c b/src/save.c index 22b3ca4cb..9bdbf4b13 100644 --- a/src/save.c +++ b/src/save.c @@ -314,9 +314,9 @@ bool8 IsSaveCorrupted(void) u32 WriteSavetoPak(s32 *param_1, u32 param_2) { struct UnkStruct_sub_8011DAC *playerSave; - const char *gameName; - int saveStatus1; - int saveStatus2; + const u8 *gameName; + s32 saveStatus1; + s32 saveStatus2; u8 *array_ptr; playerSave = MemoryAlloc(sizeof(struct UnkStruct_sub_8011DAC),5); diff --git a/src/save_menu.c b/src/save_menu.c index 9b7831922..a599c3d79 100644 --- a/src/save_menu.c +++ b/src/save_menu.c @@ -117,9 +117,6 @@ ALIGNED(4) const u8 gUnknown_80E7178[] = _("{CENTER_ALIGN}The data could not be static void sub_8038830(void); static void sub_80388C4(void); -extern void sub_8038440(void); -extern void sub_80140F8(void); - void CreateSaveMenu(s32 currMenu) { s32 index; diff --git a/src/script_item.c b/src/script_item.c index 497009b62..bdd876197 100644 --- a/src/script_item.c +++ b/src/script_item.c @@ -79,10 +79,10 @@ static const struct ItemWithQuantity sScriptItemsTable[] = { static bool8 TryAddItemWithText(const struct ItemWithQuantity *itemToAdd, const u8 *maxMoneyStr, const u8 *noItemSpaceStr, const u8 *itemGivenStr) { - char buffer[80]; + u8 buffer[80]; if (itemToAdd->id == ITEM_POKE) { - int newMoneyAmount; + s32 newMoneyAmount; sprintfStatic(buffer,_("{COLOR CYAN_G}%d{RESET} %s"),itemToAdd->quantity,gItemParametersData[ITEM_POKE].name); newMoneyAmount = gTeamInventoryRef->teamMoney + itemToAdd->quantity; if (newMoneyAmount > MAX_TEAM_MONEY) { diff --git a/src/text_util.c b/src/text_util.c index cf9b1ce59..5f1576de9 100644 --- a/src/text_util.c +++ b/src/text_util.c @@ -70,7 +70,7 @@ void BoundedCopyStringtoBuffer(u8 *buffer, u8 *string, s32 size) *buffer = '\0'; // append a terminating char and break break; } - // NOTE: *buffer++ = *string++ cases register flip + // NOTE: *buffer++ = *string++ causes register flip *buffer = *string; buffer++; string++; diff --git a/src/textbox.c b/src/textbox.c index 4fc65586d..07292a558 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -1959,7 +1959,7 @@ static void sub_809C478(void) sub_8035758(); GetScriptVarScenario(SCENARIO_MAIN, &temp, &temp1); - sub_80993C0(0); + sub_80993C0(FALSE); } static void sub_809C4B0(void) diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 9313ec08a..5051977f4 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -6,6 +6,8 @@ #include "code_801B3C0.h" #include "code_801C8C4.h" #include "code_802F204.h" +#include "code_8031D70.h" +#include "code_803C1B4.h" #include "code_8094F88.h" #include "cpu.h" #include "input.h" @@ -25,7 +27,6 @@ #include "wonder_mail_4.h" #include "wonder_mail_5.h" #include "naming_screen.h" -#include "code_803C1B4.h" static EWRAM_INIT WonderMailStruct_203B2C4 *sUnknown_203B2C4 = {NULL}; @@ -172,8 +173,6 @@ const MenuItem gUnknown_80DEEE4[] = #include "data/thank_you_wonder_mail.h" -extern u32 sub_8031DCC(void); -extern void sub_8031E00(void); extern void HandleThankYouMailPelipperMainMenu(); extern void sub_802AAC8(); extern void ReturnToThankYouMailMainMenu(); @@ -214,21 +213,18 @@ extern void HandleThankYouMailPasswordMenu(); extern void sub_802A9FC(); extern void sub_802A828(); extern void sub_802A850(); -extern void sub_8031E10(); extern void SetThankYouMailMenuState(u32); extern u8 sub_800D588(void); -extern void sub_8031D70(u8, u32); extern void sub_8011C28(u32); -extern u32 sub_8039068(u32, u8 *r1, unkStruct_203B480 *r0); bool8 CreateThankYouMailPelipper(void) { - char *monName; + u8 *monName; OpenedFile *faceFile; s32 index; - int counter; + s32 counter; unkStruct_203B480 *mail; ResetUnusedInputStruct(); @@ -845,7 +841,7 @@ void sub_802A68C(void) void sub_802A6B4(void) { - int saveStatus; + s32 saveStatus; u32 temp; if (sub_80144A4(&temp) == 0) { diff --git a/src/trap.c b/src/trap.c index b78eb0e6c..3a78e6d7c 100644 --- a/src/trap.c +++ b/src/trap.c @@ -153,7 +153,7 @@ bool8 LayTrap(DungeonPos *pos, u8 trapID, u8 param_3) { Tile *tile; Entity *entity; - int counter; + s32 counter; u16 terrainFlags; tile = GetTileMut(pos->x, pos->y); @@ -214,7 +214,7 @@ bool8 sub_807FD84(Entity *entity) return flag; } -bool8 sub_807FE04(DungeonPos *pos, char param_2) +bool8 sub_807FE04(DungeonPos *pos, u8 param_2) { Tile *tile; @@ -232,7 +232,7 @@ bool8 sub_807FE04(DungeonPos *pos, char param_2) } } -bool8 sub_807FE44(DungeonPos *pos, char param_2) +bool8 sub_807FE44(DungeonPos *pos, u8 param_2) { const Tile *tile; @@ -254,7 +254,7 @@ void GetTrapName(u8 *buffer, u8 trapIndex) strcpy(buffer, gTrapNames[trapIndex]); } -void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4) +void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, s32 param_3, u8 param_4) { Tile *tile; bool8 flag1; @@ -402,7 +402,7 @@ void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4) void HandleMudTrap(Entity *pokemon, Entity *target) { - int rand, randDef; + s32 rand, randDef; if (target == NULL) return; @@ -426,9 +426,9 @@ void HandleMudTrap(Entity *pokemon, Entity *target) void HandleStickyTrap(Entity *pokemon,Entity *target) { EntityInfo *info; - int index; - int itemCount; - int newIndex; + s32 index; + s32 itemCount; + s32 newIndex; Item *itemStack[21]; info = GetEntInfo(target); @@ -516,10 +516,10 @@ void HandleGrimyTrap(Entity *pokemon, Entity *target) { Item *item; Item *heldItem; - int counter; - int index; + s32 counter; + s32 index; EntityInfo *info; - int badFoodCount; + s32 badFoodCount; Item *itemStack [22]; badFoodCount = 0; @@ -613,7 +613,7 @@ void HandleSummonTrap(Entity *pokemon,DungeonPos *pos) { s32 r4; u32 direction; - int pokemonSummonCount; + s32 pokemonSummonCount; s16 species; struct MonSpawnInfo stack; s32 i; diff --git a/src/unk_ds_only_feature.c b/src/unk_ds_only_feature.c index 082444d8e..0aae24c98 100644 --- a/src/unk_ds_only_feature.c +++ b/src/unk_ds_only_feature.c @@ -120,7 +120,7 @@ void sub_809C6CC(u16 param_1) void sub_809C6EC(void) { - if (sub_8098F88() == 0) { + if (!sub_8098F88()) { if (gGameOptionsRef->unkC == 0) { sub_809C6CC(4); } diff --git a/src/unk_menu_203B360.c b/src/unk_menu_203B360.c index 0b8e2d2d6..6ab46fc21 100644 --- a/src/unk_menu_203B360.c +++ b/src/unk_menu_203B360.c @@ -56,8 +56,7 @@ ALIGNED(4) const u8 StorageEmpty_80E6EE4[] = _("{CENTER_ALIGN}The storage space ALIGNED(4) const u8 Caution_80E6F04[] = _("{CENTER_ALIGN}{COLOR RED}Caution!{RESET} "); static const u8 fill0[] = "pksdir0"; -extern void sub_8038440(); - +void sub_8038440(void); static void sub_80384D0(void); void sub_80382E4(s32 currMenu) diff --git a/src/weather.c b/src/weather.c index 0ecf0ded7..4bdd8d4e4 100644 --- a/src/weather.c +++ b/src/weather.c @@ -58,7 +58,7 @@ void sub_807E5AC(void) void sub_807E5E4(u8 weather) { - int index; + s32 index; u8 *preload; gDungeon->weather.unkE265 = weather; diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 9f2a84130..a2c6228e0 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -1,17 +1,20 @@ #include "global.h" #include "globaldata.h" #include "constants/communication_error_codes.h" -#include "music_util.h" -#include "friend_list.h" #include "code_8024458.h" +#include "code_8031D70.h" #include "code_8094F88.h" #include "code_80A26CC.h" #include "cpu.h" +#include "friend_list.h" +#include "ground_main.h" #include "input.h" #include "items.h" #include "main_menu1.h" #include "memory.h" #include "menu_input.h" +#include "music_util.h" +#include "naming_screen.h" #include "other_menus2.h" #include "pokemon.h" #include "rescue_password_menu.h" @@ -22,82 +25,7 @@ #include "wonder_mail.h" #include "wonder_mail_4.h" #include "wonder_mail_5.h" -#include "naming_screen.h" -#include "ground_main.h" - -static EWRAM_INIT WonderMailStruct_203B2C0 *sUnknown_203B2C0 = {NULL}; - -extern void sub_8011C28(u32); - -extern u32 sub_8031050(); -extern void sub_80310B4(); -extern void nullsub_130(void); -extern void sub_8028348(void); - -extern u32 sub_8039068(u32, u8 *r1, unkStruct_203B480 *r0); -extern u32 sub_8031DCC(); -extern void sub_8031E10(); -extern void sub_8031E00(); -extern void sub_8031E10(void); -extern void sub_8031D70(u8, u32); -extern void sub_8030F58(u32); -extern void sub_8029B34(void); -extern void sub_8029AD8(void); -extern void sub_8029AF4(void); -extern void sub_8029A88(void); -extern void sub_8029AB0(void); -extern void sub_80297B8(void); -extern void sub_80297D4(void); -extern void sub_8029884(void); -extern void sub_8029944(void); -extern void sub_80299AC(void); -extern void sub_80299D8(void); -extern void sub_8029A6C(void); -extern void ExitFriendRescueCounterMenu(void); -extern void sub_8028BF0(void); -extern void sub_8029A18(void); -extern void sub_80295A8(void); -extern void sub_8029668(void); -extern void sub_8029684(void); -extern void sub_8029740(void); -extern void sub_80295D8(void); -extern void sub_802979C(void); -extern void sub_8029358(void); -extern void sub_8029374(void); -extern void sub_802939C(void); -extern void sub_8028F58(void); -extern void sub_8028F30(void); -extern void sub_8028F04(void); -extern void sub_8028ED4(void); -extern void sub_80293D8(void); -extern void sub_80293F4(void); -extern void sub_8028DE8(u32); -extern void sub_8028EAC(void); -extern void sub_802955C(void); -extern void sub_80292A4(void); -extern void sub_80292EC(void); -extern void sub_802933C(void); -extern void sub_802958C(void); -extern void sub_8029208(void); -extern void sub_8028E84(void); -extern void sub_8028F80(void); -extern void sub_8028FC0(void); -extern void sub_8028FDC(void); -extern void sub_8028E54(void); -extern void sub_8028E24(void); -extern void sub_8028E08(void); -extern void sub_80290D4(void); -extern void sub_80290F0(void); -extern void sub_80291AC(void); -extern void sub_8029044(void); -extern void sub_8028CFC(void); -extern void sub_8028D4C(void); -extern void sub_8031E10(void); -extern void sub_80310B4(void); - -extern const u8 DontSendPokemon_80DDB80[]; -extern const u8 SendPokemon_80DDB98[]; -extern const u8 SendWOPokemon[]; +#include "wonder_mail_6.h" enum FriendRescueStates { @@ -175,217 +103,269 @@ enum MenuActions { SEND_WO_POKEMON_ACTION = 18 }; +static EWRAM_INIT WonderMailStruct_203B2C0 *sUnknown_203B2C0 = { NULL }; + #include "data/wonder_mail_1.h" +static void ExitFriendRescueCounterMenu(void); +static void SetFriendRescueCounterState(u32 state); -void SetFriendRescueCounterState(u32 r0); +static void sub_8028BF0(void); +static void sub_8028CFC(void); +static void sub_8028D4C(void); +static void sub_8028DE8(u32 newState); +static void sub_8028E08(void); +static void sub_8028E24(void); +static void sub_8028E54(void); +static void sub_8028E84(void); +static void sub_8028EAC(void); +static void sub_8028ED4(void); +static void sub_8028F04(void); +static void sub_8028F30(void); +static void sub_8028F58(void); +static void sub_8028F80(void); +static void sub_8028FC0(void); +static void sub_8028FDC(void); +static void sub_8029044(void); +static void sub_80290D4(void); +static void sub_80290F0(void); +static void sub_80291AC(void); +static void sub_8029208(void); +static void sub_80292A4(void); +static void sub_80292EC(void); +static void sub_802933C(void); +static void sub_8029358(void); +static void sub_8029374(void); +static void sub_802939C(void); +static void sub_80293D8(void); +static void sub_80293F4(void); +static void sub_802955C(void); +static void sub_802958C(void); +static void sub_80295A8(void); +static void sub_80295D8(void); +static void sub_8029668(void); +static void sub_8029684(void); +static void sub_8029740(void); +static void sub_802979C(void); +static void sub_80297B8(void); +static void sub_80297D4(void); +static void sub_8029884(void); +static void sub_8029944(void); +static void sub_80299AC(void); +static void sub_80299D8(void); +static void sub_8029A18(void); +static void sub_8029A6C(void); +static void sub_8029A88(void); +static void sub_8029AB0(void); +static void sub_8029AD8(void); +static void sub_8029AF4(void); +static void sub_8029B34(void); u8 sub_8027F88(void) { - char *monName; - OpenedFile *faceFile; - s32 counter; + u8 *monName; + OpenedFile *faceFile; + s32 counter; - ResetUnusedInputStruct(); - ShowWindows(NULL, TRUE, TRUE); - sUnknown_203B2C0 = MemoryAlloc(sizeof(WonderMailStruct_203B2C0), 8); - MemoryFill8(sUnknown_203B2C0, 0, sizeof(WonderMailStruct_203B2C0)); - sUnknown_203B2C0->unk53C = 0; - sUnknown_203B2C0->mailIndex = -1; - sUnknown_203B2C0->speciesNum = -1; - CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); - monName = GetMonSpecies(MONSTER_PELIPPER); - strcpy(gFormatBuffer_Monsters[0], monName); - faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); - sUnknown_203B2C0->monPortrait.faceFile = faceFile; - sUnknown_203B2C0->monPortrait.faceData = (PortraitGfx *) faceFile->data; - sUnknown_203B2C0->monPortrait.spriteId = 0; - sUnknown_203B2C0->monPortrait.flip = FALSE; - sUnknown_203B2C0->monPortrait.unkE = 0; - sUnknown_203B2C0->monPortrait.pos.x = 2; - sUnknown_203B2C0->monPortrait.pos.y = 8; - for(counter = 0; counter < PASSWORD_BUFFER_SIZE; counter++){ - sUnknown_203B2C0->passwordBuffer[counter] = 0; - } - sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE; - SetFriendRescueCounterState(INITIALIZE_FRIEND_RESCUE); - return 1; + ResetUnusedInputStruct(); + ShowWindows(NULL, TRUE, TRUE); + sUnknown_203B2C0 = MemoryAlloc(sizeof(WonderMailStruct_203B2C0), 8); + MemoryFill8(sUnknown_203B2C0, 0, sizeof(WonderMailStruct_203B2C0)); + sUnknown_203B2C0->unk53C = 0; + sUnknown_203B2C0->mailIndex = -1; + sUnknown_203B2C0->speciesNum = -1; + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); + monName = GetMonSpecies(MONSTER_PELIPPER); + strcpy(gFormatBuffer_Monsters[0], monName); + faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); + sUnknown_203B2C0->monPortrait.faceFile = faceFile; + sUnknown_203B2C0->monPortrait.faceData = (PortraitGfx *) faceFile->data; + sUnknown_203B2C0->monPortrait.spriteId = 0; + sUnknown_203B2C0->monPortrait.flip = FALSE; + sUnknown_203B2C0->monPortrait.unkE = 0; + sUnknown_203B2C0->monPortrait.pos.x = 2; + sUnknown_203B2C0->monPortrait.pos.y = 8; + for(counter = 0; counter < PASSWORD_BUFFER_SIZE; counter++){ + sUnknown_203B2C0->passwordBuffer[counter] = 0; + } + sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE; + SetFriendRescueCounterState(INITIALIZE_FRIEND_RESCUE); + return 1; } u32 sub_8028078(void) { - - switch(sUnknown_203B2C0->state) { - case 0x3c: - sub_8029B34(); - break; - case 0x3a: - sub_8029AD8(); - break; - case 0x3b: - sub_8029AF4(); - break; - case SENT_AOK_MAIL_SAVE_PRE: - sub_8029A88(); - break; - case SENT_AOK_MAIL: - sub_8029AB0(); - break; - case PROMPT_SELECT_HELPER_POKEMON: - sub_80297B8(); - break; - case SELECT_HELPER_POKEMON: - sub_80297D4(); - break; - case 0x34: - sub_8029884(); - break; - case 0x35: - sub_8029944(); - break; - case NO_POKEMON_IN_FRIEND_AREA: - sub_80299AC(); - break; - case CONFIRM_SEND_HELPER_POKEMON: - sub_80299D8(); - break; - case 0x30: - sub_8029A6C(); - break; - case 0x2e: - sub_8029A18(); - break; - case 0x2d: - sub_80295A8(); - break; - case PROMPT_CHOOSE_AOK_MAIL: - sub_8029668(); - break; - case 0x2b: - sub_8029684(); - break; - case 0x2c: - sub_8029740(); - break; - case 0x2a: - sub_80295D8(); - break; - case 0x2f: - sub_802979C(); - break; - case NO_MAIL_ROOM: - sub_8029358(); - break; - case RECEIVED_FRIEND_SOS_MAIL: - sub_8029374(); - break; - case RECEIVED_FRIEND_SOS_MAIL_SAVE_PRE: - sub_802939C(); - break; - case PROMPT_SOS_MAIL_PASSWORD: - sub_80293D8(); - break; - case 0x27: - sub_80293F4(); - break; - case 0x28: - sub_802955C(); - break; - case 4: - sub_80292A4(); - break; - case FRIEND_RESCUE_COMMUNICATING: - sub_80292EC(); - break; - case FRIEND_RESCUE_ERROR: - sub_802933C(); - break; - case FRIEND_RESCUE_COMMUNICATING_PRE: - sub_802958C(); - break; - case RECEIVE_SOS_MAIL: - sub_8029208(); - break; - case NO_SOS_MAIL_TO_SEND: - sub_8028DE8(FRIEND_RESCUE_MAIN); - break; - case 0x1b: - sub_8028F80(); - break; - case CANT_GO_TO_DUNGEON: - case FRIEND_RESCUE_FAILED: - sub_8028FC0(); - break; - case 0x22: - sub_8028FDC(); - break; - case PROMPT_CHOOSE_SOS_MAIL: - sub_80290D4(); - break; - case 0x20: - sub_80290F0(); - break; - case 0x21: - sub_80291AC(); - break; - case 0x1f: - sub_8029044(); - break; - case 10: - sub_8028CFC(); - break; - case 0xb: - sub_8028D4C(); - break; - case CHOOSE_DELETE_SOS_MAIL: - case CHOOSE_DELETE_AOK_MAIL: - sub_8028DE8(0xA); - break; - case CHOOSE_DELETE_ALL_MAIL: - sub_8028E08(); - break; - case NO_SOS_MAIL: - case NO_AOK_MAIL: - case NO_MAIL: - sub_8028DE8(PROMPT_DELETE_ANY_OTHER_MAIL); - break; - case PROMPT_DELETE_ALL_MAIL: - sub_8028E24(); - break; - case CONFIRM_DELETE_ALL_MAIL_1: - sub_8028E54(); - break; - case SAVING_ADVENTURE: - sub_8028E84(); - break; - case FINISH_SAVING_ADVENTURE: - sub_8028EAC(); - break; - case PROMPT_DELETE_ANY_OTHER_MAIL: - sub_8028ED4(); - break; - case CONFIRM_DELETE_ALL_MAIL_2: - sub_8028F04(); - break; - case DELETE_ALL_MAIL_SAVE_PRE: - sub_8028F30(); - break; - case 0x16: - sub_8028F58(); - break; - case INITIALIZE_FRIEND_RESCUE: - case FRIEND_RESCUE_MAIN: - sub_8028BF0(); - break; - case FRIEND_RESCUE_EXIT_PRE: - case RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE: - case SENT_AOK_MAIL_SAVE_COMPLETE: - ExitFriendRescueCounterMenu(); - break; - case FRIEND_RESCUE_COUNTER_EXIT: - return 3; - } - return 0; + switch (sUnknown_203B2C0->state) { + case 0x3c: + sub_8029B34(); + break; + case 0x3a: + sub_8029AD8(); + break; + case 0x3b: + sub_8029AF4(); + break; + case SENT_AOK_MAIL_SAVE_PRE: + sub_8029A88(); + break; + case SENT_AOK_MAIL: + sub_8029AB0(); + break; + case PROMPT_SELECT_HELPER_POKEMON: + sub_80297B8(); + break; + case SELECT_HELPER_POKEMON: + sub_80297D4(); + break; + case 0x34: + sub_8029884(); + break; + case 0x35: + sub_8029944(); + break; + case NO_POKEMON_IN_FRIEND_AREA: + sub_80299AC(); + break; + case CONFIRM_SEND_HELPER_POKEMON: + sub_80299D8(); + break; + case 0x30: + sub_8029A6C(); + break; + case 0x2e: + sub_8029A18(); + break; + case 0x2d: + sub_80295A8(); + break; + case PROMPT_CHOOSE_AOK_MAIL: + sub_8029668(); + break; + case 0x2b: + sub_8029684(); + break; + case 0x2c: + sub_8029740(); + break; + case 0x2a: + sub_80295D8(); + break; + case 0x2f: + sub_802979C(); + break; + case NO_MAIL_ROOM: + sub_8029358(); + break; + case RECEIVED_FRIEND_SOS_MAIL: + sub_8029374(); + break; + case RECEIVED_FRIEND_SOS_MAIL_SAVE_PRE: + sub_802939C(); + break; + case PROMPT_SOS_MAIL_PASSWORD: + sub_80293D8(); + break; + case 0x27: + sub_80293F4(); + break; + case 0x28: + sub_802955C(); + break; + case 4: + sub_80292A4(); + break; + case FRIEND_RESCUE_COMMUNICATING: + sub_80292EC(); + break; + case FRIEND_RESCUE_ERROR: + sub_802933C(); + break; + case FRIEND_RESCUE_COMMUNICATING_PRE: + sub_802958C(); + break; + case RECEIVE_SOS_MAIL: + sub_8029208(); + break; + case NO_SOS_MAIL_TO_SEND: + sub_8028DE8(FRIEND_RESCUE_MAIN); + break; + case 0x1b: + sub_8028F80(); + break; + case CANT_GO_TO_DUNGEON: + case FRIEND_RESCUE_FAILED: + sub_8028FC0(); + break; + case 0x22: + sub_8028FDC(); + break; + case PROMPT_CHOOSE_SOS_MAIL: + sub_80290D4(); + break; + case 0x20: + sub_80290F0(); + break; + case 0x21: + sub_80291AC(); + break; + case 0x1f: + sub_8029044(); + break; + case 10: + sub_8028CFC(); + break; + case 0xb: + sub_8028D4C(); + break; + case CHOOSE_DELETE_SOS_MAIL: + case CHOOSE_DELETE_AOK_MAIL: + sub_8028DE8(0xA); + break; + case CHOOSE_DELETE_ALL_MAIL: + sub_8028E08(); + break; + case NO_SOS_MAIL: + case NO_AOK_MAIL: + case NO_MAIL: + sub_8028DE8(PROMPT_DELETE_ANY_OTHER_MAIL); + break; + case PROMPT_DELETE_ALL_MAIL: + sub_8028E24(); + break; + case CONFIRM_DELETE_ALL_MAIL_1: + sub_8028E54(); + break; + case SAVING_ADVENTURE: + sub_8028E84(); + break; + case FINISH_SAVING_ADVENTURE: + sub_8028EAC(); + break; + case PROMPT_DELETE_ANY_OTHER_MAIL: + sub_8028ED4(); + break; + case CONFIRM_DELETE_ALL_MAIL_2: + sub_8028F04(); + break; + case DELETE_ALL_MAIL_SAVE_PRE: + sub_8028F30(); + break; + case 0x16: + sub_8028F58(); + break; + case INITIALIZE_FRIEND_RESCUE: + case FRIEND_RESCUE_MAIN: + sub_8028BF0(); + break; + case FRIEND_RESCUE_EXIT_PRE: + case RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE: + case SENT_AOK_MAIL_SAVE_COMPLETE: + ExitFriendRescueCounterMenu(); + break; + case FRIEND_RESCUE_COUNTER_EXIT: + return 3; + } + return 0; } s32 sub_80282DC(u8 *r0) @@ -396,28 +376,28 @@ s32 sub_80282DC(u8 *r0) void sub_80282FC(void) { - if (sUnknown_203B2C0 != NULL) { - CloseFile(sUnknown_203B2C0->monPortrait.faceFile); - FREE_AND_SET_NULL(sUnknown_203B2C0); - sub_8031E10(); - FriendList_Free(); - sub_803084C(); - NamingScreen_Free(); - sub_80310B4(); - sub_8030DE4(); - sub_802453C(); - } + if (sUnknown_203B2C0 != NULL) { + CloseFile(sUnknown_203B2C0->monPortrait.faceFile); + FREE_AND_SET_NULL(sUnknown_203B2C0); + sub_8031E10(); + FriendList_Free(); + sub_803084C(); + NamingScreen_Free(); + sub_80310B4(); + sub_8030DE4(); + sub_802453C(); + } } -void nullsub_130(void) +static void nullsub_130(void) { } -void sub_8028348(void) +static void sub_8028348(void) { s32 linkError; - switch(sUnknown_203B2C0->state) - { + + switch (sUnknown_203B2C0->state) { case 0x3B: RestoreSavedWindows(&sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); @@ -695,8 +675,7 @@ void sub_8028348(void) } } - -void SetFriendRescueCounterState(u32 state) +static void SetFriendRescueCounterState(u32 state) { sUnknown_203B2C0->state = state; nullsub_130(); @@ -706,8 +685,7 @@ void SetFriendRescueCounterState(u32 state) // Wonder Mail Linking... void PrintFriendRescueCounterError(u32 errorCode) { - switch(errorCode) - { + switch (errorCode) { case COMMS_GOOD: break; case 1: @@ -749,50 +727,38 @@ void PrintFriendRescueCounterError(u32 errorCode) } } -void sub_8028BF0(void) +static void sub_8028BF0(void) { u32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } + sUnknown_203B2C0->unk40 = 8; sUnknown_203B2C0->speciesNum = -1; - switch(menuChoice) - { + + switch (menuChoice) { case RECEIVE_SOS_MAIL_ACTION: sUnknown_203B2C0->unk40 = 3; sUnknown_203B2C0->unk538 = 0; - if(FindOpenMailSlot() != -1) - { + if (FindOpenMailSlot() != -1) SetFriendRescueCounterState(RECEIVE_SOS_MAIL); - } else - { SetFriendRescueCounterState(NO_MAIL_ROOM); - } break; case LEAVE_FOR_RESCUE_ACTION: - if(CountMailType(2) != 0) - { + if (CountMailType(2) != 0) SetFriendRescueCounterState(PROMPT_CHOOSE_SOS_MAIL); - } else - { SetFriendRescueCounterState(NO_SOS_MAIL_TO_SEND); - } break; case SEND_AOK_MAIL_ACTION: sUnknown_203B2C0->unk40 = 4; sUnknown_203B2C0->unk538 = 2; - if(CountMailType(WONDER_MAIL_TYPE_AOK) != 0) - { + if (CountMailType(WONDER_MAIL_TYPE_AOK) != 0) SetFriendRescueCounterState(PROMPT_CHOOSE_AOK_MAIL); - } else - { SetFriendRescueCounterState(NO_AOK_MAIL_TO_SEND); - } break; case DELETE_MAIL_ACTION: SetFriendRescueCounterState(11); @@ -805,72 +771,63 @@ void sub_8028BF0(void) } } - -void ExitFriendRescueCounterMenu() +static void ExitFriendRescueCounterMenu(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_COUNTER_EXIT); } -void sub_8028CFC() +static void sub_8028CFC(void) { s32 temp; u32 newMailCount; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } - switch(sub_8031050()) - { + + switch (sub_8031050()) { case 2: case 3: newMailCount = CountAllMail(); sub_80310B4(); - if(newMailCount != sUnknown_203B2C0->mailCount) - { + if (newMailCount != sUnknown_203B2C0->mailCount) SetFriendRescueCounterState(SAVING_ADVENTURE); - } else - { SetFriendRescueCounterState(PROMPT_DELETE_ANY_OTHER_MAIL); - } break; default: break; } } -void sub_8028D4C() +static void sub_8028D4C(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } + sUnknown_203B2C0->unk538 = menuChoice; - switch(sUnknown_203B2C0->unk538) - { + + switch (sUnknown_203B2C0->unk538) { case DELETE_SOS_MAIL_ACTION: - if(HasNoWonderMailType(2)) + if (HasNoWonderMailType(2)) SetFriendRescueCounterState(NO_SOS_MAIL); else SetFriendRescueCounterState(CHOOSE_DELETE_SOS_MAIL); break; case DELETE_AOK_MAIL_ACTION: - if(HasNoWonderMailType(WONDER_MAIL_TYPE_AOK)) + if (HasNoWonderMailType(WONDER_MAIL_TYPE_AOK)) SetFriendRescueCounterState(NO_AOK_MAIL); else SetFriendRescueCounterState(CHOOSE_DELETE_AOK_MAIL); break; case DELETE_ALL_MAIL_ACTION: - if(HasNoWonderMailType(WONDER_MAIL_TYPE_NONE)) + if (HasNoWonderMailType(WONDER_MAIL_TYPE_NONE)) SetFriendRescueCounterState(NO_MAIL); else SetFriendRescueCounterState(CHOOSE_DELETE_ALL_MAIL); @@ -883,38 +840,34 @@ void sub_8028D4C() } } -void sub_8028DE8(u32 newState) +static void sub_8028DE8(u32 newState) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(newState); } -void sub_8028E08() +static void sub_8028E08(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(PROMPT_DELETE_ALL_MAIL); } -void sub_8028E24() +static void sub_8028E24() { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(CONFIRM_DELETE_ALL_MAIL_1); break; @@ -926,16 +879,14 @@ void sub_8028E24() } } -void sub_8028E54() +static void sub_8028E54() { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(CONFIRM_DELETE_ALL_MAIL_2); break; @@ -947,43 +898,39 @@ void sub_8028E54() } } -void sub_8028E84() +static void sub_8028E84() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FINISH_SAVING_ADVENTURE); sub_8011C28(1); PrepareSavePakWrite(MONSTER_NONE); } -void sub_8028EAC() +static void sub_8028EAC() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } - if(!WriteSavePak()) - { + + if (!WriteSavePak()) { FinishWriteSavePak(); SetFriendRescueCounterState(PROMPT_DELETE_ANY_OTHER_MAIL); } } -void sub_8028ED4() +static void sub_8028ED4() { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice){ + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(0xB); break; @@ -996,153 +943,143 @@ void sub_8028ED4() } } -void sub_8028F04() +static void sub_8028F04() { s32 temp; s32 counter; - if(sub_80144A4(&temp) == 0) - { - for(counter = 0; counter <= 31; counter++) - { + if (sub_80144A4(&temp) == 0) { + for (counter = 0; counter <= 31; counter++) { DeleteMailAtIndex(counter); } + SetFriendRescueCounterState(DELETE_ALL_MAIL_SAVE_PRE); } } -void sub_8028F30() +static void sub_8028F30() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x16); sub_8011C28(1); PrepareSavePakWrite(MONSTER_NONE); } -void sub_8028F58() +static void sub_8028F58() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } - if(!WriteSavePak()) - { + + if (!WriteSavePak()) { FinishWriteSavePak(); SetFriendRescueCounterState(FRIEND_RESCUE_EXIT_PRE); } } -void sub_8028F80() +static void sub_8028F80() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + sub_809927C(sUnknown_203B2C0->mailIndex); sUnknown_203B2C0->unk53C = 1; SetFriendRescueCounterState(FRIEND_RESCUE_COUNTER_EXIT); } -void sub_8028FC0() +static void sub_8028FC0() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); } -void sub_8028FDC(void) +static void sub_8028FDC(void) { s32 menuChoice; unkStruct_203B480 *mail; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { - case YES_ACTION: + + switch (menuChoice) { + case YES_ACTION: { mail = GetMailatIndex(sUnknown_203B2C0->mailIndex); - if(!sub_80A2824(mail->dungeonSeed.location.id)) - { + if (!sub_80A2824(mail->dungeonSeed.location.id)) SetFriendRescueCounterState(CANT_GO_TO_DUNGEON); - } else if(mail->rescuesAllowed <= 0) - { SetFriendRescueCounterState(FRIEND_RESCUE_FAILED); - } else - { SetFriendRescueCounterState(0x1B); - } break; + } case NO_ACTION: - case CANCEL_ACTION: + case CANCEL_ACTION: { SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; - default: + } + default: { break; + } } } -void sub_8029044(void) +static void sub_8029044(void) { - switch(sub_8030768(1)) - { - case 2: + switch (sub_8030768(1)) { + case 2: { sub_803084C(); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; - case 3: + } + case 3: { sUnknown_203B2C0->mailIndex = sub_80307EC(); - SetFriendRescueCounterState(0x20); + SetFriendRescueCounterState(32); break; - case 4: - sUnknown_203B2C0->fallbackState = 0x1F; + } + case 4: { + sUnknown_203B2C0->fallbackState = 31; sUnknown_203B2C0->mailIndex = sub_80307EC(); RestoreSavedWindows(&sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); ShowWindows(NULL, TRUE, TRUE); sub_8030D40(sUnknown_203B2C0->mailIndex, 0); - SetFriendRescueCounterState(0x21); + SetFriendRescueCounterState(33); break; + } } } -void sub_80290D4(void) +static void sub_80290D4(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x1F); } -void sub_80290F0(void) +static void sub_80290F0(void) { - s32 menuAction; - menuAction = -1; + s32 menuAction = -1; + sub_8030768(0); - if(sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) - { + + if (sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) sub_8013114(&(sUnknown_203B2C0->unk21C[3]), &menuAction); - } - switch(menuAction) - { + + switch (menuAction) { case CONFIRM_ACTION: sub_803084C(); SetFriendRescueCounterState(0x22); @@ -1166,45 +1103,41 @@ void sub_80290F0(void) } } -void sub_80291AC(void) +static void sub_80291AC(void) { - switch(sub_8030DA0()) - { + switch (sub_8030DA0()) { case 2: case 3: sub_8030DE4(); ResetUnusedInputStruct(); ShowWindows(&sUnknown_203B2C0->unk3BC, TRUE, TRUE); sub_803092C(); - if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) - { + if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) { sub_8035CF4(sUnknown_203B2C0->unk21C, 3, TRUE); SetFriendRescueCounterState(0x20); } - else - { + else { SetFriendRescueCounterState(sUnknown_203B2C0->fallbackState); } + break; default: break; } } -void sub_8029208(void) +static void sub_8029208(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { - return; - } - switch(menuChoice) - { + if (sub_80144A4(&menuChoice) != 0) + return; + + switch (menuChoice) { case GAME_LINK_CABLE_ACTION: case 14: sUnknown_203B2C0->unk534 = 13; - switch(sUnknown_203B2C0->unk538) - { + + switch (sUnknown_203B2C0->unk538) { case 0: SetFriendRescueCounterState(4); break; @@ -1217,8 +1150,8 @@ void sub_8029208(void) break; case PASSWORD_ACTION: sUnknown_203B2C0->unk534 = 15; - switch(sUnknown_203B2C0->unk538) - { + + switch (sUnknown_203B2C0->unk538) { case 0: SetFriendRescueCounterState(PROMPT_SOS_MAIL_PASSWORD); break; @@ -1235,179 +1168,176 @@ void sub_8029208(void) } } -void sub_80292A4(void) +static void sub_80292A4(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { - case YES_ACTION: - switch(sUnknown_203B2C0->unk538) - { + + switch (menuChoice) { + case YES_ACTION: { + switch (sUnknown_203B2C0->unk538) { case 0: - case 2: + case 2: { SetFriendRescueCounterState(FRIEND_RESCUE_COMMUNICATING_PRE); break; + } } break; - case CANCEL_ACTION: + } + case CANCEL_ACTION: { SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; + } } } -void sub_80292EC(void) +static void sub_80292EC(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } - if(sUnknown_203B2C0->linkError == COMMS_GOOD) - { - switch(sUnknown_203B2C0->unk538) - { - case 0: + + if (sUnknown_203B2C0->linkError == COMMS_GOOD) { + switch (sUnknown_203B2C0->unk538) { + case 0: { SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL); break; - case 2: + } + case 2: { SetFriendRescueCounterState(SENT_AOK_MAIL); break; + } } } - else - { + else { PrintFriendRescueCounterError(sUnknown_203B2C0->linkError); SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); } } -void sub_802933C(void) +static void sub_802933C(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); } -void sub_8029358(void) +static void sub_8029358(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); } -void sub_8029374(void) +static void sub_8029374(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL_SAVE_PRE); sub_8011C28(1); PrepareSavePakWrite(MONSTER_NONE); } -void sub_802939C(void) +static void sub_802939C(void) { s32 temp; u32 saveStatus; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } - if(!WriteSavePak()) - { + + if (!WriteSavePak()) { saveStatus = GetSavePakStatus(); FinishWriteSavePak(); - if(saveStatus == SAVE_COMPLETED) - { + + if (saveStatus == SAVE_COMPLETED) SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE); - } else - { SetFriendRescueCounterState(FRIEND_RESCUE_EXIT_PRE); - } } } -void sub_80293D8(void) +static void sub_80293D8(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x27); } -void sub_80293F4(void) +static void sub_80293F4(void) { u32 return_var; unkStruct_203B480 mail; return_var = NamingScreen_HandleInput(); MemoryFill8(&mail, 0, sizeof(unkStruct_203B480)); - switch(return_var) - { - case 3: - switch(sub_8039068(PASSWORD_ENTRY_SOS_MAIL_MODE, (sUnknown_203B2C0->passwordBuffer), &mail)) - { - case PASSWORD_ENTRY_INCORRECT_PASSWORD: - CreateMenuDialogueBoxAndPortrait(gWonderMailPasswordIncorrectText, 0, 8, gUnknown_80DDA48, 0, 4, 0, &sUnknown_203B2C0->monPortrait, 0xC); - SetFriendRescueCounterState(0x28); - break; - case PASSWORD_ENTRY_NOT_SOS_MAIL: - CreateDialogueBoxAndPortrait(gWonderMailSOSPasswordIncorrectText, 0, &sUnknown_203B2C0->monPortrait, 0x10d); - SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); - break; - case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL: - CreateDialogueBoxAndPortrait(gWonderMailDuplicateText, 0, &sUnknown_203B2C0->monPortrait, 0x10d); - SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); - break; - case PASSWORD_ENTRY_SOS_MAIL_SUCCESS: - sub_8095274(mail.unk10.unk10); - mail.mailType = 2; - sub_80951BC(&mail); - CreateDialogueBoxAndPortrait(gWonderMailAOKMailReceivedText, 0, &sUnknown_203B2C0->monPortrait, 0x101); - SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL); - break; - case 23: - case 24: - default: - break; - } + + switch (return_var) { + case 3: { + switch (sub_8039068(PASSWORD_ENTRY_SOS_MAIL_MODE, (sUnknown_203B2C0->passwordBuffer), &mail)) { + case PASSWORD_ENTRY_INCORRECT_PASSWORD: + CreateMenuDialogueBoxAndPortrait(gWonderMailPasswordIncorrectText, 0, 8, gUnknown_80DDA48, 0, 4, 0, &sUnknown_203B2C0->monPortrait, 0xC); + SetFriendRescueCounterState(0x28); + break; + case PASSWORD_ENTRY_NOT_SOS_MAIL: + CreateDialogueBoxAndPortrait(gWonderMailSOSPasswordIncorrectText, 0, &sUnknown_203B2C0->monPortrait, 0x10d); + SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); + break; + case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL: + CreateDialogueBoxAndPortrait(gWonderMailDuplicateText, 0, &sUnknown_203B2C0->monPortrait, 0x10d); + SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); + break; + case PASSWORD_ENTRY_SOS_MAIL_SUCCESS: + sub_8095274(mail.unk10.unk10); + mail.mailType = 2; + sub_80951BC(&mail); + CreateDialogueBoxAndPortrait(gWonderMailAOKMailReceivedText, 0, &sUnknown_203B2C0->monPortrait, 0x101); + SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL); + break; + case 23: + case 24: + default: + break; + } NamingScreen_Free(); break; - case 2: + } + case 2: { NamingScreen_Free(); ResetUnusedInputStruct(); ShowWindows(&sUnknown_203B2C0->unk3BC, TRUE, TRUE); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; - default: + } + default: { break; + } } } -void sub_802955C(void) +static void sub_802955C(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(PROMPT_SOS_MAIL_PASSWORD); break; @@ -1417,25 +1347,24 @@ void sub_802955C(void) } } -void sub_802958C(void) +static void sub_802958C(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_COMMUNICATING); } -void sub_80295A8(void) +static void sub_80295A8(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(RECEIVE_SOS_MAIL); break; @@ -1447,10 +1376,9 @@ void sub_80295A8(void) } } -void sub_80295D8(void) +static void sub_80295D8(void) { - switch(sub_8030768(1)) - { + switch (sub_8030768(1)) { case 2: sub_803084C(); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); @@ -1471,27 +1399,26 @@ void sub_80295D8(void) } } -void sub_8029668(void) +static void sub_8029668(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x2A); } -void sub_8029684(void) +static void sub_8029684(void) { - s32 menuAction; - menuAction = -1; + s32 menuAction = -1; + sub_8030768(0); - if(sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) - { + + if (sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) sub_8013114(&(sUnknown_203B2C0->unk21C[3]), &menuAction); - } - switch(menuAction) - { + + switch (menuAction) { case CONFIRM_ACTION: sub_803084C(); SetFriendRescueCounterState(0x2D); @@ -1513,10 +1440,9 @@ void sub_8029684(void) } } -void sub_8029740(void) +static void sub_8029740(void) { - switch(sub_8030DA0()) - { + switch (sub_8030DA0()) { case 2: case 3: sub_8030DE4(); @@ -1536,30 +1462,29 @@ void sub_8029740(void) } } -void sub_802979C(void) +static void sub_802979C(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); } -void sub_80297B8(void) +static void sub_80297B8(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(SELECT_HELPER_POKEMON); } -void sub_80297D4(void) +static void sub_80297D4(void) { - switch(FriendList_HandleInput(TRUE)) - { + switch (FriendList_HandleInput(TRUE)) { case 2: FriendList_Free(); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); @@ -1581,17 +1506,16 @@ void sub_80297D4(void) } } -void sub_8029884(void) +static void sub_8029884(void) { - s32 menuAction; - menuAction = -1; + s32 menuAction = -1; + FriendList_HandleInput(FALSE); - if(sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) - { + + if (sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) sub_8013114(&(sUnknown_203B2C0->unk21C[3]), &menuAction); - } - switch(menuAction) - { + + switch (menuAction) { case CONFIRM_ACTION: FriendList_Free(); SetFriendRescueCounterState(4); @@ -1613,17 +1537,16 @@ void sub_8029884(void) } } -void sub_8029944(void) +static void sub_8029944(void) { - u32 temp; - temp = sub_80244E4(); - if(temp == 1) - { - sub_802452C(); - return; + u32 temp = sub_80244E4(); + + if (temp == 1) { + sub_802452C(); + return; } - switch(temp) - { + + switch (temp) { case 1: break; case 2: @@ -1632,28 +1555,26 @@ void sub_8029944(void) ResetUnusedInputStruct(); ShowWindows(&sUnknown_203B2C0->unk3BC, TRUE, TRUE); sub_8023B7C(1); - if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) - { + + if (sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) { sub_8035CF4(sUnknown_203B2C0->unk21C, 3, TRUE); SetFriendRescueCounterState(0x34); } - else - { + else { SetFriendRescueCounterState(sUnknown_203B2C0->fallbackState); } - + break; } } -void sub_80299AC(void) +static void sub_80299AC(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case SEND_WO_POKEMON_ACTION: SetFriendRescueCounterState(4); break; @@ -1665,16 +1586,14 @@ void sub_80299AC(void) } } -void sub_80299D8(void) +static void sub_80299D8(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { - return; - } - switch(menuChoice) - { + if (sub_80144A4(&menuChoice) != 0) + return; + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(4); break; @@ -1687,24 +1606,19 @@ void sub_80299D8(void) } } -void sub_8029A18(void) +static void sub_8029A18(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case SEND_POKEMON_ACTION: - if(sub_8024108(3) != 0) - { + if (sub_8024108(3) != 0) SetFriendRescueCounterState(NO_POKEMON_IN_FRIEND_AREA); - } else - { SetFriendRescueCounterState(PROMPT_SELECT_HELPER_POKEMON); - } break; case SEND_WO_POKEMON_ACTION: SetFriendRescueCounterState(0x4); @@ -1715,57 +1629,54 @@ void sub_8029A18(void) } } -void sub_8029A6C(void) +static void sub_8029A6C(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x2E); } -void sub_8029A88(void) +static void sub_8029A88(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } - if(!WriteSavePak()) - { + + if (!WriteSavePak()) { FinishWriteSavePak(); SetFriendRescueCounterState(SENT_AOK_MAIL_SAVE_COMPLETE); } } -void sub_8029AB0(void) +static void sub_8029AB0(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(SENT_AOK_MAIL_SAVE_PRE); sub_8011C28(1); PrepareSavePakWrite(MONSTER_NONE); } -void sub_8029AD8(void) +static void sub_8029AD8(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x3B); } -void sub_8029AF4(void) +static void sub_8029AF4(void) { - switch(sub_8031DCC()) - { - + switch (sub_8031DCC()) { case 2: case 3: sub_8031E10(); @@ -1779,12 +1690,12 @@ void sub_8029AF4(void) } } -void sub_8029B34(void) +static void sub_8029B34(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_COUNTER_EXIT); } diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c index 467e54045..e9ce4c004 100644 --- a/src/wonder_mail_5.c +++ b/src/wonder_mail_5.c @@ -53,10 +53,9 @@ const WindowTemplate gUnknown_80E091C = { const u8 gUnknown_80E0934[] = "ID:"; const u8 gUnknown_80E0938[] = "%-4d"; -extern void sub_8030DD4(void); - -void sub_8030E2C(void); -void sub_8030E48(void); +static void sub_8030DD4(void); +static void sub_8030E2C(void); +static void sub_8030E48(void); bool8 sub_8030D40(u8 mailIndex, s32 windowID) { @@ -86,7 +85,7 @@ u32 sub_8030DA0(void) } } -void sub_8030DD4(void) +static void sub_8030DD4(void) { sub_8030E2C(); sub_8030E48(); @@ -104,13 +103,13 @@ void sub_8030DE4(void) } } -void sub_8030E2C(void) +static void sub_8030E2C(void) { ResetUnusedInputStruct(); ShowWindows(&gUnknown_203B324->unk18, TRUE, TRUE); } -void sub_8030E48(void) +static void sub_8030E48(void) { u16 uVar2; unkStruct_203B480 *mail; diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index 36d891b81..0d4c7dbe2 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -9,6 +9,7 @@ #include "text_1.h" #include "wonder_mail_4.h" #include "wonder_mail_5.h" +#include "wonder_mail_6.h" struct unkStruct_203B328 { @@ -137,7 +138,7 @@ bool8 sub_8030F58(u32 wonderMailType) return TRUE; } -s32 sub_8031050(void) +u32 sub_8031050(void) { switch(gUnknown_203B328->state) { diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index 08aa6e9e5..e4ac5fd60 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -2,15 +2,17 @@ #include "globaldata.h" #include "constants/communication_error_codes.h" #include "constants/wonder_mail.h" -#include "music_util.h" #include "code_801B3C0.h" #include "code_801C8C4.h" +#include "code_8031D70.h" #include "code_803B050.h" #include "code_803D0D8.h" #include "code_8094F88.h" #include "cpu.h" #include "input.h" #include "memory.h" +#include "music_util.h" +#include "naming_screen.h" #include "other_menus2.h" #include "save.h" #include "save_write.h" @@ -20,7 +22,6 @@ #include "wonder_mail_5.h" #include "wonder_mail_802D098.h" #include "wonder_mail_main_menu.h" -#include "naming_screen.h" #define SELECT_WONDER_MAIL_MODE_MAIN_SCREEN 0 #define SEND_WONDER_MAIL_MAIN_SCREEN 1 @@ -71,7 +72,6 @@ EWRAM_INIT struct unkStruct_203B3E8 *gUnknown_203B3E8 = {NULL}; #include "data/wonder_mail_main_menu.h" extern void SetWonderMailMainMenuState(u8); -extern void sub_8031E10(void); extern u8 sub_800D588(void); extern void sub_802EF48(void);