diff --git a/include/common_structs.h b/include/common_structs.h index 05ed09a21a..78b8495c79 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -874,9 +874,9 @@ typedef struct BattleStatus { /* 0x05C */ s8 lastPartnerMenuSelection[16]; /* 0x06C */ s16 cancelTargetMenuSubstate; // might be more generally for returning from nested 'inner' state /* 0x06E */ s16 acceptTargetMenuSubstate; // might be more generally for returning from nested 'inner' state - /* 0x070 */ s16 menuDisableFlags; /* 1 = jump, 2 = hammer, 4 = items */ + /* 0x070 */ s16 enabledMenusFlags; // zero'd bits will be unavailable, used only for tutorial battles /* 0x072 */ char unk_72[2]; - /* 0x074 */ s32 enabledStarPowersMask; // zero'd bits will be unavailable, used only for tutorial battles + /* 0x074 */ s32 enabledStarPowersFlags; // zero'd bits will be unavailable, used only for tutorial battles /* 0x078 */ s8 totalStarPoints; /* 0x079 */ s8 pendingStarPoints; /* how many to add */ /* 0x07A */ s8 incrementStarPointDelay; /* related to star points, set to 0x28 when they are dropped */ diff --git a/include/effects.h b/include/effects.h index 54b8fe5be7..575a4100b9 100644 --- a/include/effects.h +++ b/include/effects.h @@ -1327,29 +1327,21 @@ typedef struct SnowfallFXData { /* 0x30 */ s32 unk_30; } SnowfallFXData; // size = 0x34 -typedef struct Effect46FXData { - /* 0x00 */ s32 unk_00; - /* 0x04 */ PlayerStatus* unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ s32 unk_1C; - /* 0x20 */ s32 unk_20; - /* 0x24 */ s32 unk_24; - /* 0x28 */ s32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ f32 unk_34; - /* 0x38 */ f32 unk_38; - /* 0x3C */ f32 unk_3C; - /* 0x40 */ f32 unk_40; - /* 0x44 */ u8 unk_44; - /* 0x45 */ u8 unk_45; - /* 0x46 */ u8 unk_46; +typedef struct SpinFXData { + /* 0x00 */ s32 type; + /* 0x04 */ PlayerStatus* player; + /* 0x08 */ Vec3f pos; + /* 0x14 */ f32 scale; + /* 0x18 */ f32 initialScale; + /* 0x1C */ s32 alpha; + /* 0x20 */ s32 duration; + /* 0x24 */ s32 timeLeft; + /* 0x28 */ s32 lifetime; + /* 0x2C */ Vec3f rot; + /* 0x38 */ Vec3f rotVel; + /* 0x44 */ Color_RGB8 color; /* 0x47 */ char unk_47; -} Effect46FXData; // size = 0x48 +} SpinFXData; // size = 0x48 typedef struct GatherMagicFXData { /* 0x00 */ s32 unk_00; @@ -2671,7 +2663,7 @@ typedef union { struct FireworkFXData* firework; struct ConfettiFXData* confetti; struct SnowfallFXData* snowfall; - struct Effect46FXData* unk_46; + struct SpinFXData* spin; struct GatherMagicFXData* gatherMagic; struct AttackResultTextFXData* attackResultText; struct SmallGoldSparkleFXData* smallGoldSparkle; diff --git a/include/enums.h b/include/enums.h index b83c6c2982..2fa72cfe77 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1195,7 +1195,7 @@ enum SoundIDs { SOUND_3B2 = 0x000003B2, SOUND_3B3 = 0x000003B3, SOUND_3B4 = 0x000003B4, - SOUND_3B5 = 0x000003B5, + SOUND_FAKE_BOWSER_BLAST = 0x000003B5, // large blasting sound when the fake bowser robot is destroyed SOUND_3B6 = 0x000003B6, SOUND_3B7 = 0x000003B7, SOUND_3B9 = 0x000003B9, @@ -3275,11 +3275,12 @@ enum PeachDisguises { // Requires decimals enum NpcIDs { - NPC_SELF = -1, - NPC_PLAYER = -2, - NPC_PARTNER = -4, - NPC_BTL_MERLEE = -10, - NPC_BTL_SPIRIT = 100, + NPC_SELF = -1, + NPC_PLAYER = -2, + NPC_PARTNER = -4, + NPC_BTL_MERLEE = -10, + NPC_BTL_COMPANION = 0, // used for Peach in intro Bowser fight and Kolorado in Lava Piranha fight + NPC_BTL_SPIRIT = 100, }; enum EntityTypes { @@ -4035,7 +4036,7 @@ enum ActorPartFlags { }; enum ActorEventFlags { - ACTOR_EVENT_FLAG_0 = 0x00000000, + ACTOR_EVENT_FLAGS_NONE = 0x00000000, ACTOR_EVENT_FLAG_1 = 0x00000001, ACTOR_EVENT_FLAG_FIREY = 0x00000002, ///< Player takes burn damage upon contact. ACTOR_EVENT_FLAG_4 = 0x00000004, @@ -5100,12 +5101,13 @@ enum BattleMenuTypes { }; enum BattleMenuDisableFlags { - BTL_MENU_DISABLED_JUMP = 1 << BTL_MENU_TYPE_JUMP, - BTL_MENU_DISABLED_SMASH = 1 << BTL_MENU_TYPE_SMASH, - BTL_MENU_DISABLED_ITEMS = 1 << BTL_MENU_TYPE_ITEMS, - BTL_MENU_DISABLED_STRATEGIES = 1 << BTL_MENU_TYPE_STRATEGIES, - BTL_MENU_DISABLED_STAR_POWERS = 1 << BTL_MENU_TYPE_STAR_POWERS, - BTL_MENU_DISABLED_PARTNER_FOCUS = 1 << BTL_MENU_TYPE_PARTNER_FOCUS, + BTL_MENU_ENABLED_JUMP = 1 << BTL_MENU_TYPE_JUMP, + BTL_MENU_ENABLED_SMASH = 1 << BTL_MENU_TYPE_SMASH, + BTL_MENU_ENABLED_ITEMS = 1 << BTL_MENU_TYPE_ITEMS, + BTL_MENU_ENABLED_ABILITIES = 1 << BTL_MENU_TYPE_ABILITY, + BTL_MENU_ENABLED_STRATEGIES = 1 << BTL_MENU_TYPE_STRATEGIES, + BTL_MENU_ENABLED_STAR_POWERS = 1 << BTL_MENU_TYPE_STAR_POWERS, + BTL_MENU_ENABLED_PARTNER_FOCUS = 1 << BTL_MENU_TYPE_PARTNER_FOCUS, }; enum DebugEnemyContactModes { diff --git a/include/npc.h b/include/npc.h index 045a629465..635d50de9c 100644 --- a/include/npc.h +++ b/include/npc.h @@ -18,8 +18,8 @@ #define NO_DROPS { \ .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = { { F16(100), F16(0), 0, F16(0) }, }, \ - .flowerDrops = { { F16(100), F16(0), 0, F16(0) }, }, \ + .heartDrops = { { F16(100), F16(0), 0, F16(0) } }, \ + .flowerDrops = { { F16(100), F16(0), 0, F16(0) } }, \ } #define STANDARD_HEART_DROPS(attempts) { \ diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 9b05cbd821..8ac6530983 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -304,7 +304,7 @@ ApiStatus ShowStartRecoveryShimmer(Evt* script, s32 isInitialCall); ApiStatus ShowRecoveryShimmer(Evt* script, s32 isInitialCall); ApiStatus func_80273444(Evt* script, s32 isInitialCall); ApiStatus WaitForState(Evt* script, s32 isInitialCall); -ApiStatus SetBattleMenuDisableFlags(Evt* script, s32 isInitialCall); +ApiStatus SetBattleMenuEnabledFlags(Evt* script, s32 isInitialCall); ApiStatus SetBattleState(Evt* script, s32 isInitialCall); ApiStatus func_8027D434(Evt* script, s32 isInitialCall); ApiStatus func_8026F1A0(Evt* script, s32 isInitialCall); diff --git a/include/script_api/macros.h b/include/script_api/macros.h index 995623ee5b..64dcbbe8c5 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -158,6 +158,25 @@ #define LVarE LocalVar(14) #define LVarF LocalVar(15) +// shorthand names for common LocalFlags +// these actually run all the way up to LocalFlag(96), but nothing past 15 is ever used +#define LFlag0 LocalFlag(0) +#define LFlag1 LocalFlag(1) +#define LFlag2 LocalFlag(2) +#define LFlag3 LocalFlag(3) +#define LFlag4 LocalFlag(4) +#define LFlag5 LocalFlag(5) +#define LFlag6 LocalFlag(6) +#define LFlag7 LocalFlag(7) +#define LFlag8 LocalFlag(8) +#define LFlag9 LocalFlag(9) +#define LFlagA LocalFlag(10) +#define LFlagB LocalFlag(11) +#define LFlagC LocalFlag(12) +#define LFlagD LocalFlag(13) +#define LFlagE LocalFlag(14) +#define LFlagF LocalFlag(15) + /****** INSTRUCTIONS **************************************************************************************************/ /// On each frame, the EVT manager will continue executing commands in all threads until a blocking command is diff --git a/src/16F740.c b/src/16F740.c index 4c6cfc505f..ba24fa975e 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -263,8 +263,8 @@ void btl_state_update_normal_start(void) { } battleStatus->actionSuccess = 0; battleStatus->unk_82 = 0; - battleStatus->menuDisableFlags = -1; - battleStatus->enabledStarPowersMask = -1; + battleStatus->enabledMenusFlags = -1; + battleStatus->enabledStarPowersFlags = -1; battleStatus->itemUsesLeft = 0; battleStatus->hammerCharge = 0; battleStatus->jumpCharge = 0; diff --git a/src/17D6A0.c b/src/17D6A0.c index bb56afe708..c95b4bb0ea 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -227,7 +227,7 @@ s32 bActorNames[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_KOOPA_BROS] MSG_EnemyName_KoopaBros, [ACTOR_TYPE_GREEN_NINJAKOOPA] MSG_EnemyName_GreenNinjakoopa, [ACTOR_TYPE_RED_NINJAKOOPA] MSG_EnemyName_RedNinjakoopa, - [ACTOR_TYPE_BLUE_NINJAKOOPA] MSG_EnemyName_BlueNinjakoopa, + [ACTOR_TYPE_BLACK_NINJAKOOPA] MSG_EnemyName_BlueNinjakoopa, [ACTOR_TYPE_YELLOW_NINJAKOOPA] MSG_EnemyName_YellowNinjakoopa, [ACTOR_TYPE_ELDSTAR] MSG_Menus_Party_Goombario, [ACTOR_TYPE_BUZZAR] MSG_EnemyName_Buzzar, @@ -1393,7 +1393,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = { .hurt = NULL, .delay = { 30, 30 } }, - [ACTOR_TYPE_BLUE_NINJAKOOPA] = { + [ACTOR_TYPE_BLACK_NINJAKOOPA] = { .walk = { SOUND_20BA, SOUND_3B4 }, .fly = { NULL, NULL }, .jump = SOUND_JUMP_3E2, @@ -1938,7 +1938,7 @@ s32 bActorTattles[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_KOOPA_BROS] = MSG_EnemyTattle_KoopaBros, [ACTOR_TYPE_GREEN_NINJAKOOPA] = MSG_EnemyTattle_GreenNinjakoopa, [ACTOR_TYPE_RED_NINJAKOOPA] = MSG_EnemyTattle_RedNinjakoopa, - [ACTOR_TYPE_BLUE_NINJAKOOPA] = MSG_EnemyTattle_BlueNinjakoopa, + [ACTOR_TYPE_BLACK_NINJAKOOPA] = MSG_EnemyTattle_BlueNinjakoopa, [ACTOR_TYPE_YELLOW_NINJAKOOPA] = MSG_EnemyTattle_YellowNinjakoopa, [ACTOR_TYPE_ELDSTAR] = NULL, [ACTOR_TYPE_BUZZAR] = MSG_EnemyTattle_Buzzar, @@ -2153,7 +2153,7 @@ ActorOffsets bActorOffsets[ACTOR_TYPE_COUNT] = { [ACTOR_TYPE_KOOPA_BROS] = { .tattleCam = { 0, 0, 26 }, .shadow = 26 }, [ACTOR_TYPE_GREEN_NINJAKOOPA] = { .tattleCam = { 0, 4, 0 }, .shadow = 0 }, [ACTOR_TYPE_RED_NINJAKOOPA] = { .tattleCam = { 0, 4, 0 }, .shadow = 0 }, - [ACTOR_TYPE_BLUE_NINJAKOOPA] = { .tattleCam = { 0, 4, 0 }, .shadow = 0 }, + [ACTOR_TYPE_BLACK_NINJAKOOPA] = { .tattleCam = { 0, 4, 0 }, .shadow = 0 }, [ACTOR_TYPE_YELLOW_NINJAKOOPA] = { .tattleCam = { 0, 4, 0 }, .shadow = 0 }, [ACTOR_TYPE_ELDSTAR] = { .tattleCam = { 0, 0, 0 }, .shadow = 0 }, [ACTOR_TYPE_BUZZAR] = { .tattleCam = { 0, 0, 0 }, .shadow = 0 }, diff --git a/src/18C790.c b/src/18C790.c index 1aa82f3c62..fa2c3f1ff4 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -364,7 +364,7 @@ EvtScript EVS_ShowStarpoints = { EVT_CALL(CreateVirtualEntity, LVar6, EVT_PTR(EMS_starpoint_starpoints)) EVT_CALL(SetVirtualEntityPosition, LVar6, -278, 68, 70) EVT_CALL(SetVirtualEntityScale, LVar6, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_SWITCH(LVar0) EVT_CASE_GT(99) diff --git a/src/415D90.c b/src/415D90.c index 72637f07b0..c26d3e5e08 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -257,14 +257,14 @@ AnimID BattleMenu_PartnerIdleAnims[] = { }; HudScript* battle_menu_PartnerMoveHudScripts[10][10] = { - [PARTNER_GOOMBARIO] { &HES_Goombario, &HES_GoombarioDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, }, - [PARTNER_KOOPER] { &HES_Kooper, &HES_KooperDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, }, - [PARTNER_BOMBETTE] { &HES_Bombette, &HES_BombetteDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, }, - [PARTNER_PARAKARRY] { &HES_Parakarry, &HES_ParakarryDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, }, - [PARTNER_GOOMPA] { &HES_Partner0, &HES_Partner0Disabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, }, - [PARTNER_WATT] { &HES_Watt, &HES_WattDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, }, - [PARTNER_SUSHIE] { &HES_Sushie, &HES_SushieDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, }, - [PARTNER_LAKILESTER] { &HES_Lakilester, &HES_LakilesterDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, }, + [PARTNER_GOOMBARIO] { &HES_Goombario, &HES_GoombarioDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, + [PARTNER_KOOPER] { &HES_Kooper, &HES_KooperDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, + [PARTNER_BOMBETTE] { &HES_Bombette, &HES_BombetteDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, + [PARTNER_PARAKARRY] { &HES_Parakarry, &HES_ParakarryDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, + [PARTNER_GOOMPA] { &HES_Partner0, &HES_Partner0Disabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, + [PARTNER_WATT] { &HES_Watt, &HES_WattDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, + [PARTNER_SUSHIE] { &HES_Sushie, &HES_SushieDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, + [PARTNER_LAKILESTER] { &HES_Lakilester, &HES_LakilesterDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, [PARTNER_BOW] { &HES_Bow, &HES_BowDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }, }; @@ -2314,7 +2314,7 @@ void btl_state_update_player_menu(void) { BattleMenu_TitleMessages[entryIdx] = MSG_Menus_EndTraining_Centered; } battle_menu_isMessageDisabled[entryIdx] = 0; - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STRATEGIES)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STRATEGIES)) { BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.disabled; BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; @@ -2337,7 +2337,7 @@ void btl_state_update_player_menu(void) { battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_ITEM_TARGET; } - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_ITEMS)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_ITEMS)) { BattleMenu_HudScripts[entryIdx] = battle_menu_ItemHudScripts.disabled; BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; @@ -2367,7 +2367,7 @@ void btl_state_update_player_menu(void) { BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_JUMP_TARGET; } - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_JUMP)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_JUMP)) { BattleMenu_HudScripts[entryIdx] = battle_menu_JumpHudScripts[0].disabled; BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; @@ -2393,7 +2393,7 @@ void btl_state_update_player_menu(void) { BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_NO_HAMMER_TARGET; } - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_SMASH)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_SMASH)) { BattleMenu_HudScripts[entryIdx] = battle_menu_HammerHudScripts[0].disabled; BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; @@ -2416,7 +2416,7 @@ void btl_state_update_player_menu(void) { BattleMenu_OptionEnabled[entryIdx] = TRUE; BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_STAR_POWERS]; battle_menu_isMessageDisabled[entryIdx] = 0; - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STAR_POWERS)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STAR_POWERS)) { BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.disabled; BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; @@ -3092,7 +3092,7 @@ void btl_state_update_player_menu(void) { battleStatus->submenuStatus[i] = 0; BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; } - if (!(battleStatus->enabledStarPowersMask & (1 << i))) { + if (!(battleStatus->enabledStarPowersFlags & (1 << i))) { battleStatus->submenuStatus[i] = 0; BattleMenu_Moves_OptionCantUseMessages[i] = BTL_MSG_CANT_SELECT_NOW; } @@ -3699,7 +3699,7 @@ void btl_state_update_partner_menu(void) { battle_menu_isMessageDisabled[entryIdx] = 0; BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.enabled; BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_STRATEGIES]; - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STRATEGIES)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STRATEGIES)) { BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; BattleMenu_HudScripts[entryIdx] = battle_menu_StrategiesHudScript.disabled; @@ -3719,7 +3719,7 @@ void btl_state_update_partner_menu(void) { BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; } - if (!(battleStatus->menuDisableFlags & BTL_MSG_ACTION_TIP_12)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_ABILITIES)) { BattleMenu_HudScripts[entryIdx] = battle_menu_PartnerMoveHudScripts[playerData->currentPartner][1]; BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; @@ -3736,7 +3736,7 @@ void btl_state_update_partner_menu(void) { battle_menu_isMessageDisabled[entryIdx] = 0; BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.enabled; BattleMenu_TitleMessages[entryIdx] = BattleMenu_CenteredMessages[BTL_MENU_TYPE_PARTNER_FOCUS]; - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_PARTNER_FOCUS)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_PARTNER_FOCUS)) { BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; BattleMenu_HudScripts[entryIdx] = battle_menu_StarPowerHudScripts.disabled; @@ -4554,7 +4554,7 @@ void btl_state_update_peach_menu(void) { battle_menu_isMessageDisabled[entryIdx] = 0; BattleMenu_HudScripts[entryIdx] = battle_menu_PeachStarPowerHudScripts.enabled; BattleMenu_TitleMessages[entryIdx] = D_802AB728[entryIdx]; - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STAR_POWERS)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STAR_POWERS)) { BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; BattleMenu_HudScripts[entryIdx] = battle_menu_PeachStarPowerHudScripts.disabled; @@ -4761,7 +4761,7 @@ void btl_state_update_twink_menu(void) { battle_menu_isMessageDisabled[entryIdx] = 0; BattleMenu_HudScripts[entryIdx] = battle_menu_TwinkStarPowerHudScripts.enabled; BattleMenu_TitleMessages[entryIdx] = D_802AB734[entryIdx]; - if (!(battleStatus->menuDisableFlags & BTL_MENU_DISABLED_STAR_POWERS)) { + if (!(battleStatus->enabledMenusFlags & BTL_MENU_ENABLED_STAR_POWERS)) { BattleMenu_OptionEnabled[entryIdx] = FALSE; battle_menu_isMessageDisabled[entryIdx] = BTL_MSG_CANT_SELECT_NOW; BattleMenu_HudScripts[entryIdx] = battle_menu_TwinkStarPowerHudScripts.disabled; diff --git a/src/5B320.c b/src/5B320.c index c28ba8b2b1..6ddcd4fd4b 100644 --- a/src/5B320.c +++ b/src/5B320.c @@ -432,18 +432,18 @@ extern HudScript HES_PartnerADisabled; extern HudScript HES_PartnerBDisabled; IconHudScriptPair gPartnerIconHudScripts[] = { - { .enabled = &HES_Partner0, .disabled = &HES_Partner0Disabled, }, - { .enabled = &HES_Goombario, .disabled = &HES_GoombarioDisabled, }, - { .enabled = &HES_Kooper, .disabled = &HES_KooperDisabled, }, - { .enabled = &HES_Bombette, .disabled = &HES_BombetteDisabled, }, - { .enabled = &HES_Parakarry, .disabled = &HES_ParakarryDisabled, }, - { .enabled = &HES_Bow, .disabled = &HES_BowDisabled, }, - { .enabled = &HES_Watt, .disabled = &HES_WattDisabled, }, - { .enabled = &HES_Sushie, .disabled = &HES_SushieDisabled, }, - { .enabled = &HES_Lakilester, .disabled = &HES_LakilesterDisabled, }, - { .enabled = &HES_Partner9, .disabled = &HES_Partner9Disabled, }, - { .enabled = &HES_PartnerA, .disabled = &HES_PartnerADisabled, }, - { .enabled = &HES_PartnerB, .disabled = &HES_PartnerBDisabled, }, + { .enabled = &HES_Partner0, .disabled = &HES_Partner0Disabled }, + { .enabled = &HES_Goombario, .disabled = &HES_GoombarioDisabled }, + { .enabled = &HES_Kooper, .disabled = &HES_KooperDisabled }, + { .enabled = &HES_Bombette, .disabled = &HES_BombetteDisabled }, + { .enabled = &HES_Parakarry, .disabled = &HES_ParakarryDisabled }, + { .enabled = &HES_Bow, .disabled = &HES_BowDisabled }, + { .enabled = &HES_Watt, .disabled = &HES_WattDisabled }, + { .enabled = &HES_Sushie, .disabled = &HES_SushieDisabled }, + { .enabled = &HES_Lakilester, .disabled = &HES_LakilesterDisabled }, + { .enabled = &HES_Partner9, .disabled = &HES_Partner9Disabled }, + { .enabled = &HES_PartnerA, .disabled = &HES_PartnerADisabled }, + { .enabled = &HES_PartnerB, .disabled = &HES_PartnerBDisabled }, { .enabled = &HES_PartnerB, .disabled = &HES_PartnerBDisabled }, }; diff --git a/src/7E9D0.c b/src/7E9D0.c index 7c765431a6..668bd09b72 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -402,7 +402,7 @@ void set_action_state(s32 actionState) { } if (playerStatus->specialDecorationEffect != NULL) { - playerStatus->specialDecorationEffect->data.unk_46->unk_24 = 10; + playerStatus->specialDecorationEffect->data.spin->timeLeft = 10; playerStatus->specialDecorationEffect = NULL; } } diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 95697419b7..689b388886 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1052,7 +1052,7 @@ s32 mdl_renderTaskBasePriorities[RENDER_MODE_COUNT] = { [RENDER_MODE_CLOUD_NO_ZB] = 700000, }; -s8 D_8014C248[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +s8 D_8014C248[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // BSS extern ModelCustomGfxBuilderList* gCurrentCustomModelGfxBuildersPtr; diff --git a/src/actor_api.c b/src/actor_api.c index 28f0ad963f..59875c2f7c 100644 --- a/src/actor_api.c +++ b/src/actor_api.c @@ -2181,15 +2181,15 @@ ApiStatus func_8026DF88(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus SetBattleMenuDisableFlags(Evt* script, s32 isInitialCall) { +ApiStatus SetBattleMenuEnabledFlags(Evt* script, s32 isInitialCall) { s32 flagsValue = *script->ptrReadPos; - gBattleStatus.menuDisableFlags = flagsValue; + gBattleStatus.enabledMenusFlags = flagsValue; return ApiStatus_DONE2; } ApiStatus SetEnabledStarPowers(Evt* script, s32 isInitialCall) { - gBattleStatus.enabledStarPowersMask = *script->ptrReadPos; + gBattleStatus.enabledStarPowersFlags = *script->ptrReadPos; return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index 7bed2a36cb..0c3f132121 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -4,10 +4,10 @@ #define NAMESPACE action_command_air_raid -s32 D_802A9970_429C90[] = { 0, 25, 50, 75, 75, }; -s32 D_802A9984_429CA4[] = { 40, 70, 99, 200, }; -s32 D_802A9994_429CB4[] = { 35, 60, 80, 99, 200, }; -s32 D_802A99A8_429CC8[] = { 35, 35, 60, 80, 99, 200, }; +s32 D_802A9970_429C90[] = { 0, 25, 50, 75, 75 }; +s32 D_802A9984_429CA4[] = { 40, 70, 99, 200 }; +s32 D_802A9994_429CB4[] = { 35, 60, 80, 99, 200 }; +s32 D_802A99A8_429CC8[] = { 35, 35, 60, 80, 99, 200 }; extern s32 actionCmdTableAirRaid[]; diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index d3f456c9f1..c5b0a6e605 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -3,8 +3,8 @@ #define NAMESPACE action_command_squirt -s32 D_802A9760_42A480[] = { 300, 300, 265, 220, 175, 175, }; -s32 D_802A9778_42A498[] = { 300, 300, 265, 220, 175, 175, }; +s32 D_802A9760_42A480[] = { 300, 300, 265, 220, 175, 175 }; +s32 D_802A9778_42A498[] = { 300, 300, 265, 220, 175, 175 }; extern s32 actionCmdTableSquirt[]; diff --git a/src/battle/area/arn/actor/hyper_paragoomba.c b/src/battle/area/arn/actor/hyper_paragoomba.c index 352d865079..d6cfa09054 100644 --- a/src/battle/area/arn/actor/hyper_paragoomba.c +++ b/src/battle/area/arn/actor/hyper_paragoomba.c @@ -102,7 +102,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021F05C), .defenseTable = N(DefenseTable_8021B2F0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -126,7 +126,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021C62C), .defenseTable = N(DefenseTable_8021B2F0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -138,7 +138,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021C638), .defenseTable = N(DefenseTable_8021B2F0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/area/arn/actor/hypergoomba.c b/src/battle/area/arn/actor/hypergoomba.c index c69a36ce6e..aa1b52933e 100644 --- a/src/battle/area/arn/actor/hypergoomba.c +++ b/src/battle/area/arn/actor/hypergoomba.c @@ -57,7 +57,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80219818), .defenseTable = N(DefenseTable_80218770), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 4e30b1a634..598dd8f4a0 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -72,7 +72,7 @@ ActorPartBlueprint N(ActorParts_80225D4C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80225C40), .defenseTable = N(DefenseTable_80225C94), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index da205531a2..0d9c5560d8 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -91,7 +91,7 @@ ActorPartBlueprint N(ActorParts_80223D30)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80223BC0), .defenseTable = N(DefenseTable_80223C78), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -103,7 +103,7 @@ ActorPartBlueprint N(ActorParts_80223D30)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80223BC0), .defenseTable = N(DefenseTable_80223C78), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index 3b8d6b99bc..fedaad6617 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -73,7 +73,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/area/flo/actor/amazy_dayzee.c b/src/battle/area/flo/actor/amazy_dayzee.c index 724c3f5c9b..3c31088a50 100644 --- a/src/battle/area/flo/actor/amazy_dayzee.c +++ b/src/battle/area/flo/actor/amazy_dayzee.c @@ -239,14 +239,14 @@ EvtScript N(attackPainfulSong) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 70) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(0) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Amazy_Anim0E) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Amazy_Anim0F) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF EVT_WAIT(1) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) @@ -257,12 +257,12 @@ EvtScript N(attackPainfulSong) = { EVT_IF_GT(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Amazy_Anim0E) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Amazy_Anim0F) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF EVT_WAIT(1) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) diff --git a/src/battle/area/flo/actor/crazee_dayzee.c b/src/battle/area/flo/actor/crazee_dayzee.c index e104c19770..62b9d494bf 100644 --- a/src/battle/area/flo/actor/crazee_dayzee.c +++ b/src/battle/area/flo/actor/crazee_dayzee.c @@ -232,14 +232,14 @@ EvtScript N(attackPainfulSong) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(MoveBattleCamOver, 70) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(0) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Anim0E) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Anim0F) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF EVT_WAIT(1) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) @@ -250,12 +250,12 @@ EvtScript N(attackPainfulSong) = { EVT_IF_GT(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Anim0E) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Anim0F) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF EVT_WAIT(1) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) diff --git a/src/battle/area/flo/actor/lakitu.c b/src/battle/area/flo/actor/lakitu.c index f40dfe0cf3..ccef3bc397 100644 --- a/src/battle/area/flo/actor/lakitu.c +++ b/src/battle/area/flo/actor/lakitu.c @@ -45,7 +45,7 @@ s32 N(IdleAnimations3)[] = { s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, - ELEMENT_MYSTERY, 0, + ELEMENT_MYSTERY, 0, ELEMENT_END, }; @@ -383,7 +383,7 @@ EvtScript N(attackSpinyFlip) = { Vec3i N(spiny_pos) = { NPC_DISPOSE_LOCATION }; Formation N(formation_spiny) = { - ACTOR_BY_POS(b_area_flo_spiny, N(spiny_pos), 100, 0x00000001), + ACTOR_BY_POS(b_area_flo_spiny, N(spiny_pos), 100, 1), }; EvtScript N(summonSpiny) = { @@ -446,20 +446,20 @@ EvtScript N(summonSpiny) = { EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_3, 0, 16, 0) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(12) EVT_ADD(LVar0, 30) EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_3, 0, 0, LVar0) EVT_ADD(LVar1, 1) EVT_IF_GE(LVar1, 6) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_3, ACTOR_PART_FLAG_INVISIBLE, TRUE) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_ELSE EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_3, ACTOR_PART_FLAG_INVISIBLE, FALSE) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_WAIT(1) @@ -514,31 +514,31 @@ EvtScript N(findPlacesForSummon) = { EVT_MOD(LVar5, 4) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(4), 1) + EVT_SET(LFlag4, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(1), 0) + EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LVarA, 0) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVarA, 2) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(4), 0) + EVT_IF_EQ(LFlag4, FALSE) EVT_SET(LVarA, 3) EVT_RETURN EVT_END_IF diff --git a/src/battle/area/flo/actor/ruff_puff.c b/src/battle/area/flo/actor/ruff_puff.c index fad6880947..a7bc405d2b 100644 --- a/src/battle/area/flo/actor/ruff_puff.c +++ b/src/battle/area/flo/actor/ruff_puff.c @@ -28,7 +28,7 @@ s32 N(IdleAnimations)[] = { s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, - ELEMENT_MYSTERY, 0, + ELEMENT_MYSTERY, 0, ELEMENT_END, }; diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 749d408dcb..0f573db0f7 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -318,7 +318,7 @@ s32 N(IdleAnimations4)[] = { s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 99, - ELEMENT_MYSTERY, 0, + ELEMENT_MYSTERY, 0, ELEMENT_JUMP, 0, ELEMENT_SMASH, 0, ELEMENT_END, @@ -473,7 +473,7 @@ EvtScript N(UpdateSize) = { }; EvtScript N(updateCharged) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_SET(LVarA, 0) EVT_SET(LVarB, 0) EVT_LABEL(0) @@ -483,24 +483,24 @@ EvtScript N(updateCharged) = { EVT_CASE_OR_EQ(4) EVT_CASE_OR_EQ(10) EVT_CASE_OR_EQ(11) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(RandInt, 2, LVarA) EVT_CALL(RandInt, 2, LVarB) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_ELSE EVT_MUL(LVarA, -1) EVT_MUL(LVarB, -1) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_OR_EQ(7) EVT_CASE_OR_EQ(8) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(RandInt, 1, LVarA) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_ELSE EVT_MUL(LVarA, -1) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH @@ -3952,7 +3952,7 @@ EvtScript N(attackGroundSlam) = { EvtScript N(tuffPuffMoveToPlayer) = { EVT_IF_EQ(LVar3, 0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_SET(LVarA, LVar1) EVT_SET(LVarB, LVar2) @@ -3988,7 +3988,7 @@ EvtScript N(tuffPuffMoveToPlayer) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(5) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) EVT_BITWISE_OR_CONST(LVar0, N(FLAG_4)) EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) diff --git a/src/battle/area/flo2/actor/tuff_puff.c b/src/battle/area/flo2/actor/tuff_puff.c index 05d0d79b57..e9bf87753c 100644 --- a/src/battle/area/flo2/actor/tuff_puff.c +++ b/src/battle/area/flo2/actor/tuff_puff.c @@ -58,7 +58,7 @@ s32 N(IdleAnimations2)[] = { s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 99, - ELEMENT_MYSTERY, 0, + ELEMENT_MYSTERY, 0, ELEMENT_JUMP, 0, ELEMENT_SMASH, 0, ELEMENT_END, diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index d9f13a6db4..ff2462ec4c 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -64,7 +64,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80219010), .defenseTable = N(DefenseTable_8021905C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -301,7 +301,7 @@ EvtScript N(80219C74) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(ActorSpeak, MSG_HOS_0019, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) - EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_JUMP) + EVT_CALL(SetBattleMenuEnabledFlags, BTL_MENU_ENABLED_JUMP) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MOVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -402,7 +402,7 @@ EvtScript N(80219C74) = { EVT_CALL(ActorSpeak, MSG_HOS_0020, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) - EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_SMASH) + EVT_CALL(SetBattleMenuEnabledFlags, BTL_MENU_ENABLED_SMASH) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MOVE) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) @@ -493,7 +493,7 @@ EvtScript N(80219C74) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_200, FALSE) EVT_LABEL(10) - EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_JUMP | BTL_MENU_DISABLED_SMASH | BTL_MENU_DISABLED_STRATEGIES) + EVT_CALL(SetBattleMenuEnabledFlags, BTL_MENU_ENABLED_JUMP | BTL_MENU_ENABLED_SMASH | BTL_MENU_ENABLED_STRATEGIES) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MOVE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 4ee70e4894..2213ce171f 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -83,7 +83,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, }, @@ -101,7 +101,7 @@ ActorPartBlueprint N(ActorParts_flying)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable_flying), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, }, @@ -113,7 +113,7 @@ ActorPartBlueprint N(ActorParts_flying)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_flying), .defenseTable = N(DefenseTable_flying), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, }, @@ -125,7 +125,7 @@ ActorPartBlueprint N(ActorParts_flying)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_broomstick), .defenseTable = N(DefenseTable_flying), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -879,16 +879,16 @@ EvtScript N(healAll) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, 71) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) @@ -920,19 +920,19 @@ EvtScript N(healAll) = { EvtScript N(shapeSpell) = { EVT_CALL(SetActorVar, ACTOR_SELF, 11, 2) - EVT_SET(LocalFlag(0), 0) - EVT_SET(LocalFlag(1), 0) + EVT_SET(LFlag0, FALSE) + EVT_SET(LFlag1, FALSE) EVT_CALL(GetActorVar, ACTOR_SELF, 10, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVarA) EVT_END_IF EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, ACTOR_FLAG_FLYING) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -945,8 +945,8 @@ EvtScript N(shapeSpell) = { EVT_CALL(MoveBattleCamOver, 10) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim02) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 17) @@ -965,7 +965,7 @@ EvtScript N(shapeSpell) = { EVT_END_IF EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim02) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -989,17 +989,17 @@ EvtScript N(shapeSpell) = { EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SPELL_CAST2) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim03) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim03) @@ -1009,8 +1009,8 @@ EvtScript N(shapeSpell) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar4, LVar5, LVar6) EVT_SUB(LVar4, 50) EVT_SET(LVar5, 0) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1027,7 +1027,7 @@ EvtScript N(shapeSpell) = { EVT_END_IF EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar6, LVar4, LVar5, LVar6, 30) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1051,23 +1051,23 @@ EvtScript N(shapeSpell) = { EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, LVarA, TRUE) EVT_END_IF EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SPELL_CAST2) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim03) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim03) @@ -1075,8 +1075,8 @@ EvtScript N(shapeSpell) = { EVT_WAIT(5) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1093,7 +1093,7 @@ EvtScript N(shapeSpell) = { EVT_END_IF EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar6, LVar4, LVar5, LVar6, 20) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1111,7 +1111,7 @@ EvtScript N(shapeSpell) = { EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar6, LVar4, LVar5, LVar6, 20) EVT_END_IF EVT_WAIT(18) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_ELSE @@ -1126,7 +1126,7 @@ EvtScript N(shapeSpell) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, LVarA, TRUE) EVT_END_IF EVT_RETURN @@ -1142,13 +1142,13 @@ EvtScript N(80221144) = { EVT_MOD(LVar1, 4) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(11), 1) + EVT_SET(LFlagB, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(12), 1) + EVT_SET(LFlagC, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(13), 1) + EVT_SET(LFlagD, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(14), 1) + EVT_SET(LFlagE, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) @@ -1159,25 +1159,25 @@ EvtScript N(80221144) = { EVT_MOD(LVar1, 4) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_IF_EQ(LocalFlag(12), 0) + EVT_IF_EQ(LFlagC, FALSE) EVT_SET(LVar0, 1) EVT_END_IF EVT_CASE_EQ(1) - EVT_IF_EQ(LocalFlag(11), 0) + EVT_IF_EQ(LFlagB, FALSE) EVT_SET(LVar0, 0) EVT_END_IF - EVT_IF_EQ(LocalFlag(13), 0) + EVT_IF_EQ(LFlagD, FALSE) EVT_SET(LVar0, 2) EVT_END_IF EVT_CASE_EQ(2) - EVT_IF_EQ(LocalFlag(12), 0) + EVT_IF_EQ(LFlagC, FALSE) EVT_SET(LVar0, 1) EVT_END_IF - EVT_IF_EQ(LocalFlag(14), 0) + EVT_IF_EQ(LFlagE, FALSE) EVT_SET(LVar0, 3) EVT_END_IF EVT_CASE_EQ(3) - EVT_IF_EQ(LocalFlag(13), 0) + EVT_IF_EQ(LFlagD, FALSE) EVT_SET(LVar0, 2) EVT_END_IF EVT_END_SWITCH @@ -1364,12 +1364,12 @@ EvtScript N(makeCopy) = { EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 10, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 11, 3) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, ACTOR_FLAG_FLYING) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802216C8)), 0) EVT_ELSE EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802216E4)), 0) @@ -1386,7 +1386,7 @@ EvtScript N(makeCopy) = { EVT_CALL(MoveBattleCamOver, 25) EVT_WAIT(25) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim02) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1433,12 +1433,12 @@ EvtScript N(makeCopy) = { EVT_CALL(GetActorPos, LVar9, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVar9, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVar9) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_ELSE EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim01) EVT_CALL(SetAnimation, LVar9, 1, ANIM_Magikoopa_Anim01) EVT_ELSE @@ -1454,7 +1454,7 @@ EvtScript N(makeCopy) = { #include "world/common/todo/UnkFunc52.inc.c" EvtScript N(boostAttack) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -1477,8 +1477,8 @@ EvtScript N(boostAttack) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF @@ -1566,7 +1566,7 @@ EvtScript N(boostAttack) = { }; EvtScript N(boostDefense) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -1589,8 +1589,8 @@ EvtScript N(boostDefense) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF @@ -1678,7 +1678,7 @@ EvtScript N(boostDefense) = { }; EvtScript N(electrify) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -1701,8 +1701,8 @@ EvtScript N(electrify) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF @@ -1795,7 +1795,7 @@ EvtScript N(electrify) = { }; EvtScript N(vanish) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -1818,8 +1818,8 @@ EvtScript N(vanish) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF @@ -1920,20 +1920,20 @@ EvtScript N(takeTurn_80223B24) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, 71) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_MULF(LVar2, EVT_FLOAT(100.0)) EVT_DIVF(LVar2, LVar3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_IF_LE(LVar2, 0) EVT_CALL(RandInt, 99, LVar4) EVT_ADD(LVar4, 1) @@ -1954,20 +1954,20 @@ EvtScript N(takeTurn_80223B24) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(1) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, 71) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_MULF(LVar2, EVT_FLOAT(100.0)) EVT_DIVF(LVar2, LVar3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_IF_LE(LVar2, 0) EVT_CALL(RandInt, 99, LVar4) EVT_ADD(LVar4, 1) @@ -1988,20 +1988,20 @@ EvtScript N(takeTurn_80223B24) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(2) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, 71) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_MULF(LVar2, EVT_FLOAT(100.0)) EVT_DIVF(LVar2, LVar3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_IF_LE(LVar2, 0) EVT_CALL(RandInt, 99, LVar4) EVT_ADD(LVar4, 1) @@ -2058,20 +2058,20 @@ EvtScript N(takeTurn_80223B24) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(11) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, 71) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_MULF(LVar2, EVT_FLOAT(100.0)) EVT_DIVF(LVar2, LVar3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_IF_LE(LVar2, LVar9) EVT_SETF(LVar9, LVar2) EVT_SET(LVarB, LVar0) diff --git a/src/battle/area/isk_part_1/actor/stone_chomp.c b/src/battle/area/isk_part_1/actor/stone_chomp.c index 249f5f1dc7..261198f012 100644 --- a/src/battle/area/isk_part_1/actor/stone_chomp.c +++ b/src/battle/area/isk_part_1/actor/stone_chomp.c @@ -121,7 +121,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(BasicAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -133,7 +133,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(BasicAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -14 }, }, @@ -145,7 +145,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -157,7 +157,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -169,7 +169,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -181,7 +181,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -193,7 +193,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -205,7 +205,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -217,7 +217,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -229,7 +229,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/area/isk_part_1/area.c b/src/battle/area/isk_part_1/area.c index 1b7b9e8346..07497d243c 100644 --- a/src/battle/area/isk_part_1/area.c +++ b/src/battle/area/isk_part_1/area.c @@ -182,18 +182,18 @@ BattleList N(Formations) = { }; StageList N(Stages) = { - { "isk_00", &N(isk_00) }, - { "isk_01", &N(isk_01) }, - { "isk_02", &N(isk_02) }, + STAGE("isk_00", N(isk_00)), + STAGE("isk_01", N(isk_01)), + STAGE("isk_02", N(isk_02)), STAGE("isk_02b", N(isk_02b)), STAGE("isk_02c", N(isk_02c)), - { "isk_03", &N(isk_03) }, + STAGE("isk_03", N(isk_03)), STAGE("isk_03b", N(isk_03b)), - { "isk_04", &N(isk_04) }, - { "isk_05", &N(isk_05) }, - { "isk_06", &N(isk_06) }, + STAGE("isk_04", N(isk_04)), + STAGE("isk_05", N(isk_05)), + STAGE("isk_06", N(isk_06)), STAGE("isk_06b", N(isk_06b)), - { "isk_07", &N(isk_07) }, - { "isk_08", &N(isk_08) }, + STAGE("isk_07", N(isk_07)), + STAGE("isk_08", N(isk_08)), {}, }; diff --git a/src/battle/area/isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c index 9494fa4bcf..52be0de940 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -134,7 +134,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(BasicAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -146,7 +146,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(BasicAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -16 }, }, @@ -158,7 +158,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -170,7 +170,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -182,7 +182,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -194,7 +194,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -206,7 +206,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -218,7 +218,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -230,7 +230,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -242,7 +242,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(ChainAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 711c5d34e6..9449bd8ae4 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -146,7 +146,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(TutankoopaAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -158,7 +158,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(TutankoopaAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -15 }, }, @@ -170,7 +170,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(BeetleShellAnims), .defenseTable = NULL, - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -182,7 +182,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(BeetleShellAnims), .defenseTable = NULL, - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -194,7 +194,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(BeetleShellAnims), .defenseTable = NULL, - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -206,7 +206,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(RockAnimsA), .defenseTable = NULL, - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -218,7 +218,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(RockAnimsA), .defenseTable = NULL, - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -230,7 +230,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(RockAnimsB), .defenseTable = NULL, - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index cb2c354888..1d3659780d 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -87,7 +87,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021B600), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -99,7 +99,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021B600), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -14 }, }, @@ -111,7 +111,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021B644), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -123,7 +123,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021B644), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -135,7 +135,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021B644), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/area/iwa/area.c b/src/battle/area/iwa/area.c index 98c64deca7..699a12146d 100644 --- a/src/battle/area/iwa/area.c +++ b/src/battle/area/iwa/area.c @@ -77,7 +77,7 @@ Formation N(Formation_0B) = { ACTOR_BY_IDX(N(monty_mole), BTL_POS_GROUND_C, 8), }; -Vec3i N(vector3D_8021853C) = { 90, 70, 0, }; +Vec3i N(vector3D_8021853C) = { 90, 70, 0 }; Formation N(Formation_0C) = { ACTOR_BY_POS(N(buzzar), N(vector3D_8021853C), 10), @@ -108,8 +108,8 @@ BattleList N(Formations) = { }; StageList N(Stages) = { - { "iwa_01", &N(iwa_01) }, + STAGE("iwa_01", N(iwa_01)), STAGE("iwa_01b", N(iwa_01b)), - { "iwa_02", &N(iwa_02) }, + STAGE("iwa_02", N(iwa_02)), {}, }; diff --git a/src/battle/area/jan/actor/hurt_plant.c b/src/battle/area/jan/actor/hurt_plant.c index b1ad3232a2..aac9776852 100644 --- a/src/battle/area/jan/actor/hurt_plant.c +++ b/src/battle/area/jan/actor/hurt_plant.c @@ -67,7 +67,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021D940), .defenseTable = N(DefenseTable_8021D98C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -8, -5 }, }, diff --git a/src/battle/area/jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c index 9e161b7ee9..804a0a7252 100644 --- a/src/battle/area/jan/actor/jungle_fuzzy.c +++ b/src/battle/area/jan/actor/jungle_fuzzy.c @@ -58,7 +58,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021EADC), .defenseTable = N(DefenseTable_8021E9D0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -384,9 +384,9 @@ EvtScript N(leechAttack) = { EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STATIC) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_ELSE - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -394,7 +394,7 @@ EvtScript N(leechAttack) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_RETURN EVT_END_IF @@ -444,16 +444,16 @@ EvtScript N(leechAttack) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Bite) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(21) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF @@ -462,99 +462,99 @@ EvtScript N(leechAttack) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.8), EVT_FLOAT(1.3), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.5), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.6), EVT_FLOAT(1.6), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(10) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF @@ -594,16 +594,16 @@ EvtScript N(leechAttack) = { EVT_CALL(func_80269470) EVT_BREAK_LOOP EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(35) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP @@ -685,10 +685,10 @@ EvtScript N(leechAttack) = { }; EvtScript N(802210E0) = { - EVT_SET(LocalFlag(1), 0) - EVT_SET(LocalFlag(2), 0) - EVT_SET(LocalFlag(3), 0) - EVT_SET(LocalFlag(4), 0) + EVT_SET(LFlag1, FALSE) + EVT_SET(LFlag2, FALSE) + EVT_SET(LFlag3, FALSE) + EVT_SET(LFlag4, FALSE) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -697,13 +697,13 @@ EvtScript N(802210E0) = { EVT_MOD(LVar5, 4) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(4), 1) + EVT_SET(LFlag4, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) @@ -714,14 +714,14 @@ EvtScript N(802210E0) = { EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_END_IF EVT_CASE_EQ(1) - EVT_IF_EQ(LocalFlag(1), 0) + EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LVarA, 0) EVT_END_IF - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_IF_EQ(LVarA, -1) EVT_SET(LVarA, 2) EVT_ELSE @@ -729,10 +729,10 @@ EvtScript N(802210E0) = { EVT_END_IF EVT_END_IF EVT_CASE_EQ(2) - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_END_IF - EVT_IF_EQ(LocalFlag(4), 0) + EVT_IF_EQ(LFlag4, FALSE) EVT_IF_EQ(LVarA, -1) EVT_SET(LVarA, 3) EVT_ELSE @@ -740,7 +740,7 @@ EvtScript N(802210E0) = { EVT_END_IF EVT_END_IF EVT_CASE_EQ(3) - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVarA, 2) EVT_END_IF EVT_END_SWITCH diff --git a/src/battle/area/jan/actor/m_bush.c b/src/battle/area/jan/actor/m_bush.c index 53896fdb97..ce0f3cd6d4 100644 --- a/src/battle/area/jan/actor/m_bush.c +++ b/src/battle/area/jan/actor/m_bush.c @@ -67,7 +67,7 @@ ActorPartBlueprint N(ActorParts_8022193C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80221830), .defenseTable = N(DefenseTable_8022187C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/area/jan/actor/spear_guy.c b/src/battle/area/jan/actor/spear_guy.c index bad571f958..4935f7665a 100644 --- a/src/battle/area/jan/actor/spear_guy.c +++ b/src/battle/area/jan/actor/spear_guy.c @@ -146,7 +146,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021BF40), .defenseTable = N(DefenseTable_80218684), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -158,7 +158,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80218658), .defenseTable = N(DefenseTable_80218684), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -170,7 +170,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80218664), .defenseTable = N(DefenseTable_80218684), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -458,7 +458,7 @@ EvtScript N(handleEvent_80218E3C) = { EVT_RETURN EVT_CASE_EQ(EVENT_SPIKE_TAUNT) EVT_WAIT(10) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) @@ -467,19 +467,19 @@ EvtScript N(handleEvent_80218E3C) = { EVT_IF_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar0, -11) EVT_ADD(LVar1, 3) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_IF_FLAG(LVar3, STATUS_FLAG_DIZZY) EVT_ADD(LVar0, -4) EVT_ADD(LVar1, 36) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_IF_FLAG(LVar3, STATUS_FLAG_SLEEP) EVT_ADD(LVar0, -8) EVT_ADD(LVar1, 36) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_ADD(LVar0, -28) EVT_ADD(LVar1, 8) EVT_END_IF @@ -487,19 +487,19 @@ EvtScript N(handleEvent_80218E3C) = { EVT_IF_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar0, -4) EVT_ADD(LVar1, 15) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_IF_FLAG(LVar3, STATUS_FLAG_DIZZY) EVT_ADD(LVar0, -4) EVT_ADD(LVar1, 36) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_IF_FLAG(LVar3, STATUS_FLAG_SLEEP) EVT_ADD(LVar0, -8) EVT_ADD(LVar1, 36) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_ADD(LVar0, -10) EVT_ADD(LVar1, 38) EVT_END_IF @@ -663,20 +663,20 @@ EvtScript N(summonBackup) = { EVT_IF_NE(LVar1, -1) EVT_GOTO(0) EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetIndexFromHome, LVar0, LVar1) EVT_IF_LT(LVar1, LVarA) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_8021A8C0)), 0) EVT_ELSE EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_8021A8DC)), 0) @@ -708,7 +708,7 @@ EvtScript N(summonBackup) = { EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0) EVT_CALL(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim0E) EVT_WAIT(20) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim04) EVT_ELSE EVT_CALL(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim03) @@ -940,31 +940,31 @@ EvtScript N(8021B770) = { EVT_MOD(LVar5, 4) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(4), 1) + EVT_SET(LFlag4, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(1), 0) + EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LVarA, 0) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVarA, 2) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(4), 0) + EVT_IF_EQ(LFlag4, FALSE) EVT_SET(LVarA, 3) EVT_RETURN EVT_END_IF @@ -1008,20 +1008,20 @@ EvtScript N(8021B96C) = { EvtScript N(8021BB18) = { EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVarA) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetIndexFromHome, LVar0, LVar1) EVT_IF_LT(LVar1, LVarA) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET(LVar0, 1) diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 7d62653a3f..508449174b 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -84,7 +84,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802189B0), .defenseTable = N(DefenseTable_80218A48), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, }, @@ -96,7 +96,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = NULL, .defenseTable = N(DefenseTable_80218A48), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, }, @@ -826,24 +826,24 @@ EvtScript N(8021B22C) = { EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_ATK_BLOCKED) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar0) EVT_IF_LE(LVar0, 0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STONE | STATUS_FLAG_RIGHT_ON) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_EXEC(N(8021B008)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim04) diff --git a/src/battle/area/kgr/stage/kgr_01.c b/src/battle/area/kgr/stage/kgr_01.c index 1ef07d807c..cf807cbd9c 100644 --- a/src/battle/area/kgr/stage/kgr_01.c +++ b/src/battle/area/kgr/stage/kgr_01.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_kgr_kgr_01 -#include "battle/common/stage/WaterEffects.inc.c" +#include "battle/common/stage/lib/WaterEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c index 2efa335825..11028b3766 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c @@ -58,7 +58,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802199B4), .defenseTable = N(DefenseTable_802198B0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -3 }, }, diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index 585ca4bf75..6207a394c9 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -65,7 +65,7 @@ ActorPartBlueprint N(ActorParts_8022339C)[] = { .opacity = 255, .idleAnimations = NULL, .defenseTable = N(DefenseTable_802232DC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -77,7 +77,7 @@ ActorPartBlueprint N(ActorParts_8022339C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802232D0), .defenseTable = N(DefenseTable_802232DC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -89,7 +89,7 @@ ActorPartBlueprint N(ActorParts_8022339C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802232D0), .defenseTable = N(DefenseTable_802232DC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -101,7 +101,7 @@ ActorPartBlueprint N(ActorParts_8022339C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802232D0), .defenseTable = N(DefenseTable_802232DC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -113,7 +113,7 @@ ActorPartBlueprint N(ActorParts_8022339C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802232D0), .defenseTable = N(DefenseTable_802232DC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -235,7 +235,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_CALL(PlaySound, SOUND_SMASH_GOOMNUT_TREE) EVT_CALL(PlaySound, SOUND_SHAKE_TREE) EVT_THREAD - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_IF_NE(LVar1, 0) EVT_WAIT(1) EVT_LOOP(5) @@ -244,8 +244,8 @@ EvtScript N(EVS_ShakeTree) = { EVT_LOOP(LVar2) EVT_BUF_READ1(LVar3) EVT_CALL(N(TransformFoliage), LVar3, EVT_FLOAT(0.1), EVT_FLOAT(0.2), LVarF, 0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(PlaySoundAtModel, LVar3, SOUND_SHAKE_TREE, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP @@ -268,7 +268,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_END_IF EVT_END_THREAD EVT_THREAD - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_IF_NE(LVar2, 0) EVT_LOOP(5) EVT_USE_BUF(LVar2) @@ -276,8 +276,8 @@ EvtScript N(EVS_ShakeTree) = { EVT_LOOP(LVar3) EVT_BUF_READ1(LVar4) EVT_CALL(N(TransformFoliage), LVar4, EVT_FLOAT(0.1), EVT_FLOAT(0.2), LVarF, 0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(PlaySoundAtModel, LVar4, SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP diff --git a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c index dc33c38426..a0ac4960ea 100644 --- a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c @@ -76,7 +76,7 @@ ActorPartBlueprint N(ActorParts_802244C4)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80224380), .defenseTable = N(DefenseTable_8022440C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 5, -4 }, }, diff --git a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c index 992acb16cc..32237c1e04 100644 --- a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c @@ -149,7 +149,7 @@ ActorPartBlueprint N(ActorParts_8022C640)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022C370), .defenseTable = N(DefenseTable_8022C418), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -6 }, }, @@ -173,7 +173,7 @@ ActorPartBlueprint N(ActorParts_8022C640)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022C3D8), .defenseTable = N(DefenseTable_8022C430), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -7 }, }, diff --git a/src/battle/area/kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c index 71131c7b6f..f04e36f585 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -60,7 +60,7 @@ ActorPartBlueprint N(ActorParts_80222AE4)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802229F0), .defenseTable = N(DefenseTable_80222A2C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index 17051527dc..b5bf907b02 100644 --- a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -92,7 +92,7 @@ ActorPartBlueprint N(ActorParts_8022A6E0)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022A550), .defenseTable = N(DefenseTable_8022A628), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -7 }, }, @@ -104,7 +104,7 @@ ActorPartBlueprint N(ActorParts_8022A6E0)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022A5D8), .defenseTable = N(DefenseTable_8022A628), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c index 8304534158..34d1a0d114 100644 --- a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c @@ -79,7 +79,7 @@ ActorPartBlueprint N(ActorParts_80225F0C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80225DC0), .defenseTable = N(DefenseTable_80225E54), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -6 }, }, @@ -91,7 +91,7 @@ ActorPartBlueprint N(ActorParts_80225F0C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80225E04), .defenseTable = N(DefenseTable_80225E54), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/area/kmr_part_3/actor/paragoomba.c b/src/battle/area/kmr_part_3/actor/paragoomba.c index 4dac311d64..80e7364733 100644 --- a/src/battle/area/kmr_part_3/actor/paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/paragoomba.c @@ -91,7 +91,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021DB9C), .defenseTable = N(DefenseTable_8021C1B0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -115,7 +115,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021C470), .defenseTable = N(DefenseTable_8021C1B0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -127,7 +127,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021C47C), .defenseTable = N(DefenseTable_8021C1B0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/area/kmr_part_3/stage/kmr_05.c b/src/battle/area/kmr_part_3/stage/kmr_05.c index 9d1d073eac..d42592816c 100644 --- a/src/battle/area/kmr_part_3/stage/kmr_05.c +++ b/src/battle/area/kmr_part_3/stage/kmr_05.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_kmr_part_3_kmr_05 -#include "battle/common/stage/MovingClouds.inc.c" +#include "battle/common/stage/lib/MovingClouds.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/kmr_part_3/stage/mac_01.c b/src/battle/area/kmr_part_3/stage/mac_01.c index 996f83a531..cdeebd1d0d 100644 --- a/src/battle/area/kmr_part_3/stage/mac_01.c +++ b/src/battle/area/kmr_part_3/stage/mac_01.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_kmr_part_3_mac_01 -#include "battle/common/stage/WaterEffects.inc.c" +#include "battle/common/stage/lib/WaterEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/kmr_part_3/stage/sam_01.c b/src/battle/area/kmr_part_3/stage/sam_01.c index d095da91e2..352b64d4b5 100644 --- a/src/battle/area/kmr_part_3/stage/sam_01.c +++ b/src/battle/area/kmr_part_3/stage/sam_01.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_kmr_part_3_sam_01 -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/kpa/actor/bony_beetle.c b/src/battle/area/kpa/actor/bony_beetle.c index 9687b9152a..77c006f495 100644 --- a/src/battle/area/kpa/actor/bony_beetle.c +++ b/src/battle/area/kpa/actor/bony_beetle.c @@ -291,7 +291,7 @@ EvtScript N(takeTurn) = { EVT_END }; -s32 N(bounceTable)[] = { 7, 13, 17, 21, 23, 24, 23, 21, 17, 13, 7, 0, 4, 6, 7, 6, 4, 0, 2, 0, }; +s32 N(FlipPosOffsets)[] = { 7, 13, 17, 21, 23, 24, 23, 21, 17, 13, 7, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent_normal) = { EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -341,7 +341,7 @@ EvtScript N(handleEvent_normal) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim08) - EVT_USE_BUF(N(bounceTable)) + EVT_USE_BUF(N(FlipPosOffsets)) EVT_LOOP(20) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) @@ -563,7 +563,7 @@ EvtScript N(handleEvent_spiky) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim09) - EVT_USE_BUF(N(bounceTable)) + EVT_USE_BUF(N(FlipPosOffsets)) EVT_LOOP(20) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) @@ -596,20 +596,20 @@ EvtScript N(handleEvent_spiky) = { EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_TAUNT) EVT_WAIT(10) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar0, -3) EVT_ADD(LVar1, 10) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_IF_FLAG(LVar3, STATUS_FLAG_DIZZY) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 26) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_ADD(LVar0, -8) EVT_ADD(LVar1, 26) EVT_END_IF @@ -939,7 +939,7 @@ EvtScript N(handleEvent_flipped) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim1A) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) - EVT_USE_BUF(N(bounceTable)) + EVT_USE_BUF(N(FlipPosOffsets)) EVT_LOOP(20) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) @@ -1071,7 +1071,7 @@ EvtScript N(handleEvent_spiky_flipped) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_spiky_flipped))) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim1B) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) - EVT_USE_BUF(N(bounceTable)) + EVT_USE_BUF(N(FlipPosOffsets)) EVT_LOOP(20) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) diff --git a/src/battle/area/kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c index eec870c19e..e28674b989 100644 --- a/src/battle/area/kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -157,11 +157,11 @@ EvtScript N(init) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_TURN_COUNTER), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PEACH_SPOKE), 0) EVT_CALL(SetActorVar, ACTOR_SELF, 14, 0) - EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_JUMP) - EVT_CALL(CreateNpc, 0x00000000, ANIM_ParadePeach_IdleRaisedArms) - EVT_CALL(SetNpcYaw, 0x00000000, 90) - EVT_CALL(SetNpcPos, 0x00000000, -130, 0, -12) - EVT_CALL(EnableNpcShadow, 0x00000000, TRUE) + EVT_CALL(SetBattleMenuEnabledFlags, BTL_MENU_ENABLED_JUMP) + EVT_CALL(CreateNpc, NPC_BTL_COMPANION, ANIM_ParadePeach_IdleRaisedArms) + EVT_CALL(SetNpcYaw, NPC_BTL_COMPANION, 90) + EVT_CALL(SetNpcPos, NPC_BTL_COMPANION, -130, 0, -12) + EVT_CALL(EnableNpcShadow, NPC_BTL_COMPANION, TRUE) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -367,12 +367,12 @@ EvtScript N(attackClawSwipe) = { EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TURN_COUNTER), LVar0) EVT_IF_GE(LVar0, 3) - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_Weep) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_Weep) EVT_ELSE - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_HorrorLoop) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_HorrorLoop) EVT_END_IF EVT_WAIT(45) - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_IdleRaisedArms) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_IdleRaisedArms) EVT_END_THREAD EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -423,7 +423,7 @@ EvtScript N(attackFireBreath) = { EVT_WAIT(70) EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_Weep) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_Weep) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 55) EVT_WAIT(20) @@ -442,7 +442,7 @@ EvtScript N(attackFireBreath) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) EVT_END_THREAD EVT_WAIT(60) - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_HorrorLoop) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_HorrorLoop) EVT_LOOP(68) EVT_CALL(GetAnimation, ACTOR_PLAYER, 0, LVar0) EVT_IF_EQ(LVar0, ANIM_Mario1_FallDown) @@ -450,7 +450,7 @@ EvtScript N(attackFireBreath) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_Bow) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_Bow) EVT_WAIT(30) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index ae5f193ae5..a75357ba1b 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -483,7 +483,7 @@ EvtScript N(onDeath) = { EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH) EVT_END_CASE_GROUP EVT_CASE_DEFAULT - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar1) EVT_SWITCH(LVar1) EVT_CASE_OR_EQ(ACTOR_TYPE_BOB_OMB) diff --git a/src/battle/area/kpa3/actor/anti_guy.c b/src/battle/area/kpa3/actor/anti_guy.c index f42f8640c3..7e6edbe59f 100644 --- a/src/battle/area/kpa3/actor/anti_guy.c +++ b/src/battle/area/kpa3/actor/anti_guy.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index 6aafd2245f..8cfe5e0dbc 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -87,10 +87,10 @@ ActorBlueprint NAMESPACE = { }; s32 N(IdleAnimations)[] = { - STATUS_KEY_NORMAL, ANIM_BulletBill_Gold_Anim01, - STATUS_KEY_STONE, ANIM_BulletBill_Gold_Anim00, - STATUS_KEY_STOP, ANIM_BulletBill_Gold_Anim00, - STATUS_KEY_PARALYZE, ANIM_BulletBill_Gold_Anim00, + STATUS_KEY_NORMAL, ANIM_BulletBill_Gold_Idle, + STATUS_KEY_STONE, ANIM_BulletBill_Gold_Still, + STATUS_KEY_STOP, ANIM_BulletBill_Gold_Still, + STATUS_KEY_PARALYZE, ANIM_BulletBill_Gold_Still, STATUS_END, }; @@ -125,10 +125,10 @@ EvtScript N(init) = { EVT_CALL(GetActorPos, LVar0, LVar1, LVarB, LVarC) EVT_SUB(LVar1, 90) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Tense) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Idle) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_END_IF @@ -144,7 +144,7 @@ EvtScript N(idle) = { EvtScript N(explode) = { EVT_EXEC_WAIT(N(playExplosionEffects)) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim07) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_BurnHurt) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN @@ -158,11 +158,11 @@ EvtScript N(handleEvent) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CASE_EQ(EVENT_BURN_HIT) EVT_EXEC_WAIT(N(explode)) @@ -178,13 +178,13 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_ShockHit) EVT_EXEC_WAIT(N(explode)) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_ShockHit) EVT_EXEC_WAIT(N(explode)) EVT_RETURN @@ -192,12 +192,12 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim01) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Idle) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_EXEC_WAIT(N(explode)) EVT_RETURN @@ -206,21 +206,21 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim01) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Idle) EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_EXEC_WAIT(N(explode)) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Tense) EVT_EXEC_WAIT(EVS_Enemy_AirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Tense) EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_RETURN EVT_CASE_DEFAULT @@ -239,7 +239,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Gold_Fire) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) EVT_WAIT(1) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) @@ -284,7 +284,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_Anim07) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Gold_BurnHurt) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN diff --git a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c index df816c55f6..0afce2b84d 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c +++ b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c @@ -90,10 +90,10 @@ ActorBlueprint NAMESPACE = { }; s32 N(IdleAnimations)[] = { - STATUS_KEY_NORMAL, ANIM_BillBlaster_Gold_Anim01, - STATUS_KEY_STONE, ANIM_BillBlaster_Gold_Anim00, - STATUS_KEY_STOP, ANIM_BillBlaster_Gold_Anim00, - STATUS_KEY_PARALYZE, ANIM_BillBlaster_Gold_Anim00, + STATUS_KEY_NORMAL, ANIM_BillBlaster_Gold_Idle, + STATUS_KEY_STONE, ANIM_BillBlaster_Gold_Still, + STATUS_KEY_STOP, ANIM_BillBlaster_Gold_Still, + STATUS_KEY_PARALYZE, ANIM_BillBlaster_Gold_Still, STATUS_END, }; @@ -119,50 +119,50 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Hurt) EVT_SET_CONST(LVar2, -1) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Hurt) EVT_SET_CONST(LVar2, -1) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim01) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Idle) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim01) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Idle) EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_AirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Gold_Hurt) EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_RETURN EVT_CASE_DEFAULT @@ -199,7 +199,7 @@ API_CALLABLE(ApplyBillSettings) { } EvtScript N(bulletShot) = { - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BillBlaster_Gold_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BillBlaster_Gold_Fire) EVT_WAIT(13) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) diff --git a/src/battle/area/kzn/actor/lava_bubble.c b/src/battle/area/kzn/actor/lava_bubble.c index 3b8489fe71..d80561b8fb 100644 --- a/src/battle/area/kzn/actor/lava_bubble.c +++ b/src/battle/area/kzn/actor/lava_bubble.c @@ -75,7 +75,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80219010), .defenseTable = N(DefenseTable_80218E10), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -87,7 +87,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80219010), .defenseTable = N(DefenseTable_80218E10), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -99,7 +99,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80219010), .defenseTable = N(DefenseTable_80218E10), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -111,7 +111,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80219010), .defenseTable = N(DefenseTable_80218E10), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index d59f3325a5..c7d6c6dd0a 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -587,9 +587,9 @@ EvtScript N(init) = { EVT_CALL(SummonEnemy, EVT_PTR(N(formation_lava_bud_2)), 0) EVT_WAIT(2) EVT_EXEC(N(initVines)) - EVT_CALL(CreateNpc, 0x00000000, ANIM_BattleKolorado_Idle) - EVT_CALL(SetNpcYaw, 0x00000000, 90) - EVT_CALL(SetNpcPos, 0x00000000, -300, 0, 0) + EVT_CALL(CreateNpc, NPC_BTL_COMPANION, ANIM_BattleKolorado_Idle) + EVT_CALL(SetNpcYaw, NPC_BTL_COMPANION, 90) + EVT_CALL(SetNpcPos, NPC_BTL_COMPANION, -300, 0, 0) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -647,7 +647,7 @@ EvtScript N(nextTurn) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) - EVT_IF_NOT_FLAG(LVar0, 0x00000001) + EVT_IF_NOT_FLAG(LVar0, 0x1) EVT_BITWISE_OR_CONST(LVar0, 0x1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_EXEC_WAIT(N(spawnColorado)) @@ -663,64 +663,64 @@ EvtScript N(spawnColorado) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableBattleStatusBar, FALSE) - EVT_CALL(SpeakToPlayer, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0, MSG_CH5_0104) + EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, -1, -1, 0, MSG_CH5_0104) EVT_THREAD EVT_LOOP(9) - EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_20BA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_20BA, SOUND_SPACE_MODE_0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_3B4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_3B4, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_WalkSad) - EVT_CALL(SetNpcAnimationSpeed, 0x00000000, EVT_FLOAT(2.0)) - EVT_CALL(SetNpcSpeed, 0x00000000, EVT_FLOAT(10.0)) - EVT_CALL(NpcMoveTo, 0x00000000, 70, 0, 0) - EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_E8, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcAnimationSpeed, 0x00000000, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcJumpscale, 0x00000000, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_Injured) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_WalkSad) + EVT_CALL(SetNpcAnimationSpeed, NPC_BTL_COMPANION, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(10.0)) + EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, 70, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_E8, SOUND_SPACE_MODE_0) + EVT_CALL(SetNpcAnimationSpeed, NPC_BTL_COMPANION, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcJumpscale, NPC_BTL_COMPANION, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Injured) EVT_THREAD EVT_LOOP(10) - EVT_CALL(GetNpcPos, 0x00000000, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_COMPANION, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(NpcJump0, 0x00000000, 70, 180, 0, 20) - EVT_CALL(SpeakToPlayer, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0, MSG_CH5_0105) - EVT_CALL(SetNpcYaw, 0x00000000, 270) - EVT_CALL(SetNpcPos, 0x00000000, 50, 180, 0) + EVT_CALL(NpcJump0, NPC_BTL_COMPANION, 70, 180, 0, 20) + EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, -1, -1, 0, MSG_CH5_0105) + EVT_CALL(SetNpcYaw, NPC_BTL_COMPANION, 270) + EVT_CALL(SetNpcPos, NPC_BTL_COMPANION, 50, 180, 0) EVT_THREAD EVT_LOOP(10) - EVT_CALL(GetNpcPos, 0x00000000, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_COMPANION, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(NpcJump0, 0x00000000, 50, 0, 0, 20) - EVT_CALL(NpcJump0, 0x00000000, 50, 0, 0, 6) - EVT_CALL(NpcJump0, 0x00000000, 50, 0, 0, 3) + EVT_CALL(NpcJump0, NPC_BTL_COMPANION, 50, 0, 0, 20) + EVT_CALL(NpcJump0, NPC_BTL_COMPANION, 50, 0, 0, 6) + EVT_CALL(NpcJump0, NPC_BTL_COMPANION, 50, 0, 0, 3) EVT_WAIT(8) - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_Hurt) - EVT_CALL(SetNpcJumpscale, 0x00000000, EVT_FLOAT(0.7)) - EVT_CALL(NpcJump0, 0x00000000, 50, 0, 0, 12) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Hurt) + EVT_CALL(SetNpcJumpscale, NPC_BTL_COMPANION, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_BTL_COMPANION, 50, 0, 0, 12) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_20BA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_20BA, SOUND_SPACE_MODE_0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_3B4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_3B4, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_Run) - EVT_CALL(SetNpcSpeed, 0x00000000, EVT_FLOAT(8.0)) - EVT_CALL(NpcMoveTo, 0x00000000, -60, 0, 0) - EVT_CALL(SpeakToPlayer, 0x00000000, ANIM_BattleKolorado_Shout, ANIM_BattleKolorado_ShoutStill, 5, MSG_CH5_0106) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Run) + EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -60, 0, 0) + EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, ANIM_BattleKolorado_Shout, ANIM_BattleKolorado_ShoutStill, 5, MSG_CH5_0106) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_174) - EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_Run) - EVT_CALL(SetNpcSpeed, 0x00000000, EVT_FLOAT(6.0)) - EVT_CALL(NpcMoveTo, 0x00000000, -300, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Run) + EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -300, 0, 0) EVT_CALL(EnableBattleStatusBar, TRUE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index ea32a14cca..8baa67d824 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -910,15 +910,15 @@ EvtScript N(handleEvent_8021D0CC) = { EVT_IF_FLAG(LVar0, 0x3F1000) EVT_BREAK_SWITCH EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(1) EVT_CASE_OR_EQ(0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index e3090ec82f..2d8fa3be86 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -89,7 +89,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021D360), .defenseTable = N(DefenseTable_8021D3C4), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, }, @@ -508,7 +508,7 @@ ActorPartBlueprint N(GoombarioParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021E94C), .defenseTable = N(DefenseTable_8021E998), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -9 }, }, @@ -1219,11 +1219,7 @@ EvtScript N(idle_80220790) = { EVT_END }; -s32 N(intTable_802208B0)[] = { - 0x00000009, 0x00000010, 0x00000016, 0x0000001A, 0x0000001E, 0x00000020, 0x00000021, 0x00000020, - 0x0000001E, 0x0000001A, 0x00000016, 0x00000010, 0x00000009, 0x00000000, 0x00000004, 0x00000006, - 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, -}; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent_80220908) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -1286,8 +1282,8 @@ EvtScript N(handleEvent_80220908) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) EVT_WAIT(1) EVT_END_THREAD - EVT_USE_BUF(EVT_PTR(N(intTable_802208B0))) - EVT_LOOP(22) + EVT_USE_BUF(EVT_PTR(N(FlipPosOffsets))) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) @@ -1659,7 +1655,7 @@ ActorPartBlueprint N(BombetteParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80222290), .defenseTable = N(DefenseTable_802222DC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -7 }, }, @@ -2013,7 +2009,7 @@ ActorPartBlueprint N(ParakarryParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80223388), .defenseTable = N(DefenseTable_802233D4), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -16 }, }, @@ -2025,7 +2021,7 @@ ActorPartBlueprint N(ParakarryParts)[] = { .opacity = 255, .idleAnimations = NULL, .defenseTable = N(DefenseTable_802233D4), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -16 }, }, @@ -2375,7 +2371,7 @@ ActorPartBlueprint N(BowParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80224410), .defenseTable = N(DefenseTable_8022445C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -2387,7 +2383,7 @@ ActorPartBlueprint N(BowParts)[] = { .opacity = 255, .idleAnimations = NULL, .defenseTable = N(DefenseTable_8022445C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -2672,9 +2668,9 @@ EvtScript N(takeTurn_80224CA0) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2019) EVT_ADD(LVarA, 1) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_SlapOnce) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_IF_EQ(LVarA, LVar8) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) EVT_ELSE @@ -2682,7 +2678,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_END_IF EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_SlapBack) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_IF_EQ(LVarA, LVar8) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_RIGHT) EVT_ELSE @@ -3305,7 +3301,7 @@ ActorPartBlueprint N(SushieParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022697C), .defenseTable = N(DefenseTable_802269C8), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -12 }, }, @@ -3784,7 +3780,7 @@ ActorPartBlueprint N(LakilesterParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022840C), .defenseTable = N(DefenseTable_80228464), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, }, @@ -3796,7 +3792,7 @@ ActorPartBlueprint N(LakilesterParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80228458), .defenseTable = N(DefenseTable_80228464), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index 630b658ed1..468b6f96d9 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -67,7 +67,7 @@ ActorPartBlueprint N(ActorParts_8022A364)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022A260), .defenseTable = N(DefenseTable_8022A2AC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -7 }, }, @@ -377,15 +377,15 @@ EvtScript N(handleEvent_8022B2CC) = { EVT_IF_FLAG(LVar0, 0x3F1000) EVT_BREAK_SWITCH EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(1) EVT_CASE_OR_EQ(0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 33741a3bf9..2bb47b672e 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -74,7 +74,7 @@ ActorPartBlueprint N(ActorParts_8022B790)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022B640), .defenseTable = N(DefenseTable_8022B6D8), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -7 }, }, @@ -600,15 +600,15 @@ EvtScript N(handleEvent_8022D634) = { EVT_IF_FLAG(LVar0, 0x3F1000) EVT_BREAK_SWITCH EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(1) EVT_CASE_OR_EQ(0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index 060fc62bac..e609a9b94f 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -81,7 +81,7 @@ ActorPartBlueprint N(ActorParts_8022DAF0)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022D9A0), .defenseTable = N(DefenseTable_8022DA38), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -7 }, }, @@ -93,7 +93,7 @@ ActorPartBlueprint N(ActorParts_8022DAF0)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022D9A0), .defenseTable = N(DefenseTable_8022DA38), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -984,15 +984,15 @@ EvtScript N(handleEvent_80231408) = { EVT_IF_FLAG(LVar0, 0x3F1000) EVT_BREAK_SWITCH EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(1) EVT_CASE_OR_EQ(0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/area/mac/stage/mac_01.c b/src/battle/area/mac/stage/mac_01.c index 2841ba941d..e821aa8452 100644 --- a/src/battle/area/mac/stage/mac_01.c +++ b/src/battle/area/mac/stage/mac_01.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_mac_mac_01 -#include "battle/common/stage/WaterEffects.inc.c" +#include "battle/common/stage/lib/WaterEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/mim/actor/forest_fuzzy.c b/src/battle/area/mim/actor/forest_fuzzy.c index d9849b9ba4..7279a834d9 100644 --- a/src/battle/area/mim/actor/forest_fuzzy.c +++ b/src/battle/area/mim/actor/forest_fuzzy.c @@ -56,7 +56,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802184C4), .defenseTable = N(DefenseTable_802183C0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -382,9 +382,9 @@ EvtScript N(80219054) = { EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STATIC) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_ELSE - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -392,7 +392,7 @@ EvtScript N(80219054) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_RETURN EVT_END_IF @@ -512,10 +512,10 @@ EvtScript N(80219054) = { }; EvtScript N(8021A0D4) = { - EVT_SET(LocalFlag(1), 0) - EVT_SET(LocalFlag(2), 0) - EVT_SET(LocalFlag(3), 0) - EVT_SET(LocalFlag(4), 0) + EVT_SET(LFlag1, FALSE) + EVT_SET(LFlag2, FALSE) + EVT_SET(LFlag3, FALSE) + EVT_SET(LFlag4, FALSE) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -524,13 +524,13 @@ EvtScript N(8021A0D4) = { EVT_MOD(LVar5, 4) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(4), 1) + EVT_SET(LFlag4, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) @@ -541,14 +541,14 @@ EvtScript N(8021A0D4) = { EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_END_IF EVT_CASE_EQ(1) - EVT_IF_EQ(LocalFlag(1), 0) + EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LVarA, 0) EVT_END_IF - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_IF_EQ(LVarA, -1) EVT_SET(LVarA, 2) EVT_ELSE @@ -556,10 +556,10 @@ EvtScript N(8021A0D4) = { EVT_END_IF EVT_END_IF EVT_CASE_EQ(2) - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_END_IF - EVT_IF_EQ(LocalFlag(4), 0) + EVT_IF_EQ(LFlag4, FALSE) EVT_IF_EQ(LVarA, -1) EVT_SET(LVarA, 3) EVT_ELSE @@ -567,7 +567,7 @@ EvtScript N(8021A0D4) = { EVT_END_IF EVT_END_IF EVT_CASE_EQ(3) - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVarA, 2) EVT_END_IF EVT_END_SWITCH diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 59f1944e9e..9b8958bfee 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -18,11 +18,7 @@ enum N(ActorPartIDs) { PRT_9 = 9, }; -s32 N(intTable_80227910)[] = { - 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, - 4, 6, 7, 6, 4, 0, - 2, 0, -}; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; s32 N(IdleAnimations_80227968)[] = { STATUS_KEY_NORMAL, ANIM_KentCKoopa_Anim01, @@ -111,7 +107,7 @@ ActorPartBlueprint N(ActorParts_80227AB4)[] = { .opacity = 255, .idleAnimations = NULL, .defenseTable = N(DefenseTable_802279F0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -123,7 +119,7 @@ ActorPartBlueprint N(ActorParts_80227AB4)[] = { .opacity = 255, .idleAnimations = NULL, .defenseTable = N(DefenseTable_802279FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -135,7 +131,7 @@ ActorPartBlueprint N(ActorParts_80227AB4)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802279D0), .defenseTable = N(DefenseTable_802279FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -147,7 +143,7 @@ ActorPartBlueprint N(ActorParts_80227AB4)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802279D0), .defenseTable = N(DefenseTable_802279FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -159,7 +155,7 @@ ActorPartBlueprint N(ActorParts_80227AB4)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802279D0), .defenseTable = N(DefenseTable_802279FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -171,7 +167,7 @@ ActorPartBlueprint N(ActorParts_80227AB4)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802279D0), .defenseTable = N(DefenseTable_802279FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -183,7 +179,7 @@ ActorPartBlueprint N(ActorParts_80227AB4)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802279D0), .defenseTable = N(DefenseTable_802279FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -195,7 +191,7 @@ ActorPartBlueprint N(ActorParts_80227AB4)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802279D0), .defenseTable = N(DefenseTable_802279FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -1031,8 +1027,8 @@ EvtScript N(flipOver_KentC) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_USE_BUF(EVT_PTR(N(intTable_80227910))) - EVT_LOOP(ARRAY_COUNT(N(intTable_80227910))) + EVT_USE_BUF(EVT_PTR(N(FlipPosOffsets))) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_IF_EQ(LVar0, 0) diff --git a/src/battle/area/omo/actor/anti_guy.c b/src/battle/area/omo/actor/anti_guy.c index 7a0bd26dcf..5867cf1d30 100644 --- a/src/battle/area/omo/actor/anti_guy.c +++ b/src/battle/area/omo/actor/anti_guy.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(ActorParts_802219C8)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80221A14), .defenseTable = N(DefenseTable_80221910), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/area/omo/actor/blue_shy_guy.c b/src/battle/area/omo/actor/blue_shy_guy.c index 24112c7416..31cf9cd84d 100644 --- a/src/battle/area/omo/actor/blue_shy_guy.c +++ b/src/battle/area/omo/actor/blue_shy_guy.c @@ -55,7 +55,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021AE1C), .defenseTable = N(DefenseTable_8021AD10), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/area/omo/actor/green_shy_guy.c b/src/battle/area/omo/actor/green_shy_guy.c index cff0e6fcc9..49ea3b86f0 100644 --- a/src/battle/area/omo/actor/green_shy_guy.c +++ b/src/battle/area/omo/actor/green_shy_guy.c @@ -55,7 +55,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021FF1C), .defenseTable = N(DefenseTable_8021FE10), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/area/omo/actor/groove_guy.c b/src/battle/area/omo/actor/groove_guy.c index 48e69c5f68..124717973e 100644 --- a/src/battle/area/omo/actor/groove_guy.c +++ b/src/battle/area/omo/actor/groove_guy.c @@ -80,7 +80,7 @@ ActorPartBlueprint N(ActorParts_80224AEC)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802249E0), .defenseTable = N(DefenseTable_80224A2C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -446,10 +446,10 @@ EvtScript N(sleepySpin) = { }; EvtScript N(getFirstOpenColumn) = { - EVT_SET(LocalFlag(1), 0) - EVT_SET(LocalFlag(2), 0) - EVT_SET(LocalFlag(3), 0) - EVT_SET(LocalFlag(4), 0) + EVT_SET(LFlag1, FALSE) + EVT_SET(LFlag2, FALSE) + EVT_SET(LFlag3, FALSE) + EVT_SET(LFlag4, FALSE) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -458,31 +458,31 @@ EvtScript N(getFirstOpenColumn) = { EVT_MOD(LVar5, 4) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(4), 1) + EVT_SET(LFlag4, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(1), 0) + EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LVarA, 0) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVarA, 2) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(4), 0) + EVT_IF_EQ(LFlag4, FALSE) EVT_SET(LVarA, 3) EVT_RETURN EVT_END_IF diff --git a/src/battle/area/omo/actor/pink_shy_guy.c b/src/battle/area/omo/actor/pink_shy_guy.c index 669e33aff8..a171fdf210 100644 --- a/src/battle/area/omo/actor/pink_shy_guy.c +++ b/src/battle/area/omo/actor/pink_shy_guy.c @@ -55,7 +55,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021E41C), .defenseTable = N(DefenseTable_8021E310), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/area/omo/actor/sky_guy.c b/src/battle/area/omo/actor/sky_guy.c index 4d39454bc5..695779cffa 100644 --- a/src/battle/area/omo/actor/sky_guy.c +++ b/src/battle/area/omo/actor/sky_guy.c @@ -153,7 +153,7 @@ ActorPartBlueprint N(ActorParts_8022977C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022B104), .defenseTable = N(DefenseTable_80229610), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -165,7 +165,7 @@ ActorPartBlueprint N(ActorParts_8022977C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802294C0), .defenseTable = N(DefenseTable_802295FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -177,7 +177,7 @@ ActorPartBlueprint N(ActorParts_8022977C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8022950C), .defenseTable = N(DefenseTable_802295FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, .overrideNameMsg = MSG_EnemyName_Balloon, @@ -190,7 +190,7 @@ ActorPartBlueprint N(ActorParts_8022977C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80229558), .defenseTable = N(DefenseTable_802295FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -202,7 +202,7 @@ ActorPartBlueprint N(ActorParts_8022977C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802295A4), .defenseTable = N(DefenseTable_802295FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -214,7 +214,7 @@ ActorPartBlueprint N(ActorParts_8022977C)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_802295F0), .defenseTable = N(DefenseTable_802295FC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/area/omo/actor/spy_guy.c b/src/battle/area/omo/actor/spy_guy.c index 9e176c2325..ffc76229e2 100644 --- a/src/battle/area/omo/actor/spy_guy.c +++ b/src/battle/area/omo/actor/spy_guy.c @@ -87,7 +87,7 @@ ActorPartBlueprint N(ActorParts_80227564)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80227400), .defenseTable = N(DefenseTable_802274A4), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -13 }, }, @@ -99,7 +99,7 @@ ActorPartBlueprint N(ActorParts_80227564)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80227498), .defenseTable = N(DefenseTable_802274A4), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -517,12 +517,12 @@ EvtScript N(hammerAttack) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_ATK_BLOCKED) EVT_CALL(N(SpyGuyActionFunc), LVar0) EVT_IF_NE(LVar0, -1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar0) @@ -540,7 +540,7 @@ EvtScript N(hammerAttack) = { EVT_WAIT(20) EVT_GOTO(100) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_EXEC(N(80228778)) EVT_WAIT(8) diff --git a/src/battle/area/omo/actor/yellow_shy_guy.c b/src/battle/area/omo/actor/yellow_shy_guy.c index c83fbeba0a..a8f2d3ec5d 100644 --- a/src/battle/area/omo/actor/yellow_shy_guy.c +++ b/src/battle/area/omo/actor/yellow_shy_guy.c @@ -56,7 +56,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021C91C), .defenseTable = N(DefenseTable_8021C810), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/area/omo/area.c b/src/battle/area/omo/area.c index aee3621ee1..43d3498018 100644 --- a/src/battle/area/omo/area.c +++ b/src/battle/area/omo/area.c @@ -339,14 +339,14 @@ BattleList N(Formations) = { }; StageList N(Stages) = { - { "omo_01", &N(omo_01) }, - { "omo_02", &N(omo_02) }, - { "omo_03", &N(omo_03) }, + STAGE("omo_01", N(omo_01)), + STAGE("omo_02", N(omo_02)), + STAGE("omo_03", N(omo_03)), STAGE("omo_03b", N(omo_03b)), - { "omo_04", &N(omo_04) }, - { "omo_05", &N(omo_05) }, + STAGE("omo_04", N(omo_04)), + STAGE("omo_05", N(omo_05)), STAGE("omo_05b", N(omo_05b)), - { "omo_06", &N(omo_06) }, - { "omo_07", &N(omo_07) }, + STAGE("omo_06", N(omo_06)), + STAGE("omo_07", N(omo_07)), {}, }; diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index dfe6ab44d8..1989c65acf 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -516,7 +516,7 @@ EvtScript N(handleEvent) = { EVT_WAIT(1000) EVT_CASE_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET(LVar0, 2) - EVT_SET(LVar1, 7340033) + EVT_SET(LVar1, ANIM_StiltGuy_Anim01) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_CASE_EQ(EVENT_BURN_HIT) EVT_CALL(GetDamageSource, LVar0) diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index 3ebdf7eca3..e8d93c7981 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -811,7 +811,7 @@ EvtScript N(takeTurn) = { EVT_BITWISE_OR_CONST(LVar0, N(FLAG_LOW_HP)) EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_MUL(LVar0, 100) @@ -823,7 +823,7 @@ EvtScript N(takeTurn) = { EVT_IF_LE(LVar0, 100) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_HEAL_COUNTER), LVar0) EVT_IF_LT(LVar0, 2) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CASE_LT(40) @@ -832,7 +832,7 @@ EvtScript N(takeTurn) = { EVT_IF_LE(LVar0, 30) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_HEAL_COUNTER), LVar0) EVT_IF_LT(LVar0, 2) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CASE_LT(55) @@ -841,11 +841,11 @@ EvtScript N(takeTurn) = { EVT_IF_LE(LVar0, 10) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_HEAL_COUNTER), LVar0) EVT_IF_LT(LVar0, 2) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_END_SWITCH - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_HEAL_COUNTER), LVar0) EVT_ADD(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_HEAL_COUNTER), LVar0) @@ -1974,7 +1974,7 @@ EvtScript N(NormalAttack) = { }; EvtScript N(Heal) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_PHASE), LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(N(PHASE_SUMMONED_CLONES)) @@ -1983,13 +1983,13 @@ EvtScript N(Heal) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVarB) EVT_CALL(ActorExists, LVarA, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_CALL(EnableIdleScript, LVarA, 0) EVT_CALL(UseIdleAnimation, LVarB, FALSE) @@ -2007,7 +2007,7 @@ EvtScript N(Heal) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1D) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_CrystalKing_Anim1D) EVT_CALL(SetAnimation, LVarB, 1, ANIM_CrystalKing_Anim1D) EVT_END_IF @@ -2019,7 +2019,7 @@ EvtScript N(Heal) = { EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) EVT_END_THREAD - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_206D) @@ -2035,7 +2035,7 @@ EvtScript N(Heal) = { EVT_CALL(PlaySoundAtActor, LVarB, SOUND_25C) EVT_END_THREAD EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) EVT_CALL(HealActor, ACTOR_SELF, 20, FALSE) @@ -2064,7 +2064,7 @@ EvtScript N(Heal) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(EnableIdleScript, LVarA, 1) EVT_CALL(UseIdleAnimation, LVarA, TRUE) EVT_CALL(EnableIdleScript, LVarA, 1) diff --git a/src/battle/area/pra2/stage/sam_04.c b/src/battle/area/pra2/stage/sam_04.c index 07f0918f71..ebf246faf9 100644 --- a/src/battle/area/pra2/stage/sam_04.c +++ b/src/battle/area/pra2/stage/sam_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_pra2_sam_04 -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" void func_802189E0_661130(void) { enable_background_wave(); diff --git a/src/battle/area/sam/stage/sam_01.c b/src/battle/area/sam/stage/sam_01.c index 1664ac9b97..1073050062 100644 --- a/src/battle/area/sam/stage/sam_01.c +++ b/src/battle/area/sam/stage/sam_01.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam_sam_01 -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam/stage/sam_02.c b/src/battle/area/sam/stage/sam_02.c index 64f7f61dd9..dc3a6f7ba2 100644 --- a/src/battle/area/sam/stage/sam_02.c +++ b/src/battle/area/sam/stage/sam_02.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam_sam_02 -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam/stage/sam_02b.c b/src/battle/area/sam/stage/sam_02b.c index 82dced6c69..5e24da9325 100644 --- a/src/battle/area/sam/stage/sam_02b.c +++ b/src/battle/area/sam/stage/sam_02b.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam_sam_02b -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam/stage/sam_02c.c b/src/battle/area/sam/stage/sam_02c.c index fb21afe97d..0cf9fe3888 100644 --- a/src/battle/area/sam/stage/sam_02c.c +++ b/src/battle/area/sam/stage/sam_02c.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam_sam_02c -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam/stage/sam_02d.c b/src/battle/area/sam/stage/sam_02d.c index fdd45898af..9486e66667 100644 --- a/src/battle/area/sam/stage/sam_02d.c +++ b/src/battle/area/sam/stage/sam_02d.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam_sam_02d -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam/stage/sam_03.c b/src/battle/area/sam/stage/sam_03.c index fc495a42dd..49cf059759 100644 --- a/src/battle/area/sam/stage/sam_03.c +++ b/src/battle/area/sam/stage/sam_03.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam_sam_03 -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" void func_8021AE70_626A10(void) { enable_background_wave(); diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index 78fc788a1f..e86df71793 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -525,7 +525,7 @@ EvtScript N(OnDeath) = { EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH) EVT_END_CASE_GROUP EVT_CASE_DEFAULT - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar1) EVT_SWITCH(LVar1) EVT_CASE_OR_EQ(ACTOR_TYPE_BOB_OMB) diff --git a/src/battle/area/sam2/stage/sam_01.c b/src/battle/area/sam2/stage/sam_01.c index 5ac6ff3f9a..c4051d0816 100644 --- a/src/battle/area/sam2/stage/sam_01.c +++ b/src/battle/area/sam2/stage/sam_01.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam2_sam_01 -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam2/stage/sam_02.c b/src/battle/area/sam2/stage/sam_02.c index 13ffb5e284..34c9284d2d 100644 --- a/src/battle/area/sam2/stage/sam_02.c +++ b/src/battle/area/sam2/stage/sam_02.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam2_sam_02 -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam2/stage/sam_02b.c b/src/battle/area/sam2/stage/sam_02b.c index 8a66b86bf2..229d4d2d7e 100644 --- a/src/battle/area/sam2/stage/sam_02b.c +++ b/src/battle/area/sam2/stage/sam_02b.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam2_sam_02b -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam2/stage/sam_02c.c b/src/battle/area/sam2/stage/sam_02c.c index fc6acb7901..1c2b2067a1 100644 --- a/src/battle/area/sam2/stage/sam_02c.c +++ b/src/battle/area/sam2/stage/sam_02c.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam2_sam_02c -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam2/stage/sam_02d.c b/src/battle/area/sam2/stage/sam_02d.c index 53c3caccc0..b4b7b3d658 100644 --- a/src/battle/area/sam2/stage/sam_02d.c +++ b/src/battle/area/sam2/stage/sam_02d.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam2_sam_02d -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/sam2/stage/sam_03.c b/src/battle/area/sam2/stage/sam_03.c index 1e76412baf..8588687cf2 100644 --- a/src/battle/area/sam2/stage/sam_03.c +++ b/src/battle/area/sam2/stage/sam_03.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sam2_sam_03 -#include "battle/common/stage/sam_Snowflakes.inc.c" +#include "battle/common/stage/lib/Snowflakes.inc.c" void func_80219E40_63F020(void) { enable_background_wave(); diff --git a/src/battle/area/tik/actor/dark_koopa.c b/src/battle/area/tik/actor/dark_koopa.c index 7575a40eea..755f3c4ec8 100644 --- a/src/battle/area/tik/actor/dark_koopa.c +++ b/src/battle/area/tik/actor/dark_koopa.c @@ -344,7 +344,7 @@ EvtScript N(idle) = { EVT_END }; -s32 N(bounceTable)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0, }; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -419,8 +419,8 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) EVT_WAIT(1) EVT_END_THREAD - EVT_USE_BUF(N(bounceTable)) - EVT_LOOP(22) + EVT_USE_BUF(N(FlipPosOffsets)) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) diff --git a/src/battle/area/tik/actor/dark_paratroopa.c b/src/battle/area/tik/actor/dark_paratroopa.c index fd4d8a258d..2379175fe3 100644 --- a/src/battle/area/tik/actor/dark_paratroopa.c +++ b/src/battle/area/tik/actor/dark_paratroopa.c @@ -896,7 +896,7 @@ EvtScript N(idle_koopa) = { EVT_END }; -s32 N(bounceTable)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0, }; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent_koopa) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -971,8 +971,8 @@ EvtScript N(handleEvent_koopa) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) EVT_WAIT(1) EVT_END_THREAD - EVT_USE_BUF(N(bounceTable)) - EVT_LOOP(22) + EVT_USE_BUF(N(FlipPosOffsets)) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) diff --git a/src/battle/area/tik/stage/tik_04.c b/src/battle/area/tik/stage/tik_04.c index c875251456..f7b7f70f76 100644 --- a/src/battle/area/tik/stage/tik_04.c +++ b/src/battle/area/tik/stage/tik_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik_tik_04 -#include "battle/common/stage/WaterEffects.inc.c" +#include "battle/common/stage/lib/WaterEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index d0f31a255d..737be05b62 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -483,77 +483,77 @@ EvtScript N(takeTurn) = { EVT_LOOP(5) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(10) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.1), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.8), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(3) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP @@ -591,46 +591,46 @@ EvtScript N(takeTurn) = { EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(3) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.8), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.1), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP @@ -642,16 +642,16 @@ EvtScript N(takeTurn) = { EVT_CALL(func_80269470) EVT_BREAK_LOOP EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(12) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DispatchEventPlayer, EVENT_66) EVT_BREAK_LOOP EVT_END_IF diff --git a/src/battle/area/tik2/stage/tik_04.c b/src/battle/area/tik2/stage/tik_04.c index de941620f1..be9b72a607 100644 --- a/src/battle/area/tik2/stage/tik_04.c +++ b/src/battle/area/tik2/stage/tik_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik2_tik_04 -#include "battle/common/stage/WaterEffects.inc.c" +#include "battle/common/stage/lib/WaterEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/tik3/stage/tik_04.c b/src/battle/area/tik3/stage/tik_04.c index d1c256c8a3..653459edea 100644 --- a/src/battle/area/tik3/stage/tik_04.c +++ b/src/battle/area/tik3/stage/tik_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_tik3_tik_04 -#include "battle/common/stage/WaterEffects.inc.c" +#include "battle/common/stage/lib/WaterEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/area/trd_part_1/actor/bill_blaster.c b/src/battle/area/trd_part_1/actor/bill_blaster.c index da41ce60a8..a50778d13f 100644 --- a/src/battle/area/trd_part_1/actor/bill_blaster.c +++ b/src/battle/area/trd_part_1/actor/bill_blaster.c @@ -7,9 +7,10 @@ extern EvtScript N(EVS_Init); extern EvtScript N(EVS_Idle); extern EvtScript N(EVS_TakeTurn); extern EvtScript N(EVS_HandleEvent); -extern s32 N(DefaultAnims)[]; extern EvtScript N(EVS_Move_FireBullet); extern EvtScript N(EVS_Move_CheckForBullet); +extern s32 N(DefaultAnims)[]; + extern ActorBlueprint A(bullet_bill); extern Formation N(BulletBillSummon); @@ -62,7 +63,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(DefaultAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -9 }, }, @@ -74,7 +75,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(DefaultAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -9 }, }, @@ -104,10 +105,10 @@ ActorBlueprint NAMESPACE = { }; s32 N(DefaultAnims)[] = { - STATUS_KEY_NORMAL, ANIM_BillBlaster_Anim01, - STATUS_KEY_STONE, ANIM_BillBlaster_Anim00, - STATUS_KEY_STOP, ANIM_BillBlaster_Anim00, - STATUS_KEY_PARALYZE, ANIM_BillBlaster_Anim00, + STATUS_KEY_NORMAL, ANIM_BillBlaster_Idle, + STATUS_KEY_STONE, ANIM_BillBlaster_Still, + STATUS_KEY_STOP, ANIM_BillBlaster_Still, + STATUS_KEY_PARALYZE, ANIM_BillBlaster_Still, STATUS_END, }; @@ -133,50 +134,50 @@ EvtScript N(EVS_HandleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Hurt) EVT_SET_CONST(LVar2, -1) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Hurt) EVT_SET_CONST(LVar2, -1) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim01) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Idle) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_WAIT(10) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim01) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Idle) EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Hurt) EVT_EXEC_WAIT(EVS_Enemy_AirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BillBlaster_Anim03) + EVT_SET_CONST(LVar1, ANIM_BillBlaster_Hurt) EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_RETURN EVT_CASE_DEFAULT @@ -211,7 +212,7 @@ API_CALLABLE(N(SetBulletInitVars)) { } EvtScript N(EVS_Move_FireBullet) = { - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BillBlaster_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BillBlaster_Fire) EVT_WAIT(13) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) diff --git a/src/battle/area/trd_part_1/actor/bob_omb.c b/src/battle/area/trd_part_1/actor/bob_omb.c index bd788398ce..f9ff4e0070 100644 --- a/src/battle/area/trd_part_1/actor/bob_omb.c +++ b/src/battle/area/trd_part_1/actor/bob_omb.c @@ -24,28 +24,28 @@ enum N(ActorParams) { }; s32 N(DefaultAnims)[] = { - STATUS_KEY_NORMAL, ANIM_Bobomb_Anim02, - STATUS_KEY_STONE, ANIM_Bobomb_Anim00, - STATUS_KEY_SLEEP, ANIM_Bobomb_Anim18, - STATUS_KEY_POISON, ANIM_Bobomb_Anim04, - STATUS_KEY_STOP, ANIM_Bobomb_Anim00, - STATUS_KEY_STATIC, ANIM_Bobomb_Anim02, - STATUS_KEY_PARALYZE, ANIM_Bobomb_Anim00, - STATUS_KEY_DIZZY, ANIM_Bobomb_Anim1C, - STATUS_KEY_FEAR, ANIM_Bobomb_Anim1C, + STATUS_KEY_NORMAL, ANIM_Bobomb_Idle, + STATUS_KEY_STONE, ANIM_Bobomb_Still, + STATUS_KEY_SLEEP, ANIM_Bobomb_Sleep, + STATUS_KEY_POISON, ANIM_Bobomb_Walk, + STATUS_KEY_STOP, ANIM_Bobomb_Still, + STATUS_KEY_STATIC, ANIM_Bobomb_Idle, + STATUS_KEY_PARALYZE, ANIM_Bobomb_Still, + STATUS_KEY_DIZZY, ANIM_Bobomb_Dizzy, + STATUS_KEY_FEAR, ANIM_Bobomb_Dizzy, STATUS_END, }; s32 N(IgnitedAnims)[] = { - STATUS_KEY_NORMAL, ANIM_Bobomb_Anim05, - STATUS_KEY_STONE, ANIM_Bobomb_Anim01, - STATUS_KEY_SLEEP, ANIM_Bobomb_Anim18, - STATUS_KEY_POISON, ANIM_Bobomb_Anim05, - STATUS_KEY_STOP, ANIM_Bobomb_Anim01, - STATUS_KEY_STATIC, ANIM_Bobomb_Anim03, - STATUS_KEY_PARALYZE, ANIM_Bobomb_Anim01, - STATUS_KEY_DIZZY, ANIM_Bobomb_Anim1D, - STATUS_KEY_FEAR, ANIM_Bobomb_Anim1D, + STATUS_KEY_NORMAL, ANIM_Bobomb_WalkLit, + STATUS_KEY_STONE, ANIM_Bobomb_StillLit, + STATUS_KEY_SLEEP, ANIM_Bobomb_Sleep, + STATUS_KEY_POISON, ANIM_Bobomb_WalkLit, + STATUS_KEY_STOP, ANIM_Bobomb_StillLit, + STATUS_KEY_STATIC, ANIM_Bobomb_IdleLit, + STATUS_KEY_PARALYZE, ANIM_Bobomb_StillLit, + STATUS_KEY_DIZZY, ANIM_Bobomb_DizzyLit, + STATUS_KEY_FEAR, ANIM_Bobomb_DizzyLit, STATUS_END, }; @@ -169,7 +169,7 @@ EvtScript N(EVS_Ignite) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, TRUE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_Ignited))) EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_80000001) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_WalkLit) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) @@ -239,24 +239,24 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_0, TRUE) EVT_END_IF EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CASE_EQ(EVENT_HIT) EVT_CALL(GetLastElement, LVarE) EVT_IF_FLAG(LVarE, DAMAGE_TYPE_SHOCK) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim10) - EVT_SET_CONST(LVar2, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_Bobomb_BurnStill) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_ELSE EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, 0) @@ -266,19 +266,19 @@ EvtScript N(EVS_HandleEvent) = { EVT_CASE_OR_EQ(EVENT_BURN_HIT) EVT_CASE_OR_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim10) - EVT_SET_CONST(LVar2, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_Bobomb_BurnStill) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, 0) @@ -286,28 +286,28 @@ EvtScript N(EVS_HandleEvent) = { EVT_END_IF EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) EVT_EXEC_WAIT(N(EVS_Cleanup)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_OR_EQ(EVENT_SHOCK_HIT) EVT_CASE_OR_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim10) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnHurt) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim02) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Idle) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim02) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Idle) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_0, LVar0) EVT_IF_EQ(LVar0, TRUE) @@ -318,54 +318,54 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(GetLastElement, LVarE) EVT_IF_FLAG(LVarE, DAMAGE_TYPE_SHOCK) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim10) - EVT_SET_CONST(LVar2, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_Bobomb_BurnStill) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_ELSE EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_Cleanup)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_EXPLODE_TRIGGER) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim10) - EVT_SET_CONST(LVar2, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_Bobomb_BurnStill) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim02) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Idle) EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim06) - EVT_SET_CONST(LVar2, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Run) + EVT_SET_CONST(LVar2, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_ScareAway) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim1C) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Dizzy) EVT_EXEC_WAIT(EVS_Enemy_AirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim1C) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Dizzy) EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_RETURN EVT_CASE_DEFAULT @@ -386,11 +386,11 @@ EvtScript N(EVS_HandleEvent_Ignited) = { EVT_IF_FLAG(LVarE, DAMAGE_TYPE_WATER) EVT_EXEC_WAIT(N(EVS_Defuse)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_ELSE EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0F) + EVT_SET_CONST(LVar1, ANIM_Bobomb_HurtLit) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_END_IF EVT_CASE_EQ(EVENT_HIT) @@ -399,27 +399,27 @@ EvtScript N(EVS_HandleEvent_Ignited) = { EVT_CASE_FLAG(DAMAGE_TYPE_WATER) EVT_EXEC_WAIT(N(EVS_Defuse)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CASE_FLAG(DAMAGE_TYPE_SHOCK) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim10) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnHurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_DEFAULT EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0F) + EVT_SET_CONST(LVar1, ANIM_Bobomb_HurtLit) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN @@ -432,7 +432,7 @@ EvtScript N(EVS_HandleEvent_Ignited) = { EVT_CASE_OR_EQ(EVENT_EXPLODE_TRIGGER) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN @@ -441,7 +441,7 @@ EvtScript N(EVS_HandleEvent_Ignited) = { EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim03) + EVT_SET_CONST(LVar1, ANIM_Bobomb_IdleLit) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) @@ -449,11 +449,11 @@ EvtScript N(EVS_HandleEvent_Ignited) = { EVT_IF_FLAG(LVarE, DAMAGE_TYPE_WATER) EVT_EXEC_WAIT(N(EVS_Defuse)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Hurt) EVT_ELSE EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_END_IF EVT_EXEC_WAIT(EVS_Enemy_Death) @@ -462,39 +462,39 @@ EvtScript N(EVS_HandleEvent_Ignited) = { EVT_CASE_OR_EQ(EVENT_SHOCK_DEATH) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim03) + EVT_SET_CONST(LVar1, ANIM_Bobomb_IdleLit) EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_EXEC_WAIT(N(EVS_Cleanup)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim06) - EVT_SET_CONST(LVar2, ANIM_Bobomb_Anim0E) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Run) + EVT_SET_CONST(LVar2, ANIM_Bobomb_Hurt) EVT_EXEC_WAIT(EVS_Enemy_ScareAway) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim1D) + EVT_SET_CONST(LVar1, ANIM_Bobomb_DizzyLit) EVT_EXEC_WAIT(EVS_Enemy_AirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_CALL(GetDamageSource, LVar0) EVT_IF_EQ(LVar0, DMG_SRC_HURRICANE) EVT_EXEC_WAIT(N(EVS_Defuse)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim1C) + EVT_SET_CONST(LVar1, ANIM_Bobomb_Dizzy) EVT_ELSE EVT_CHILD_THREAD EVT_WAIT(100) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_END_CHILD_THREAD EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim1D) + EVT_SET_CONST(LVar1, ANIM_Bobomb_DizzyLit) EVT_END_IF EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_RETURN @@ -515,18 +515,18 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Idle) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) EVT_WAIT(1) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -539,7 +539,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.1)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim1C) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Dizzy) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) @@ -560,11 +560,11 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_RETURN @@ -573,7 +573,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.1)) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim14) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Buildup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4) EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3, 0) @@ -588,7 +588,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Idle) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -607,11 +607,11 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) EVT_WAIT(4) EVT_CALL(YieldTurn) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_RETURN @@ -631,14 +631,14 @@ EvtScript N(EVS_Attack_Blast) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_RunLit) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 80, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, -1, 14, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 90) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_RunLit) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -646,7 +646,7 @@ EvtScript N(EVS_Attack_Blast) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_EXEC_WAIT(N(EVS_Explode)) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_BurnStill) EVT_WAIT(10) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -662,22 +662,22 @@ EvtScript N(EVS_Attack_Blast) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_RunLit) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 10, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim14) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Buildup) EVT_WAIT(15) EVT_SET(LVarA, 1) EVT_EXEC_WAIT(N(EVS_Explode)) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_BurnStill) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_EXPLOSION, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(15) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_Bobomb_Anim11) + EVT_SET_CONST(LVar1, ANIM_Bobomb_BurnStill) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN diff --git a/src/battle/area/trd_part_1/actor/bullet_bill.c b/src/battle/area/trd_part_1/actor/bullet_bill.c index 3786e2db82..e008f1b381 100644 --- a/src/battle/area/trd_part_1/actor/bullet_bill.c +++ b/src/battle/area/trd_part_1/actor/bullet_bill.c @@ -92,10 +92,10 @@ ActorBlueprint NAMESPACE = { }; s32 N(DefaultAnims)[] = { - STATUS_KEY_NORMAL, ANIM_BulletBill_Anim01, - STATUS_KEY_STONE, ANIM_BulletBill_Anim00, - STATUS_KEY_STOP, ANIM_BulletBill_Anim00, - STATUS_KEY_PARALYZE, ANIM_BulletBill_Anim00, + STATUS_KEY_NORMAL, ANIM_BulletBill_Idle, + STATUS_KEY_STONE, ANIM_BulletBill_Still, + STATUS_KEY_STOP, ANIM_BulletBill_Still, + STATUS_KEY_PARALYZE, ANIM_BulletBill_Still, STATUS_END, }; @@ -130,10 +130,10 @@ EvtScript N(EVS_Init) = { EVT_CALL(GetActorPos, LVar0, LVar1, LVarB, LVarC) EVT_SUB(LVar1, 90) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Tense) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Idle) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_END_IF @@ -149,7 +149,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_Explode) = { EVT_EXEC_WAIT(N(EVS_MakeExplosionFX)) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim07) + EVT_SET_CONST(LVar1, ANIM_BulletBill_BurnHurt) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN @@ -163,11 +163,11 @@ EvtScript N(EVS_HandleEvent) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_CASE_EQ(EVENT_BURN_HIT) EVT_EXEC_WAIT(N(EVS_Explode)) @@ -183,13 +183,13 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Hurt) EVT_EXEC_WAIT(EVS_Enemy_ShockHit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Hurt) EVT_EXEC_WAIT(EVS_Enemy_ShockHit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_RETURN @@ -197,12 +197,12 @@ EvtScript N(EVS_HandleEvent) = { EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim01) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Idle) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_RETURN @@ -211,21 +211,21 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim01) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Idle) EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim05) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Hurt) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_EXEC_WAIT(N(EVS_Explode)) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim03) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Tense) EVT_EXEC_WAIT(EVS_Enemy_AirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim03) + EVT_SET_CONST(LVar1, ANIM_BulletBill_Tense) EVT_EXEC_WAIT(EVS_Enemy_BlowAway) EVT_RETURN EVT_CASE_DEFAULT @@ -244,7 +244,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BulletBill_Fire) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -1, 0) EVT_WAIT(1) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) @@ -289,7 +289,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BulletBill_Anim07) + EVT_SET_CONST(LVar1, ANIM_BulletBill_BurnHurt) EVT_SET(LVar2, EXEC_DEATH_NO_SPINNING) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN diff --git a/src/battle/area/trd_part_1/stage/trd_00.c b/src/battle/area/trd_part_1/stage/trd_00.c index abd950cddd..a3b6861b4e 100644 --- a/src/battle/area/trd_part_1/stage/trd_00.c +++ b/src/battle/area/trd_part_1/stage/trd_00.c @@ -1,30 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt00_shape.h" -#define NAMESPACE A(trd_00) - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - MODEL_p1, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt00_shape", - .hit = "trd_bt00_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_00.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_01.c b/src/battle/area/trd_part_1/stage/trd_01.c index 301af779ae..522bdbfdbe 100644 --- a/src/battle/area/trd_part_1/stage/trd_01.c +++ b/src/battle/area/trd_part_1/stage/trd_01.c @@ -1,24 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt01_shape.h" -#define NAMESPACE A(trd_01) - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt01_shape", - .hit = "trd_bt01_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_01.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_02.c b/src/battle/area/trd_part_1/stage/trd_02.c index d5a4319e50..f6d69cee62 100644 --- a/src/battle/area/trd_part_1/stage/trd_02.c +++ b/src/battle/area/trd_part_1/stage/trd_02.c @@ -1,46 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt02_shape.h" -#define NAMESPACE A(trd_02) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_kabe2_2, FALSE) - EVT_THREAD - EVT_SET(LVar0, MODEL_mizu) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu2) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_o298) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_o297) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - MODEL_saku, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt02_shape", - .hit = "trd_bt02_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_02.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_02b.c b/src/battle/area/trd_part_1/stage/trd_02b.c index a34309a437..d1521096ba 100644 --- a/src/battle/area/trd_part_1/stage/trd_02b.c +++ b/src/battle/area/trd_part_1/stage/trd_02b.c @@ -1,42 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt02_shape.h" -#define NAMESPACE A(trd_02b) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_saku, FALSE) - EVT_CALL(EnableModel, MODEL_kiwa, FALSE) - EVT_CALL(EnableModel, MODEL_tyuu, FALSE) - EVT_THREAD - EVT_SET(LVar0, MODEL_mizu) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu2) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_o298) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_o297) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt02_shape", - .hit = "trd_bt02_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_02b.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_02c.c b/src/battle/area/trd_part_1/stage/trd_02c.c index 487499c73a..382d967d47 100644 --- a/src/battle/area/trd_part_1/stage/trd_02c.c +++ b/src/battle/area/trd_part_1/stage/trd_02c.c @@ -1,32 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt02_shape.h" -#define NAMESPACE A(trd_02c) - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_dai, FALSE) - EVT_CALL(EnableModel, MODEL_kusari1, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - MODEL_saku, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt02_shape", - .hit = "trd_bt02_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_02c.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_02d.c b/src/battle/area/trd_part_1/stage/trd_02d.c index bade41139f..63ae59d351 100644 --- a/src/battle/area/trd_part_1/stage/trd_02d.c +++ b/src/battle/area/trd_part_1/stage/trd_02d.c @@ -1,38 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt02_shape.h" -#define NAMESPACE A(trd_02d) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_mizu, FALSE) - EVT_CALL(EnableModel, MODEL_mizu2, FALSE) - EVT_CALL(EnableModel, MODEL_o298, FALSE) - EVT_CALL(EnableModel, MODEL_o297, FALSE) - EVT_CALL(EnableModel, MODEL_kiwa, FALSE) - EVT_CALL(EnableModel, MODEL_tyuu, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - MODEL_saku, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt02_shape", - .hit = "trd_bt02_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_02d.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_03.c b/src/battle/area/trd_part_1/stage/trd_03.c index f9a7bbe458..792bf53cef 100644 --- a/src/battle/area/trd_part_1/stage/trd_03.c +++ b/src/battle/area/trd_part_1/stage/trd_03.c @@ -1,42 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt03_shape.h" -#define NAMESPACE A(trd_03) - -#include "battle/common/stage/MovingClouds.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, MODEL_g65) - EVT_SET(LVar2, 0) - EVT_EXEC(N(EVS_AnimateCloud)) - EVT_SET(LVar0, MODEL_g62) - EVT_SET(LVar2, 70) - EVT_SET(LVar3, 175) - EVT_SET(LVar4, -170) - EVT_EXEC(N(EVS_AnimateCloud_WithOffset2D)) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - MODEL_saku, - MODEL_kabe2, - MODEL_kabe, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt03_shape", - .hit = "trd_bt03_hit", - .bg = "nok_bg", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_03.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_04.c b/src/battle/area/trd_part_1/stage/trd_04.c index dc1ff7c014..c1c9ad7385 100644 --- a/src/battle/area/trd_part_1/stage/trd_04.c +++ b/src/battle/area/trd_part_1/stage/trd_04.c @@ -1,37 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt04_shape.h" -#define NAMESPACE A(trd_04) - -#include "battle/common/stage/TexturePanner.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_SET(LVar0, MODEL_hikari1) - EVT_SET(LVar1, TEX_PANNER_0) - EVT_SET(LVar2, 40) - EVT_SET(LVar3, 0) - EVT_EXEC(N(EVS_TexturePanMain)) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - MODEL_hikari1, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt04_shape", - .hit = "trd_bt04_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_04.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_05.c b/src/battle/area/trd_part_1/stage/trd_05.c index 50c36c9f3c..a83190d867 100644 --- a/src/battle/area/trd_part_1/stage/trd_05.c +++ b/src/battle/area/trd_part_1/stage/trd_05.c @@ -1,44 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt05_shape.h" -#define NAMESPACE A(trd_05) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_THREAD - EVT_SET(LVar0, MODEL_o318) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu4) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_END_THREAD - EVT_THREAD - EVT_SET(LVar0, MODEL_mizu3) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu2) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu1) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .bg = "nok_bg", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_05b.c b/src/battle/area/trd_part_1/stage/trd_05b.c index 50446e01c1..89d5f278e2 100644 --- a/src/battle/area/trd_part_1/stage/trd_05b.c +++ b/src/battle/area/trd_part_1/stage/trd_05b.c @@ -1,36 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt05_shape.h" -#define NAMESPACE A(trd_05b) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_kai, FALSE) - EVT_CALL(EnableModel, MODEL_kusari1, FALSE) - EVT_CALL(EnableModel, MODEL_mizu1, FALSE) - EVT_CALL(EnableModel, MODEL_mizu2, FALSE) - EVT_CALL(EnableModel, MODEL_mizu3, FALSE) - EVT_CALL(EnableModel, MODEL_ori, FALSE) - EVT_CALL(EnableModel, MODEL_saku1, FALSE) - EVT_CALL(EnableModel, MODEL_saku2, FALSE) - EVT_CALL(EnableModel, MODEL_mizu4, FALSE) - EVT_CALL(EnableModel, MODEL_o318, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05b.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_05c.c b/src/battle/area/trd_part_1/stage/trd_05c.c index e42715d234..842b9d1c6a 100644 --- a/src/battle/area/trd_part_1/stage/trd_05c.c +++ b/src/battle/area/trd_part_1/stage/trd_05c.c @@ -1,44 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt05_shape.h" -#define NAMESPACE A(trd_05c) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_yuka3, FALSE) - EVT_CALL(EnableModel, MODEL_hako, FALSE) - EVT_CALL(EnableModel, MODEL_ori, FALSE) - EVT_CALL(EnableModel, MODEL_saku1, FALSE) - EVT_CALL(EnableModel, MODEL_saku2, FALSE) - EVT_CALL(EnableModel, MODEL_mizu4, FALSE) - EVT_SET(LVar0, MODEL_o318) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_THREAD - EVT_SET(LVar0, MODEL_mizu3) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu2) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu1) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05c.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_05d.c b/src/battle/area/trd_part_1/stage/trd_05d.c index 54dca2b4bf..0e93b2a6b7 100644 --- a/src/battle/area/trd_part_1/stage/trd_05d.c +++ b/src/battle/area/trd_part_1/stage/trd_05d.c @@ -1,43 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt05_shape.h" -#define NAMESPACE A(trd_05d) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_yuka3, FALSE) - EVT_CALL(EnableModel, MODEL_hako, FALSE) - EVT_CALL(EnableModel, MODEL_kai, FALSE) - EVT_CALL(EnableModel, MODEL_kusari1, FALSE) - EVT_CALL(EnableModel, MODEL_mizu4, FALSE) - EVT_CALL(EnableModel, MODEL_hikari2, FALSE) - EVT_CALL(EnableModel, MODEL_o318, FALSE) - EVT_THREAD - EVT_SET(LVar0, MODEL_mizu3) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu2) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_WAIT(5) - EVT_SET(LVar0, MODEL_mizu1) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05d.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_05e.c b/src/battle/area/trd_part_1/stage/trd_05e.c index 8fb177974d..91721eab43 100644 --- a/src/battle/area/trd_part_1/stage/trd_05e.c +++ b/src/battle/area/trd_part_1/stage/trd_05e.c @@ -1,34 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt05_shape.h" -#define NAMESPACE A(trd_05e) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_o318, FALSE) - EVT_CALL(EnableModel, MODEL_mizu1, FALSE) - EVT_CALL(EnableModel, MODEL_mizu2, FALSE) - EVT_CALL(EnableModel, MODEL_mizu3, FALSE) - EVT_CALL(EnableModel, MODEL_ori, FALSE) - EVT_CALL(EnableModel, MODEL_saku1, FALSE) - EVT_CALL(EnableModel, MODEL_saku2, FALSE) - EVT_CALL(EnableModel, MODEL_mizu4, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05e.inc.c" diff --git a/src/battle/area/trd_part_1/stage/trd_05f.c b/src/battle/area/trd_part_1/stage/trd_05f.c index 1c3401828c..648637d788 100644 --- a/src/battle/area/trd_part_1/stage/trd_05f.c +++ b/src/battle/area/trd_part_1/stage/trd_05f.c @@ -1,36 +1,3 @@ #include "../area.h" -#include "mapfs/trd_bt05_shape.h" -#define NAMESPACE A(trd_05f) - -#include "battle/common/stage/BeachEffects.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_SET(LVar0, MODEL_o318) - EVT_EXEC(N(EVS_AnimateWave)) - EVT_CALL(EnableModel, MODEL_mizu1, FALSE) - EVT_CALL(EnableModel, MODEL_mizu2, FALSE) - EVT_CALL(EnableModel, MODEL_mizu3, FALSE) - EVT_CALL(EnableModel, MODEL_ori, FALSE) - EVT_CALL(EnableModel, MODEL_saku1, FALSE) - EVT_CALL(EnableModel, MODEL_saku2, FALSE) - EVT_CALL(EnableModel, MODEL_mizu4, FALSE) - EVT_CALL(EnableModel, MODEL_hako, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05f.inc.c" diff --git a/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c deleted file mode 100644 index ed6b1f1a6c..0000000000 --- a/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c +++ /dev/null @@ -1,822 +0,0 @@ -#include "common.h" -#include "effects.h" -#include "battle/battle.h" -#include "script_api/battle.h" -#include "sprite/npc/KoopaBros.h" - -#define NAMESPACE b_area_trd_part_2_blue_ninja_koopa - -extern s32 N(IdleAnimations_8022B5B0)[]; -extern EvtScript N(init_8022DC2C); -extern EvtScript N(idle_8022DD20); -extern EvtScript N(handleEvent_8022DD88); -extern EvtScript N(nextTurn_8022E424); -extern EvtScript N(takeTurn_8022E414); - -enum N(ActorPartIDs) { - PRT_MAIN = 1, -}; - -s32 N(DefenseTable_8022B4A0)[] = { - ELEMENT_NORMAL, 1, - ELEMENT_END, -}; - -s32 N(DefenseTable_8022B4AC)[] = { - ELEMENT_NORMAL, 0, - ELEMENT_END, -}; - -s32 N(StatusTable_8022B4B8)[] = { - STATUS_KEY_NORMAL, 0, - STATUS_KEY_DEFAULT, 0, - STATUS_KEY_SLEEP, 40, - STATUS_KEY_POISON, 0, - STATUS_KEY_FROZEN, 0, - STATUS_KEY_DIZZY, 30, - STATUS_KEY_FEAR, 0, - STATUS_KEY_STATIC, 0, - STATUS_KEY_PARALYZE, 60, - STATUS_KEY_SHRINK, 100, - STATUS_KEY_STOP, 75, - STATUS_TURN_MOD_DEFAULT, 0, - STATUS_TURN_MOD_SLEEP, -1, - STATUS_TURN_MOD_POISON, 0, - STATUS_TURN_MOD_FROZEN, 0, - STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, - STATUS_TURN_MOD_STATIC, 0, - STATUS_TURN_MOD_PARALYZE, -1, - STATUS_TURN_MOD_SHRINK, -1, - STATUS_TURN_MOD_STOP, -2, - STATUS_END, -}; - -ActorPartBlueprint N(ActorParts_8022B564)[] = { - { - .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = PRT_MAIN, - .posOffset = { 0, 0, 0 }, - .targetOffset = { -5, 36 }, - .opacity = 255, - .idleAnimations = N(IdleAnimations_8022B5B0), - .defenseTable = N(DefenseTable_8022B4A0), - .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, - .elementImmunityFlags = 0, - .projectileTargetOffset = { 0, 0 }, - }, -}; - -ActorBlueprint NAMESPACE = { - .flags = ACTOR_FLAG_NO_HEALTH_BAR | ACTOR_FLAG_NO_ATTACK, - .type = ACTOR_TYPE_BLUE_NINJAKOOPA, - .level = 17, - .maxHP = 5, - .partCount = ARRAY_COUNT( N(ActorParts_8022B564)), - .partsData = N(ActorParts_8022B564), - .initScript = &N(init_8022DC2C), - .statusTable = N(StatusTable_8022B4B8), - .escapeChance = 0, - .airLiftChance = 0, - .hurricaneChance = 0, - .spookChance = 0, - .upAndAwayChance = 0, - .spinSmashReq = 0, - .powerBounceChance = 85, - .coinReward = 0, - .size = { 38, 42 }, - .healthBarOffset = { 0, 0 }, - .statusIconOffset = { -10, 20 }, - .statusTextOffset = { 10, 20 }, -}; - -s32 N(IdleAnimations_8022B5B0)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Black_Anim04, - STATUS_KEY_STONE, ANIM_KoopaBros_Black_Anim00, - STATUS_KEY_SLEEP, ANIM_KoopaBros_Black_Anim15, - STATUS_KEY_POISON, ANIM_KoopaBros_Black_Anim00, - STATUS_KEY_STOP, ANIM_KoopaBros_Black_Anim00, - STATUS_KEY_STATIC, ANIM_KoopaBros_Black_Anim00, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Black_Anim00, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Black_Anim00, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Black_Anim18, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Black_Anim18, - STATUS_END, -}; - -s32 N(IdleAnimations_8022B604)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Black_Anim05, - STATUS_KEY_STONE, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_POISON, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_STOP, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_STATIC, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Black_Anim01, - STATUS_END, -}; - -s32 N(IdleAnimations_8022B640)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Black_Anim0D, - STATUS_KEY_STONE, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_POISON, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_STOP, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_STATIC, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Black_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Black_Anim01, - STATUS_END, -}; - -s32 N(IdleAnimations_8022B67C)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Black_Anim0C, - STATUS_KEY_STONE, ANIM_KoopaBros_Black_Anim17, - STATUS_KEY_SLEEP, ANIM_KoopaBros_Black_Anim17, - STATUS_KEY_POISON, ANIM_KoopaBros_Black_Anim17, - STATUS_KEY_STOP, ANIM_KoopaBros_Black_Anim17, - STATUS_KEY_STATIC, ANIM_KoopaBros_Black_Anim17, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Black_Anim17, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Black_Anim17, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Black_Anim22, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Black_Anim22, - STATUS_END, -}; - -s32 N(IdleAnimations_8022B6D0)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Black_Anim0A, - STATUS_END, -}; - -s32 N(IdleAnimations_8022B6DC)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Black_Anim0C, - STATUS_END, -}; - -#include "common/StartRumbleWithParams.inc.c" - -#include "common/UnkWhirlwindEffectFunc.inc.c" - -#include "common/UnkEnemyFunc.inc.c" - -#include "common/UnkEnemyPosFunc.inc.c" - -#include "common/GetLastActorEventType.inc.c" - -EvtScript N(8022B6E8) = { - EVT_CALL(SetOwnerID, ACTOR_ENEMY2) - EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_SWITCH(LVarA) - EVT_CASE_EQ(0) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B5B0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim04) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B604))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim05) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_WAIT(5) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B640))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0D) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(2) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, 192) - EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B640))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0D) - EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B6D0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0A) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(3) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(N(GetLastActorEventType), 14) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0E) - EVT_SET_CONST(LVar2, -1) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, 192) - EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B640))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0D) - EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B6D0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0A) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim08) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim09) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim1F) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim20) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_WAIT(15) - EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET(LocalFlag(0), 0) - EVT_IF_EQ(LVar0, 3) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0A) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B6D0))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(N(StartRumbleWithParams), 256, 5) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) - EVT_END_THREAD - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B6DC))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B67C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022B4AC))) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(6) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET(LocalFlag(0), 0) - EVT_IF_EQ(LVar0, 3) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B6D0))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(N(StartRumbleWithParams), 256, 5) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) - EVT_END_THREAD - EVT_END_IF - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4) - EVT_DIVF(LVar3, EVT_FLOAT(2.0)) - EVT_ADDF(LVar1, LVar3) - EVT_ADDF(LVar2, EVT_FLOAT(5.0)) - EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B6DC))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B67C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022B4AC))) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(9) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) - EVT_SUB(LVar0, 1) - EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) - EVT_WAIT(20) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) - EVT_WAIT(12) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_THREAD - EVT_SET(LVar0, 0) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 18, 0) - EVT_LOOP(4) - EVT_ADD(LVar0, 22) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -5, 36) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022B4A0))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B5B0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim04) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_WAIT(20) - EVT_END_SWITCH - EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(2) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_END_SWITCH - EVT_CASE_EQ(7) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim08) - EVT_WAIT(10) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_356) - EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_355) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_354) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(HIT_RESULT_LUCKY) - EVT_WAIT(20) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) - EVT_RETURN - EVT_CASE_EQ(HIT_RESULT_MISS) - EVT_RETURN - EVT_END_SWITCH - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVarA) - EVT_LABEL(0) - EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_IF_GT(LVar0, LVar3) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar1) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(13.0)) - EVT_CASE_EQ(3) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) - EVT_CASE_EQ(2) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) - EVT_END_SWITCH - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVarB) - EVT_SET(LVar0, LVarB) - EVT_SUB(LVar0, 1) - EVT_MUL(LVar0, 18) - EVT_SWITCH(LVarB) - EVT_CASE_EQ(4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -10) - EVT_CASE_EQ(3) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -7) - EVT_CASE_EQ(2) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -4) - EVT_END_SWITCH - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_CASE_EQ(3) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 50) - EVT_WAIT(50) - EVT_CASE_EQ(2) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 40) - EVT_WAIT(40) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim09) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) - EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim1B) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 22) - EVT_ADD(LVar1, 19) - EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim04) - EVT_WAIT(20) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 1, 0) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim1F) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) - EVT_CASE_EQ(5) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) - EVT_CASE_EQ(6) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) - EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 36, -7) - EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 18, -4) - EVT_CASE_EQ(6) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) - EVT_END_SWITCH - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 50) - EVT_WAIT(50) - EVT_CASE_EQ(5) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 40) - EVT_WAIT(40) - EVT_CASE_EQ(6) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim20) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim05) - EVT_WAIT(30) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(8) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(GetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SET(LVar2, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim03) - EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim1F) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_353) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(HIT_RESULT_LUCKY) - EVT_WAIT(20) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) - EVT_RETURN - EVT_CASE_EQ(HIT_RESULT_MISS) - EVT_RETURN - EVT_END_SWITCH - EVT_LABEL(0) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_IF_GT(LVar0, LVar3) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SET(LVar2, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim09) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) - EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim1B) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 22) - EVT_ADD(LVar1, 19) - EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim03) - EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -513) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_END_SWITCH - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_8022DC2C) = { - EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8022E414))) - EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022DD20))) - EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022DD88))) - EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022E424))) - EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(idle_8022DD20) = { - EVT_RETURN - EVT_END -}; - -s32 N(intTable_8022DD30)[] = { - 0x00000009, 0x00000010, 0x00000016, 0x0000001A, 0x0000001E, 0x00000020, 0x00000021, 0x00000020, - 0x0000001E, 0x0000001A, 0x00000016, 0x00000010, 0x00000009, 0x00000000, 0x00000004, 0x00000006, - 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, -}; - -EvtScript N(handleEvent_8022DD88) = { - EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(EVENT_HIT_COMBO) - EVT_CASE_OR_EQ(EVENT_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_END_CASE_GROUP - EVT_CASE_EQ(EVENT_BURN_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0E) - EVT_SET_CONST(LVar2, ANIM_KoopaBros_Black_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_CASE_EQ(EVENT_BURN_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0E) - EVT_SET_CONST(LVar2, ANIM_KoopaBros_Black_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) - EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_FLIP_TRIGGER) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022B67C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022B4AC))) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0B) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) - EVT_THREAD - EVT_WAIT(4) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 30) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -30) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -60) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) - EVT_WAIT(1) - EVT_END_THREAD - EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim0C) - EVT_END_IF - EVT_USE_BUF(EVT_PTR(N(intTable_8022DD30))) - EVT_LOOP(22) - EVT_BUF_READ1(LVar0) - EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) - EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim08) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Black_Anim09) - EVT_WAIT(10) - EVT_END_IF - EVT_ELSE - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0C) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_CASE_EQ(EVENT_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_RECOVER_STATUS) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Black_Anim04) - EVT_EXEC_WAIT(EVS_Enemy_Recover) - EVT_END_IF - EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) - EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(takeTurn_8022E414) = { - EVT_RETURN - EVT_END -}; - -EvtScript N(nextTurn_8022E424) = { - EVT_RETURN - EVT_END -}; diff --git a/src/battle/area/trd_part_2/actor/boss.h b/src/battle/area/trd_part_2/actor/boss.h new file mode 100644 index 0000000000..26092e903d --- /dev/null +++ b/src/battle/area/trd_part_2/actor/boss.h @@ -0,0 +1,93 @@ +#include "common.h" + +/** + * Koopa Bros Boss Fight + * + * The fake_bowser actor controls both parts of the boss battle. + * During the first part, it uses ANIM commands defined in fake_bowser to animate models from trd_00 forming the parts + * of its body. In this phase, each group of models (head, shell, feet, etc.) are tethered to a corresponding ActorPart + * which the animation scripts operate on. + * + * During the second part, four 'dummy' Koopa Bros actors are enabled, which all have identical behavior. Their actions + * are completely governed by fake_bowser; they are only responsible for executing animations in response to commands + * issued by fake_bowser. These commands are listed in the enum below as BOSS_CMD_*. They mostly pertain to the state of + * the 'tower'. + * + * During each turn, fake_bowser will attempt to form a Koopa Bros tower. If none exists, all standing Koopa Bros are + * used to create one. If one already exists and an idle Koopa Bros is found, they are joined with the tower (This can + * occur if the Koopa in question wass incapacitated when the tower was built). If a valid tower exists, a spin attack + * is executed. + * + * The tower topples when hit twice in one turn by the player or when hit with an explosive or electic attack. A single + * hit puts the tower into an 'unstable' or 'tipping' state. If not knocked over by the start of fake_bowser's turn, + * the tower will regain stability. + * + * The current state of the tower is stored in fake_bowser's actor var AVAR_Boss_TowerState + * The state of each Koopa is stored in their actor var AVAR_Koopa_State +*/ + +enum N(ActorIDs) { + GREEN_ACTOR = ACTOR_ENEMY0, + YELLOW_ACTOR = ACTOR_ENEMY1, + BLACK_ACTOR = ACTOR_ENEMY2, + RED_ACTOR = ACTOR_ENEMY3, + BOSS_ACTOR = ACTOR_ENEMY4, + FIRST_KOOPA_ACTOR = ACTOR_ENEMY0, +}; + +enum { + // boss actor vars + AVAR_Boss_Flags = 0, + AVAR_Boss_TowerState = 1, + AVAR_Boss_BowserTaunts = 2, + AVAR_Boss_TowerHeight = 3, + AVAR_Boss_TopKoopaID = 4, // top of the tower upon tower formation + AVAR_Boss_LeadKoopaID = 5, // top of the tower during spin attack (invalid at other times) + // flag values for boss var 0 + AFLAG_Boss_KoopaBrosRevealed = 0x001, + AFLAG_Boss_Dialogue_HaveATaste = 0x002, + AFLAG_Boss_Dialogue_SpinAttack = 0x004, + AFLAG_Boss_Dialogue_BowserReveal = 0x008, + AFLAG_Boss_TowerUnstable = 0x010, + AFLAG_Boss_Dialogue_WereGoingOver = 0x020, + AFLAG_Boss_PlayerHitTower = 0x040, + AFLAG_Boss_PartnerHitTower = 0x080, + AFLAG_Boss_DoneTowerUpdate = 0x100, + AFLAG_Boss_DoingSoloAttack = 0x200, + // state values for tower (AVAR_Boss_TowerState) + AVAL_Boss_TowerState_None = 0, + AVAL_Boss_TowerState_Stable = 1, + AVAL_Boss_TowerState_Unstable = 2, + AVAL_Boss_TowerState_Toppled = 3, // also init value to prevent first-turn tower attack + + // actor vars for each koopa + AVAR_Koopa_State = 1, + AVAR_Koopa_ToppledTurns = 2, // number of toppled turns remaining + // state values for koopas (AVAR_Koopa_State) + AVAL_Koopa_State_Ready = 0, + AVAL_Koopa_State_Toppled = 1, + AVAL_Koopa_State_GotUp = 2, + AVAL_Koopa_State_PosA = 3, // top position + AVAL_Koopa_State_PosD = 4, // above posC + AVAL_Koopa_State_PosC = 5, // above posB + AVAL_Koopa_State_PosB = 6, // bottom position + + // position in the koopa bros tower + TOWER_TOP = 0, + TOWER_DOWN_1 = 1, + TOWER_DOWN_2 = 2, + TOWER_DOWN_3 = 3, + + // commands sent to koopa bros from boss + BOSS_CMD_STABLE = 0, + BOSS_CMD_UNSTABLE = 1, + BOSS_CMD_HIT = 2, + BOSS_CMD_BURN_HIT = 3, + BOSS_CMD_NO_DAMAGE_HIT = 4, + BOSS_CMD_TOPPLE_HIT = 5, + BOSS_CMD_TOPPLE_BURN_HIT = 6, + BOSS_CMD_SPIN_ATTACK = 7, + BOSS_CMD_SOLO_ATTACK = 8, + BOSS_CMD_TRY_GET_UP = 9, + BOSS_CMD_GET_READY = 10, +}; diff --git a/src/battle/area/trd_part_2/actor/red_ninja_koopa.c b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c similarity index 54% rename from src/battle/area/trd_part_2/actor/red_ninja_koopa.c rename to src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c index da40fcdc4b..21ee558a78 100644 --- a/src/battle/area/trd_part_2/actor/red_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c @@ -1,42 +1,37 @@ -#include "common.h" -#include "effects.h" -#include "battle/battle.h" -#include "script_api/battle.h" -#include "sprite/npc/KoopaBros.h" +#include "../area.h" +#include "boss.h" -#define NAMESPACE b_area_trd_part_2_red_ninja_koopa - -extern s32 N(IdleAnimations_80228610)[]; -extern EvtScript N(init_8022AC8C); -extern EvtScript N(idle_8022AD80); -extern EvtScript N(handleEvent_8022ADE8); -extern EvtScript N(nextTurn_8022B484); -extern EvtScript N(takeTurn_8022B474); +extern s32 N(DefaultAnims)[]; +extern EvtScript N(EVS_Init); +extern EvtScript N(EVS_Idle); +extern EvtScript N(EVS_HandleEvent); +extern EvtScript N(EVS_HandlePhase); +extern EvtScript N(EVS_TakeTurn); enum N(ActorPartIDs) { PRT_MAIN = 1, }; -s32 N(DefenseTable_80228500)[] = { +s32 N(DefaultDefense)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(DefenseTable_8022850C)[] = { +s32 N(ToppledDefense)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(StatusTable_80228518)[] = { +s32 N(StatusTable)[] = { STATUS_KEY_NORMAL, 0, STATUS_KEY_DEFAULT, 0, - STATUS_KEY_SLEEP, 30, + STATUS_KEY_SLEEP, THIS_SLEEP_CHANCE, STATUS_KEY_POISON, 0, STATUS_KEY_FROZEN, 0, - STATUS_KEY_DIZZY, 60, + STATUS_KEY_DIZZY, THIS_DIZZY_CHANCE, STATUS_KEY_FEAR, 0, STATUS_KEY_STATIC, 0, - STATUS_KEY_PARALYZE, 60, + STATUS_KEY_PARALYZE, THIS_PARALYZE_CHANCE, STATUS_KEY_SHRINK, 100, STATUS_KEY_STOP, 75, STATUS_TURN_MOD_DEFAULT, 0, @@ -52,15 +47,15 @@ s32 N(StatusTable_80228518)[] = { STATUS_END, }; -ActorPartBlueprint N(ActorParts_802285C4)[] = { +ActorPartBlueprint N(ActorParts)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PRT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 36 }, .opacity = 255, - .idleAnimations = N(IdleAnimations_80228610), - .defenseTable = N(DefenseTable_80228500), + .idleAnimations = N(DefaultAnims), + .defenseTable = N(DefaultDefense), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -69,13 +64,13 @@ ActorPartBlueprint N(ActorParts_802285C4)[] = { ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_NO_HEALTH_BAR | ACTOR_FLAG_NO_ATTACK, - .type = ACTOR_TYPE_RED_NINJAKOOPA, - .level = 17, + .type = THIS_ACTOR_TYPE, + .level = THIS_LEVEL, .maxHP = 5, - .partCount = ARRAY_COUNT( N(ActorParts_802285C4)), - .partsData = N(ActorParts_802285C4), - .initScript = &N(init_8022AC8C), - .statusTable = N(StatusTable_80228518), + .partCount = ARRAY_COUNT( N(ActorParts)), + .partsData = N(ActorParts), + .initScript = &N(EVS_Init), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -90,196 +85,371 @@ ActorBlueprint NAMESPACE = { .statusTextOffset = { 10, 20 }, }; -s32 N(IdleAnimations_80228610)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Red_Anim04, - STATUS_KEY_STONE, ANIM_KoopaBros_Red_Anim00, - STATUS_KEY_SLEEP, ANIM_KoopaBros_Red_Anim15, - STATUS_KEY_POISON, ANIM_KoopaBros_Red_Anim00, - STATUS_KEY_STOP, ANIM_KoopaBros_Red_Anim00, - STATUS_KEY_STATIC, ANIM_KoopaBros_Red_Anim00, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Red_Anim00, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Red_Anim00, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Red_Anim18, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Red_Anim18, +s32 N(DefaultAnims)[] = { + STATUS_KEY_NORMAL, THIS_ANIM_IDLE, + STATUS_KEY_STONE, THIS_ANIM_STILL, + STATUS_KEY_SLEEP, THIS_ANIM_SLEEP, + STATUS_KEY_POISON, THIS_ANIM_STILL, + STATUS_KEY_STOP, THIS_ANIM_STILL, + STATUS_KEY_STATIC, THIS_ANIM_STILL, + STATUS_KEY_PARALYZE, THIS_ANIM_STILL, + STATUS_KEY_PARALYZE, THIS_ANIM_STILL, + STATUS_KEY_DIZZY, THIS_ANIM_DIZZY, + STATUS_KEY_DIZZY, THIS_ANIM_DIZZY, STATUS_END, }; -s32 N(IdleAnimations_80228664)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Red_Anim05, - STATUS_KEY_STONE, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_POISON, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_STOP, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_STATIC, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Red_Anim01, +s32 N(TowerAnims)[] = { + STATUS_KEY_NORMAL, THIS_ANIM_TOWER_IDLE, + STATUS_KEY_STONE, THIS_ANIM_TOWER_STILL, + STATUS_KEY_POISON, THIS_ANIM_TOWER_STILL, + STATUS_KEY_STOP, THIS_ANIM_TOWER_STILL, + STATUS_KEY_STATIC, THIS_ANIM_TOWER_STILL, + STATUS_KEY_PARALYZE, THIS_ANIM_TOWER_STILL, + STATUS_KEY_PARALYZE, THIS_ANIM_TOWER_STILL, STATUS_END, }; -s32 N(IdleAnimations_802286A0)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Red_Anim0D, - STATUS_KEY_STONE, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_POISON, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_STOP, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_STATIC, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Red_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Red_Anim01, +s32 N(TippingAnims)[] = { + STATUS_KEY_NORMAL, THIS_ANIM_TIPPING_IDLE, + STATUS_KEY_STONE, THIS_ANIM_TOWER_STILL, + STATUS_KEY_POISON, THIS_ANIM_TOWER_STILL, + STATUS_KEY_STOP, THIS_ANIM_TOWER_STILL, + STATUS_KEY_STATIC, THIS_ANIM_TOWER_STILL, + STATUS_KEY_PARALYZE, THIS_ANIM_TOWER_STILL, + STATUS_KEY_PARALYZE, THIS_ANIM_TOWER_STILL, STATUS_END, }; -s32 N(IdleAnimations_802286DC)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Red_Anim0C, - STATUS_KEY_STONE, ANIM_KoopaBros_Red_Anim17, - STATUS_KEY_SLEEP, ANIM_KoopaBros_Red_Anim17, - STATUS_KEY_POISON, ANIM_KoopaBros_Red_Anim17, - STATUS_KEY_STOP, ANIM_KoopaBros_Red_Anim17, - STATUS_KEY_STATIC, ANIM_KoopaBros_Red_Anim17, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Red_Anim17, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Red_Anim17, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Red_Anim22, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Red_Anim22, +s32 N(ToppledAnims)[] = { + STATUS_KEY_NORMAL, THIS_ANIM_TOPPLE_IDLE, + STATUS_KEY_STONE, THIS_ANIM_TOPPLE_STILL, + STATUS_KEY_SLEEP, THIS_ANIM_TOPPLE_STILL, + STATUS_KEY_POISON, THIS_ANIM_TOPPLE_STILL, + STATUS_KEY_STOP, THIS_ANIM_TOPPLE_STILL, + STATUS_KEY_STATIC, THIS_ANIM_TOPPLE_STILL, + STATUS_KEY_PARALYZE, THIS_ANIM_TOPPLE_STILL, + STATUS_KEY_PARALYZE, THIS_ANIM_TOPPLE_STILL, + STATUS_KEY_DIZZY, THIS_ANIM_TOPPLE_DIZZY, + STATUS_KEY_DIZZY, THIS_ANIM_TOPPLE_DIZZY, STATUS_END, }; -s32 N(IdleAnimations_80228730)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Red_Anim0A, +s32 N(BasicHurtAnims)[] = { + STATUS_KEY_NORMAL, THIS_ANIM_HURT_STILL, STATUS_END, }; -s32 N(IdleAnimations_8022873C)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Red_Anim0C, +s32 N(BasicToppledAnims)[] = { + STATUS_KEY_NORMAL, THIS_ANIM_TOPPLE_IDLE, STATUS_END, }; #include "common/StartRumbleWithParams.inc.c" -#include "common/UnkWhirlwindEffectFunc.inc.c" +BSS PlayerStatus N(DummyPlayerStatus); -#include "common/UnkEnemyFunc.inc.c" +API_CALLABLE(N(SpawnSpinEffect)) { + Bytecode* args = script->ptrReadPos; + s32 posX = evt_get_variable(script, *args++); + s32 posY = evt_get_variable(script, *args++); + s32 posZ = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); -#include "common/UnkEnemyPosFunc.inc.c" + N(DummyPlayerStatus).position.x = posX; + N(DummyPlayerStatus).position.y = posY - 10.0f; + N(DummyPlayerStatus).position.z = posZ; -#include "common/GetLastActorEventType.inc.c" + fx_46(6, &N(DummyPlayerStatus), 1.0f, duration); + return ApiStatus_DONE2; +} -EvtScript N(80228748) = { - EVT_CALL(SetOwnerID, ACTOR_ENEMY3) +Actor* N(GetKoopaBrosWithState)(s32 state) { + Actor* actor = get_actor(GREEN_ACTOR); + if (actor != NULL && actor->state.varTable[AVAR_Koopa_State] == state) { + return actor; + } + + actor = get_actor(YELLOW_ACTOR); + if (actor != NULL && actor->state.varTable[AVAR_Koopa_State] == state) { + return actor; + } + + actor = get_actor(BLACK_ACTOR); + if (actor != NULL && actor->state.varTable[AVAR_Koopa_State] == state) { + return actor; + } + + actor = get_actor(RED_ACTOR); + if (actor != NULL && actor->state.varTable[AVAR_Koopa_State] == state) { + return actor; + } + + return NULL; +} + +API_CALLABLE(N(GetTowerFallPosition)) { + Bytecode* args = script->ptrReadPos; + Vec3f temp; + Vec3f fallPositions[4]; + s32 height; + s32 ownerState; + Actor* enemy; + Vec3f* iVec; + Vec3f* jVec; + s32 i, j; + + height = get_actor(BOSS_ACTOR)->state.varTable[AVAR_Boss_TowerHeight]; + switch (height) { + case 2: + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosA)); + fallPositions[0].x = enemy->homePos.x; + fallPositions[0].y = enemy->homePos.y; + fallPositions[0].z = enemy->homePos.z; + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosB)); + fallPositions[1].x = enemy->homePos.x; + fallPositions[1].y = enemy->homePos.y; + fallPositions[1].z = enemy->homePos.z; + break; + case 3: + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosA)); + fallPositions[0].x = enemy->homePos.x; + fallPositions[0].y = enemy->homePos.y; + fallPositions[0].z = enemy->homePos.z; + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosC)); + fallPositions[1].x = enemy->homePos.x; + fallPositions[1].y = enemy->homePos.y; + fallPositions[1].z = enemy->homePos.z; + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosB)); + fallPositions[2].x = enemy->homePos.x; + fallPositions[2].y = enemy->homePos.y; + fallPositions[2].z = enemy->homePos.z; + break; + case 4: + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosA)); + fallPositions[0].x = enemy->homePos.x; + fallPositions[0].y = enemy->homePos.y; + fallPositions[0].z = enemy->homePos.z; + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosD)); + fallPositions[1].x = enemy->homePos.x; + fallPositions[1].y = enemy->homePos.y; + fallPositions[1].z = enemy->homePos.z; + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosC)); + fallPositions[2].x = enemy->homePos.x; + fallPositions[2].y = enemy->homePos.y; + fallPositions[2].z = enemy->homePos.z; + enemy = N(GetKoopaBrosWithState(AVAL_Koopa_State_PosB)); + fallPositions[3].x = enemy->homePos.x; + fallPositions[3].y = enemy->homePos.y; + fallPositions[3].z = enemy->homePos.z; + break; + } + + for (i = 0; i < height - 1; i++) { + for (j = i; j < height; j++) { + iVec = &fallPositions[i]; + jVec = &fallPositions[j]; + if (iVec->x < jVec->x) { + temp = *iVec; + *iVec = *jVec; + *jVec = temp; + } + } + } + + ownerState = get_actor(script->owner1.enemyID)->state.varTable[AVAR_Koopa_State]; + switch (height) { + case 2: + switch (ownerState) { + case AVAL_Koopa_State_PosA: + evt_set_variable(script, *args++, fallPositions[0].x); + evt_set_variable(script, *args++, fallPositions[0].y); + evt_set_variable(script, *args++, fallPositions[0].z); + break; + case AVAL_Koopa_State_PosB: + evt_set_variable(script, *args++, fallPositions[1].x); + evt_set_variable(script, *args++, fallPositions[1].y); + evt_set_variable(script, *args++, fallPositions[1].z); + break; + } + break; + case 3: + switch (ownerState) { + case AVAL_Koopa_State_PosA: + evt_set_variable(script, *args++, fallPositions[0].x); + evt_set_variable(script, *args++, fallPositions[0].y); + evt_set_variable(script, *args++, fallPositions[0].z); + break; + case AVAL_Koopa_State_PosC: + evt_set_variable(script, *args++, fallPositions[1].x); + evt_set_variable(script, *args++, fallPositions[1].y); + evt_set_variable(script, *args++, fallPositions[1].z); + break; + case AVAL_Koopa_State_PosB: + evt_set_variable(script, *args++, fallPositions[2].x); + evt_set_variable(script, *args++, fallPositions[2].y); + evt_set_variable(script, *args++, fallPositions[2].z); + break; + } + break; + case 4: + switch (ownerState) { + case AVAL_Koopa_State_PosA: + evt_set_variable(script, *args++, fallPositions[0].x); + evt_set_variable(script, *args++, fallPositions[0].y); + evt_set_variable(script, *args++, fallPositions[0].z); + break; + case AVAL_Koopa_State_PosD: + evt_set_variable(script, *args++, fallPositions[1].x); + evt_set_variable(script, *args++, fallPositions[1].y); + evt_set_variable(script, *args++, fallPositions[1].z); + break; + case AVAL_Koopa_State_PosC: + evt_set_variable(script, *args++, fallPositions[2].x); + evt_set_variable(script, *args++, fallPositions[2].y); + evt_set_variable(script, *args++, fallPositions[2].z); + break; + case AVAL_Koopa_State_PosB: + evt_set_variable(script, *args++, fallPositions[3].x); + evt_set_variable(script, *args++, fallPositions[3].y); + evt_set_variable(script, *args++, fallPositions[3].z); + break; + } + break; + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetLastActorEventType)) { + Bytecode* args = script->ptrReadPos; + Actor* actor = get_actor(script->owner1.actorID); + + actor->lastEventType = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} + +// respond to commands issued from BOSS_ACTOR +// (in) LVarA : event +EvtScript N(HandleCommand) = { + EVT_CALL(SetOwnerID, THIS_ACTOR_ID) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, 0) EVT_RETURN EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_SWITCH(LVarA) - EVT_CASE_EQ(0) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_STABLE) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80228610))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim04) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80228664))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim05) + EVT_CASE_EQ(AVAL_Koopa_State_PosA) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefaultAnims))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_IDLE) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(TowerAnims))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOWER_IDLE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_UNSTABLE) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) EVT_WAIT(5) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_802286A0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0D) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(TippingAnims))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TIPPING_IDLE) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CASE_EQ(2) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_HIT) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_HURT) EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, 192) - EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_802286A0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0D) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, AFLAG_Boss_PlayerHitTower | AFLAG_Boss_PartnerHitTower) + EVT_IF_NE(LVar0, AFLAG_Boss_PlayerHitTower | AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(TippingAnims))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TIPPING_IDLE) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80228730))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0A) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(BasicHurtAnims))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_HURT_STILL) EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CASE_EQ(3) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_BURN_HIT) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(N(GetLastActorEventType), 14) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0E) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(N(GetLastActorEventType), EVENT_BURN_HIT) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_BURN) EVT_SET_CONST(LVar2, -1) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, 192) - EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_802286A0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0D) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, AFLAG_Boss_PlayerHitTower | AFLAG_Boss_PartnerHitTower) + EVT_IF_NE(LVar0, AFLAG_Boss_PlayerHitTower | AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(TippingAnims))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TIPPING_IDLE) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80228730))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0A) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(BasicHurtAnims))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_HURT_STILL) EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_NO_DAMAGE_HIT) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim08) + EVT_CASE_EQ(AVAL_Koopa_State_PosA) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_TOP_ENTER_SHELL) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim09) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim1F) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOP_EXIT_SHELL) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_ENTER_SHELL) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim20) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_EXIT_SHELL) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(15) - EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_TOPPLE_HIT) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET(LocalFlag(0), 0) - EVT_IF_EQ(LVar0, 3) - EVT_SET(LocalFlag(0), 1) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_SET(LFlag0, FALSE) + EVT_IF_EQ(LVar0, AVAL_Koopa_State_PosA) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) + EVT_CALL(N(GetTowerFallPosition), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0A) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80228730))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_HURT_STILL) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(BasicHurtAnims))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022873C))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOPPLE_IDLE) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(BasicToppledAnims))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) @@ -287,31 +457,31 @@ EvtScript N(80228748) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_802286DC))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022850C))) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(ToppledAnims))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(ToppledDefense))) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_State, AVAL_Koopa_State_Toppled) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_ToppledTurns, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CASE_EQ(6) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_TOPPLE_BURN_HIT) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET(LocalFlag(0), 0) - EVT_IF_EQ(LVar0, 3) - EVT_SET(LocalFlag(0), 1) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_SET(LFlag0, FALSE) + EVT_IF_EQ(LVar0, AVAL_Koopa_State_PosA) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) + EVT_CALL(N(GetTowerFallPosition), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80228730))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_BURN) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(BasicHurtAnims))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) @@ -324,8 +494,8 @@ EvtScript N(80228748) = { EVT_ADDF(LVar2, EVT_FLOAT(5.0)) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022873C))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOPPLE_IDLE) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(BasicToppledAnims))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) @@ -333,25 +503,27 @@ EvtScript N(80228748) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_802286DC))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022850C))) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(ToppledAnims))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(ToppledDefense))) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_State, AVAL_Koopa_State_Toppled) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_ToppledTurns, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CASE_EQ(9) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_TRY_GET_UP) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) + EVT_CASE_EQ(AVAL_Koopa_State_Toppled) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_ToppledTurns, LVar0) EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) + // still has topple turns left, just struggle a bit + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_ToppledTurns, LVar0) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_ELSE + // topple turns are over, koopa bros can get up EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(12) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) @@ -374,28 +546,29 @@ EvtScript N(80228748) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -5, 36) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_80228500))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80228610))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim04) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_State, AVAL_Koopa_State_GotUp) + EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefaultDefense))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefaultAnims))) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_IDLE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CASE_DEFAULT EVT_WAIT(20) EVT_END_SWITCH - EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_GET_READY) + // if koopa just got up, change its state to ready + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(2) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CASE_EQ(AVAL_Koopa_State_GotUp) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_State, AVAL_Koopa_State_Ready) EVT_END_SWITCH - EVT_CASE_EQ(7) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_SPIN_ATTACK) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim08) + EVT_CASE_EQ(AVAL_Koopa_State_PosA) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOP_ENTER_SHELL) EVT_WAIT(10) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_356) @@ -404,9 +577,9 @@ EvtScript N(80228748) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_354) EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 60) EVT_WAIT(60) EVT_THREAD EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) @@ -418,7 +591,7 @@ EvtScript N(80228748) = { EVT_CASE_EQ(HIT_RESULT_MISS) EVT_RETURN EVT_END_SWITCH - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVarA) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TopKoopaID, LVarA) EVT_LABEL(0) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) @@ -428,14 +601,14 @@ EvtScript N(80228748) = { EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar1) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(4) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(13.0)) @@ -460,11 +633,11 @@ EvtScript N(80228748) = { EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) EVT_END_THREAD - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVarB) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVarB) EVT_SET(LVar0, LVarB) EVT_SUB(LVar0, 1) EVT_MUL(LVar0, 18) @@ -478,51 +651,51 @@ EvtScript N(80228748) = { EVT_END_SWITCH EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(4) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 60) EVT_WAIT(60) EVT_CASE_EQ(3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 50) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 50) EVT_WAIT(50) EVT_CASE_EQ(2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 40) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 40) EVT_WAIT(40) EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOP_EXIT_SHELL) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim1B) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_POINT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_IDLE) EVT_WAIT(20) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 1, 0) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim1F) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_TowerState, 0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_ENTER_SHELL) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 60) EVT_WAIT(60) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) + EVT_CASE_EQ(AVAL_Koopa_State_PosD) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) - EVT_CASE_EQ(5) + EVT_CASE_EQ(AVAL_Koopa_State_PosC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) - EVT_CASE_EQ(6) + EVT_CASE_EQ(AVAL_Koopa_State_PosB) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_END_SWITCH EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) @@ -542,22 +715,22 @@ EvtScript N(80228748) = { EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) EVT_END_THREAD - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) + EVT_CASE_EQ(AVAL_Koopa_State_PosD) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 36, -7) - EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) + EVT_CASE_EQ(AVAL_Koopa_State_PosC) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 18, -4) - EVT_CASE_EQ(6) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) + EVT_CASE_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) @@ -565,42 +738,42 @@ EvtScript N(80228748) = { EVT_END_SWITCH EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) + EVT_CASE_EQ(AVAL_Koopa_State_PosD) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 50) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 50) EVT_WAIT(50) - EVT_CASE_EQ(5) + EVT_CASE_EQ(AVAL_Koopa_State_PosC) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 40) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 40) EVT_WAIT(40) - EVT_CASE_EQ(6) + EVT_CASE_EQ(AVAL_Koopa_State_PosB) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 30) EVT_WAIT(30) EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim20) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_EXIT_SHELL) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOWER_IDLE) EVT_WAIT(30) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CASE_EQ(8) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_CASE_EQ(BOSS_CMD_SOLO_ATTACK) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) + EVT_CASE_EQ(AVAL_Koopa_State_Ready) EVT_CALL(GetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar2, 15) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_RUN) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim1F) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_ENTER_SHELL) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_353) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 30) EVT_WAIT(30) EVT_THREAD EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) @@ -650,102 +823,98 @@ EvtScript N(80228748) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) + EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 30) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOP_EXIT_SHELL) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim1B) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_POINT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_RUN) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -513) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, ~AFLAG_Boss_DoingSoloAttack) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_SWITCH EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript N(init_8022AC8C) = { - EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8022B474))) - EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022AD80))) - EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022ADE8))) - EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022B484))) +EvtScript N(EVS_Init) = { + EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(EVS_TakeTurn))) + EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(EVS_Idle))) + EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_HandleEvent))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(EVS_HandlePhase))) EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_State, AVAL_Koopa_State_Ready) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_ToppledTurns, 0) EVT_RETURN EVT_END }; -EvtScript N(idle_8022AD80) = { +EvtScript N(EVS_Idle) = { EVT_RETURN EVT_END }; -s32 N(intTable_8022AD90)[] = { - 0x00000009, 0x00000010, 0x00000016, 0x0000001A, 0x0000001E, 0x00000020, 0x00000021, 0x00000020, - 0x0000001E, 0x0000001A, 0x00000016, 0x00000010, 0x00000009, 0x00000000, 0x00000004, 0x00000006, - 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, -}; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; -EvtScript N(handleEvent_8022ADE8) = { +EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_HURT) EVT_EXEC_WAIT(EVS_Enemy_Hit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0E) - EVT_SET_CONST(LVar2, ANIM_KoopaBros_Red_Anim0F) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_BURN) + EVT_SET_CONST(LVar2, THIS_ANIM_BURN_STILL) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0E) - EVT_SET_CONST(LVar2, ANIM_KoopaBros_Red_Anim0F) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_BURN) + EVT_SET_CONST(LVar2, THIS_ANIM_BURN_STILL) EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0F) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_BURN_STILL) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_HURT) EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_HURT) EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_HURT) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_802286DC))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022850C))) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_State, AVAL_Koopa_State_Toppled) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Koopa_ToppledTurns, 2) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(ToppledAnims))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(ToppledDefense))) EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0B) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) + EVT_IF_EQ(LVar0, AVAL_Koopa_State_Ready) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_HURT) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD EVT_WAIT(4) @@ -761,10 +930,10 @@ EvtScript N(handleEvent_8022ADE8) = { EVT_WAIT(1) EVT_END_THREAD EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOPPLE_IDLE) EVT_END_IF - EVT_USE_BUF(EVT_PTR(N(intTable_8022AD90))) - EVT_LOOP(22) + EVT_USE_BUF(EVT_PTR(N(FlipPosOffsets))) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) @@ -773,35 +942,35 @@ EvtScript N(handleEvent_8022ADE8) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim08) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) + EVT_IF_EQ(LVar0, AVAL_Koopa_State_Ready) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_TOP_ENTER_SHELL) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Red_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOP_EXIT_SHELL) EVT_WAIT(10) EVT_END_IF EVT_ELSE - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0C) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_TOPPLE_IDLE) EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_HURT) EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim0B) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_HURT) EVT_EXEC_WAIT(EVS_Enemy_Death) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Red_Anim04) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Koopa_State, LVar0) + EVT_IF_EQ(LVar0, AVAL_Koopa_State_Ready) + EVT_SET_CONST(LVar0, PRT_MAIN) + EVT_SET_CONST(LVar1, THIS_ANIM_IDLE) EVT_EXEC_WAIT(EVS_Enemy_Recover) EVT_END_IF EVT_END_SWITCH @@ -811,12 +980,12 @@ EvtScript N(handleEvent_8022ADE8) = { EVT_END }; -EvtScript N(takeTurn_8022B474) = { +EvtScript N(EVS_TakeTurn) = { EVT_RETURN EVT_END }; -EvtScript N(nextTurn_8022B484) = { +EvtScript N(EVS_HandlePhase) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index 512eb21e1f..d6515852c5 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -1,62 +1,88 @@ -#include "common.h" -#include "effects.h" -#include "battle/battle.h" -#include "script_api/battle.h" +#include "../area.h" #include "sprite/npc/KoopaBros.h" +#include "mapfs/trd_bt00_shape.h" -#define NAMESPACE b_area_trd_part_2_fake_bowser +#define NAMESPACE A(fake_bowser) -extern EvtScript b_area_trd_part_2_green_ninja_koopa_802257A8; -extern EvtScript b_area_trd_part_2_red_ninja_koopa_80228748; -extern EvtScript b_area_trd_part_2_blue_ninja_koopa_8022B6E8; -extern EvtScript b_area_trd_part_2_yellow_ninja_koopa_8022E688; +#include "boss.h" -extern EvtScript N(init_8021A968); -extern EvtScript N(handleEvent_8021E6F0); -extern EvtScript N(handleEvent_802242FC); -extern EvtScript N(idle_8021D508); -extern EvtScript N(idle_802239BC); -extern EvtScript N(nextTurn_8021F410); -extern EvtScript N(nextTurn_80225438); -extern EvtScript N(takeTurn_8021EC98); -extern EvtScript N(takeTurn_80224D84); -extern EvtScript N(8021E3A0); -extern EvtScript N(8021F630); -extern EvtScript N(80222C44); -extern EvtScript N(80223870); +extern EvtScript N(EVS_Init); +// first part of the battle +extern EvtScript N(EVS_FakeBowser_Idle); +extern EvtScript N(EVS_FakeBowser_HandleEvent); +extern EvtScript N(EVS_FakeBowser_HandlePhase); +extern EvtScript N(EVS_FakeBowser_TakeTurn); +// second part of the battle +extern EvtScript N(EVS_KoopaBros_Idle); +extern EvtScript N(EVS_KoopaBros_HandleEvent); +extern EvtScript N(EVS_KoopaBros_HandlePhase); +extern EvtScript N(EVS_KoopaBros_TakeTurn); -BSS s32 D_80235FC0[31]; +extern EvtScript A(green_ninja_koopa_HandleCommand); +extern EvtScript A(red_ninja_koopa_HandleCommand); +extern EvtScript A(black_ninja_koopa_HandleCommand); +extern EvtScript A(yellow_ninja_koopa_HandleCommand); + +extern EvtScript N(EVS_SpawnDamageFX); +extern EvtScript N(EVS_KoopaBrosEnter); +extern EvtScript N(EVS_TryFormingTower); +extern EvtScript N(EVS_BroadcastToKoopaBros); + +// only the first element is actually used +BSS s32 FakeBowserAnimState[31]; enum N(ActorPartIDs) { - PRT_MAIN = 1, - PRT_2 = 2, - PRT_3 = 3, - PRT_4 = 4, - PRT_5 = 5, - PRT_6 = 6, - PRT_7 = 7, - PRT_8 = 8, - PRT_9 = 9, - PRT_10 = 10, - PRT_11 = 11, + // the targetable bowser in part 1 + PRT_TARGET = 1, + // the targetable koopa bros tower in part 2 + PRT_TOWER = 2, + // non-targetable parts of the bowser robot use to animate breaking apart + PRT_BODY = 3, + PRT_SHELL = 4, + PRT_HEAD = 5, + PRT_LEFT_ARM = 6, + PRT_TAIL = 7, + PRT_FRONT_WHEELS = 8, + PRT_BACK_WHEELS = 9, + PRT_FEET = 10, + PRT_RIGHT_ARM = 11, +}; + +enum N(ActorParams) { + DMG_STRIKE = 1, +}; + +enum N(AnimState) { + ANIM_BEGIN_IDLE = 0, + ANIM_DOING_IDLE = 1, + ANIM_BEGIN_HURT = 2, + ANIM_DOING_HURT = 3, + ANIM_BEGIN_MOVE = 4, + ANIM_DOING_MOVE = 5, + ANIM_BEGIN_STRIKE = 6, + ANIM_DOING_STRIKE = 7, + ANIM_BEGIN_DEATH = 8, + ANIM_DOING_DEATH = 9, + ANIM_BEGIN_BLOCKED = 10, + ANIM_DOING_BLOCKED = 11, }; #include "common/StartRumbleWithParams.inc.c" #include "world/common/atomic/UnkFunc27.inc.c" -s32 N(DefenseTable_8021A670)[] = { +s32 N(BowserDefense)[] = { ELEMENT_NORMAL, 1, ELEMENT_BLAST, 1, ELEMENT_END, }; -s32 N(DefenseTable_8021A684)[] = { +s32 N(TowerDefense)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(StatusTable_8021A690)[] = { +s32 N(StatusTable)[] = { STATUS_KEY_NORMAL, 0, STATUS_KEY_DEFAULT, -1, STATUS_KEY_SLEEP, 0, @@ -81,141 +107,141 @@ s32 N(StatusTable_8021A690)[] = { STATUS_END, }; -s32 N(IdleAnimations_8021A73C)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Black_Anim04, +s32 N(PlaceholderAnims)[] = { + STATUS_KEY_NORMAL, ANIM_KoopaBros_Black_Idle, STATUS_END, }; ActorPartBlueprint N(ActorParts)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, - .index = PRT_MAIN, + .index = PRT_TARGET, .posOffset = { 0, 0, 15 }, .targetOffset = { -46, 110 }, .opacity = 255, - .idleAnimations = N(IdleAnimations_8021A73C), - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .idleAnimations = N(PlaceholderAnims), + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, - .index = PRT_2, + .index = PRT_TOWER, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A684), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(TowerDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, - .index = PRT_5, + .index = PRT_HEAD, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, - .index = PRT_3, + .index = PRT_BODY, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, - .index = PRT_4, + .index = PRT_SHELL, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, - .index = PRT_6, + .index = PRT_LEFT_ARM, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, - .index = PRT_7, + .index = PRT_TAIL, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, - .index = PRT_8, + .index = PRT_FRONT_WHEELS, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, - .index = PRT_9, + .index = PRT_BACK_WHEELS, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, - .index = PRT_10, + .index = PRT_FEET, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, - .index = PRT_11, + .index = PRT_RIGHT_ARM, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(DefenseTable_8021A670), - .eventFlags = ACTOR_EVENT_FLAG_0, + .defenseTable = N(BowserDefense), + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -228,8 +254,8 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT( N(ActorParts)), .partsData = N(ActorParts), - .initScript = &N(init_8021A968), - .statusTable = N(StatusTable_8021A690), + .initScript = &N(EVS_Init), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -244,237 +270,246 @@ ActorBlueprint NAMESPACE = { .statusTextOffset = { 10, 20 }, }; -s32 N(D_8021A8FC_48BAEC)[] = { - 0x00000009, 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000F, 0x00000010, 0x00000011, 0x00000012, - 0x00000013, 0x00000014, 0x00000019, 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001D, 0x0000001F, - 0x00000020, 0x00000021, 0x00000023, 0x00000024, 0x00000025, 0x00000027, 0x00000028, 0x00000029, - 0x0000002B, 0x0000002D, 0x0000FFFF, +s32 N(BowserModels)[] = { + MODEL_p1, // tail + MODEL_u1, MODEL_u2, MODEL_u3, // near arm + MODEL_k1, MODEL_k2, MODEL_k3, MODEL_k4, MODEL_k5, MODEL_k6, // head + MODEL_s1, MODEL_s2, MODEL_s3, MODEL_s4, MODEL_s5, // shell + MODEL_d1, MODEL_d2, MODEL_d3, // body + MODEL_o171, MODEL_o172, MODEL_o183, // far arm + MODEL_o118, MODEL_o120, MODEL_o165, // feet + MODEL_km1, // front wheels + MODEL_km2, // rear wheels + 0xFFFF, }; -EvtScript N(init_8021A968) = { - EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021EC98))) - EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021D508))) - EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021E6F0))) - EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8021F410))) - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) - EVT_SET(ArrayVar(0), 0) +EvtScript N(EVS_Init) = { + EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(EVS_FakeBowser_TakeTurn))) + EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(EVS_FakeBowser_Idle))) + EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_FakeBowser_HandleEvent))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(EVS_FakeBowser_HandlePhase))) + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_None) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerHeight, 0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) EVT_CALL(SetActorPos, ACTOR_SELF, 96, 0, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_TARGET_FLAG_4, TRUE) + EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, PRT_TOWER, ACTOR_PART_TARGET_FLAG_4, TRUE) EVT_RETURN EVT_END }; -s32 N(D_8021AAC4_48BCB4)[] = { - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - -230000000, -230000000, -229998976, - -230000000, -230000000, -229997952, - -230000000, -230000000, -229997440, - -230000000, -230000000, -229996928, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229996416, - -230000000, -230000000, -229996928, - -230000000, -230000000, -229997440, - -230000000, -230000000, -229996928, - -230000000, -230000000, -229997952, - -230000000, -230000000, -229998976, - -230000000, -230000000, -229999488, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - 255, 255, 255 +// ------------------------------------------------------------------------- +// FAKE BOWSER BATTLE + +s32 N(IdleHeadAngles)[] = { + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(2.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(2.5), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(3.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(3.5), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(3.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(2.5), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(3.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(2.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.5), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + 255, 255, 255 }; -EvtScript N(8021ABE4) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_FBUF(EVT_PTR(N(D_8021AAC4_48BCB4))) +EvtScript N(EVS_AnimBowser_IdleHead) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_FBUF(EVT_PTR(N(IdleHeadAngles))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 1) - EVT_RETURN - EVT_END_IF - EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_FBUF(EVT_PTR(N(D_8021AAC4_48BCB4))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_IDLE) + EVT_RETURN + EVT_END_IF EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_FBUF(EVT_PTR(N(IdleHeadAngles))) + EVT_FBUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -s32 N(D_8021ACCC_48BEBC)[] = { - -230000000, -230000000, -230000000, - -230000000, -230000000, -229997952, - -230000000, -230000000, -229994880, - -230000000, -230000000, -229991808, - -230000000, -230000000, -229991808, - -230000000, -230000000, -229991808, - -230000000, -230000000, -229991808, - -230000000, -230000000, -229992832, - -230000000, -230000000, -229994880, - -230000000, -230000000, -229995904, - -230000000, -230000000, -229998976, - -230000000, -230000000, -230000000, - 255, 255, 255 +s32 N(MoveHeadAngles)[] = { + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(2.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(5.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(8.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(8.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(8.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(8.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(7.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(5.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(4.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + 255, 255, 255 }; -EvtScript N(8021AD68) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_FBUF(EVT_PTR(N(D_8021ACCC_48BEBC))) +EvtScript N(EVS_AnimBowser_MoveHead) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_FBUF(EVT_PTR(N(MoveHeadAngles))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 5) - EVT_RETURN - EVT_END_IF - EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_FBUF(EVT_PTR(N(D_8021ACCC_48BEBC))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_MOVE) + EVT_RETURN + EVT_END_IF EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_FBUF(EVT_PTR(N(MoveHeadAngles))) + EVT_FBUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -s32 N(D_8021AE50_48C040)[] = { - -230000000, -229989760, -230000000, - -229979520, -230000000, -229994880, - -230000000, -230000000, -230000000, - -229994880, -229979520, -230000000, - -229989760, -230000000, -230000000, - -230000000, -229969280, -230000000, - -230000000, -229994880, -229997952, - -229969280, -230000000, -229989760, - -229969280, -229989760, -230000000, - -230000000, -229959040, -229997952, - -230000000, -230000000, -229994880, - -229994880, -230000000, -229991808, - -229989760, -230000000, -230000000, - -230000000, -229969280, -230000000, - -229979520, -230000000, -229994880, - -230000000, -230000000, -230000000, - -230000000, -229994880, -230000000, - -229989760, -230000000, -229991808, - -230000000, -229979520, -230000000, - -229994880, -230000000, -230000000, - -230000000, -229994880, -229994880, - -229969280, -230000000, -230000000, - -230000000, -230000000, -230000000, - 255, 255, 255 +s32 N(HurtHeadAngles)[] = { + EVT_FLOAT(0.0), EVT_FLOAT(10.0), EVT_FLOAT(0.0), + EVT_FLOAT(20.0), EVT_FLOAT(0.0), EVT_FLOAT(5.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(5.0), EVT_FLOAT(20.0), EVT_FLOAT(0.0), + EVT_FLOAT(10.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(30.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(5.0), EVT_FLOAT(2.0), + EVT_FLOAT(30.0), EVT_FLOAT(0.0), EVT_FLOAT(10.0), + EVT_FLOAT(30.0), EVT_FLOAT(10.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(40.0), EVT_FLOAT(2.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(5.0), + EVT_FLOAT(5.0), EVT_FLOAT(0.0), EVT_FLOAT(8.0), + EVT_FLOAT(10.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(30.0), EVT_FLOAT(0.0), + EVT_FLOAT(20.0), EVT_FLOAT(0.0), EVT_FLOAT(5.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(5.0), EVT_FLOAT(0.0), + EVT_FLOAT(10.0), EVT_FLOAT(0.0), EVT_FLOAT(8.0), + EVT_FLOAT(0.0), EVT_FLOAT(20.0), EVT_FLOAT(0.0), + EVT_FLOAT(5.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(5.0), EVT_FLOAT(5.0), + EVT_FLOAT(30.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + 255, 255, 255 }; -EvtScript N(8021AF70) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_FBUF(EVT_PTR(N(D_8021AE50_48C040))) +EvtScript N(EVS_AnimBowser_HurtHead) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_FBUF(EVT_PTR(N(HurtHeadAngles))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 3) - EVT_RETURN - EVT_END_IF - EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_FBUF(EVT_PTR(N(D_8021AE50_48C040))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_HURT) + EVT_RETURN + EVT_END_IF EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(RandInt, 100, LVarA) - EVT_IF_LT(LVarA, 50) - EVT_SETF(LVarA, EVT_FLOAT(0.0)) - EVT_SUBF(LVarA, LVar0) - EVT_SETF(LVar0, LVarA) - EVT_SETF(LVarA, EVT_FLOAT(0.0)) - EVT_SUBF(LVarA, LVar1) - EVT_SETF(LVar1, LVarA) - EVT_END_IF - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_FBUF(EVT_PTR(N(HurtHeadAngles))) + EVT_FBUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(RandInt, 100, LVarA) + EVT_IF_LT(LVarA, 50) + EVT_SETF(LVarA, EVT_FLOAT(0.0)) + EVT_SUBF(LVarA, LVar0) + EVT_SETF(LVar0, LVarA) + EVT_SETF(LVarA, EVT_FLOAT(0.0)) + EVT_SUBF(LVarA, LVar1) + EVT_SETF(LVar1, LVarA) + EVT_END_IF + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(8021B0E4) = { - EVT_USE_ARRAY(D_80235FC0) +EvtScript N(EVS_AnimBowser_DeathMain) = { + EVT_USE_ARRAY(FakeBowserAnimState) EVT_CALL(N(StartRumbleWithParams), 256, 30) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 20, EVT_FLOAT(3.0)) EVT_END_THREAD - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_5, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2) - EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_5, 0, -60, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_HEAD, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2) + EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_HEAD, 0, -60, 0) EVT_SET(LVar1, 60) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_LOOP(60) EVT_ADD(LVar0, 20) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_SUB(LVar0, 60) EVT_SET(LVar1, -200) EVT_ADD(LVar2, 100) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_5, EVT_FLOAT(0.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2, 60, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_HEAD, EVT_FLOAT(0.5)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2, 60, TRUE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, 15, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_k1, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, 11, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_u1, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 150, 20) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, 9, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_p1, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(30) - EVT_CALL(PlaySoundAtModel, 31, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_d1, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 70, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, 25, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_s1, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtModel, 43, SOUND_1E2, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtModel, MODEL_km1, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_CALL(N(StartRumbleWithParams), 60, 20) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) @@ -490,7 +525,7 @@ EvtScript N(8021B0E4) = { EVT_END }; -s32 N(intTable_8021B5D0)[] = { +s32 N(IdleBodyOffsets)[] = { 0, 0, 0, 0, 1, 0, 0, 2, 0, @@ -517,27 +552,27 @@ s32 N(intTable_8021B5D0)[] = { 255, 255, 255, }; -EvtScript N(8021B6F0) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_BUF(EVT_PTR(N(intTable_8021B5D0))) +EvtScript N(EVS_AnimBowser_IdleBody) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_BUF(EVT_PTR(N(IdleBodyOffsets))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 1) - EVT_RETURN - EVT_END_IF - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_BUF(EVT_PTR(N(intTable_8021B5D0))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_IDLE) + EVT_RETURN + EVT_END_IF EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetActorDispOffset, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_BUF(EVT_PTR(N(IdleBodyOffsets))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetActorDispOffset, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -s32 N(intTable_8021B7D4)[] = { +s32 N(MoveBodyOffsets)[] = { 0, 2, 0, 0, 7, 0, 0, 9, 0, @@ -552,27 +587,27 @@ s32 N(intTable_8021B7D4)[] = { 255, 255, 255, }; -EvtScript N(8021B864) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_BUF(EVT_PTR(N(intTable_8021B7D4))) +EvtScript N(EVS_AnimBowser_MoveBody) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_BUF(EVT_PTR(N(MoveBodyOffsets))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 5) - EVT_RETURN - EVT_END_IF - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_BUF(EVT_PTR(N(intTable_8021B7D4))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_MOVE) + EVT_RETURN + EVT_END_IF EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetActorDispOffset, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_BUF(EVT_PTR(N(MoveBodyOffsets))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetActorDispOffset, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -s32 N(intTable_8021B948)[] = { +s32 N(StrikeBodyOffsets)[] = { 0, 0, 0, 0, 1, 0, 0, 2, 0, @@ -599,30 +634,30 @@ s32 N(intTable_8021B948)[] = { 255, 255, 255, }; -EvtScript N(8021BA68) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_BUF(EVT_PTR(N(intTable_8021B948))) +EvtScript N(EVS_AnimBowser_StrikeBody) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_BUF(EVT_PTR(N(StrikeBodyOffsets))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(7) - EVT_CASE_EQ(11) - EVT_CASE_DEFAULT - EVT_RETURN - EVT_END_SWITCH - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_BUF(EVT_PTR(N(intTable_8021B948))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ANIM_DOING_STRIKE) + EVT_CASE_EQ(ANIM_DOING_BLOCKED) + EVT_CASE_DEFAULT + EVT_RETURN + EVT_END_SWITCH EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetActorDispOffset, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_BUF(EVT_PTR(N(StrikeBodyOffsets))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetActorDispOffset, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -s32 N(intTable_8021BB68)[] = { +s32 N(HurtBodyOffsets)[] = { 0, 1, 0, 0, 4, 0, 0, 16, 0, @@ -649,59 +684,59 @@ s32 N(intTable_8021BB68)[] = { 255, 255, 255, }; -EvtScript N(8021BC88) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_BUF(EVT_PTR(N(intTable_8021BB68))) +EvtScript N(EVS_AnimBowser_HurtBody) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_BUF(EVT_PTR(N(HurtBodyOffsets))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 3) - EVT_RETURN - EVT_END_IF - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_BUF(EVT_PTR(N(intTable_8021BB68))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_HURT) + EVT_RETURN + EVT_END_IF EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetActorDispOffset, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_BUF(EVT_PTR(N(HurtBodyOffsets))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetActorDispOffset, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(8021BD6C) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_3, 0, -30, 0) +EvtScript N(EVS_AnimBowser_DeathBody) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_BODY, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_BODY, LVar0, LVar1, LVar2) + EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_BODY, 0, -30, 0) EVT_SET(LVar1, 30) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_BODY, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_LOOP(80) EVT_ADD(LVar0, -20) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_BODY, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_SUB(LVar0, 150) EVT_SET(LVar1, -200) EVT_SUB(LVar2, 200) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_3, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2, 80, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_BODY, EVT_FLOAT(0.3)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_BODY, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; -EvtScript N(8021BF14) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_4, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_4, LVar0, LVar1, LVar2) - EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_4, 0, -24, 0) +EvtScript N(EVS_AnimBowser_DeathShell) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_SHELL, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_SHELL, LVar0, LVar1, LVar2) + EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_SHELL, 0, -24, 0) EVT_SET(LVar1, 24) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_4, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_SHELL, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) @@ -709,20 +744,21 @@ EvtScript N(8021BF14) = { EVT_LOOP(60) EVT_ADD(LVar0, 4) EVT_ADD(LVar1, -1) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_4, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_SHELL, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_ADD(LVar0, 30) EVT_SET(LVar1, -200) EVT_ADD(LVar2, 150) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_4, EVT_FLOAT(0.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_4, LVar0, LVar1, LVar2, 60, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_SHELL, EVT_FLOAT(0.5)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_SHELL, LVar0, LVar1, LVar2, 60, TRUE) EVT_RETURN EVT_END }; -s32 N(intTable_8021C0CC)[] = { +// opposite of IdleBodyOffsets +s32 N(IdleFeetOffsets)[] = { 0, 0, 0, 0, 0, 0, 0, -1, 0, @@ -749,77 +785,79 @@ s32 N(intTable_8021C0CC)[] = { 255, 255, 255, }; -EvtScript N(8021C1EC) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_BUF(EVT_PTR(N(intTable_8021C0CC))) +EvtScript N(EVS_AnimBowser_IdleFeet) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_BUF(EVT_PTR(N(IdleFeetOffsets))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 1) - EVT_RETURN - EVT_END_IF - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_BUF(EVT_PTR(N(intTable_8021C0CC))) - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -s32 N(intTable_8021C2D4)[] = { - 0, 0, 0, - 0, 0, 0, - 0, -1, 0, - 0, -1, 0, - 0, -2, 0, - 0, -2, 0, - 0, -2, 0, - 0, -2, 0, - 0, -2, 0, - 0, -1, 0, - 0, -1, 0, - 0, -1, 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, - 255, 255, 255, -}; - -EvtScript N(8021C3F4) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_BUF(EVT_PTR(N(intTable_8021C2D4))) - EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(7) - EVT_CASE_EQ(11) - EVT_CASE_DEFAULT + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_IDLE) EVT_RETURN - EVT_END_SWITCH - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_BUF(EVT_PTR(N(intTable_8021C2D4))) + EVT_END_IF EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_BUF(EVT_PTR(N(IdleFeetOffsets))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -s32 N(intTable_8021C4F8)[] = { +// opposite of StrikeBodyOffsets +s32 N(StrikeFeetOffsets)[] = { + 0, 0, 0, + 0, 0, 0, + 0, -1, 0, + 0, -1, 0, + 0, -2, 0, + 0, -2, 0, + 0, -2, 0, + 0, -2, 0, + 0, -2, 0, + 0, -1, 0, + 0, -1, 0, + 0, -1, 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, + 255, 255, 255, +}; + +EvtScript N(EVS_AnimBowser_StrikeFeet) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_BUF(EVT_PTR(N(StrikeFeetOffsets))) + EVT_LABEL(0) + EVT_SET(LVar0, ArrayVar(0)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ANIM_DOING_STRIKE) + EVT_CASE_EQ(ANIM_DOING_BLOCKED) + EVT_CASE_DEFAULT + EVT_RETURN + EVT_END_SWITCH + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_IF_EQ(LVar0, 255) + EVT_USE_BUF(EVT_PTR(N(StrikeFeetOffsets))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +// opposite of MoveBodyOffsets +s32 N(MoveFeetOffsets)[] = { 0, 0, 0, 0, -2, 0, 0, -4, 0, @@ -835,136 +873,136 @@ s32 N(intTable_8021C4F8)[] = { 255, 255, 255, }; -EvtScript N(8021C594) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_BUF(EVT_PTR(N(intTable_8021C4F8))) +EvtScript N(EVS_AnimBowser_MoveFeet) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_BUF(EVT_PTR(N(MoveFeetOffsets))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 5) - EVT_RETURN - EVT_END_IF - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_BUF(EVT_PTR(N(intTable_8021C4F8))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_MOVE) + EVT_RETURN + EVT_END_IF EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_BUF(EVT_PTR(N(MoveFeetOffsets))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(8021C67C) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_10, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) +EvtScript N(EVS_AnimBowser_DeathFeet) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_FEET, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_LOOP(80) EVT_ADD(LVar0, -10) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_SUB(LVar0, 50) EVT_SET(LVar1, -200) EVT_SUB(LVar2, 200) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_10, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2, 80, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_FEET, EVT_FLOAT(0.3)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; -s32 N(D_8021C7F4_48D9E4)[] = { - -230000000, -230000000, -229994880, - -230000000, -230000000, -229989760, - -230000000, -230000000, -229984640, - -230000000, -230000000, -229979520, - -230000000, -230000000, -229974400, - -230000000, -230000000, -229969280, - -230000000, -230000000, -229964160, - -230000000, -230000000, -229959040, - -230000000, -230000000, -229953920, - -230000000, -230000000, -229953920, - -230000000, -230000000, -229950848, - -230000000, -230000000, -229953920, - -230000000, -230000000, -229950848, - -230000000, -230000000, -229953920, - -230000000, -230000000, -229950848, - -230000000, -230000000, -229953920, - -230000000, -230000000, -229950848, - -230000000, -230000000, -229953920, - -230000000, -230000000, -229950848, - -230000000, -230000000, -229953920, - -230000000, -230000000, -229950848, - -230000000, -230000000, -229953920, - -230000000, -230000000, -229964160, - -230000000, -230000000, -229974400, - -230000000, -230000000, -229984640, - -230000000, -230000000, -229994880, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - -230000000, -230000000, -230000000, - 255, 255, 255, +s32 N(StrikeArmAngles)[] = { + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(5.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(10.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(15.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(20.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(25.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(30.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(35.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(40.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(45.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(45.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(48.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(45.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(48.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(45.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(48.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(45.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(48.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(45.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(48.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(45.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(48.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(45.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(35.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(25.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(15.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(5.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + 255, 255, 255, }; -EvtScript N(8021C9A4) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_FBUF(EVT_PTR(N(D_8021C7F4_48D9E4))) +EvtScript N(EVS_AnimBowser_StrikeArm) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_FBUF(EVT_PTR(N(StrikeArmAngles))) EVT_SET(LVarF, 0) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 7) - EVT_RETURN - EVT_END_IF - EVT_IF_EQ(LVarF, 0) - EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_SET(LVarF, 1) - EVT_SET(LVar0, EVT_FLOAT(0.0)) - EVT_SET(LVar1, EVT_FLOAT(0.0)) - EVT_SET(LVar2, EVT_FLOAT(0.0)) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_STRIKE) + EVT_RETURN EVT_END_IF - EVT_END_IF - EVT_MULF(LVar2, EVT_FLOAT(-2.0)) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVarF, 0) + EVT_FBUF_READ3(LVar0, LVar1, LVar2) + EVT_IF_EQ(LVar0, 255) + EVT_SET(LVarF, 1) + EVT_SET(LVar0, EVT_FLOAT(0.0)) + EVT_SET(LVar1, EVT_FLOAT(0.0)) + EVT_SET(LVar2, EVT_FLOAT(0.0)) + EVT_END_IF + EVT_END_IF + EVT_MULF(LVar2, EVT_FLOAT(-2.0)) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_LEFT_ARM, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(8021CAE4) = { - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_6, LVar2, LVar3, LVar4) +EvtScript N(EVS_AnimBowser_BlockArm) = { + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_LEFT_ARM, LVar2, LVar3, LVar4) EVT_CALL(MakeLerp, LVar4, 0, 20, EASING_LINEAR) EVT_LABEL(0) - EVT_CALL(UpdateLerp) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_6, EVT_FLOAT(0.0), EVT_FLOAT(0.0), LVar0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(UpdateLerp) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_LEFT_ARM, EVT_FLOAT(0.0), EVT_FLOAT(0.0), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF EVT_RETURN EVT_END }; -EvtScript N(8021CB98) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_6, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2) - EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_6, 0, -60, 0) +EvtScript N(EVS_AnimBowser_DeathLeftArm) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_LEFT_ARM, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_LEFT_ARM, LVar0, LVar1, LVar2) + EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_LEFT_ARM, 0, -60, 0) EVT_SET(LVar1, 60) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_LEFT_ARM, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) @@ -972,134 +1010,134 @@ EvtScript N(8021CB98) = { EVT_LOOP(80) EVT_ADD(LVar0, 8) EVT_ADD(LVar1, 10) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_LEFT_ARM, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_SUB(LVar0, 0) EVT_SET(LVar1, -200) EVT_ADD(LVar2, 100) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_6, EVT_FLOAT(0.6)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2, 80, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_LEFT_ARM, EVT_FLOAT(0.6)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_LEFT_ARM, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; -EvtScript N(8021CD50) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_11, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_11, LVar0, LVar1, LVar2) - EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_11, 0, -60, 0) +EvtScript N(EVS_AnimBowser_DeathRightArm) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_RIGHT_ARM, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_RIGHT_ARM, LVar0, LVar1, LVar2) + EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_RIGHT_ARM, 0, -60, 0) EVT_SET(LVar1, 60) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_11, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_RIGHT_ARM, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 0) EVT_SET(LVar1, -200) EVT_SUB(LVar2, 200) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_11, EVT_FLOAT(0.4)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_11, LVar0, LVar1, LVar2, 80, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_RIGHT_ARM, EVT_FLOAT(0.4)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_RIGHT_ARM, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; -s32 N(D_8021CE68_48E058)[] = { - -230000000, -230000000, -229979520, - -230000000, -230000000, -229959040, - -230000000, -230000000, -229938560, - -230000000, -230000000, -229918080, - -230000000, -230000000, -229897600, - -230000000, -230000000, -229877120, - -230000000, -230000000, -229856640, - -230000000, -230000000, -229836160, - -230000000, -230000000, -229815680, - -230000000, -230000000, -229795200, - -230000000, -230000000, -229774720, - -230000000, -230000000, -229754240, - -230000000, -230000000, -229733760, - -230000000, -230000000, -229713280, - -230000000, -230000000, -229692800, - -230000000, -230000000, -229672320, - -230000000, -230000000, -229651840, - -230000000, -230000000, -230000000, - 255, 255, 255 +s32 N(MoveWheelAngles)[] = { + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(20.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(40.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(60.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(80.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(100.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(120.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(140.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(160.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(180.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(200.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(220.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(240.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(260.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(280.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(300.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(320.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(340.0), + EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), + 255, 255, 255 }; -EvtScript N(8021CF4C) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_USE_FBUF(EVT_PTR(N(D_8021CE68_48E058))) +EvtScript N(EVS_AnimBowser_MoveWheels) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_USE_FBUF(EVT_PTR(N(MoveWheelAngles))) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_NE(LVar0, 5) - EVT_RETURN - EVT_END_IF - EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, 255) - EVT_USE_FBUF(EVT_PTR(N(D_8021CE68_48E058))) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_NE(LVar0, ANIM_DOING_MOVE) + EVT_RETURN + EVT_END_IF EVT_FBUF_READ3(LVar0, LVar1, LVar2) - EVT_END_IF - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_8, LVar0, LVar1, LVar2) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_9, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_IF_EQ(LVar0, 255) + EVT_USE_FBUF(EVT_PTR(N(MoveWheelAngles))) + EVT_FBUF_READ3(LVar0, LVar1, LVar2) + EVT_END_IF + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_FRONT_WHEELS, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_BACK_WHEELS, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(8021D054) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_8, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_8, LVar0, LVar1, LVar2) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_8, LVar0, LVar1, LVar2) +EvtScript N(EVS_AnimBowser_DeathFrontWheels) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_FRONT_WHEELS, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_FRONT_WHEELS, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_FRONT_WHEELS, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_LOOP(80) EVT_ADD(LVar0, 8) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_8, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_FRONT_WHEELS, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_SUB(LVar0, 150) EVT_SET(LVar1, -200) EVT_ADD(LVar2, 100) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_8, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_8, LVar0, LVar1, LVar2, 80, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_FRONT_WHEELS, EVT_FLOAT(0.3)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_FRONT_WHEELS, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; -EvtScript N(8021D1CC) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_9, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_9, LVar0, LVar1, LVar2) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_9, LVar0, LVar1, LVar2) +EvtScript N(EVS_AnimBowser_DeathBackWheels) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_BACK_WHEELS, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_BACK_WHEELS, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_BACK_WHEELS, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_LOOP(80) EVT_ADD(LVar0, 8) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_9, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_BACK_WHEELS, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_SUB(LVar0, 50) EVT_SET(LVar1, -200) EVT_SUB(LVar2, 100) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_9, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_9, LVar0, LVar1, LVar2, 80, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_BACK_WHEELS, EVT_FLOAT(0.3)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_BACK_WHEELS, LVar0, LVar1, LVar2, 80, TRUE) EVT_WAIT(100) EVT_RETURN EVT_END }; -EvtScript N(8021D350) = { - EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_7, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_7, LVar0, LVar1, LVar2) - EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_7, 0, -30, 0) +EvtScript N(EVS_AnimBowser_DeathTail) = { + EVT_USE_ARRAY(FakeBowserAnimState) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TAIL, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_TAIL, LVar0, LVar1, LVar2) + EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_TAIL, 0, -30, 0) EVT_SET(LVar1, 30) - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_7, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_TAIL, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) @@ -1107,205 +1145,211 @@ EvtScript N(8021D350) = { EVT_LOOP(80) EVT_ADD(LVar0, 25) EVT_ADD(LVar1, 1) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_7, LVar0, LVar1, LVar2) + EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_TAIL, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_SUB(LVar0, 0) EVT_SET(LVar1, -200) EVT_ADD(LVar2, 200) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_7, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_7, LVar0, LVar1, LVar2, 80, TRUE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_TAIL, EVT_FLOAT(0.3)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_TAIL, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; -EvtScript N(idle_8021D508) = { - EVT_USE_ARRAY(D_80235FC0) +EvtScript N(EVS_FakeBowser_Idle) = { + EVT_USE_ARRAY(FakeBowserAnimState) EVT_SET(LVarA, 0) EVT_LABEL(0) - EVT_SET(LVar0, ArrayVar(0)) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_SET(ArrayVar(0), 1) - EVT_EXEC(N(8021B6F0)) - EVT_EXEC(N(8021C1EC)) - EVT_EXEC(N(8021ABE4)) - EVT_CASE_EQ(1) - EVT_CASE_EQ(2) - EVT_SET(ArrayVar(0), 3) - EVT_EXEC(N(8021BC88)) - EVT_EXEC(N(8021AF70)) - EVT_CASE_EQ(3) - EVT_CASE_EQ(4) - EVT_SET(ArrayVar(0), 5) - EVT_EXEC(N(8021B864)) - EVT_EXEC(N(8021C594)) - EVT_EXEC(N(8021AD68)) - EVT_EXEC(N(8021CF4C)) - EVT_CASE_EQ(5) - EVT_CASE_EQ(6) - EVT_SET(ArrayVar(0), 7) - EVT_EXEC(N(8021BA68)) - EVT_EXEC(N(8021C3F4)) - EVT_EXEC(N(8021C9A4)) - EVT_CASE_EQ(7) - EVT_CASE_EQ(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B5) - EVT_SET(ArrayVar(0), 9) - EVT_EXEC(N(8021B0E4)) - EVT_EXEC(N(8021BD6C)) - EVT_EXEC(N(8021BF14)) - EVT_EXEC(N(8021CB98)) - EVT_EXEC(N(8021CD50)) - EVT_EXEC(N(8021D350)) - EVT_EXEC(N(8021D054)) - EVT_EXEC(N(8021D1CC)) - EVT_EXEC(N(8021C67C)) - EVT_EXEC(N(8021F630)) - EVT_CASE_EQ(9) - EVT_CASE_EQ(10) - EVT_SET(ArrayVar(0), 11) - EVT_EXEC(N(8021BA68)) - EVT_EXEC(N(8021C3F4)) - EVT_EXEC(N(8021CAE4)) - EVT_CASE_EQ(11) - EVT_END_SWITCH - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 24, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_5, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 24, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 24, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 24, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 15, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 16, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 17, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 18, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 19, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 20, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 21, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 22, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 23, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 34, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 34, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 34, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 34, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 31, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 32, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 33, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_4, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 30, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_4, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 30, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 30, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 30, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 25, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 26, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 27, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 28, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 29, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 14, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 14, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 14, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 14, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 11, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 12, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 13, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_7, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 10, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_7, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 10, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 10, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 10, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 9, MODEL_FLAG_FLAG_40, TRUE) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_EQ(LVar0, 9) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_8, LVar0, LVar1, LVar2) - EVT_ELSE - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SET(LVar1, 0) - EVT_END_IF - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_8, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 44, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_8, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 44, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 44, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 44, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 43, MODEL_FLAG_FLAG_40, TRUE) - EVT_SET(LVar0, ArrayVar(0)) - EVT_IF_EQ(LVar0, 9) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_9, LVar0, LVar1, LVar2) - EVT_ELSE - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SET(LVar1, 0) - EVT_END_IF - EVT_CALL(SetPartPos, ACTOR_SELF, PRT_9, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 46, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_9, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 46, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 46, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 46, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 45, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_11, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 38, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_11, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 38, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 38, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 38, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 35, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 36, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 37, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(GetPartPos, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) - EVT_CALL(TranslateGroup, 42, LVar0, LVar1, LVar2) - EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2) - EVT_CALL(RotateGroup, 42, LVar0, 1, 0, 0) - EVT_CALL(RotateGroup, 42, LVar1, 0, 1, 0) - EVT_CALL(RotateGroup, 42, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 39, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 40, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(SetModelFlags, 41, MODEL_FLAG_FLAG_40, TRUE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_NOT_FLAG(LVar0, 2) - EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) - EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) - EVT_MUL(LVar0, 100) - EVT_DIV(LVar0, LVar1) + // update animation state. ANIM_BEGIN states start new animations, ANIM_DOING states continue them. + EVT_SET(LVar0, ArrayVar(0)) EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_LT(20) - EVT_IF_GT(LVarA, 20) - EVT_EXEC(N(8021E3A0)) - EVT_SET(LVarA, 0) - EVT_END_IF - EVT_CASE_LT(40) - EVT_IF_GT(LVarA, 40) - EVT_EXEC(N(8021E3A0)) - EVT_SET(LVarA, 0) - EVT_END_IF - EVT_CASE_LT(60) - EVT_IF_GT(LVarA, 60) - EVT_EXEC(N(8021E3A0)) - EVT_SET(LVarA, 0) - EVT_END_IF - EVT_CASE_LT(80) - EVT_IF_GT(LVarA, 80) - EVT_EXEC(N(8021E3A0)) - EVT_SET(LVarA, 0) - EVT_END_IF + EVT_CASE_EQ(ANIM_BEGIN_IDLE) + EVT_SET(ArrayVar(0), ANIM_DOING_IDLE) + EVT_EXEC(N(EVS_AnimBowser_IdleBody)) + EVT_EXEC(N(EVS_AnimBowser_IdleFeet)) + EVT_EXEC(N(EVS_AnimBowser_IdleHead)) + EVT_CASE_EQ(ANIM_DOING_IDLE) + EVT_CASE_EQ(ANIM_BEGIN_HURT) + EVT_SET(ArrayVar(0), ANIM_DOING_HURT) + EVT_EXEC(N(EVS_AnimBowser_HurtBody)) + EVT_EXEC(N(EVS_AnimBowser_HurtHead)) + EVT_CASE_EQ(ANIM_DOING_HURT) + EVT_CASE_EQ(ANIM_BEGIN_MOVE) + EVT_SET(ArrayVar(0), ANIM_DOING_MOVE) + EVT_EXEC(N(EVS_AnimBowser_MoveBody)) + EVT_EXEC(N(EVS_AnimBowser_MoveFeet)) + EVT_EXEC(N(EVS_AnimBowser_MoveHead)) + EVT_EXEC(N(EVS_AnimBowser_MoveWheels)) + EVT_CASE_EQ(ANIM_DOING_MOVE) + EVT_CASE_EQ(ANIM_BEGIN_STRIKE) + EVT_SET(ArrayVar(0), ANIM_DOING_STRIKE) + EVT_EXEC(N(EVS_AnimBowser_StrikeBody)) + EVT_EXEC(N(EVS_AnimBowser_StrikeFeet)) + EVT_EXEC(N(EVS_AnimBowser_StrikeArm)) + EVT_CASE_EQ(ANIM_DOING_STRIKE) + EVT_CASE_EQ(ANIM_BEGIN_DEATH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_BLAST) + EVT_SET(ArrayVar(0), ANIM_DOING_DEATH) + EVT_EXEC(N(EVS_AnimBowser_DeathMain)) + EVT_EXEC(N(EVS_AnimBowser_DeathBody)) + EVT_EXEC(N(EVS_AnimBowser_DeathShell)) + EVT_EXEC(N(EVS_AnimBowser_DeathLeftArm)) + EVT_EXEC(N(EVS_AnimBowser_DeathRightArm)) + EVT_EXEC(N(EVS_AnimBowser_DeathTail)) + EVT_EXEC(N(EVS_AnimBowser_DeathFrontWheels)) + EVT_EXEC(N(EVS_AnimBowser_DeathBackWheels)) + EVT_EXEC(N(EVS_AnimBowser_DeathFeet)) + EVT_EXEC(N(EVS_KoopaBrosEnter)) + EVT_CASE_EQ(ANIM_DOING_DEATH) + EVT_CASE_EQ(ANIM_BEGIN_BLOCKED) + EVT_SET(ArrayVar(0), ANIM_DOING_BLOCKED) + EVT_EXEC(N(EVS_AnimBowser_StrikeBody)) + EVT_EXEC(N(EVS_AnimBowser_StrikeFeet)) + EVT_EXEC(N(EVS_AnimBowser_BlockArm)) + EVT_CASE_EQ(ANIM_DOING_BLOCKED) EVT_END_SWITCH - EVT_ADD(LVarA, 1) - EVT_END_IF - EVT_WAIT(1) - EVT_GOTO(0) + // sync the positions of the models to corresponding actor parts + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_atama, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_atama, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_atama, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_atama, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_k1, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_k2, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_k3, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_k4, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_k5, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_k6, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_k7, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_k8, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_k9, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_BODY, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_BODY, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_dou, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_dou, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_d1, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_d2, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_d3, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_SHELL, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_koura, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_SHELL, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_koura, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_koura, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_koura, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_s1, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_s2, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_s3, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_s4, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_s5, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_LEFT_ARM, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_left_arm, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_LEFT_ARM, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_left_arm, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_left_arm, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_left_arm, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_u1, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_u2, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_u3, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_TAIL, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_shippo, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_TAIL, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_shippo, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_shippo, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_shippo, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_p1, MODEL_FLAG_FLAG_40, TRUE) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_EQ(LVar0, ANIM_DOING_DEATH) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_FRONT_WHEELS, LVar0, LVar1, LVar2) + EVT_ELSE + EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_SET(LVar1, 0) + EVT_END_IF + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_FRONT_WHEELS, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_koma1, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_FRONT_WHEELS, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_koma1, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_koma1, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_koma1, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_km1, MODEL_FLAG_FLAG_40, TRUE) + EVT_SET(LVar0, ArrayVar(0)) + EVT_IF_EQ(LVar0, ANIM_DOING_DEATH) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_BACK_WHEELS, LVar0, LVar1, LVar2) + EVT_ELSE + EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_SET(LVar1, 0) + EVT_END_IF + EVT_CALL(SetPartPos, ACTOR_SELF, PRT_BACK_WHEELS, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_koma2, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_BACK_WHEELS, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_koma2, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_koma2, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_koma2, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_km2, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_RIGHT_ARM, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_right_arm, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_RIGHT_ARM, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_right_arm, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_right_arm, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_right_arm, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_o171, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_o172, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_o183, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(GetPartPos, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_ashi, LVar0, LVar1, LVar2) + EVT_CALL(GetPartRotation, ACTOR_SELF, PRT_FEET, LVar0, LVar1, LVar2) + EVT_CALL(RotateGroup, MODEL_ashi, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_ashi, LVar1, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_ashi, LVar2, 0, 0, 1) + EVT_CALL(SetModelFlags, MODEL_o118, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_o120, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, MODEL_o165, MODEL_FLAG_FLAG_40, TRUE) + // spawn puffs of smoke if health is low enough + // written to have different effects at every quintile, but every case in the final + // version just executes the same script + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_Dialogue_HaveATaste) // odd reuse/misuse of flag. always FALSE here. + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) + EVT_MUL(LVar0, 100) + EVT_DIV(LVar0, LVar1) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_LT(20) + EVT_IF_GT(LVarA, 20) + EVT_EXEC(N(EVS_SpawnDamageFX)) + EVT_SET(LVarA, 0) + EVT_END_IF + EVT_CASE_LT(40) + EVT_IF_GT(LVarA, 40) + EVT_EXEC(N(EVS_SpawnDamageFX)) + EVT_SET(LVarA, 0) + EVT_END_IF + EVT_CASE_LT(60) + EVT_IF_GT(LVarA, 60) + EVT_EXEC(N(EVS_SpawnDamageFX)) + EVT_SET(LVarA, 0) + EVT_END_IF + EVT_CASE_LT(80) + EVT_IF_GT(LVarA, 80) + EVT_EXEC(N(EVS_SpawnDamageFX)) + EVT_SET(LVarA, 0) + EVT_END_IF + EVT_END_SWITCH + EVT_ADD(LVarA, 1) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(8021E3A0) = { +// (in) LVarA : remaining health percent +EvtScript N(EVS_SpawnDamageFX) = { EVT_DIV(LVarA, 4) EVT_ADD(LVarA, 1) EVT_CALL(RandInt, LVarA, LVar3) @@ -1342,36 +1386,36 @@ EvtScript N(8021E3A0) = { EVT_END }; -EvtScript N(handleEvent_8021E6F0) = { - EVT_USE_ARRAY(D_80235FC0) +EvtScript N(EVS_FakeBowser_HandleEvent) = { + EVT_USE_ARRAY(FakeBowserAnimState) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) - EVT_SET(ArrayVar(0), 2) + EVT_SET(ArrayVar(0), ANIM_BEGIN_HURT) EVT_WAIT(20) - EVT_SET(ArrayVar(0), 0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) EVT_CASE_EQ(EVENT_HIT) - EVT_SET(ArrayVar(0), 2) + EVT_SET(ArrayVar(0), ANIM_BEGIN_HURT) EVT_WAIT(20) - EVT_SET(ArrayVar(0), 0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_SET(ArrayVar(0), 2) + EVT_SET(ArrayVar(0), ANIM_BEGIN_HURT) EVT_WAIT(20) - EVT_SET(ArrayVar(0), 0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_DEATH) EVT_CASE_OR_EQ(EVENT_BURN_DEATH) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_IF_EQ(LVar0, EVENT_BURN_DEATH) - EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(D_8021A8FC_48BAEC)), FOG_MODE_3) + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(BowserModels)), FOG_MODE_3) EVT_CALL(N(UnkFunc26), 3, 35, 35, 35, 0, 0, 0, 0, 0, 0) EVT_END_IF - EVT_SET(ArrayVar(0), 2) + EVT_SET(ArrayVar(0), ANIM_BEGIN_HURT) EVT_WAIT(20) EVT_IF_EQ(LVar0, EVENT_BURN_DEATH) - EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(D_8021A8FC_48BAEC)), FOG_MODE_0) + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(BowserModels)), FOG_MODE_0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4) EVT_DIVF(LVar3, EVT_FLOAT(2.0)) @@ -1382,29 +1426,29 @@ EvtScript N(handleEvent_8021E6F0) = { EVT_WAIT(5) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_END_IF - EVT_CALL(ActorSpeak, MSG_CH1_0106, ACTOR_SELF, PRT_MAIN, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH1_0106, ACTOR_SELF, PRT_TARGET, -1, -1) EVT_WAIT(30) - EVT_SET(ArrayVar(0), 8) + EVT_SET(ArrayVar(0), ANIM_BEGIN_DEATH) EVT_LABEL(20) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_WAIT(1) - EVT_IF_NOT_FLAG(LVar0, 1) - EVT_GOTO(20) - EVT_END_IF + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_WAIT(1) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_KoopaBrosRevealed) + EVT_GOTO(20) + EVT_END_IF EVT_WAIT(20) - EVT_EXEC_WAIT(N(80222C44)) + EVT_EXEC_WAIT(N(EVS_TryFormingTower)) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_BURN_CONTACT) EVT_CASE_OR_EQ(EVENT_BURN_HIT) - EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(D_8021A8FC_48BAEC)), FOG_MODE_3) + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(BowserModels)), FOG_MODE_3) EVT_CALL(N(UnkFunc26), 3, 35, 35, 35, 0, 0, 0, 0, 0, 0) - EVT_SET(ArrayVar(0), 2) + EVT_SET(ArrayVar(0), ANIM_BEGIN_HURT) EVT_WAIT(20) - EVT_SET(ArrayVar(0), 0) - EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(D_8021A8FC_48BAEC)), FOG_MODE_0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(BowserModels)), FOG_MODE_0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4) EVT_DIVF(LVar3, EVT_FLOAT(2.0)) @@ -1422,8 +1466,8 @@ EvtScript N(handleEvent_8021E6F0) = { EVT_END }; -EvtScript N(takeTurn_8021EC98) = { - EVT_USE_ARRAY(D_80235FC0) +EvtScript N(EVS_FakeBowser_TakeTurn) = { + EVT_USE_ARRAY(FakeBowserAnimState) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_THREAD @@ -1432,18 +1476,18 @@ EvtScript N(takeTurn_8021EC98) = { EVT_WAIT(5) EVT_END_LOOP EVT_END_THREAD - EVT_SET(ArrayVar(0), 4) + EVT_SET(ArrayVar(0), ANIM_BEGIN_MOVE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 70, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_SET(ArrayVar(0), 0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FD) EVT_WAIT(22) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FE) EVT_END_THREAD - EVT_SET(ArrayVar(0), 6) + EVT_SET(ArrayVar(0), ANIM_BEGIN_STRIKE) EVT_WAIT(24) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -1462,22 +1506,22 @@ EvtScript N(takeTurn_8021EC98) = { EVT_WAIT(8) EVT_END_LOOP EVT_END_THREAD - EVT_SET(ArrayVar(0), 4) + EVT_SET(ArrayVar(0), ANIM_BEGIN_MOVE) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_SET(ArrayVar(0), 0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, DMG_STRIKE, BS_FLAGS1_40) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_ATK_BLOCKED) EVT_CALL(GetPlayerHP, LVar0) EVT_IF_NE(LVar0, 0) - EVT_SET(ArrayVar(0), 10) + EVT_SET(ArrayVar(0), ANIM_BEGIN_BLOCKED) EVT_END_IF EVT_END_IF EVT_WAIT(18) @@ -1487,11 +1531,11 @@ EvtScript N(takeTurn_8021EC98) = { EVT_WAIT(8) EVT_END_LOOP EVT_END_THREAD - EVT_SET(ArrayVar(0), 4) + EVT_SET(ArrayVar(0), ANIM_BEGIN_MOVE) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_SET(ArrayVar(0), 0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(GetPlayerHP, LVar0) EVT_IF_LE(LVar0, 0) @@ -1504,52 +1548,52 @@ EvtScript N(takeTurn_8021EC98) = { EVT_CALL(SetBattleCamZoom, 500) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(15) - EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(ActorSpeak, MSG_CH1_00FE, ACTOR_SELF, PRT_MAIN, -1, -1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) + EVT_CALL(ActorSpeak, MSG_CH1_00FE, ACTOR_SELF, PRT_TARGET, -1, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 1) EVT_CASE_EQ(1) - EVT_CALL(ActorSpeak, MSG_CH1_00FF, ACTOR_SELF, PRT_MAIN, -1, -1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) + EVT_CALL(ActorSpeak, MSG_CH1_00FF, ACTOR_SELF, PRT_TARGET, -1, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 2) EVT_CASE_EQ(2) - EVT_CALL(ActorSpeak, MSG_CH1_0100, ACTOR_SELF, PRT_MAIN, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH1_0100, ACTOR_SELF, PRT_TARGET, -1, -1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 85, 81, 0) EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(SetBattleCamZoom, 249) EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(10) - EVT_CALL(ActorSpeak, MSG_CH1_0101, ACTOR_SELF, PRT_MAIN, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH1_0101, ACTOR_SELF, PRT_TARGET, -1, -1) EVT_WAIT(10) - EVT_CALL(ActorSpeak, MSG_CH1_0102, ACTOR_SELF, PRT_MAIN, -1, -1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 3) + EVT_CALL(ActorSpeak, MSG_CH1_0102, ACTOR_SELF, PRT_TARGET, -1, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 3) EVT_CASE_EQ(3) - EVT_CALL(ActorSpeak, MSG_CH1_0103, ACTOR_SELF, PRT_MAIN, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH1_0103, ACTOR_SELF, PRT_TARGET, -1, -1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 85, 81, 0) EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(SetBattleCamZoom, 249) EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(10) - EVT_CALL(ActorSpeak, MSG_CH1_0104, ACTOR_SELF, PRT_MAIN, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH1_0104, ACTOR_SELF, PRT_TARGET, -1, -1) EVT_WAIT(10) - EVT_CALL(ActorSpeak, MSG_CH1_0105, ACTOR_SELF, PRT_MAIN, -1, -1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) + EVT_CALL(ActorSpeak, MSG_CH1_0105, ACTOR_SELF, PRT_TARGET, -1, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_BowserTaunts, 1) EVT_END_SWITCH EVT_CALL(EnableBattleStatusBar, TRUE) EVT_RETURN EVT_END }; -EvtScript N(nextTurn_8021F410) = { - EVT_USE_ARRAY(D_80235FC0) +EvtScript N(EVS_FakeBowser_HandlePhase) = { + EVT_USE_ARRAY(FakeBowserAnimState) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_PLAYER_BEGIN) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_NOT_FLAG(LVar0, 0x00000008) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_Dialogue_BowserReveal) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, -4, 46, -2) EVT_CALL(SetBattleCamYaw, 24) @@ -1557,19 +1601,19 @@ EvtScript N(nextTurn_8021F410) = { EVT_CALL(SetBattleCamZoom, 461) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) - EVT_CALL(ActorSpeak, MSG_CH1_00FD, ACTOR_SELF, PRT_MAIN, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH1_00FD, ACTOR_SELF, PRT_TARGET, -1, -1) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FD) EVT_WAIT(22) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FE) EVT_END_THREAD - EVT_SET(ArrayVar(0), 6) + EVT_SET(ArrayVar(0), ANIM_BEGIN_STRIKE) EVT_WAIT(30) - EVT_SET(ArrayVar(0), 0) - EVT_CALL(EndActorSpeech, ACTOR_SELF, PRT_MAIN, -1, -1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x8) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE) + EVT_CALL(EndActorSpeech, ACTOR_SELF, PRT_TARGET, -1, -1) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_Dialogue_BowserReveal) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(20) EVT_END_IF @@ -1579,124 +1623,127 @@ EvtScript N(nextTurn_8021F410) = { EVT_END }; -API_CALLABLE(func_80218350_4B1540) { - bgm_set_battle_song(8, 0); +// ------------------------------------------------------------------------- +// KOOPA BROS BATTLE + +API_CALLABLE(N(PlayKoopaBrosSong)) { + bgm_set_battle_song(SONG_KOOPA_BROS_BATTLE, 0); bgm_push_battle_song(); return ApiStatus_DONE2; } -EvtScript N(8021F630) = { - EVT_CALL(UseIdleAnimation, ACTOR_ENEMY0, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_ENEMY0, 0) - EVT_CALL(SetActorPos, ACTOR_ENEMY0, 100, 0, 10) - EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_KoopaBros_Green_Anim1C) +EvtScript N(EVS_KoopaBrosEnter) = { + EVT_CALL(UseIdleAnimation, GREEN_ACTOR, FALSE) + EVT_CALL(EnableIdleScript, GREEN_ACTOR, 0) + EVT_CALL(SetActorPos, GREEN_ACTOR, 100, 0, 10) + EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_Launched) EVT_THREAD - EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY0, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY0, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(SetGoalPos, ACTOR_ENEMY0, -300, 250, 0) - EVT_CALL(JumpToGoal, ACTOR_ENEMY0, 50, FALSE, TRUE, FALSE) + EVT_CALL(SetActorJumpGravity, GREEN_ACTOR, EVT_FLOAT(0.4)) + EVT_CALL(SetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetGoalPos, GREEN_ACTOR, -300, 250, 0) + EVT_CALL(JumpToGoal, GREEN_ACTOR, 50, FALSE, TRUE, FALSE) EVT_END_THREAD - EVT_CALL(UseIdleAnimation, ACTOR_ENEMY1, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_ENEMY1, 0) - EVT_CALL(SetActorPos, ACTOR_ENEMY1, 100, 0, 10) - EVT_CALL(SetAnimation, ACTOR_ENEMY1, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim1C) + EVT_CALL(UseIdleAnimation, YELLOW_ACTOR, FALSE) + EVT_CALL(EnableIdleScript, YELLOW_ACTOR, 0) + EVT_CALL(SetActorPos, YELLOW_ACTOR, 100, 0, 10) + EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_Launched) EVT_THREAD - EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY1, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY1, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(SetGoalPos, ACTOR_ENEMY1, -200, 250, 0) - EVT_CALL(JumpToGoal, ACTOR_ENEMY1, 50, FALSE, TRUE, FALSE) + EVT_CALL(SetActorJumpGravity, YELLOW_ACTOR, EVT_FLOAT(0.4)) + EVT_CALL(SetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetGoalPos, YELLOW_ACTOR, -200, 250, 0) + EVT_CALL(JumpToGoal, YELLOW_ACTOR, 50, FALSE, TRUE, FALSE) EVT_END_THREAD - EVT_CALL(UseIdleAnimation, ACTOR_ENEMY2, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_ENEMY2, 0) - EVT_CALL(SetActorPos, ACTOR_ENEMY2, 100, 0, 10) - EVT_CALL(SetAnimation, ACTOR_ENEMY2, PRT_MAIN, ANIM_KoopaBros_Black_Anim1C) + EVT_CALL(UseIdleAnimation, BLACK_ACTOR, FALSE) + EVT_CALL(EnableIdleScript, BLACK_ACTOR, 0) + EVT_CALL(SetActorPos, BLACK_ACTOR, 100, 0, 10) + EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_Launched) EVT_THREAD - EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY2, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY2, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(SetGoalPos, ACTOR_ENEMY2, 0, 250, 0) - EVT_CALL(JumpToGoal, ACTOR_ENEMY2, 50, FALSE, TRUE, FALSE) + EVT_CALL(SetActorJumpGravity, BLACK_ACTOR, EVT_FLOAT(0.4)) + EVT_CALL(SetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetGoalPos, BLACK_ACTOR, 0, 250, 0) + EVT_CALL(JumpToGoal, BLACK_ACTOR, 50, FALSE, TRUE, FALSE) EVT_END_THREAD - EVT_CALL(UseIdleAnimation, ACTOR_ENEMY3, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_ENEMY3, 0) - EVT_CALL(SetActorPos, ACTOR_ENEMY3, 100, 0, 10) - EVT_CALL(SetAnimation, ACTOR_ENEMY3, PRT_MAIN, ANIM_KoopaBros_Red_Anim1C) + EVT_CALL(UseIdleAnimation, RED_ACTOR, FALSE) + EVT_CALL(EnableIdleScript, RED_ACTOR, 0) + EVT_CALL(SetActorPos, RED_ACTOR, 100, 0, 10) + EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_Launched) EVT_THREAD - EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY3, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY3, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(SetGoalPos, ACTOR_ENEMY3, 150, 250, 0) - EVT_CALL(JumpToGoal, ACTOR_ENEMY3, 50, FALSE, TRUE, FALSE) + EVT_CALL(SetActorJumpGravity, RED_ACTOR, EVT_FLOAT(0.4)) + EVT_CALL(SetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetGoalPos, RED_ACTOR, 150, 250, 0) + EVT_CALL(JumpToGoal, RED_ACTOR, 50, FALSE, TRUE, FALSE) EVT_END_THREAD EVT_WAIT(100) EVT_WAIT(100) - EVT_CALL(EnableGroup, 24, FALSE) - EVT_CALL(EnableGroup, 14, FALSE) - EVT_CALL(EnableGroup, 10, FALSE) - EVT_CALL(EnableGroup, 34, FALSE) - EVT_CALL(EnableGroup, 30, FALSE) - EVT_CALL(EnableGroup, 44, FALSE) - EVT_CALL(EnableGroup, 46, FALSE) - EVT_CALL(EnableGroup, 38, FALSE) - EVT_CALL(EnableGroup, 42, FALSE) + EVT_CALL(EnableGroup, MODEL_atama, FALSE) + EVT_CALL(EnableGroup, MODEL_left_arm, FALSE) + EVT_CALL(EnableGroup, MODEL_shippo, FALSE) + EVT_CALL(EnableGroup, MODEL_dou, FALSE) + EVT_CALL(EnableGroup, MODEL_koura, FALSE) + EVT_CALL(EnableGroup, MODEL_koma1, FALSE) + EVT_CALL(EnableGroup, MODEL_koma2, FALSE) + EVT_CALL(EnableGroup, MODEL_right_arm, FALSE) + EVT_CALL(EnableGroup, MODEL_ashi, FALSE) EVT_THREAD EVT_WAIT(23) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, SOUND_301) + EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_301) + EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_301) + EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, SOUND_301) + EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_301) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_KoopaBros_Green_Anim12) - EVT_CALL(SetActorPos, ACTOR_ENEMY0, 20, 250, 0) - EVT_CALL(SetGoalPos, ACTOR_ENEMY0, 20, 0, 0) - EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY0, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY0, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(FallToGoal, ACTOR_ENEMY0, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, SOUND_3E9) - EVT_CALL(ResetActorSounds, ACTOR_ENEMY0, ACTOR_SOUND_JUMP) - EVT_CALL(ForceHomePos, ACTOR_ENEMY0, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_KoopaBros_Green_Anim05) + EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_Land) + EVT_CALL(SetActorPos, GREEN_ACTOR, 20, 250, 0) + EVT_CALL(SetGoalPos, GREEN_ACTOR, 20, 0, 0) + EVT_CALL(SetActorJumpGravity, GREEN_ACTOR, EVT_FLOAT(1.5)) + EVT_CALL(SetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(FallToGoal, GREEN_ACTOR, 30) + EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_3E9) + EVT_CALL(ResetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP) + EVT_CALL(ForceHomePos, GREEN_ACTOR, 20, 0, 0) + EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_IdleCrouch) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetAnimation, ACTOR_ENEMY1, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim12) - EVT_CALL(SetActorPos, ACTOR_ENEMY1, 60, 250, -5) - EVT_CALL(SetGoalPos, ACTOR_ENEMY1, 60, 0, -5) - EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY1, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY1, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(FallToGoal, ACTOR_ENEMY1, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_3E9) - EVT_CALL(ResetActorSounds, ACTOR_ENEMY1, ACTOR_SOUND_JUMP) - EVT_CALL(ForceHomePos, ACTOR_ENEMY1, 60, 0, -5) - EVT_CALL(SetAnimation, ACTOR_ENEMY1, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim05) + EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_Land) + EVT_CALL(SetActorPos, YELLOW_ACTOR, 60, 250, -5) + EVT_CALL(SetGoalPos, YELLOW_ACTOR, 60, 0, -5) + EVT_CALL(SetActorJumpGravity, YELLOW_ACTOR, EVT_FLOAT(1.5)) + EVT_CALL(SetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(FallToGoal, YELLOW_ACTOR, 30) + EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_3E9) + EVT_CALL(ResetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP) + EVT_CALL(ForceHomePos, YELLOW_ACTOR, 60, 0, -5) + EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_IdleCrouch) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_ENEMY2, PRT_MAIN, ANIM_KoopaBros_Black_Anim12) - EVT_CALL(SetActorPos, ACTOR_ENEMY2, 100, 250, -10) - EVT_CALL(SetGoalPos, ACTOR_ENEMY2, 100, 0, -10) - EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY2, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY2, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(FallToGoal, ACTOR_ENEMY2, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_3E9) - EVT_CALL(ResetActorSounds, ACTOR_ENEMY2, ACTOR_SOUND_JUMP) - EVT_CALL(ForceHomePos, ACTOR_ENEMY2, 100, 0, -10) - EVT_CALL(SetAnimation, ACTOR_ENEMY2, PRT_MAIN, ANIM_KoopaBros_Black_Anim05) + EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_Land) + EVT_CALL(SetActorPos, BLACK_ACTOR, 100, 250, -10) + EVT_CALL(SetGoalPos, BLACK_ACTOR, 100, 0, -10) + EVT_CALL(SetActorJumpGravity, BLACK_ACTOR, EVT_FLOAT(1.5)) + EVT_CALL(SetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(FallToGoal, BLACK_ACTOR, 30) + EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_3E9) + EVT_CALL(ResetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP) + EVT_CALL(ForceHomePos, BLACK_ACTOR, 100, 0, -10) + EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_IdleCrouch) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(SetAnimation, ACTOR_ENEMY3, PRT_MAIN, ANIM_KoopaBros_Red_Anim12) - EVT_CALL(SetActorPos, ACTOR_ENEMY3, 140, 250, -15) - EVT_CALL(SetGoalPos, ACTOR_ENEMY3, 140, 0, -15) - EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY3, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY3, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(FallToGoal, ACTOR_ENEMY3, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, SOUND_3E9) - EVT_CALL(ResetActorSounds, ACTOR_ENEMY3, ACTOR_SOUND_JUMP) - EVT_CALL(ForceHomePos, ACTOR_ENEMY3, 140, 0, -15) - EVT_CALL(SetAnimation, ACTOR_ENEMY3, PRT_MAIN, ANIM_KoopaBros_Red_Anim05) + EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_Land) + EVT_CALL(SetActorPos, RED_ACTOR, 140, 250, -15) + EVT_CALL(SetGoalPos, RED_ACTOR, 140, 0, -15) + EVT_CALL(SetActorJumpGravity, RED_ACTOR, EVT_FLOAT(1.5)) + EVT_CALL(SetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(FallToGoal, RED_ACTOR, 30) + EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_3E9) + EVT_CALL(ResetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP) + EVT_CALL(ForceHomePos, RED_ACTOR, 140, 0, -15) + EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_IdleCrouch) EVT_END_THREAD EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -1705,101 +1752,107 @@ EvtScript N(8021F630) = { EVT_CALL(SetBattleCamZoom, 292) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(28) - EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_KoopaBros_Green_Anim1A) + EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_ThumbsUp) EVT_WAIT(5) - EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, GREEN_ACTOR, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, SOUND_20F3) - EVT_CALL(SetAnimation, ACTOR_ENEMY1, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim1A) + EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_20F3) + EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_ThumbsUp) EVT_WAIT(5) - EVT_CALL(GetActorPos, ACTOR_ENEMY1, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, YELLOW_ACTOR, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_20F3) - EVT_CALL(SetAnimation, ACTOR_ENEMY2, PRT_MAIN, ANIM_KoopaBros_Black_Anim1A) + EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_20F3) + EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_ThumbsUp) EVT_WAIT(5) - EVT_CALL(GetActorPos, ACTOR_ENEMY2, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, BLACK_ACTOR, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_20F3) - EVT_CALL(SetAnimation, ACTOR_ENEMY3, PRT_MAIN, ANIM_KoopaBros_Red_Anim1A) + EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_20F3) + EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_ThumbsUp) EVT_WAIT(5) - EVT_CALL(GetActorPos, ACTOR_ENEMY3, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, RED_ACTOR, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_20F3) EVT_WAIT(30) - EVT_CALL(func_80218350_4B1540) - EVT_CALL(ActorSpeak, MSG_CH1_0107, ACTOR_ENEMY1, PRT_MAIN, -1, -1) + EVT_CALL(N(PlayKoopaBrosSong)) + EVT_CALL(ActorSpeak, MSG_CH1_0107, YELLOW_ACTOR, 1, -1, -1) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR | ACTOR_FLAG_NO_DMG_APPLY, TRUE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) - EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80224D84))) - EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_802239BC))) - EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802242FC))) - EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80225438))) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(HPBarToHome, ACTOR_ENEMY0) - EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_KoopaBros_Green_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(HPBarToHome, ACTOR_ENEMY1) - EVT_CALL(SetAnimation, ACTOR_ENEMY1, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(HPBarToHome, ACTOR_ENEMY2) - EVT_CALL(SetAnimation, ACTOR_ENEMY2, PRT_MAIN, ANIM_KoopaBros_Black_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY3, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(HPBarToHome, ACTOR_ENEMY3) - EVT_CALL(SetAnimation, ACTOR_ENEMY3, PRT_MAIN, ANIM_KoopaBros_Red_Anim04) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x1) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TARGET, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TOWER, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TARGET, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TOWER, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(EVS_KoopaBros_TakeTurn))) + EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(EVS_KoopaBros_Idle))) + EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_KoopaBros_HandleEvent))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(EVS_KoopaBros_HandlePhase))) + EVT_CALL(SetActorFlagBits, GREEN_ACTOR, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) + EVT_CALL(SetPartFlagBits, GREEN_ACTOR, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(HPBarToHome, GREEN_ACTOR) + EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_Idle) + EVT_CALL(SetActorFlagBits, YELLOW_ACTOR, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) + EVT_CALL(SetPartFlagBits, YELLOW_ACTOR, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(HPBarToHome, YELLOW_ACTOR) + EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_Idle) + EVT_CALL(SetActorFlagBits, BLACK_ACTOR, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) + EVT_CALL(SetPartFlagBits, BLACK_ACTOR, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(HPBarToHome, BLACK_ACTOR) + EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_Idle) + EVT_CALL(SetActorFlagBits, RED_ACTOR, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) + EVT_CALL(SetPartFlagBits, RED_ACTOR, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(HPBarToHome, RED_ACTOR) + EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_Idle) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_Toppled) // prevents first-turn tower attack + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_KoopaBrosRevealed) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_RETURN EVT_END }; -API_CALLABLE(func_8021837C_4B156C) { +API_CALLABLE(N(PlayLandOnTowerFX)) { Bytecode* args = script->ptrReadPos; - Actor* actor = get_actor(evt_get_variable(script, *args++)); + s32 actorID = evt_get_variable(script, *args++); + Actor* actor = get_actor(actorID); play_movement_dust_effects(2, actor->state.goalPos.x - 15.0f, actor->state.goalPos.y, actor->state.goalPos.z, actor->state.angle); return ApiStatus_DONE2; } -EvtScript N(80220588) = { - EVT_IF_EQ(LVar2, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 5, LVar0) +// (in) Var0 : koopa bros actorID +// (in) Var1 : expected tower height +// (in) Var2 : tower index (height - 1, height - 2, ..., 0) +EvtScript N(EVS_BuildTowerWithKoopa) = { + #define VAR_TOWER_HEIGHT LVarB + #define VAR_CUR_TOWER_IDX LVarC + EVT_IF_EQ(LVar2, TOWER_TOP) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_LeadKoopaID, LVar0) EVT_END_IF EVT_SET(LVarA, LVar0) - EVT_SET(LVarB, LVar1) - EVT_SET(LVarC, LVar2) + EVT_SET(VAR_TOWER_HEIGHT, LVar1) + EVT_SET(VAR_CUR_TOWER_IDX, LVar2) EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_SWITCH(LVar2) - EVT_CASE_EQ(0) + EVT_CASE_EQ(TOWER_TOP) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim1B) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_PointForward) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_PointForward) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_PointForward) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_PointForward) EVT_END_SWITCH EVT_CALL(SetActorYaw, LVarA, 0) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) @@ -1807,10 +1860,10 @@ EvtScript N(80220588) = { EVT_ADD(LVar1, 19) EVT_WAIT(10) EVT_WAIT(30) - EVT_SET(LVar0, LVarB) + EVT_SET(LVar0, VAR_TOWER_HEIGHT) EVT_SUB(LVar0, 1) EVT_MUL(LVar0, 16) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_CALL(SetBattleCamTarget, LVar2, LVar3, LVar4) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -1818,20 +1871,20 @@ EvtScript N(80220588) = { EVT_CALL(SetBattleCamZoom, 400) EVT_CALL(MoveBattleCamOver, LVar0) EVT_WAIT(LVar0) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, LVarA, LVar2, LVar3, LVar4) EVT_CALL(AddGoalPos, LVarA, 0, 0, 0) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim03) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim03) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim03) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim03) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Run) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Run) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Run) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Run) EVT_END_SWITCH EVT_CALL(GetGoalPos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -1841,24 +1894,24 @@ EvtScript N(80220588) = { EVT_CALL(SetActorYaw, LVarA, 180) EVT_END_IF EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim10) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Leap) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Leap) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Leap) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Leap) EVT_END_SWITCH EVT_WAIT(5) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, LVarA, LVar2, LVar3, LVar4) - EVT_SET(LVar0, LVarB) + EVT_SET(LVar0, VAR_TOWER_HEIGHT) EVT_SUB(LVar0, 1) EVT_MUL(LVar0, 18) - EVT_SWITCH(LVarB) + EVT_SWITCH(VAR_TOWER_HEIGHT) EVT_CASE_EQ(4) EVT_CALL(AddGoalPos, LVarA, 0, LVar0, -10) EVT_CASE_EQ(3) @@ -1870,54 +1923,54 @@ EvtScript N(80220588) = { EVT_THREAD EVT_WAIT(10) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim12) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Land) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Land) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Land) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Land) EVT_END_SWITCH EVT_END_THREAD EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim11) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Midair) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Midair) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Midair) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Midair) EVT_END_SWITCH EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) - EVT_CALL(func_8021837C_4B156C, LVarA) + EVT_CALL(N(PlayLandOnTowerFX), LVarA) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim04) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Idle) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Idle) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Idle) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Idle) EVT_END_SWITCH EVT_WAIT(5) EVT_CALL(SetActorYaw, LVarA, 0) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim1B) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_PointForward) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_PointForward) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_PointForward) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_PointForward) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, LVarA, SOUND_20F3) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) @@ -1925,218 +1978,227 @@ EvtScript N(80220588) = { EVT_ADD(LVar1, 19) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) EVT_WAIT(20) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_NOT_FLAG(LVar0, 2) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_Dialogue_HaveATaste) EVT_CALL(ActorSpeak, MSG_CH1_010A, LVarA, 1, -1, -1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x2) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_Dialogue_HaveATaste) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF EVT_WAIT(10) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim04) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Idle) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Idle) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Idle) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Idle) EVT_END_SWITCH EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_HEALTH_BAR, TRUE) EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetActorVar, LVarA, 1, 3) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(2) - EVT_CASE_OR_EQ(3) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosA) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_Stable) + EVT_CASE_OR_EQ(TOWER_DOWN_1) + EVT_CASE_OR_EQ(TOWER_DOWN_2) + EVT_CASE_OR_EQ(TOWER_DOWN_3) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_IdleCrouch) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_IdleCrouch) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_IdleCrouch) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_IdleCrouch) EVT_END_SWITCH EVT_WAIT(50) - EVT_SET(LVar0, LVarB) - EVT_SUB(LVar0, 1) - EVT_IF_EQ(LVarC, LVar0) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + // handle (height - 1) position + EVT_SET(LVar0, VAR_TOWER_HEIGHT) + EVT_SUB(LVar0, TOWER_DOWN_1) + EVT_IF_EQ(VAR_CUR_TOWER_IDX, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, LVarA, LVar2, LVar3, LVar4) EVT_CALL(AddGoalPos, LVarA, 0, 0, 0) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim03) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim03) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim03) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim03) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Run) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Run) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Run) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Run) EVT_END_SWITCH EVT_CALL(RunToGoal, LVarA, 10, FALSE) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_IdleCrouch) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_IdleCrouch) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_IdleCrouch) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_IdleCrouch) EVT_END_SWITCH EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_HEALTH_BAR, TRUE) EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetActorVar, LVarA, 1, 6) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosB) EVT_END_IF - EVT_SET(LVar0, LVarB) - EVT_SUB(LVar0, 2) - EVT_IF_EQ(LVarC, LVar0) + // handle (height - 2) position + EVT_SET(LVar0, VAR_TOWER_HEIGHT) + EVT_SUB(LVar0, TOWER_DOWN_2) + EVT_IF_EQ(VAR_CUR_TOWER_IDX, LVar0) EVT_WAIT(10) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, LVarA, LVar2, LVar3, LVar4) EVT_CALL(AddGoalPos, LVarA, 0, 18, -4) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim10) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Leap) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Leap) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Leap) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Leap) EVT_END_SWITCH EVT_WAIT(5) EVT_CALL(AddGoalPos, LVarA, 15, 0, 0) EVT_THREAD EVT_WAIT(10) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim12) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Land) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Land) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Land) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Land) EVT_END_SWITCH EVT_END_THREAD EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim11) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Midair) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Midair) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Midair) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Midair) EVT_END_SWITCH EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) - EVT_CALL(func_8021837C_4B156C, LVarA) + EVT_CALL(N(PlayLandOnTowerFX), LVarA) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_IdleCrouch) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_IdleCrouch) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_IdleCrouch) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_IdleCrouch) EVT_END_SWITCH EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_HEALTH_BAR, TRUE) EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetActorVar, LVarA, 1, 5) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosC) EVT_END_IF + // handle (height - 3) position EVT_SET(LVar0, LVarB) - EVT_SUB(LVar0, 3) - EVT_IF_EQ(LVarC, LVar0) + EVT_SUB(LVar0, TOWER_DOWN_3) + EVT_IF_EQ(VAR_CUR_TOWER_IDX, LVar0) EVT_WAIT(30) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_SET(LVar4, 15) EVT_CALL(SetGoalPos, LVarA, LVar2, LVar3, LVar4) EVT_CALL(AddGoalPos, LVarA, 0, 36, -7) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim10) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Leap) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Leap) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Leap) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Leap) EVT_END_SWITCH EVT_WAIT(5) EVT_CALL(AddGoalPos, LVarA, 15, 0, 0) EVT_THREAD EVT_WAIT(10) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim12) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Land) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Land) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Land) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Land) EVT_END_SWITCH EVT_END_THREAD EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim11) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Midair) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Midair) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Midair) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Midair) EVT_END_SWITCH EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) - EVT_CALL(func_8021837C_4B156C, LVarA) + EVT_CALL(N(PlayLandOnTowerFX), LVarA) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_IdleCrouch) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_IdleCrouch) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_IdleCrouch) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_IdleCrouch) EVT_END_SWITCH EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_HEALTH_BAR, TRUE) EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetActorVar, LVarA, 1, 4) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosD) EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH EVT_RETURN EVT_END + #undef VAR_TOWER_HEIGHT + #undef VAR_CUR_TOWER_IDX }; -EvtScript N(80221DB4) = { +// (in) Var0 : koopa bros actorID +// (in) Var1 : expected tower height +// (in) Var2 : add index (0, 1, ...), or (-1) to mean "demoting" +// (in) Var3 : orphan count +EvtScript N(EVS_UpdateTowerWithKoopa) = { EVT_IF_EQ(LVar2, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 5, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_LeadKoopaID, LVar0) EVT_END_IF EVT_SET(LVarA, LVar0) EVT_SET(LVarB, LVar1) @@ -2144,41 +2206,41 @@ EvtScript N(80221DB4) = { EVT_SET(LVarD, LVar3) EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim1B) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_PointForward) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_PointForward) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_PointForward) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_PointForward) EVT_END_SWITCH EVT_WAIT(15) EVT_SWITCH(LVarC) EVT_CASE_EQ(-1) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_IdleCrouch) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_IdleCrouch) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_IdleCrouch) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_IdleCrouch) EVT_END_SWITCH EVT_SWITCH(LVarB) EVT_CASE_EQ(4) EVT_SWITCH(LVarD) EVT_CASE_EQ(2) - EVT_CALL(SetActorVar, LVarA, 1, 5) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosC) EVT_CASE_EQ(1) - EVT_CALL(SetActorVar, LVarA, 1, 4) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosD) EVT_END_SWITCH EVT_CASE_EQ(3) - EVT_CALL(SetActorVar, LVarA, 1, 5) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosC) EVT_END_SWITCH EVT_CASE_EQ(0) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) EVT_CALL(SetBattleCamTarget, LVar2, LVar3, LVar4) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -2189,17 +2251,17 @@ EvtScript N(80221DB4) = { EVT_WAIT(25) EVT_END_IF EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim10) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Leap) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Leap) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Leap) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Leap) EVT_END_SWITCH EVT_WAIT(5) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar0) EVT_CALL(GetHomePos, LVar0, LVar1, LVar2, LVar3) EVT_SET(LVar3, 15) EVT_CALL(SetGoalPos, LVarA, LVar1, LVar2, LVar3) @@ -2213,53 +2275,53 @@ EvtScript N(80221DB4) = { EVT_THREAD EVT_WAIT(10) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim12) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Land) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Land) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Land) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Land) EVT_END_SWITCH EVT_END_THREAD EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim11) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Midair) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Midair) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Midair) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Midair) EVT_END_SWITCH EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) - EVT_CALL(func_8021837C_4B156C, LVarA) + EVT_CALL(N(PlayLandOnTowerFX), LVarA) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim04) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Idle) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Idle) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Idle) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Idle) EVT_END_SWITCH EVT_WAIT(10) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim1B) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim1B) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_PointForward) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_PointForward) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_PointForward) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_PointForward) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, LVarA, SOUND_20F3) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) @@ -2270,23 +2332,23 @@ EvtScript N(80221DB4) = { EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_HEALTH_BAR, TRUE) EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetActorVar, LVarA, 1, 3) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x100) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosA) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_DoneTowerUpdate) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_CASE_EQ(1) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim10) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim10) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Leap) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Leap) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Leap) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Leap) EVT_END_SWITCH EVT_WAIT(5) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar0) EVT_CALL(GetHomePos, LVar0, LVar1, LVar2, LVar3) EVT_SET(LVar3, 15) EVT_CALL(SetGoalPos, LVarA, LVar1, LVar2, LVar3) @@ -2295,601 +2357,640 @@ EvtScript N(80221DB4) = { EVT_THREAD EVT_WAIT(10) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim12) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim12) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Land) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Land) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Land) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Land) EVT_END_SWITCH EVT_END_THREAD EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim11) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim11) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Midair) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Midair) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Midair) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Midair) EVT_END_SWITCH EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) - EVT_CALL(func_8021837C_4B156C, LVarA) + EVT_CALL(N(PlayLandOnTowerFX), LVarA) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim04) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim04) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Idle) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Idle) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Idle) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Idle) EVT_END_SWITCH EVT_WAIT(10) EVT_SWITCH(LVarA) - EVT_CASE_EQ(ACTOR_ENEMY0) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY1) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY2) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_Anim05) - EVT_CASE_EQ(ACTOR_ENEMY3) - EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Green_IdleCrouch) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Yellow_IdleCrouch) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Black_IdleCrouch) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_IdleCrouch) EVT_END_SWITCH EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_HEALTH_BAR, TRUE) EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetActorVar, LVarA, 1, 4) + EVT_CALL(SetActorVar, LVarA, AVAR_Koopa_State, AVAL_Koopa_State_PosD) EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript N(80222C44) = { - EVT_SET(LVarA, 0) +EvtScript N(EVS_TryFormingTower) = { + // count the number of standing koopa bros + #define VAR_STANDING_COUNT LVarA + EVT_SET(VAR_STANDING_COUNT, 0) EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(GetActorVar, LVar0, 1, LVar1) - EVT_IF_EQ(LVar1, 0) - EVT_CALL(GetStatusFlags, LVar0, LVar1) + EVT_CALL(GetOwnerTarget, LVar0, LVar1) + EVT_CALL(GetActorVar, LVar0, AVAR_Koopa_State, LVar1) EVT_IF_EQ(LVar1, 0) - EVT_IF_EQ(LVarA, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 4, LVar0) + EVT_CALL(GetStatusFlags, LVar0, LVar1) + EVT_IF_EQ(LVar1, 0) + EVT_IF_EQ(VAR_STANDING_COUNT, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar0) + EVT_END_IF + EVT_ADD(VAR_STANDING_COUNT, 1) EVT_END_IF - EVT_ADD(LVarA, 1) EVT_END_IF - EVT_END_IF - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF - EVT_SWITCH(LVarA) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF + // check special cases for standing koopa count + EVT_SWITCH(VAR_STANDING_COUNT) EVT_CASE_EQ(0) EVT_RETURN EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x200) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_DoingSoloAttack) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_RETURN EVT_END_SWITCH - EVT_CALL(SetActorVar, ACTOR_SELF, 3, LVarA) - EVT_SET(LocalFlag(0), 0) - EVT_SET(LVarB, LVarA) - EVT_SUB(LVarB, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerHeight, VAR_STANDING_COUNT) + EVT_SET(LFlag0, FALSE) + // have each koopa join the tower from front to back + // the index ranges from (height - 1) for the bottom koopa to 0 for the top + #define VAR_CUR_KOOPA_IDX LVarB + EVT_SET(VAR_CUR_KOOPA_IDX, VAR_STANDING_COUNT) + EVT_SUB(VAR_CUR_KOOPA_IDX, 1) EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(1) - EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(GetActorVar, LVar0, 1, LVar1) - EVT_IF_EQ(LVar1, 0) - EVT_CALL(GetStatusFlags, LVar0, LVar1) + EVT_CALL(GetOwnerTarget, LVar0, LVar1) + EVT_CALL(GetActorVar, LVar0, AVAR_Koopa_State, LVar1) EVT_IF_EQ(LVar1, 0) - EVT_SET(LVar1, LVarA) - EVT_SET(LVar2, LVarB) - EVT_EXEC(N(80220588)) - EVT_SUB(LVarB, 1) + EVT_CALL(GetStatusFlags, LVar0, LVar1) + EVT_IF_EQ(LVar1, 0) + EVT_SET(LVar1, VAR_STANDING_COUNT) + EVT_SET(LVar2, VAR_CUR_KOOPA_IDX) + EVT_EXEC(N(EVS_BuildTowerWithKoopa)) + EVT_SUB(VAR_CUR_KOOPA_IDX, 1) + EVT_END_IF EVT_END_IF - EVT_END_IF - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(1) - EVT_END_IF + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(1) + EVT_END_IF + // hide the status bar until the tower is formed EVT_CALL(EnableBattleStatusBar, FALSE) EVT_LABEL(2) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_WAIT(1) - EVT_IF_EQ(LVar0, 3) - EVT_GOTO(2) - EVT_END_IF + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, AVAL_Boss_TowerState_Toppled) + EVT_GOTO(2) + EVT_END_IF EVT_CALL(EnableBattleStatusBar, TRUE) + // housekeeping for various actor states in the new tower configuration EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_POPUP, TRUE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_SET(LVar0, LVarA) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TOWER, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_SET(LVar0, VAR_STANDING_COUNT) EVT_MUL(LVar0, 18) EVT_ADD(LVar0, 20) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_2, -4, LVar0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_TOWER, -4, LVar0) EVT_CALL(SetActorSize, ACTOR_SELF, LVar0, 45) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_KOOPA_BROS) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetActorPos, LVar1, LVar2, LVar3, LVar4) EVT_CALL(SetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_SET(LVarA, 0) - EVT_EXEC_WAIT(N(80223870)) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) + EVT_SET(LVarA, BOSS_CMD_STABLE) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_Stable) EVT_RETURN EVT_END + #undef VAR_STANDING_COUNT + #undef VAR_CUR_KOOPA_IDX }; -EvtScript N(802230E8) = { - EVT_SET(LVarA, 0) +// count the number of standing koopa bros +EvtScript N(EVS_TryJoiningTower) = { + #define VAR_STANDING_COUNT LVarA + EVT_SET(VAR_STANDING_COUNT, 0) EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(GetActorVar, LVar0, 1, LVar1) - EVT_IF_EQ(LVar1, 0) - EVT_CALL(GetStatusFlags, LVar0, LVar1) + EVT_CALL(GetOwnerTarget, LVar0, LVar1) + EVT_CALL(GetActorVar, LVar0, AVAR_Koopa_State, LVar1) EVT_IF_EQ(LVar1, 0) - EVT_ADD(LVarA, 1) + EVT_CALL(GetStatusFlags, LVar0, LVar1) + EVT_IF_EQ(LVar1, 0) + EVT_ADD(VAR_STANDING_COUNT, 1) + EVT_END_IF EVT_END_IF - EVT_END_IF - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF - EVT_IF_EQ(LVarA, 0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF + EVT_IF_EQ(VAR_STANDING_COUNT, 0) + // no orphaned koopa bros found EVT_RETURN EVT_END_IF + // add orphan count to tower size EVT_SET(LVar3, LVarA) - EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerHeight, LVar0) EVT_ADD(LVarA, LVar0) - EVT_CALL(SetActorVar, ACTOR_SELF, 3, LVarA) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -257) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_SET(LVar0, 512) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerHeight, LVarA) + // reset 'joined' flag + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, ~AFLAG_Boss_DoneTowerUpdate) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + // demote the top koopa bros + EVT_SET(LVar0, FIRST_KOOPA_ACTOR) EVT_LOOP(4) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) - EVT_CALL(GetActorVar, LVar0, 1, LVar2) - EVT_IF_EQ(LVar2, 3) + EVT_CALL(GetActorVar, LVar0, AVAR_Koopa_State, LVar2) + EVT_IF_EQ(LVar2, AVAL_Koopa_State_PosA) EVT_SET(LVar1, LVarA) EVT_SET(LVar2, -1) - EVT_EXEC(N(80221DB4)) + EVT_EXEC(N(EVS_UpdateTowerWithKoopa)) EVT_BREAK_LOOP EVT_END_IF EVT_END_IF EVT_ADD(LVar0, 1) EVT_END_LOOP + // have each orphaned koopa join the tower from front to back EVT_SET(LVar2, 0) EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(1) - EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(GetActorVar, LVar0, 1, LVar8) - EVT_IF_EQ(LVar8, 0) - EVT_SET(LVar1, LVarA) - EVT_EXEC(N(80221DB4)) - EVT_ADD(LVar2, 1) - EVT_END_IF - EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(1) - EVT_END_IF + EVT_CALL(GetOwnerTarget, LVar0, LVar1) + EVT_CALL(GetActorVar, LVar0, AVAR_Koopa_State, LVar8) + EVT_IF_EQ(LVar8, AVAL_Koopa_State_Ready) + EVT_SET(LVar1, LVarA) + EVT_EXEC(N(EVS_UpdateTowerWithKoopa)) + EVT_ADD(LVar2, 1) + EVT_END_IF + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(1) + EVT_END_IF + // hide the status bar until the tower is formed EVT_CALL(EnableBattleStatusBar, FALSE) EVT_LABEL(2) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_NOT_FLAG(LVar0, 0x00000100) - EVT_WAIT(1) - EVT_GOTO(2) - EVT_END_IF + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_DoneTowerUpdate) + EVT_WAIT(1) + EVT_GOTO(2) + EVT_END_IF EVT_CALL(EnableBattleStatusBar, TRUE) + // housekeeping for various actor states in the new tower configuration EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_POPUP, TRUE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TOWER, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_SET(LVar0, LVarA) EVT_MUL(LVar0, 18) EVT_ADD(LVar0, 20) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_2, -4, LVar0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_TOWER, -4, LVar0) EVT_CALL(SetActorSize, ACTOR_SELF, LVar0, 45) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_KOOPA_BROS) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar1) EVT_CALL(GetActorPos, LVar1, LVar2, LVar3, LVar4) EVT_CALL(SetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_SET(LVarA, 0) - EVT_EXEC_WAIT(N(80223870)) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) + EVT_SET(LVarA, BOSS_CMD_STABLE) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_Stable) EVT_RETURN EVT_END + #undef VAR_STANDING_COUNT }; -EvtScript N(802235E0) = { - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 2) +EvtScript N(EVS_Broadcast_TowerUnstable) = { + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_IF_EQ(LVar0, AVAL_Boss_TowerState_Unstable) EVT_RETURN EVT_END_IF - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x10) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_SET(LVarA, 1) - EVT_EXEC_WAIT(N(80223870)) - EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVarA) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_TowerUnstable) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_Unstable) + EVT_SET(LVarA, BOSS_CMD_UNSTABLE) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerHeight, LVarA) EVT_SET(LVar0, LVarA) EVT_MUL(LVar0, 18) EVT_ADD(LVar0, 5) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_2, -4, LVar0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_TOWER, -4, LVar0) EVT_CALL(SetActorSize, ACTOR_SELF, LVar0, 45) EVT_RETURN EVT_END }; -EvtScript N(80223718) = { - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3) +EvtScript N(EVS_Broadcast_ToppleHit) = { + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_Toppled) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, EVENT_BURN_HIT) - EVT_SET(LVarA, 5) + EVT_SET(LVarA, BOSS_CMD_TOPPLE_HIT) EVT_ELSE - EVT_SET(LVarA, 6) + EVT_SET(LVarA, BOSS_CMD_TOPPLE_BURN_HIT) EVT_END_IF - EVT_EXEC_WAIT(N(80223870)) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -17) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -33) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TARGET, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_TOWER, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, ~AFLAG_Boss_TowerUnstable) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, ~AFLAG_Boss_Dialogue_WereGoingOver) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_RETURN EVT_END }; -EvtScript N(80223870) = { - EVT_CALL(ActorExists, ACTOR_ENEMY0, LVar0) +// (in) LVarA : event +EvtScript N(EVS_BroadcastToKoopaBros) = { + EVT_CALL(ActorExists, GREEN_ACTOR, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_EXEC_GET_TID(b_area_trd_part_2_green_ninja_koopa_802257A8, LVar1) + EVT_EXEC_GET_TID(A(green_ninja_koopa_HandleCommand), LVar1) EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar0) + EVT_CALL(ActorExists, YELLOW_ACTOR, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_EXEC_GET_TID(b_area_trd_part_2_yellow_ninja_koopa_8022E688, LVar1) + EVT_EXEC_GET_TID(A(yellow_ninja_koopa_HandleCommand), LVar1) EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar0) + EVT_CALL(ActorExists, BLACK_ACTOR, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_EXEC_GET_TID(b_area_trd_part_2_blue_ninja_koopa_8022B6E8, LVar1) + EVT_EXEC_GET_TID(A(black_ninja_koopa_HandleCommand), LVar1) EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY3, LVar0) + EVT_CALL(ActorExists, RED_ACTOR, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_EXEC_GET_TID(b_area_trd_part_2_red_ninja_koopa_80228748, LVar1) + EVT_EXEC_GET_TID(A(red_ninja_koopa_HandleCommand), LVar1) EVT_END_IF + // if any koopa bros are still alive, wait for their script to finish EVT_LABEL(0) - EVT_IS_THREAD_RUNNING(LVar1, LVar0) - EVT_IF_EQ(LVar0, TRUE) + EVT_IS_THREAD_RUNNING(LVar1, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +// adds a random jitter to KoopaBros actors' X position while the tower is unstable +EvtScript N(EVS_KoopaBros_Idle) = { + EVT_LABEL(0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_IF_NE(LVar0, AVAL_Boss_TowerState_Unstable) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + // get initial actor positions + EVT_CALL(ActorExists, GREEN_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorPos, GREEN_ACTOR, LVarA, LVarE, LVarF) + EVT_END_IF + EVT_CALL(ActorExists, YELLOW_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorPos, YELLOW_ACTOR, LVarC, LVarE, LVarF) + EVT_END_IF + EVT_CALL(ActorExists, BLACK_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorPos, BLACK_ACTOR, LVarD, LVarE, LVarF) + EVT_END_IF + EVT_CALL(ActorExists, RED_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorPos, RED_ACTOR, LVarB, LVarE, LVarF) + EVT_END_IF + // while tower is unstable, add random X offsets to koopa bros + EVT_LABEL(1) + EVT_CALL(ActorExists, GREEN_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorVar, GREEN_ACTOR, AVAR_Koopa_State, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(RandInt, 2, LVar0) + EVT_SET(LVar1, 1) + EVT_SUB(LVar0, LVar1) + EVT_ADD(LVar0, LVarA) + EVT_CALL(GetActorPos, GREEN_ACTOR, LVar1, LVar2, LVar3) + EVT_CALL(SetActorPos, GREEN_ACTOR, LVar0, LVar2, LVar3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(ActorExists, YELLOW_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorVar, YELLOW_ACTOR, AVAR_Koopa_State, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(RandInt, 2, LVar0) + EVT_SET(LVar1, 1) + EVT_SUB(LVar0, LVar1) + EVT_ADD(LVar0, LVarC) + EVT_CALL(GetActorPos, YELLOW_ACTOR, LVar1, LVar2, LVar3) + EVT_CALL(SetActorPos, YELLOW_ACTOR, LVar0, LVar2, LVar3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(ActorExists, BLACK_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorVar, BLACK_ACTOR, AVAR_Koopa_State, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(RandInt, 2, LVar0) + EVT_SET(LVar1, 1) + EVT_SUB(LVar0, LVar1) + EVT_ADD(LVar0, LVarD) + EVT_CALL(GetActorPos, BLACK_ACTOR, LVar1, LVar2, LVar3) + EVT_CALL(SetActorPos, BLACK_ACTOR, LVar0, LVar2, LVar3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(ActorExists, RED_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorVar, RED_ACTOR, AVAR_Koopa_State, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(RandInt, 2, LVar0) + EVT_SET(LVar1, 1) + EVT_SUB(LVar0, LVar1) + EVT_ADD(LVar0, LVarB) + EVT_CALL(GetActorPos, RED_ACTOR, LVar1, LVar2, LVar3) + EVT_CALL(SetActorPos, RED_ACTOR, LVar0, LVar2, LVar3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_IF_EQ(LVar0, AVAL_Boss_TowerState_Unstable) + EVT_WAIT(2) + EVT_GOTO(1) + EVT_END_IF + // once tower regains stability, reset X positions to initial values + EVT_CALL(ActorExists, GREEN_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorVar, GREEN_ACTOR, AVAR_Koopa_State, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(GetActorPos, GREEN_ACTOR, LVar1, LVar2, LVar3) + EVT_CALL(SetActorPos, GREEN_ACTOR, LVarA, LVar2, LVar3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(ActorExists, YELLOW_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorVar, YELLOW_ACTOR, AVAR_Koopa_State, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(GetActorPos, YELLOW_ACTOR, LVar1, LVar2, LVar3) + EVT_CALL(SetActorPos, YELLOW_ACTOR, LVarC, LVar2, LVar3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(ActorExists, BLACK_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorVar, BLACK_ACTOR, AVAR_Koopa_State, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(GetActorPos, BLACK_ACTOR, LVar1, LVar2, LVar3) + EVT_CALL(SetActorPos, BLACK_ACTOR, LVarD, LVar2, LVar3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(ActorExists, RED_ACTOR, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_CALL(GetActorVar, RED_ACTOR, AVAR_Koopa_State, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosA) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosD) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosC) + EVT_CASE_OR_EQ(AVAL_Koopa_State_PosB) + EVT_CALL(GetActorPos, RED_ACTOR, LVar1, LVar2, LVar3) + EVT_CALL(SetActorPos, RED_ACTOR, LVarB, LVar2, LVar3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_END_IF EVT_WAIT(1) EVT_GOTO(0) - EVT_END_IF EVT_RETURN EVT_END }; -EvtScript N(idle_802239BC) = { - EVT_LABEL(0) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_NE(LVar0, 2) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY0, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVarA, LVarE, LVarF) - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorPos, ACTOR_ENEMY1, LVarC, LVarE, LVarF) - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorPos, ACTOR_ENEMY2, LVarD, LVarE, LVarF) - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY3, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorPos, ACTOR_ENEMY3, LVarB, LVarE, LVarF) - EVT_END_IF - EVT_LABEL(1) - EVT_CALL(ActorExists, ACTOR_ENEMY0, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY0, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(RandInt, 2, LVar0) - EVT_SET(LVar1, 1) - EVT_SUB(LVar0, LVar1) - EVT_ADD(LVar0, LVarA) - EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVar1, LVar2, LVar3) - EVT_CALL(SetActorPos, ACTOR_ENEMY0, LVar0, LVar2, LVar3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY1, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(RandInt, 2, LVar0) - EVT_SET(LVar1, 1) - EVT_SUB(LVar0, LVar1) - EVT_ADD(LVar0, LVarC) - EVT_CALL(GetActorPos, ACTOR_ENEMY1, LVar1, LVar2, LVar3) - EVT_CALL(SetActorPos, ACTOR_ENEMY1, LVar0, LVar2, LVar3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY2, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(RandInt, 2, LVar0) - EVT_SET(LVar1, 1) - EVT_SUB(LVar0, LVar1) - EVT_ADD(LVar0, LVarD) - EVT_CALL(GetActorPos, ACTOR_ENEMY2, LVar1, LVar2, LVar3) - EVT_CALL(SetActorPos, ACTOR_ENEMY2, LVar0, LVar2, LVar3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY3, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY3, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(RandInt, 2, LVar0) - EVT_SET(LVar1, 1) - EVT_SUB(LVar0, LVar1) - EVT_ADD(LVar0, LVarB) - EVT_CALL(GetActorPos, ACTOR_ENEMY3, LVar1, LVar2, LVar3) - EVT_CALL(SetActorPos, ACTOR_ENEMY3, LVar0, LVar2, LVar3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_END_IF - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 2) - EVT_WAIT(2) - EVT_GOTO(1) - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY0, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY0, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVar1, LVar2, LVar3) - EVT_CALL(SetActorPos, ACTOR_ENEMY0, LVarA, LVar2, LVar3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY1, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(GetActorPos, ACTOR_ENEMY1, LVar1, LVar2, LVar3) - EVT_CALL(SetActorPos, ACTOR_ENEMY1, LVarC, LVar2, LVar3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY2, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(GetActorPos, ACTOR_ENEMY2, LVar1, LVar2, LVar3) - EVT_CALL(SetActorPos, ACTOR_ENEMY2, LVarD, LVar2, LVar3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_END_IF - EVT_CALL(ActorExists, ACTOR_ENEMY3, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY3, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(GetActorPos, ACTOR_ENEMY3, LVar1, LVar2, LVar3) - EVT_CALL(SetActorPos, ACTOR_ENEMY3, LVarB, LVar2, LVar3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_END_IF - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(handleEvent_802242FC) = { +EvtScript N(EVS_KoopaBros_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) + // set flags for player or partner hitting the koopa bros tower EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x80) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_ELSE - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x40) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF - EVT_SET(LVarA, 2) - EVT_EXEC_WAIT(N(80223870)) + EVT_SET(LVarA, BOSS_CMD_HIT) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_WAIT(30) + // if the attack was explosive, set both flags EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_BLAST) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x40) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x80) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF - EVT_EXEC_WAIT(N(802235E0)) + EVT_EXEC_WAIT(N(EVS_Broadcast_TowerUnstable)) EVT_CASE_EQ(EVENT_HIT) + // set flags for player or partner hitting the koopa bros tower EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x80) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_ELSE - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x40) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF + // if the attack was explosive, set both flags EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_BLAST) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x40) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x80) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_FLAG(LVar0, 0x40) - EVT_IF_FLAG(LVar0, 0x80) - EVT_EXEC_WAIT(N(80223718)) + // if this was the second hit, topple the tower + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_FLAG(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_IF_FLAG(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_EXEC_WAIT(N(EVS_Broadcast_ToppleHit)) EVT_WAIT(20) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF EVT_END_IF - EVT_SET(LVarA, 2) - EVT_EXEC_WAIT(N(80223870)) + // this was the first hit + EVT_SET(LVarA, BOSS_CMD_HIT) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_WAIT(30) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_NE(LVar0, 2) - EVT_EXEC_WAIT(N(802235E0)) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_IF_NE(LVar0, AVAL_Boss_TowerState_Unstable) + EVT_EXEC_WAIT(N(EVS_Broadcast_TowerUnstable)) EVT_END_IF - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_FLAG(LVar0, 0x10) - EVT_IF_NOT_FLAG(LVar0, 0x20) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_FLAG(LVar0, AFLAG_Boss_TowerUnstable) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_Dialogue_WereGoingOver) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar0) EVT_CALL(ActorSpeak, MSG_CH1_0109, LVar0, 1, -1, -1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x20) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_Dialogue_WereGoingOver) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_WAIT(20) EVT_END_IF EVT_END_IF EVT_CASE_EQ(EVENT_BURN_HIT) + // set flags for player or partner hitting the koopa bros tower EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x80) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_ELSE - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x40) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF + // if the attack was explosive, set both flags EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_BLAST) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x40) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x80) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_FLAG(LVar0, 0x40) - EVT_IF_FLAG(LVar0, 0x80) - EVT_EXEC_WAIT(N(80223718)) + // if this was the second hit, topple the tower + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_FLAG(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_IF_FLAG(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_EXEC_WAIT(N(EVS_Broadcast_ToppleHit)) EVT_WAIT(20) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF EVT_END_IF - EVT_SET(LVarA, 3) - EVT_EXEC_WAIT(N(80223870)) + // this was the first hit + EVT_SET(LVarA, BOSS_CMD_BURN_HIT) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_WAIT(30) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_NE(LVar0, 2) - EVT_EXEC_WAIT(N(802235E0)) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_IF_NE(LVar0, AVAL_Boss_TowerState_Unstable) + EVT_EXEC_WAIT(N(EVS_Broadcast_TowerUnstable)) EVT_END_IF - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_FLAG(LVar0, 0x10) - EVT_IF_NOT_FLAG(LVar0, 0x20) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_FLAG(LVar0, AFLAG_Boss_TowerUnstable) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_Dialogue_WereGoingOver) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar0) EVT_CALL(ActorSpeak, MSG_CH1_0109, LVar0, 1, -1, -1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x20) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_Dialogue_WereGoingOver) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_WAIT(20) EVT_END_IF EVT_END_IF EVT_CASE_EQ(EVENT_ZERO_DAMAGE) - EVT_SET(LVarA, 4) - EVT_EXEC_WAIT(N(80223870)) + EVT_SET(LVarA, BOSS_CMD_NO_DAMAGE_HIT) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_CASE_EQ(EVENT_IMMUNE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 2) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x40) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x80) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + // set both flags if the tower is already unstable + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_IF_EQ(LVar0, AVAL_Boss_TowerState_Unstable) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_FLAG(LVar0, 0x40) - EVT_IF_FLAG(LVar0, 0x00000080) - EVT_EXEC_WAIT(N(80223718)) + // if this was the second hit, topple the tower + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_FLAG(LVar0, AFLAG_Boss_PlayerHitTower) + EVT_IF_FLAG(LVar0, AFLAG_Boss_PartnerHitTower) + EVT_EXEC_WAIT(N(EVS_Broadcast_ToppleHit)) EVT_WAIT(20) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_IF EVT_END_IF - EVT_SET(LVarA, 4) - EVT_EXEC_WAIT(N(80223870)) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_FLAG(LVar0, 0x10) - EVT_IF_NOT_FLAG(LVar0, 0x20) - EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) + // this was the first hit + EVT_SET(LVarA, BOSS_CMD_NO_DAMAGE_HIT) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_FLAG(LVar0, AFLAG_Boss_TowerUnstable) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_Dialogue_WereGoingOver) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TopKoopaID, LVar0) EVT_CALL(ActorSpeak, MSG_CH1_0109, LVar0, 1, -1, -1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x20) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_Dialogue_WereGoingOver) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_WAIT(20) EVT_END_IF EVT_END_IF @@ -2903,47 +3004,50 @@ EvtScript N(handleEvent_802242FC) = { EVT_END }; -EvtScript N(takeTurn_80224D84) = { +EvtScript N(EVS_KoopaBros_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + // reform stable tower if tipping + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CASE_EQ(1) - EVT_CASE_EQ(2) + EVT_CASE_EQ(AVAL_Boss_TowerState_None) + EVT_CASE_EQ(AVAL_Boss_TowerState_Stable) + EVT_CASE_EQ(AVAL_Boss_TowerState_Unstable) EVT_WAIT(30) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_SET(LVarA, 0) - EVT_EXEC_WAIT(N(80223870)) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -17) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -33) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVarA) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_Stable) + EVT_SET(LVarA, BOSS_CMD_STABLE) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, ~AFLAG_Boss_TowerUnstable) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, ~AFLAG_Boss_Dialogue_WereGoingOver) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerHeight, LVarA) EVT_SET(LVar0, LVarA) EVT_MUL(LVar0, 18) EVT_ADD(LVar0, 20) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_2, -4, LVar0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_TOWER, -4, LVar0) EVT_CALL(SetActorSize, ACTOR_SELF, LVar0, 45) - EVT_CASE_EQ(3) + EVT_CASE_EQ(AVAL_Boss_TowerState_Toppled) EVT_END_SWITCH - EVT_SET(LVar0, 512) + // find if any koopa bros are toppled + EVT_SET(LVar0, FIRST_KOOPA_ACTOR) EVT_LOOP(4) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) EVT_CALL(GetStatusFlags, LVar0, LVar1) EVT_IF_EQ(LVar1, 0) - EVT_CALL(GetActorVar, LVar0, 1, LVar1) - EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_CALL(GetActorVar, LVar0, AVAR_Koopa_State, LVar1) + EVT_IF_EQ(LVar1, AVAL_Koopa_State_Toppled) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_END_IF EVT_END_IF EVT_ADD(LVar0, 1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + // zoom in to show the toppled koopa bros and have them try to get up + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 90, 0, 0) EVT_CALL(SetBattleCamZoom, 350) @@ -2951,83 +3055,88 @@ EvtScript N(takeTurn_80224D84) = { EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) EVT_END_IF - EVT_SET(LVarA, 9) - EVT_EXEC_WAIT(N(80223870)) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) + EVT_SET(LVarA, BOSS_CMD_TRY_GET_UP) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) + // try tower operations + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(N(802230E8)) + EVT_CASE_EQ(AVAL_Boss_TowerState_Stable) + // try adding any orphaned koopa bros to the tower + EVT_EXEC_WAIT(N(EVS_TryJoiningTower)) EVT_CASE_DEFAULT - EVT_EXEC_WAIT(N(80222C44)) + // try forming a new tower + EVT_EXEC_WAIT(N(EVS_TryFormingTower)) EVT_END_SWITCH - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_FLAG(LVar0, 0x00000200) + // if only one koopa bro is alive, perform a solo attack + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_FLAG(LVar0, AFLAG_Boss_DoingSoloAttack) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) - EVT_SET(LVarA, 8) - EVT_EXEC_WAIT(N(80223870)) + EVT_SET(LVarA, BOSS_CMD_SOLO_ATTACK) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_LABEL(123) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_FLAG(LVar0, 0x00000200) - EVT_WAIT(1) - EVT_GOTO(123) - EVT_END_IF - EVT_SET(LVarA, 10) - EVT_EXEC_WAIT(N(80223870)) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_FLAG(LVar0, AFLAG_Boss_DoingSoloAttack) + EVT_WAIT(1) + EVT_GOTO(123) + EVT_END_IF + EVT_SET(LVarA, BOSS_CMD_GET_READY) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_WAIT(5) EVT_RETURN EVT_END_IF - EVT_SET(LVarA, 10) - EVT_EXEC_WAIT(N(80223870)) + EVT_SET(LVarA, BOSS_CMD_GET_READY) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_WAIT(5) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 3) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_IF_EQ(LVar0, AVAL_Boss_TowerState_Toppled) EVT_RETURN EVT_END_IF + // execute spin attack EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_IF_NOT_FLAG(LVar0, 4) - EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_IF_NOT_FLAG(LVar0, AFLAG_Boss_Dialogue_SpinAttack) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_LeadKoopaID, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_EQ(512) - EVT_CALL(ActorSpeak, MSG_CH1_0108, LVar0, 1, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04) - EVT_CASE_EQ(513) - EVT_CALL(ActorSpeak, MSG_CH1_0108, LVar0, 1, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04) - EVT_CASE_EQ(514) - EVT_CALL(ActorSpeak, MSG_CH1_0108, LVar0, 1, ANIM_KoopaBros_Black_Anim14, ANIM_KoopaBros_Black_Anim04) - EVT_CASE_EQ(515) - EVT_CALL(ActorSpeak, MSG_CH1_0108, LVar0, 1, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04) + EVT_CASE_EQ(GREEN_ACTOR) + EVT_CALL(ActorSpeak, MSG_CH1_0108, LVar0, 1, ANIM_KoopaBros_Green_Talk, ANIM_KoopaBros_Green_Idle) + EVT_CASE_EQ(YELLOW_ACTOR) + EVT_CALL(ActorSpeak, MSG_CH1_0108, LVar0, 1, ANIM_KoopaBros_Yellow_Talk, ANIM_KoopaBros_Yellow_Idle) + EVT_CASE_EQ(BLACK_ACTOR) + EVT_CALL(ActorSpeak, MSG_CH1_0108, LVar0, 1, ANIM_KoopaBros_Black_Talk, ANIM_KoopaBros_Black_Idle) + EVT_CASE_EQ(RED_ACTOR) + EVT_CALL(ActorSpeak, MSG_CH1_0108, LVar0, 1, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle) EVT_END_SWITCH - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_OR_CONST(LVar0, 0x4) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_OR_CONST(LVar0, AFLAG_Boss_Dialogue_SpinAttack) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_END_IF - EVT_SET(LVarA, 7) - EVT_EXEC_WAIT(N(80223870)) + EVT_SET(LVarA, BOSS_CMD_SPIN_ATTACK) + EVT_EXEC_WAIT(N(EVS_BroadcastToKoopaBros)) EVT_LABEL(10) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_WAIT(1) - EVT_IF_NE(LVar0, 0) - EVT_GOTO(10) - EVT_END_IF - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, LVar0) + EVT_WAIT(1) + EVT_IF_NE(LVar0, AVAL_Boss_TowerState_None) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Boss_TowerState, AVAL_Boss_TowerState_Stable) EVT_RETURN EVT_END }; -EvtScript N(nextTurn_80225438) = { +EvtScript N(EVS_KoopaBros_HandlePhase) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_PLAYER_BEGIN) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -65) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -129) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, ~AFLAG_Boss_PlayerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) + EVT_BITWISE_AND_CONST(LVar0, ~AFLAG_Boss_PartnerHitTower) + EVT_CALL(SetActorVar, BOSS_ACTOR, AVAR_Boss_Flags, LVar0) EVT_CASE_EQ(PHASE_ENEMY_BEGIN) EVT_CASE_EQ(PHASE_ENEMY_END) EVT_END_SWITCH diff --git a/src/battle/area/trd_part_2/actor/green_ninja_koopa.c b/src/battle/area/trd_part_2/actor/green_ninja_koopa.c deleted file mode 100644 index 5976b36afe..0000000000 --- a/src/battle/area/trd_part_2/actor/green_ninja_koopa.c +++ /dev/null @@ -1,822 +0,0 @@ -#include "common.h" -#include "effects.h" -#include "battle/battle.h" -#include "script_api/battle.h" -#include "sprite/npc/KoopaBros.h" - -#define NAMESPACE b_area_trd_part_2_green_ninja_koopa - -extern s32 N(IdleAnimations_80225670)[]; -extern EvtScript N(init_80227CEC); -extern EvtScript N(idle_80227DE0); -extern EvtScript N(handleEvent_80227E48); -extern EvtScript N(nextTurn_802284E4); -extern EvtScript N(takeTurn_802284D4); - -enum N(ActorPartIDs) { - PRT_MAIN = 1, -}; - -s32 N(DefenseTable_80225560)[] = { - ELEMENT_NORMAL, 1, - ELEMENT_END, -}; - -s32 N(DefenseTable_8022556C)[] = { - ELEMENT_NORMAL, 0, - ELEMENT_END, -}; - -s32 N(StatusTable_80225578)[] = { - STATUS_KEY_NORMAL, 0, - STATUS_KEY_DEFAULT, 0, - STATUS_KEY_SLEEP, 70, - STATUS_KEY_POISON, 0, - STATUS_KEY_FROZEN, 0, - STATUS_KEY_DIZZY, 45, - STATUS_KEY_FEAR, 0, - STATUS_KEY_STATIC, 0, - STATUS_KEY_PARALYZE, 75, - STATUS_KEY_SHRINK, 100, - STATUS_KEY_STOP, 75, - STATUS_TURN_MOD_DEFAULT, 0, - STATUS_TURN_MOD_SLEEP, -1, - STATUS_TURN_MOD_POISON, 0, - STATUS_TURN_MOD_FROZEN, 0, - STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, - STATUS_TURN_MOD_STATIC, 0, - STATUS_TURN_MOD_PARALYZE, -1, - STATUS_TURN_MOD_SHRINK, -1, - STATUS_TURN_MOD_STOP, -2, - STATUS_END, -}; - -ActorPartBlueprint N(ActorParts_80225624)[] = { - { - .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = PRT_MAIN, - .posOffset = { 0, 0, 0 }, - .targetOffset = { -5, 36 }, - .opacity = 255, - .idleAnimations = N(IdleAnimations_80225670), - .defenseTable = N(DefenseTable_80225560), - .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, - .elementImmunityFlags = 0, - .projectileTargetOffset = { 0, 0 }, - }, -}; - -ActorBlueprint NAMESPACE = { - .flags = ACTOR_FLAG_NO_HEALTH_BAR | ACTOR_FLAG_NO_ATTACK, - .type = ACTOR_TYPE_GREEN_NINJAKOOPA, - .level = 16, - .maxHP = 5, - .partCount = ARRAY_COUNT( N(ActorParts_80225624)), - .partsData = N(ActorParts_80225624), - .initScript = &N(init_80227CEC), - .statusTable = N(StatusTable_80225578), - .escapeChance = 0, - .airLiftChance = 0, - .hurricaneChance = 0, - .spookChance = 0, - .upAndAwayChance = 0, - .spinSmashReq = 0, - .powerBounceChance = 85, - .coinReward = 0, - .size = { 38, 42 }, - .healthBarOffset = { 0, 0 }, - .statusIconOffset = { -10, 20 }, - .statusTextOffset = { 10, 20 }, -}; - -s32 N(IdleAnimations_80225670)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Green_Anim04, - STATUS_KEY_STONE, ANIM_KoopaBros_Green_Anim00, - STATUS_KEY_SLEEP, ANIM_KoopaBros_Green_Anim15, - STATUS_KEY_POISON, ANIM_KoopaBros_Green_Anim00, - STATUS_KEY_STOP, ANIM_KoopaBros_Green_Anim00, - STATUS_KEY_STATIC, ANIM_KoopaBros_Green_Anim00, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Green_Anim00, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Green_Anim00, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Green_Anim18, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Green_Anim18, - STATUS_END, -}; - -s32 N(IdleAnimations_802256C4)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Green_Anim05, - STATUS_KEY_STONE, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_POISON, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_STOP, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_STATIC, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Green_Anim01, - STATUS_END, -}; - -s32 N(IdleAnimations_80225700)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Green_Anim0D, - STATUS_KEY_STONE, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_POISON, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_STOP, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_STATIC, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Green_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Green_Anim01, - STATUS_END, -}; - -s32 N(IdleAnimations_8022573C)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Green_Anim0C, - STATUS_KEY_STONE, ANIM_KoopaBros_Green_Anim17, - STATUS_KEY_SLEEP, ANIM_KoopaBros_Green_Anim17, - STATUS_KEY_POISON, ANIM_KoopaBros_Green_Anim17, - STATUS_KEY_STOP, ANIM_KoopaBros_Green_Anim17, - STATUS_KEY_STATIC, ANIM_KoopaBros_Green_Anim17, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Green_Anim17, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Green_Anim17, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Green_Anim22, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Green_Anim22, - STATUS_END, -}; - -s32 N(IdleAnimations_80225790)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Green_Anim0A, - STATUS_END, -}; - -s32 N(IdleAnimations_8022579C)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Green_Anim0C, - STATUS_END, -}; - -#include "common/StartRumbleWithParams.inc.c" - -#include "common/UnkWhirlwindEffectFunc.inc.c" - -#include "common/UnkEnemyFunc.inc.c" - -#include "common/UnkEnemyPosFunc.inc.c" - -#include "common/GetLastActorEventType.inc.c" - -EvtScript N(802257A8) = { - EVT_CALL(SetOwnerID, ACTOR_ENEMY0) - EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_SWITCH(LVarA) - EVT_CASE_EQ(0) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225670))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim04) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_802256C4))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim05) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_WAIT(5) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225700))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0D) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(2) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, 192) - EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225700))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0D) - EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225790))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0A) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(3) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(N(GetLastActorEventType), 14) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0E) - EVT_SET_CONST(LVar2, -1) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, 192) - EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225700))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0D) - EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225790))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0A) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim08) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim09) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim1F) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim20) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_WAIT(15) - EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET(LocalFlag(0), 0) - EVT_IF_EQ(LVar0, 3) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0A) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225790))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(N(StartRumbleWithParams), 256, 5) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) - EVT_END_THREAD - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022579C))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022573C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022556C))) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(6) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET(LocalFlag(0), 0) - EVT_IF_EQ(LVar0, 3) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225790))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(N(StartRumbleWithParams), 256, 5) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) - EVT_END_THREAD - EVT_END_IF - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4) - EVT_DIVF(LVar3, EVT_FLOAT(2.0)) - EVT_ADDF(LVar1, LVar3) - EVT_ADDF(LVar2, EVT_FLOAT(5.0)) - EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022579C))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022573C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022556C))) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(9) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) - EVT_SUB(LVar0, 1) - EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) - EVT_WAIT(20) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) - EVT_WAIT(12) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_THREAD - EVT_SET(LVar0, 0) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 18, 0) - EVT_LOOP(4) - EVT_ADD(LVar0, 22) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -5, 36) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_80225560))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_80225670))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim04) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_WAIT(20) - EVT_END_SWITCH - EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(2) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_END_SWITCH - EVT_CASE_EQ(7) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim08) - EVT_WAIT(10) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_356) - EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_355) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_354) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(HIT_RESULT_LUCKY) - EVT_WAIT(20) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) - EVT_RETURN - EVT_CASE_EQ(HIT_RESULT_MISS) - EVT_RETURN - EVT_END_SWITCH - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVarA) - EVT_LABEL(0) - EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_IF_GT(LVar0, LVar3) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar1) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(13.0)) - EVT_CASE_EQ(3) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) - EVT_CASE_EQ(2) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) - EVT_END_SWITCH - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVarB) - EVT_SET(LVar0, LVarB) - EVT_SUB(LVar0, 1) - EVT_MUL(LVar0, 18) - EVT_SWITCH(LVarB) - EVT_CASE_EQ(4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -10) - EVT_CASE_EQ(3) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -7) - EVT_CASE_EQ(2) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -4) - EVT_END_SWITCH - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_CASE_EQ(3) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 50) - EVT_WAIT(50) - EVT_CASE_EQ(2) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 40) - EVT_WAIT(40) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim09) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) - EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim1B) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 22) - EVT_ADD(LVar1, 19) - EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim04) - EVT_WAIT(20) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 1, 0) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim1F) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) - EVT_CASE_EQ(5) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) - EVT_CASE_EQ(6) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) - EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 36, -7) - EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 18, -4) - EVT_CASE_EQ(6) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) - EVT_END_SWITCH - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 50) - EVT_WAIT(50) - EVT_CASE_EQ(5) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 40) - EVT_WAIT(40) - EVT_CASE_EQ(6) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim20) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim05) - EVT_WAIT(30) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(8) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(GetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SET(LVar2, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim03) - EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim1F) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_353) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(HIT_RESULT_LUCKY) - EVT_WAIT(20) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) - EVT_RETURN - EVT_CASE_EQ(HIT_RESULT_MISS) - EVT_RETURN - EVT_END_SWITCH - EVT_LABEL(0) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_IF_GT(LVar0, LVar3) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SET(LVar2, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim09) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) - EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim1B) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 22) - EVT_ADD(LVar1, 19) - EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim03) - EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -513) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_END_SWITCH - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_80227CEC) = { - EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_802284D4))) - EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80227DE0))) - EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80227E48))) - EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_802284E4))) - EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(idle_80227DE0) = { - EVT_RETURN - EVT_END -}; - -s32 N(intTable_80227DF0)[] = { - 0x00000009, 0x00000010, 0x00000016, 0x0000001A, 0x0000001E, 0x00000020, 0x00000021, 0x00000020, - 0x0000001E, 0x0000001A, 0x00000016, 0x00000010, 0x00000009, 0x00000000, 0x00000004, 0x00000006, - 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, -}; - -EvtScript N(handleEvent_80227E48) = { - EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(EVENT_HIT_COMBO) - EVT_CASE_OR_EQ(EVENT_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_END_CASE_GROUP - EVT_CASE_EQ(EVENT_BURN_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0E) - EVT_SET_CONST(LVar2, ANIM_KoopaBros_Green_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_CASE_EQ(EVENT_BURN_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0E) - EVT_SET_CONST(LVar2, ANIM_KoopaBros_Green_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) - EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_FLIP_TRIGGER) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022573C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022556C))) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0B) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) - EVT_THREAD - EVT_WAIT(4) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 30) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -30) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -60) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) - EVT_WAIT(1) - EVT_END_THREAD - EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim0C) - EVT_END_IF - EVT_USE_BUF(EVT_PTR(N(intTable_80227DF0))) - EVT_LOOP(22) - EVT_BUF_READ1(LVar0) - EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) - EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim08) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Green_Anim09) - EVT_WAIT(10) - EVT_END_IF - EVT_ELSE - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0C) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_CASE_EQ(EVENT_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_RECOVER_STATUS) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Green_Anim04) - EVT_EXEC_WAIT(EVS_Enemy_Recover) - EVT_END_IF - EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) - EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(takeTurn_802284D4) = { - EVT_RETURN - EVT_END -}; - -EvtScript N(nextTurn_802284E4) = { - EVT_RETURN - EVT_END -}; diff --git a/src/battle/area/trd_part_2/actor/koopa_bros_black.c b/src/battle/area/trd_part_2/actor/koopa_bros_black.c new file mode 100644 index 0000000000..efb9926ddf --- /dev/null +++ b/src/battle/area/trd_part_2/actor/koopa_bros_black.c @@ -0,0 +1,37 @@ +#include "../area.h" +#include "sprite/npc/KoopaBros.h" + +#define NAMESPACE A(black_ninja_koopa) + +// these are the only parameters that vary among koopa bros actors +enum N(ThisBrosParams) { + THIS_ACTOR_ID = ACTOR_ENEMY2, + THIS_ACTOR_TYPE = ACTOR_TYPE_BLACK_NINJAKOOPA, + THIS_LEVEL = 17, + THIS_SLEEP_CHANCE = 40, + THIS_DIZZY_CHANCE = 30, + THIS_PARALYZE_CHANCE = 60, + THIS_ANIM_IDLE = ANIM_KoopaBros_Black_Idle, + THIS_ANIM_STILL = ANIM_KoopaBros_Black_Still, + THIS_ANIM_SLEEP = ANIM_KoopaBros_Black_Sleep, + THIS_ANIM_DIZZY = ANIM_KoopaBros_Black_Dizzy, + THIS_ANIM_RUN = ANIM_KoopaBros_Black_Run, + THIS_ANIM_HURT = ANIM_KoopaBros_Black_Hurt, + THIS_ANIM_HURT_STILL = ANIM_KoopaBros_Black_HurtStill, + THIS_ANIM_BURN = ANIM_KoopaBros_Black_BurnHurt, + THIS_ANIM_BURN_STILL = ANIM_KoopaBros_Black_BurnStill, + THIS_ANIM_TOWER_IDLE = ANIM_KoopaBros_Black_IdleCrouch, + THIS_ANIM_TOWER_STILL = ANIM_KoopaBros_Black_StillCrouch, + THIS_ANIM_TOPPLE_IDLE = ANIM_KoopaBros_Black_IdleToppled, + THIS_ANIM_TOPPLE_STILL = ANIM_KoopaBros_Black_StillToppled, + THIS_ANIM_TOPPLE_DIZZY = ANIM_KoopaBros_Black_DizzyToppled, + THIS_ANIM_TIPPING_IDLE = ANIM_KoopaBros_Black_IdleTipping, + THIS_ANIM_TOP_ENTER_SHELL = ANIM_KoopaBros_Black_TopEnterShell, + THIS_ANIM_TOP_EXIT_SHELL = ANIM_KoopaBros_Black_TopExitShell, + THIS_ANIM_ENTER_SHELL = ANIM_KoopaBros_Black_EnterShell, + THIS_ANIM_EXIT_SHELL = ANIM_KoopaBros_Black_ExitShell, + THIS_ANIM_SHELL_SPIN = ANIM_KoopaBros_Black_ShellSpin, + THIS_ANIM_POINT = ANIM_KoopaBros_Black_PointForward, +}; + +#include "common_koopa_bros.inc.c" diff --git a/src/battle/area/trd_part_2/actor/koopa_bros_green.c b/src/battle/area/trd_part_2/actor/koopa_bros_green.c new file mode 100644 index 0000000000..7554a4010d --- /dev/null +++ b/src/battle/area/trd_part_2/actor/koopa_bros_green.c @@ -0,0 +1,37 @@ +#include "../area.h" +#include "sprite/npc/KoopaBros.h" + +#define NAMESPACE A(green_ninja_koopa) + +// these are the only parameters that vary among koopa bros actors +enum N(ThisBrosParams) { + THIS_ACTOR_ID = ACTOR_ENEMY0, + THIS_ACTOR_TYPE = ACTOR_TYPE_GREEN_NINJAKOOPA, + THIS_LEVEL = 16, + THIS_SLEEP_CHANCE = 70, + THIS_DIZZY_CHANCE = 45, + THIS_PARALYZE_CHANCE = 75, + THIS_ANIM_IDLE = ANIM_KoopaBros_Green_Idle, + THIS_ANIM_STILL = ANIM_KoopaBros_Green_Still, + THIS_ANIM_SLEEP = ANIM_KoopaBros_Green_Sleep, + THIS_ANIM_DIZZY = ANIM_KoopaBros_Green_Dizzy, + THIS_ANIM_RUN = ANIM_KoopaBros_Green_Run, + THIS_ANIM_HURT = ANIM_KoopaBros_Green_Hurt, + THIS_ANIM_HURT_STILL = ANIM_KoopaBros_Green_HurtStill, + THIS_ANIM_BURN = ANIM_KoopaBros_Green_BurnHurt, + THIS_ANIM_BURN_STILL = ANIM_KoopaBros_Green_BurnStill, + THIS_ANIM_TOWER_IDLE = ANIM_KoopaBros_Green_IdleCrouch, + THIS_ANIM_TOWER_STILL = ANIM_KoopaBros_Green_StillCrouch, + THIS_ANIM_TOPPLE_IDLE = ANIM_KoopaBros_Green_IdleToppled, + THIS_ANIM_TOPPLE_STILL = ANIM_KoopaBros_Green_StillToppled, + THIS_ANIM_TOPPLE_DIZZY = ANIM_KoopaBros_Green_DizzyToppled, + THIS_ANIM_TIPPING_IDLE = ANIM_KoopaBros_Green_IdleTipping, + THIS_ANIM_TOP_ENTER_SHELL = ANIM_KoopaBros_Green_TopEnterShell, + THIS_ANIM_TOP_EXIT_SHELL = ANIM_KoopaBros_Green_TopExitShell, + THIS_ANIM_ENTER_SHELL = ANIM_KoopaBros_Green_EnterShell, + THIS_ANIM_EXIT_SHELL = ANIM_KoopaBros_Green_ExitShell, + THIS_ANIM_SHELL_SPIN = ANIM_KoopaBros_Green_ShellSpin, + THIS_ANIM_POINT = ANIM_KoopaBros_Green_PointForward, +}; + +#include "common_koopa_bros.inc.c" diff --git a/src/battle/area/trd_part_2/actor/koopa_bros_red.c b/src/battle/area/trd_part_2/actor/koopa_bros_red.c new file mode 100644 index 0000000000..e824aec026 --- /dev/null +++ b/src/battle/area/trd_part_2/actor/koopa_bros_red.c @@ -0,0 +1,37 @@ +#include "../area.h" +#include "sprite/npc/KoopaBros.h" + +#define NAMESPACE A(red_ninja_koopa) + +// these are the only parameters that vary among koopa bros actors +enum N(ThisBrosParams) { + THIS_ACTOR_ID = ACTOR_ENEMY3, + THIS_ACTOR_TYPE = ACTOR_TYPE_RED_NINJAKOOPA, + THIS_LEVEL = 17, + THIS_SLEEP_CHANCE = 30, + THIS_DIZZY_CHANCE = 60, + THIS_PARALYZE_CHANCE = 60, + THIS_ANIM_IDLE = ANIM_KoopaBros_Red_Idle, + THIS_ANIM_STILL = ANIM_KoopaBros_Red_Still, + THIS_ANIM_SLEEP = ANIM_KoopaBros_Red_Sleep, + THIS_ANIM_DIZZY = ANIM_KoopaBros_Red_Dizzy, + THIS_ANIM_RUN = ANIM_KoopaBros_Red_Run, + THIS_ANIM_HURT = ANIM_KoopaBros_Red_Hurt, + THIS_ANIM_HURT_STILL = ANIM_KoopaBros_Red_HurtStill, + THIS_ANIM_BURN = ANIM_KoopaBros_Red_BurnHurt, + THIS_ANIM_BURN_STILL = ANIM_KoopaBros_Red_BurnStill, + THIS_ANIM_TOWER_IDLE = ANIM_KoopaBros_Red_IdleCrouch, + THIS_ANIM_TOWER_STILL = ANIM_KoopaBros_Red_StillCrouch, + THIS_ANIM_TOPPLE_IDLE = ANIM_KoopaBros_Red_IdleToppled, + THIS_ANIM_TOPPLE_STILL = ANIM_KoopaBros_Red_StillToppled, + THIS_ANIM_TOPPLE_DIZZY = ANIM_KoopaBros_Red_DizzyToppled, + THIS_ANIM_TIPPING_IDLE = ANIM_KoopaBros_Red_IdleTipping, + THIS_ANIM_TOP_ENTER_SHELL = ANIM_KoopaBros_Red_TopEnterShell, + THIS_ANIM_TOP_EXIT_SHELL = ANIM_KoopaBros_Red_TopExitShell, + THIS_ANIM_ENTER_SHELL = ANIM_KoopaBros_Red_EnterShell, + THIS_ANIM_EXIT_SHELL = ANIM_KoopaBros_Red_ExitShell, + THIS_ANIM_SHELL_SPIN = ANIM_KoopaBros_Red_ShellSpin, + THIS_ANIM_POINT = ANIM_KoopaBros_Red_PointForward, +}; + +#include "common_koopa_bros.inc.c" diff --git a/src/battle/area/trd_part_2/actor/koopa_bros_yellow.c b/src/battle/area/trd_part_2/actor/koopa_bros_yellow.c new file mode 100644 index 0000000000..a947faadc4 --- /dev/null +++ b/src/battle/area/trd_part_2/actor/koopa_bros_yellow.c @@ -0,0 +1,37 @@ +#include "../area.h" +#include "sprite/npc/KoopaBros.h" + +#define NAMESPACE A(yellow_ninja_koopa) + +// these are the only parameters that vary among koopa bros actors +enum N(ThisBrosParams) { + THIS_ACTOR_ID = ACTOR_ENEMY1, + THIS_ACTOR_TYPE = ACTOR_TYPE_YELLOW_NINJAKOOPA, + THIS_LEVEL = 16, + THIS_SLEEP_CHANCE = 60, + THIS_DIZZY_CHANCE = 75, + THIS_PARALYZE_CHANCE = 75, + THIS_ANIM_IDLE = ANIM_KoopaBros_Yellow_Idle, + THIS_ANIM_STILL = ANIM_KoopaBros_Yellow_Still, + THIS_ANIM_SLEEP = ANIM_KoopaBros_Yellow_Sleep, + THIS_ANIM_DIZZY = ANIM_KoopaBros_Yellow_Dizzy, + THIS_ANIM_RUN = ANIM_KoopaBros_Yellow_Run, + THIS_ANIM_HURT = ANIM_KoopaBros_Yellow_Hurt, + THIS_ANIM_HURT_STILL = ANIM_KoopaBros_Yellow_HurtStill, + THIS_ANIM_BURN = ANIM_KoopaBros_Yellow_BurnHurt, + THIS_ANIM_BURN_STILL = ANIM_KoopaBros_Yellow_BurnStill, + THIS_ANIM_TOWER_IDLE = ANIM_KoopaBros_Yellow_IdleCrouch, + THIS_ANIM_TOWER_STILL = ANIM_KoopaBros_Yellow_StillCrouch, + THIS_ANIM_TOPPLE_IDLE = ANIM_KoopaBros_Yellow_IdleToppled, + THIS_ANIM_TOPPLE_STILL = ANIM_KoopaBros_Yellow_StillToppled, + THIS_ANIM_TOPPLE_DIZZY = ANIM_KoopaBros_Yellow_DizzyToppled, + THIS_ANIM_TIPPING_IDLE = ANIM_KoopaBros_Yellow_IdleTipping, + THIS_ANIM_TOP_ENTER_SHELL = ANIM_KoopaBros_Yellow_TopEnterShell, + THIS_ANIM_TOP_EXIT_SHELL = ANIM_KoopaBros_Yellow_TopExitShell, + THIS_ANIM_ENTER_SHELL = ANIM_KoopaBros_Yellow_EnterShell, + THIS_ANIM_EXIT_SHELL = ANIM_KoopaBros_Yellow_ExitShell, + THIS_ANIM_SHELL_SPIN = ANIM_KoopaBros_Yellow_ShellSpin, + THIS_ANIM_POINT = ANIM_KoopaBros_Yellow_PointForward, +}; + +#include "common_koopa_bros.inc.c" diff --git a/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c deleted file mode 100644 index ba6e2fea4b..0000000000 --- a/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c +++ /dev/null @@ -1,822 +0,0 @@ -#include "common.h" -#include "effects.h" -#include "battle/battle.h" -#include "script_api/battle.h" -#include "sprite/npc/KoopaBros.h" - -#define NAMESPACE b_area_trd_part_2_yellow_ninja_koopa - -extern s32 N(IdleAnimations_8022E550)[]; -extern EvtScript N(init_80230BCC); -extern EvtScript N(idle_80230CC0); -extern EvtScript N(handleEvent_80230D28); -extern EvtScript N(nextTurn_802313C4); -extern EvtScript N(takeTurn_802313B4); - -enum N(ActorPartIDs) { - PRT_MAIN = 1, -}; - -s32 N(DefenseTable_8022E440)[] = { - ELEMENT_NORMAL, 1, - ELEMENT_END, -}; - -s32 N(DefenseTable_8022E44C)[] = { - ELEMENT_NORMAL, 0, - ELEMENT_END, -}; - -s32 N(StatusTable_8022E458)[] = { - STATUS_KEY_NORMAL, 0, - STATUS_KEY_DEFAULT, 0, - STATUS_KEY_SLEEP, 60, - STATUS_KEY_POISON, 0, - STATUS_KEY_FROZEN, 0, - STATUS_KEY_DIZZY, 75, - STATUS_KEY_FEAR, 0, - STATUS_KEY_STATIC, 0, - STATUS_KEY_PARALYZE, 75, - STATUS_KEY_SHRINK, 100, - STATUS_KEY_STOP, 75, - STATUS_TURN_MOD_DEFAULT, 0, - STATUS_TURN_MOD_SLEEP, -1, - STATUS_TURN_MOD_POISON, 0, - STATUS_TURN_MOD_FROZEN, 0, - STATUS_TURN_MOD_DIZZY, -1, - STATUS_TURN_MOD_FEAR, 0, - STATUS_TURN_MOD_STATIC, 0, - STATUS_TURN_MOD_PARALYZE, -1, - STATUS_TURN_MOD_SHRINK, -1, - STATUS_TURN_MOD_STOP, -2, - STATUS_END, -}; - -ActorPartBlueprint N(ActorParts_8022E504)[] = { - { - .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = PRT_MAIN, - .posOffset = { 0, 0, 0 }, - .targetOffset = { -5, 36 }, - .opacity = 255, - .idleAnimations = N(IdleAnimations_8022E550), - .defenseTable = N(DefenseTable_8022E440), - .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, - .elementImmunityFlags = 0, - .projectileTargetOffset = { 0, 0 }, - }, -}; - -ActorBlueprint NAMESPACE = { - .flags = ACTOR_FLAG_NO_HEALTH_BAR | ACTOR_FLAG_NO_ATTACK, - .type = ACTOR_TYPE_YELLOW_NINJAKOOPA, - .level = 16, - .maxHP = 5, - .partCount = ARRAY_COUNT( N(ActorParts_8022E504)), - .partsData = N(ActorParts_8022E504), - .initScript = &N(init_80230BCC), - .statusTable = N(StatusTable_8022E458), - .escapeChance = 0, - .airLiftChance = 0, - .hurricaneChance = 0, - .spookChance = 0, - .upAndAwayChance = 0, - .spinSmashReq = 0, - .powerBounceChance = 85, - .coinReward = 0, - .size = { 38, 42 }, - .healthBarOffset = { 0, 0 }, - .statusIconOffset = { -10, 20 }, - .statusTextOffset = { 10, 20 }, -}; - -s32 N(IdleAnimations_8022E550)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Yellow_Anim04, - STATUS_KEY_STONE, ANIM_KoopaBros_Yellow_Anim00, - STATUS_KEY_SLEEP, ANIM_KoopaBros_Yellow_Anim15, - STATUS_KEY_POISON, ANIM_KoopaBros_Yellow_Anim00, - STATUS_KEY_STOP, ANIM_KoopaBros_Yellow_Anim00, - STATUS_KEY_STATIC, ANIM_KoopaBros_Yellow_Anim00, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Yellow_Anim00, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Yellow_Anim00, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Yellow_Anim18, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Yellow_Anim18, - STATUS_END, -}; - -s32 N(IdleAnimations_8022E5A4)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Yellow_Anim05, - STATUS_KEY_STONE, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_POISON, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_STOP, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_STATIC, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Yellow_Anim01, - STATUS_END, -}; - -s32 N(IdleAnimations_8022E5E0)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Yellow_Anim0D, - STATUS_KEY_STONE, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_POISON, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_STOP, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_STATIC, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Yellow_Anim01, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Yellow_Anim01, - STATUS_END, -}; - -s32 N(IdleAnimations_8022E61C)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Yellow_Anim0C, - STATUS_KEY_STONE, ANIM_KoopaBros_Yellow_Anim17, - STATUS_KEY_SLEEP, ANIM_KoopaBros_Yellow_Anim17, - STATUS_KEY_POISON, ANIM_KoopaBros_Yellow_Anim17, - STATUS_KEY_STOP, ANIM_KoopaBros_Yellow_Anim17, - STATUS_KEY_STATIC, ANIM_KoopaBros_Yellow_Anim17, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Yellow_Anim17, - STATUS_KEY_PARALYZE, ANIM_KoopaBros_Yellow_Anim17, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Yellow_Anim22, - STATUS_KEY_DIZZY, ANIM_KoopaBros_Yellow_Anim22, - STATUS_END, -}; - -s32 N(IdleAnimations_8022E670)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Yellow_Anim0A, - STATUS_END, -}; - -s32 N(IdleAnimations_8022E67C)[] = { - STATUS_KEY_NORMAL, ANIM_KoopaBros_Yellow_Anim0C, - STATUS_END, -}; - -#include "common/StartRumbleWithParams.inc.c" - -#include "common/UnkWhirlwindEffectFunc.inc.c" - -#include "common/UnkEnemyFunc.inc.c" - -#include "common/UnkEnemyPosFunc.inc.c" - -#include "common/GetLastActorEventType.inc.c" - -EvtScript N(8022E688) = { - EVT_CALL(SetOwnerID, ACTOR_ENEMY1) - EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_SWITCH(LVarA) - EVT_CASE_EQ(0) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E550))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim04) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E5A4))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim05) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_WAIT(5) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E5E0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0D) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(2) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, 192) - EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E5E0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0D) - EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E670))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0A) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(3) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(N(GetLastActorEventType), 14) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0E) - EVT_SET_CONST(LVar2, -1) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, 192) - EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E5E0))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0D) - EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E670))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0A) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim08) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim09) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim1F) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim20) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_WAIT(15) - EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET(LocalFlag(0), 0) - EVT_IF_EQ(LVar0, 3) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0A) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E670))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(N(StartRumbleWithParams), 256, 5) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) - EVT_END_THREAD - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E67C))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E61C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022E44C))) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(6) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(3) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_SET(LocalFlag(0), 0) - EVT_IF_EQ(LVar0, 3) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E670))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(N(StartRumbleWithParams), 256, 5) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) - EVT_END_THREAD - EVT_END_IF - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4) - EVT_DIVF(LVar3, EVT_FLOAT(2.0)) - EVT_ADDF(LVar1, LVar3) - EVT_ADDF(LVar2, EVT_FLOAT(5.0)) - EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E67C))) - EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_HEALTH_BAR, FALSE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E61C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022E44C))) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(9) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(1) - EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) - EVT_SUB(LVar0, 1) - EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) - EVT_WAIT(20) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) - EVT_WAIT(12) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_THREAD - EVT_SET(LVar0, 0) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 18, 0) - EVT_LOOP(4) - EVT_ADD(LVar0, 22) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -5, 36) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022E440))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E550))) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim04) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_WAIT(20) - EVT_END_SWITCH - EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(2) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_END_SWITCH - EVT_CASE_EQ(7) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(3) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim08) - EVT_WAIT(10) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_356) - EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_355) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_354) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(HIT_RESULT_LUCKY) - EVT_WAIT(20) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) - EVT_RETURN - EVT_CASE_EQ(HIT_RESULT_MISS) - EVT_RETURN - EVT_END_SWITCH - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVarA) - EVT_LABEL(0) - EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_IF_GT(LVar0, LVar3) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar1) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(13.0)) - EVT_CASE_EQ(3) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) - EVT_CASE_EQ(2) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) - EVT_END_SWITCH - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVarB) - EVT_SET(LVar0, LVarB) - EVT_SUB(LVar0, 1) - EVT_MUL(LVar0, 18) - EVT_SWITCH(LVarB) - EVT_CASE_EQ(4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -10) - EVT_CASE_EQ(3) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -7) - EVT_CASE_EQ(2) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar0, -4) - EVT_END_SWITCH - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_CASE_EQ(3) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 50) - EVT_WAIT(50) - EVT_CASE_EQ(2) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 40) - EVT_WAIT(40) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim09) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) - EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim1B) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 22) - EVT_ADD(LVar1, 19) - EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim04) - EVT_WAIT(20) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 1, 0) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(5) - EVT_CASE_OR_EQ(6) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim1F) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 60) - EVT_WAIT(60) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) - EVT_CASE_EQ(5) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) - EVT_CASE_EQ(6) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) - EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 36, -7) - EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 18, -4) - EVT_CASE_EQ(6) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) - EVT_CALL(GetHomePos, LVar1, LVar2, LVar3, LVar4) - EVT_SET(LVar4, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) - EVT_END_SWITCH - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(4) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 50) - EVT_WAIT(50) - EVT_CASE_EQ(5) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 40) - EVT_WAIT(40) - EVT_CASE_EQ(6) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim20) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim05) - EVT_WAIT(30) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CASE_EQ(8) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(0) - EVT_CALL(GetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SET(LVar2, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim03) - EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim1F) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_353) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim07) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) - EVT_SWITCH(LVar0) - EVT_CASE_EQ(HIT_RESULT_LUCKY) - EVT_WAIT(20) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) - EVT_RETURN - EVT_CASE_EQ(HIT_RESULT_MISS) - EVT_RETURN - EVT_END_SWITCH - EVT_LABEL(0) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_IF_GT(LVar0, LVar3) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_END_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) - EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_THREAD - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 15, 0) - EVT_SET(LVar0, 0) - EVT_LOOP(40) - EVT_SUB(LVar0, 45) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_MAIN, 0, 0, 0) - EVT_END_THREAD - EVT_CALL(GetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SET(LVar2, 15) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) - EVT_CALL(JumpToGoal, ACTOR_SELF, 40, FALSE, TRUE, FALSE) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkWhirlwindEffectFunc), LVar0, LVar1, LVar2, 30) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim09) - EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) - EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim1B) - EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 22) - EVT_ADD(LVar1, 19) - EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim03) - EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) - EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_BITWISE_AND_CONST(LVar0, -513) - EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) - EVT_END_SWITCH - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(init_80230BCC) = { - EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_802313B4))) - EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80230CC0))) - EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80230D28))) - EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_802313C4))) - EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_MAIN, ACTOR_PART_FLAG_NO_TARGET, TRUE) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(idle_80230CC0) = { - EVT_RETURN - EVT_END -}; - -s32 N(intTable_80230CD0)[] = { - 0x00000009, 0x00000010, 0x00000016, 0x0000001A, 0x0000001E, 0x00000020, 0x00000021, 0x00000020, - 0x0000001E, 0x0000001A, 0x00000016, 0x00000010, 0x00000009, 0x00000000, 0x00000004, 0x00000006, - 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, -}; - -EvtScript N(handleEvent_80230D28) = { - EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(EVENT_HIT_COMBO) - EVT_CASE_OR_EQ(EVENT_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_END_CASE_GROUP - EVT_CASE_EQ(EVENT_BURN_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0E) - EVT_SET_CONST(LVar2, ANIM_KoopaBros_Yellow_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_CASE_EQ(EVENT_BURN_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0E) - EVT_SET_CONST(LVar2, ANIM_KoopaBros_Yellow_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_BurnHit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0F) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) - EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_FLIP_TRIGGER) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(IdleAnimations_8022E61C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefenseTable_8022E44C))) - EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, 0, 18) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0B) - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) - EVT_THREAD - EVT_WAIT(4) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 30) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -30) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -60) - EVT_WAIT(1) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) - EVT_WAIT(1) - EVT_END_THREAD - EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim0C) - EVT_END_IF - EVT_USE_BUF(EVT_PTR(N(intTable_80230CD0))) - EVT_LOOP(22) - EVT_BUF_READ1(LVar0) - EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) - EVT_CASE_OR_EQ(EVENT_IMMUNE) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim08) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaBros_Yellow_Anim09) - EVT_WAIT(10) - EVT_END_IF - EVT_ELSE - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0C) - EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit) - EVT_END_IF - EVT_END_CASE_GROUP - EVT_CASE_EQ(EVENT_DEATH) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Hit) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim0B) - EVT_EXEC_WAIT(EVS_Enemy_Death) - EVT_RETURN - EVT_CASE_EQ(EVENT_RECOVER_STATUS) - EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaBros_Yellow_Anim04) - EVT_EXEC_WAIT(EVS_Enemy_Recover) - EVT_END_IF - EVT_END_SWITCH - EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) - EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_RETURN - EVT_END -}; - -EvtScript N(takeTurn_802313B4) = { - EVT_RETURN - EVT_END -}; - -EvtScript N(nextTurn_802313C4) = { - EVT_RETURN - EVT_END -}; diff --git a/src/battle/area/trd_part_2/area.c b/src/battle/area/trd_part_2/area.c index 7716ff4b88..1c5bb03e8a 100644 --- a/src/battle/area/trd_part_2/area.c +++ b/src/battle/area/trd_part_2/area.c @@ -1,53 +1,52 @@ #include "common.h" #include "battle/battle.h" #include "script_api/battle.h" +#include "area.h" -#define NAMESPACE b_area_trd_part_2 +extern ActorBlueprint A(green_ninja_koopa); +extern ActorBlueprint A(yellow_ninja_koopa); +extern ActorBlueprint A(black_ninja_koopa); +extern ActorBlueprint A(red_ninja_koopa); +extern ActorBlueprint A(fake_bowser); -extern ActorBlueprint N(green_ninja_koopa); -extern ActorBlueprint N(yellow_ninja_koopa); -extern ActorBlueprint N(blue_ninja_koopa); -extern ActorBlueprint N(red_ninja_koopa); -extern ActorBlueprint N(fake_bowser); +extern Stage A(trd_00); +extern Stage A(trd_01); +extern Stage A(trd_02); +extern Stage A(trd_02b); +extern Stage A(trd_03); +extern Stage A(trd_04); +extern Stage A(trd_05); +extern Stage A(trd_05b); +extern Stage A(trd_05c); +extern Stage A(trd_05d); +extern Stage A(trd_05e); +extern Stage A(trd_05f); -extern Stage N(trd_00); -extern Stage N(trd_01); -extern Stage N(trd_02); -extern Stage N(trd_02b); -extern Stage N(trd_03); -extern Stage N(trd_04); -extern Stage N(trd_05); -extern Stage N(trd_05b); -extern Stage N(trd_05c); -extern Stage N(trd_05d); -extern Stage N(trd_05e); -extern Stage N(trd_05f); - -Formation N(Formation_00) = { - ACTOR_BY_IDX(N(green_ninja_koopa), BTL_POS_GROUND_A, 10), - ACTOR_BY_IDX(N(yellow_ninja_koopa), BTL_POS_GROUND_A, 9), - ACTOR_BY_IDX(N(blue_ninja_koopa), BTL_POS_GROUND_A, 8), - ACTOR_BY_IDX(N(red_ninja_koopa), BTL_POS_GROUND_A, 7), - ACTOR_BY_IDX(N(fake_bowser), BTL_POS_GROUND_D, 6), +Formation A(Formation_00) = { + ACTOR_BY_IDX(A(green_ninja_koopa), BTL_POS_GROUND_A, 10), + ACTOR_BY_IDX(A(yellow_ninja_koopa), BTL_POS_GROUND_A, 9), + ACTOR_BY_IDX(A(black_ninja_koopa), BTL_POS_GROUND_A, 8), + ACTOR_BY_IDX(A(red_ninja_koopa), BTL_POS_GROUND_A, 7), + ACTOR_BY_IDX(A(fake_bowser), BTL_POS_GROUND_D, 6), }; -BattleList N(Formations) = { - BATTLE(N(Formation_00), N(trd_00), "ノコブロス"), +BattleList A(Formations) = { + BATTLE(A(Formation_00), A(trd_00), "ノコブロス"), {}, }; -StageList N(Stages) = { - { "trd_00", &N(trd_00) }, - { "trd_01", &N(trd_01) }, - { "trd_02", &N(trd_02) }, - STAGE("trd_02b", N(trd_02b)), - { "trd_03", &N(trd_03) }, - { "trd_04", &N(trd_04) }, - { "trd_05", &N(trd_05) }, - STAGE("trd_05b", N(trd_05b)), - STAGE("trd_05c", N(trd_05c)), - STAGE("trd_05d", N(trd_05d)), - STAGE("trd_05e", N(trd_05e)), - STAGE("trd_05f", N(trd_05f)), +StageList A(Stages) = { + STAGE("trd_00", A(trd_00)), + STAGE("trd_01", A(trd_01)), + STAGE("trd_02", A(trd_02)), + STAGE("trd_02b", A(trd_02b)), + STAGE("trd_03", A(trd_03)), + STAGE("trd_04", A(trd_04)), + STAGE("trd_05", A(trd_05)), + STAGE("trd_05b", A(trd_05b)), + STAGE("trd_05c", A(trd_05c)), + STAGE("trd_05d", A(trd_05d)), + STAGE("trd_05e", A(trd_05e)), + STAGE("trd_05f", A(trd_05f)), {}, }; diff --git a/src/battle/area/trd_part_2/area.h b/src/battle/area/trd_part_2/area.h new file mode 100644 index 0000000000..a0a3cf5868 --- /dev/null +++ b/src/battle/area/trd_part_2/area.h @@ -0,0 +1,6 @@ +#include "common.h" +#include "effects.h" +#include "battle/battle.h" +#include "script_api/battle.h" + +#define AREA b_area_trd_part_2 diff --git a/src/battle/area/trd_part_2/stage/trd_00.c b/src/battle/area/trd_part_2/stage/trd_00.c index de7fa31589..a3b6861b4e 100644 --- a/src/battle/area/trd_part_2/stage/trd_00.c +++ b/src/battle/area/trd_part_2/stage/trd_00.c @@ -1,30 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_00 - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - 0x00000009, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt00_shape", - .hit = "trd_bt00_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_00.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_01.c b/src/battle/area/trd_part_2/stage/trd_01.c index 7d908131d5..522bdbfdbe 100644 --- a/src/battle/area/trd_part_2/stage/trd_01.c +++ b/src/battle/area/trd_part_2/stage/trd_01.c @@ -1,24 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_01 - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt01_shape", - .hit = "trd_bt01_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_01.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_02.c b/src/battle/area/trd_part_2/stage/trd_02.c index ce92b0593d..f6d69cee62 100644 --- a/src/battle/area/trd_part_2/stage/trd_02.c +++ b/src/battle/area/trd_part_2/stage/trd_02.c @@ -1,141 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_02 - -EvtScript N(802314E0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802315F8) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, 12, FALSE) - EVT_THREAD - EVT_SET(LVar0, 19) - EVT_EXEC(N(802315F8)) - EVT_WAIT(5) - EVT_SET(LVar0, 17) - EVT_EXEC(N(802315F8)) - EVT_WAIT(5) - EVT_SET(LVar0, 15) - EVT_EXEC(N(802315F8)) - EVT_WAIT(5) - EVT_SET(LVar0, 13) - EVT_EXEC(N(802315F8)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - 0x00000016, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt02_shape", - .hit = "trd_bt02_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_02.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_02b.c b/src/battle/area/trd_part_2/stage/trd_02b.c index 7068443502..d1521096ba 100644 --- a/src/battle/area/trd_part_2/stage/trd_02b.c +++ b/src/battle/area/trd_part_2/stage/trd_02b.c @@ -1,137 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_02b - -EvtScript N(80231CE0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231DF8) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, 22, FALSE) - EVT_CALL(EnableModel, 9, FALSE) - EVT_CALL(EnableModel, 10, FALSE) - EVT_THREAD - EVT_SET(LVar0, 19) - EVT_EXEC(N(80231DF8)) - EVT_WAIT(5) - EVT_SET(LVar0, 17) - EVT_EXEC(N(80231DF8)) - EVT_WAIT(5) - EVT_SET(LVar0, 15) - EVT_EXEC(N(80231DF8)) - EVT_WAIT(5) - EVT_SET(LVar0, 13) - EVT_EXEC(N(80231DF8)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt02_shape", - .hit = "trd_bt02_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_02b.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_03.c b/src/battle/area/trd_part_2/stage/trd_03.c index ea6b3103fc..792bf53cef 100644 --- a/src/battle/area/trd_part_2/stage/trd_03.c +++ b/src/battle/area/trd_part_2/stage/trd_03.c @@ -1,42 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_03 - -#include "battle/common/stage/MovingClouds.inc.c" - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 0) - EVT_EXEC(N(EVS_AnimateCloud)) - EVT_SET(LVar0, 2) - EVT_SET(LVar2, 70) - EVT_SET(LVar3, 175) - EVT_SET(LVar4, -170) - EVT_EXEC(N(EVS_AnimateCloud_WithOffset2D)) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - 0x0000000F, - 0x0000000E, - 0x0000000D, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt03_shape", - .hit = "trd_bt03_hit", - .bg = "nok_bg", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_03.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_04.c b/src/battle/area/trd_part_2/stage/trd_04.c index 29f37b61ff..c1c9ad7385 100644 --- a/src/battle/area/trd_part_2/stage/trd_04.c +++ b/src/battle/area/trd_part_2/stage/trd_04.c @@ -1,88 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_04 - -EvtScript N(80232970) = { - EVT_SET(LVarA, LVar1) - EVT_SET(LVarB, LVar2) - EVT_SET(LVarC, LVar3) - EVT_CALL(SetTexPanner, LVar0, LVar1) - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, LVarA, 0, LVar0, LVar1) - EVT_ADD(LVar0, LVarB) - EVT_ADD(LVar1, LVarC) - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(80232A40) = { - EVT_SET(LVarA, LVar1) - EVT_SET(LVarB, LVar2) - EVT_SET(LVarC, LVar3) - EVT_CALL(SetTexPanner, LVar0, LVar1) - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, LVarA, 0, LVar0, 0) - EVT_CALL(SetTexPanOffset, LVarA, 1, LVar1, 0) - EVT_ADD(LVar0, LVarB) - EVT_ADD(LVar1, LVarC) - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(80232B2C) = { - EVT_SET(LVarA, LVar1) - EVT_SET(LVarB, LVar2) - EVT_SET(LVarC, LVar3) - EVT_CALL(SetTexPanner, LVar0, LVar1) - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, LVarA, 0, 0, LVar0) - EVT_CALL(SetTexPanOffset, LVarA, 1, 0, LVar1) - EVT_ADD(LVar0, LVarB) - EVT_ADD(LVar1, LVarC) - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_SET(LVar0, 13) - EVT_SET(LVar1, 0) - EVT_SET(LVar2, 40) - EVT_SET(LVar3, 0) - EVT_EXEC(N(80232970)) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(ForegroundModels)[] = { - 0x0000000D, - STAGE_MODEL_LIST_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt04_shape", - .hit = "trd_bt04_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), - .foregroundModelList = N(ForegroundModels), -}; +#include "battle/common/stage/trd_04.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_05.c b/src/battle/area/trd_part_2/stage/trd_05.c index d7df772be3..a83190d867 100644 --- a/src/battle/area/trd_part_2/stage/trd_05.c +++ b/src/battle/area/trd_part_2/stage/trd_05.c @@ -1,139 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_05 - -EvtScript N(80232CE0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80232DF8) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_THREAD - EVT_SET(LVar0, 27) - EVT_EXEC(N(80232DF8)) - EVT_WAIT(5) - EVT_SET(LVar0, 25) - EVT_EXEC(N(80232DF8)) - EVT_END_THREAD - EVT_THREAD - EVT_SET(LVar0, 6) - EVT_EXEC(N(80232DF8)) - EVT_WAIT(5) - EVT_SET(LVar0, 4) - EVT_EXEC(N(80232DF8)) - EVT_WAIT(5) - EVT_SET(LVar0, 2) - EVT_EXEC(N(80232DF8)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .bg = "nok_bg", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_05b.c b/src/battle/area/trd_part_2/stage/trd_05b.c index 48ecab5c07..89d5f278e2 100644 --- a/src/battle/area/trd_part_2/stage/trd_05b.c +++ b/src/battle/area/trd_part_2/stage/trd_05b.c @@ -1,131 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_05b - -EvtScript N(802334F0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80233608) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, 16, FALSE) - EVT_CALL(EnableModel, 17, FALSE) - EVT_CALL(EnableModel, 2, FALSE) - EVT_CALL(EnableModel, 4, FALSE) - EVT_CALL(EnableModel, 6, FALSE) - EVT_CALL(EnableModel, 20, FALSE) - EVT_CALL(EnableModel, 18, FALSE) - EVT_CALL(EnableModel, 19, FALSE) - EVT_CALL(EnableModel, 25, FALSE) - EVT_CALL(EnableModel, 27, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05b.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_05c.c b/src/battle/area/trd_part_2/stage/trd_05c.c index e99500ded0..842b9d1c6a 100644 --- a/src/battle/area/trd_part_2/stage/trd_05c.c +++ b/src/battle/area/trd_part_2/stage/trd_05c.c @@ -1,139 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_05c - -EvtScript N(80233CF0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80233E08) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, 10, FALSE) - EVT_CALL(EnableModel, 15, FALSE) - EVT_CALL(EnableModel, 20, FALSE) - EVT_CALL(EnableModel, 18, FALSE) - EVT_CALL(EnableModel, 19, FALSE) - EVT_CALL(EnableModel, 25, FALSE) - EVT_SET(LVar0, 27) - EVT_EXEC(N(80233E08)) - EVT_THREAD - EVT_SET(LVar0, 6) - EVT_EXEC(N(80233E08)) - EVT_WAIT(5) - EVT_SET(LVar0, 4) - EVT_EXEC(N(80233E08)) - EVT_WAIT(5) - EVT_SET(LVar0, 2) - EVT_EXEC(N(80233E08)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05c.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_05d.c b/src/battle/area/trd_part_2/stage/trd_05d.c index 6addfb55b1..0e93b2a6b7 100644 --- a/src/battle/area/trd_part_2/stage/trd_05d.c +++ b/src/battle/area/trd_part_2/stage/trd_05d.c @@ -1,138 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_05d - -EvtScript N(80234540) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80234658) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, 10, FALSE) - EVT_CALL(EnableModel, 15, FALSE) - EVT_CALL(EnableModel, 16, FALSE) - EVT_CALL(EnableModel, 17, FALSE) - EVT_CALL(EnableModel, 25, FALSE) - EVT_CALL(EnableModel, 14, FALSE) - EVT_CALL(EnableModel, 27, FALSE) - EVT_THREAD - EVT_SET(LVar0, 6) - EVT_EXEC(N(80234658)) - EVT_WAIT(5) - EVT_SET(LVar0, 4) - EVT_EXEC(N(80234658)) - EVT_WAIT(5) - EVT_SET(LVar0, 2) - EVT_EXEC(N(80234658)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05d.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_05e.c b/src/battle/area/trd_part_2/stage/trd_05e.c index 4b7d042e64..91721eab43 100644 --- a/src/battle/area/trd_part_2/stage/trd_05e.c +++ b/src/battle/area/trd_part_2/stage/trd_05e.c @@ -1,129 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_05e - -EvtScript N(80234D80) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80234E98) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, 27, FALSE) - EVT_CALL(EnableModel, 2, FALSE) - EVT_CALL(EnableModel, 4, FALSE) - EVT_CALL(EnableModel, 6, FALSE) - EVT_CALL(EnableModel, 20, FALSE) - EVT_CALL(EnableModel, 18, FALSE) - EVT_CALL(EnableModel, 19, FALSE) - EVT_CALL(EnableModel, 25, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05e.inc.c" diff --git a/src/battle/area/trd_part_2/stage/trd_05f.c b/src/battle/area/trd_part_2/stage/trd_05f.c index 192c19fa97..648637d788 100644 --- a/src/battle/area/trd_part_2/stage/trd_05f.c +++ b/src/battle/area/trd_part_2/stage/trd_05f.c @@ -1,131 +1,3 @@ -#include "common.h" -#include "battle/battle.h" +#include "../area.h" -#define NAMESPACE b_area_trd_part_2_trd_05f - -EvtScript N(80235560) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80235678) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PreBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_SET(LVar0, 27) - EVT_EXEC(N(80235678)) - EVT_CALL(EnableModel, 2, FALSE) - EVT_CALL(EnableModel, 4, FALSE) - EVT_CALL(EnableModel, 6, FALSE) - EVT_CALL(EnableModel, 20, FALSE) - EVT_CALL(EnableModel, 18, FALSE) - EVT_CALL(EnableModel, 19, FALSE) - EVT_CALL(EnableModel, 25, FALSE) - EVT_CALL(EnableModel, 15, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_PostBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "trd_tex", - .shape = "trd_bt05_shape", - .hit = "trd_bt05_hit", - .preBattle = &N(EVS_PreBattle), - .postBattle = &N(EVS_PostBattle), -}; +#include "battle/common/stage/trd_05f.inc.c" diff --git a/src/battle/area/trd_part_3/actor/eldstar.c b/src/battle/area/trd_part_3/actor/eldstar.c index 79205ec320..4cff45cd0c 100644 --- a/src/battle/area/trd_part_3/actor/eldstar.c +++ b/src/battle/area/trd_part_3/actor/eldstar.c @@ -1,19 +1,14 @@ -#include "common.h" -#include "effects.h" -#include "battle/battle.h" -#include "script_api/battle.h" +#include "../area.h" #include "sprite/npc/WorldEldstar.h" -#define NAMESPACE b_area_trd_part_3_eldstar +#define NAMESPACE A(eldstar) extern EvtScript N(EVS_Init); -extern EvtScript N(EVS_TakeTurn); extern EvtScript N(EVS_Idle); +extern EvtScript N(EVS_TakeTurn); extern EvtScript N(EVS_HandleEvent); extern EvtScript N(EVS_ManageTutorial); -BSS s32 D_80219040; - enum N(ActorPartIDs) { PRT_MAIN = 1, }; @@ -62,7 +57,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnims), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -100,45 +95,44 @@ EvtScript N(EVS_Init) = { EVT_END }; -API_CALLABLE(func_80218000_4CF1B0) { +API_CALLABLE(N(UpdateHoverOffset)) { Actor* actor = get_actor(script->owner1.actorID); - s32* sym; + static s32 HoverOffset; if (isInitialCall) { - D_80219040 = 0; + HoverOffset = 0; } - sym = &D_80219040; - *sym += 15; - *sym = clamp_angle(*sym); - actor->verticalRenderOffset = sin_rad(DEG_TO_RAD(*sym)) * 3.0f; + HoverOffset += 15; + HoverOffset = clamp_angle(HoverOffset); + actor->verticalRenderOffset = sin_rad(DEG_TO_RAD(HoverOffset)) * 3.0f; return ApiStatus_BLOCK; } -API_CALLABLE(func_802180C8_4CF278) { +API_CALLABLE(N(StartBlinkingSP)) { status_bar_start_blinking_sp(); return ApiStatus_DONE2; } -API_CALLABLE(func_802180E8_4CF298) { +API_CALLABLE(N(StopBlinkingSP)) { status_bar_stop_blinking_sp(); return ApiStatus_DONE2; } -API_CALLABLE(func_80218108_4CF2B8) { +API_CALLABLE(N(StartBlinkingHPandFP)) { status_bar_start_blinking_hp(); status_bar_start_blinking_fp(); return ApiStatus_DONE2; } -API_CALLABLE(func_80218130_4CF2E0) { +API_CALLABLE(N(StopBlinkingHPandFP)) { status_bar_stop_blinking_hp(); status_bar_stop_blinking_fp(); return ApiStatus_DONE2; } -API_CALLABLE(func_80218158_4CF308) { +API_CALLABLE(N(ClearPlayerMenuSelections)) { BattleStatus* battleStatus = &gBattleStatus; battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] = 0; @@ -164,7 +158,7 @@ API_CALLABLE(N(func_80218170_4CF320)) { return ApiStatus_DONE2; } -API_CALLABLE(func_802181B4_4CF364) { +API_CALLABLE(N(func_802181B4_4CF364)) { BattleStatus* battleStatus = &gBattleStatus; if (isInitialCall) { @@ -181,7 +175,7 @@ API_CALLABLE(func_802181B4_4CF364) { return ApiStatus_DONE2; } -API_CALLABLE(func_802181F8_4CF3A8) { +API_CALLABLE(N(AddStarPower)) { PlayerData* playerData = &gPlayerData; playerData->specialBarsFilled += 32; @@ -190,7 +184,7 @@ API_CALLABLE(func_802181F8_4CF3A8) { } EvtScript N(EVS_Idle) = { - EVT_CALL(func_80218000_4CF1B0) + EVT_CALL(N(UpdateHoverOffset)) EVT_RETURN EVT_END }; @@ -207,7 +201,7 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TUTORIAL_BATTLE, TRUE) - EVT_CALL(func_80218158_4CF308) + EVT_CALL(N(ClearPlayerMenuSelections)) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(15) @@ -221,9 +215,9 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(func_802180C8_4CF278) + EVT_CALL(N(StartBlinkingSP)) EVT_WAIT(120) - EVT_CALL(func_802180E8_4CF298) + EVT_CALL(N(StopBlinkingSP)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) @@ -232,13 +226,13 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(ActorSpeak, MSG_CH1_0115, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) - EVT_CALL(func_802180C8_4CF278) + EVT_CALL(N(StartBlinkingSP)) EVT_WAIT(120) - EVT_CALL(func_802180E8_4CF298) + EVT_CALL(N(StopBlinkingSP)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(ActorSpeak, MSG_CH1_0116, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) - EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_STAR_POWERS) + EVT_CALL(SetBattleMenuEnabledFlags, BTL_MENU_ENABLED_STAR_POWERS) EVT_CALL(SetEnabledStarPowers, 1 << STAR_POWER_INDEX(MOVE_REFRESH)) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MOVE) EVT_SET(LVar0, 255) @@ -271,9 +265,9 @@ EvtScript N(EVS_ManageTutorial) = { EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) - EVT_CALL(func_802180C8_4CF278) + EVT_CALL(N(StartBlinkingSP)) EVT_WAIT(120) - EVT_CALL(func_802180E8_4CF298) + EVT_CALL(N(StopBlinkingSP)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(ActorSpeak, MSG_CH1_0118, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) @@ -292,9 +286,9 @@ EvtScript N(EVS_ManageTutorial) = { EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) - EVT_CALL(func_802180C8_4CF278) + EVT_CALL(N(StartBlinkingSP)) EVT_WAIT(120) - EVT_CALL(func_802180E8_4CF298) + EVT_CALL(N(StopBlinkingSP)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -305,9 +299,9 @@ EvtScript N(EVS_ManageTutorial) = { EVT_WAIT(10) EVT_CALL(ActorSpeak, MSG_CH1_011B, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) - EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_STAR_POWERS) + EVT_CALL(SetBattleMenuEnabledFlags, BTL_MENU_ENABLED_STAR_POWERS) EVT_CALL(SetEnabledStarPowers, 1 << STAR_POWER_INDEX(MOVE_FOCUS)) - EVT_CALL(func_80218158_4CF308) + EVT_CALL(N(ClearPlayerMenuSelections)) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MOVE) EVT_SET(LVar0, 255) EVT_LOOP(10) @@ -339,9 +333,9 @@ EvtScript N(EVS_ManageTutorial) = { EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) - EVT_CALL(func_802180C8_4CF278) + EVT_CALL(N(StartBlinkingSP)) EVT_WAIT(120) - EVT_CALL(func_802180E8_4CF298) + EVT_CALL(N(StopBlinkingSP)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(ActorSpeak, MSG_CH1_011D, ACTOR_SELF, PRT_MAIN, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_CALL(WaitForState, BATTLE_STATE_0) diff --git a/src/battle/area/trd_part_3/area.c b/src/battle/area/trd_part_3/area.c index 2dc1e86a29..e08a33f976 100644 --- a/src/battle/area/trd_part_3/area.c +++ b/src/battle/area/trd_part_3/area.c @@ -1,23 +1,22 @@ #include "common.h" #include "battle/battle.h" #include "script_api/battle.h" +#include "area.h" -#define NAMESPACE b_area_trd_part_3 +extern ActorBlueprint A(eldstar); -extern ActorBlueprint N(eldstar); +extern Stage A(nok_01); -extern Stage N(nok_01); - -Formation N(Formation_00) = { - ACTOR_BY_IDX(N(eldstar), BTL_POS_AIR_C, 10), +Formation A(Formation_00) = { + ACTOR_BY_IDX(A(eldstar), BTL_POS_AIR_C, 10), }; -BattleList N(Formations) = { - BATTLE(N(Formation_00), N(nok_01), "ほしのせい レクチャー"), +BattleList A(Formations) = { + BATTLE(A(Formation_00), A(nok_01), "ほしのせい レクチャー"), {}, }; -StageList N(Stages) = { - STAGE("nok_01", N(nok_01)), +StageList A(Stages) = { + STAGE("nok_01", A(nok_01)), {}, }; diff --git a/src/battle/area/trd_part_3/area.h b/src/battle/area/trd_part_3/area.h new file mode 100644 index 0000000000..5a3fdd2baa --- /dev/null +++ b/src/battle/area/trd_part_3/area.h @@ -0,0 +1,6 @@ +#include "common.h" +#include "effects.h" +#include "battle/battle.h" +#include "script_api/battle.h" + +#define AREA b_area_trd_part_3 diff --git a/src/battle/area/trd_part_3/stage/nok_01.c b/src/battle/area/trd_part_3/stage/nok_01.c index 3e0734134c..22ce52c3e7 100644 --- a/src/battle/area/trd_part_3/stage/nok_01.c +++ b/src/battle/area/trd_part_3/stage/nok_01.c @@ -1,6 +1,5 @@ -#include "common.h" -#include "battle/battle.h" - -#define NAMESPACE b_area_trd_part_3_nok_01 +#include "../area.h" +//TODO migrate into include +#define NAMESPACE A(nok_01) #include "battle/common/stage/nok_01.inc.c" diff --git a/src/battle/battle.h b/src/battle/battle.h index bc4a09cd41..075799fbcc 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -241,7 +241,7 @@ typedef enum ActorType { ACTOR_TYPE_KOOPA_BROS = 0x9A, ACTOR_TYPE_GREEN_NINJAKOOPA = 0x9B, ACTOR_TYPE_RED_NINJAKOOPA = 0x9C, - ACTOR_TYPE_BLUE_NINJAKOOPA = 0x9D, + ACTOR_TYPE_BLACK_NINJAKOOPA = 0x9D, ACTOR_TYPE_YELLOW_NINJAKOOPA = 0x9E, ACTOR_TYPE_ELDSTAR = 0x9F, ACTOR_TYPE_BUZZAR = 0xA0, diff --git a/src/battle/btl_evt_library.c b/src/battle/btl_evt_library.c index ceb2dcde19..077eb443bd 100644 --- a/src/battle/btl_evt_library.c +++ b/src/battle/btl_evt_library.c @@ -1724,7 +1724,7 @@ EvtScript EVS_Enemy_DeathWithoutRemove = { EVT_CASE_OR_EQ(DMG_SRC_SPIN_SMASH) EVT_END_CASE_GROUP EVT_CASE_DEFAULT - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar1) EVT_SWITCH(LVar1) EVT_CASE_OR_EQ(ACTOR_TYPE_BOB_OMB) @@ -2077,56 +2077,56 @@ EvtScript EVS_Enemy_BlowAway = { EVT_IF_NOT_FLAG(LVar5, STATUS_FLAGS_IMMOBILIZED) EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) EVT_ELSE - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_IF_FLAG(LVar2, STATUS_FLAG_SLEEP) EVT_IF_FLAG(LVar5, STATUS_FLAG_SLEEP) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_IF_FLAG(LVar2, STATUS_FLAG_STATIC) EVT_IF_FLAG(LVar5, STATUS_FLAG_STATIC) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_IF_FLAG(LVar2, STATUS_FLAG_FROZEN) EVT_IF_FLAG(LVar5, STATUS_FLAG_FROZEN) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_IF_FLAG(LVar2, STATUS_FLAG_FEAR) EVT_IF_FLAG(LVar5, STATUS_FLAG_FEAR) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_IF_FLAG(LVar2, STATUS_FLAG_PARALYZE) EVT_IF_FLAG(LVar5, STATUS_FLAG_PARALYZE) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_IF_FLAG(LVar2, STATUS_FLAG_POISON) EVT_IF_FLAG(LVar5, STATUS_FLAG_POISON) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_IF_FLAG(LVar2, STATUS_FLAG_DIZZY) EVT_IF_FLAG(LVar5, STATUS_FLAG_DIZZY) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_IF_FLAG(LVar5, STATUS_FLAG_SHRINK) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_IF_FLAG(LVar2, STATUS_FLAG_STONE) EVT_IF_FLAG(LVar5, STATUS_FLAG_STONE) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_IF_FLAG(LVar2, STATUS_FLAG_KO) EVT_IF_FLAG(LVar5, STATUS_FLAG_KO) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) EVT_END_IF EVT_END_IF diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index cd1b3d7184..7d0625370e 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -88,7 +88,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -12 }, }, @@ -100,7 +100,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_coin), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -115,7 +115,7 @@ ActorPartBlueprint N(ActorParts_coin)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_coin), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 2c6dbe318a..71799832ae 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -314,10 +314,7 @@ EvtScript N(setAnimation) = { EVT_END }; -s32 N(bounceTable)[] = { - 7, 13, 17, 21, 23, 24, 23, 21, 17, 13, - 7, 0, 4, 7, 6, 4, 0, 2, 0, -}; +s32 N(FlipPosOffsets)[] = { 7, 13, 17, 21, 23, 24, 23, 21, 17, 13, 7, 0, 4, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -394,7 +391,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -180) EVT_WAIT(1) EVT_END_THREAD - EVT_USE_BUF(EVT_PTR(N(bounceTable))) + EVT_USE_BUF(EVT_PTR(N(FlipPosOffsets))) EVT_LOOP(19) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index 34728e1908..0805bab8fa 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -69,7 +69,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -10 }, }, @@ -81,7 +81,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, }, @@ -93,7 +93,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, }, @@ -105,7 +105,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, }, @@ -117,7 +117,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, }, @@ -129,7 +129,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, }, diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index c91b91de68..b8e29453b7 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -64,7 +64,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 8, -3 }, }, diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index 4ca3fa328a..e6dad4ff1f 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -68,7 +68,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021AEA8), .defenseTable = N(DefenseTable_8021ACB0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -80,7 +80,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021AEA8), .defenseTable = N(DefenseTable_8021ACB0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -92,7 +92,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021AEA8), .defenseTable = N(DefenseTable_8021ACB0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -104,7 +104,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021AEA8), .defenseTable = N(DefenseTable_8021ACB0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, @@ -251,31 +251,31 @@ EvtScript N(8021B398) = { EVT_MOD(LVar5, 4) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(4), 1) + EVT_SET(LFlag4, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(1), 0) + EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LVarA, 0) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVarA, 2) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(4), 0) + EVT_IF_EQ(LFlag4, FALSE) EVT_SET(LVarA, 3) EVT_RETURN EVT_END_IF @@ -284,7 +284,7 @@ EvtScript N(8021B398) = { EVT_END }; -Vec3i N(vector3D_8021B594) = { NPC_DISPOSE_LOCATION, }; +Vec3i N(vector3D_8021B594) = { NPC_DISPOSE_LOCATION }; Formation N(specialFormation_8021B5A0) = { ACTOR_BY_POS(NAMESPACE, N(vector3D_8021B594), 0), diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index b31bf0278f..9a946dd691 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -49,7 +49,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -315,9 +315,9 @@ EvtScript N(takeTurn) = { EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STATIC) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_ELSE - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -325,7 +325,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_RETURN EVT_END_IF diff --git a/src/battle/common/actor/ghost_bow.inc.c b/src/battle/common/actor/ghost_bow.inc.c index aa66292b80..5117449855 100644 --- a/src/battle/common/actor/ghost_bow.inc.c +++ b/src/battle/common/actor/ghost_bow.inc.c @@ -342,9 +342,9 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2019) EVT_ADD(LVarA, 1) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_SlapOnce) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_IF_EQ(LVarA, LVar8) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) EVT_ELSE @@ -352,7 +352,7 @@ EvtScript N(bow_takeTurn) = { EVT_END_IF EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_SlapBack) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_IF_EQ(LVarA, LVar8) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_RIGHT) EVT_ELSE diff --git a/src/battle/common/actor/ghost_kooper.inc.c b/src/battle/common/actor/ghost_kooper.inc.c index f0bf4dd78f..a78f3776ed 100644 --- a/src/battle/common/actor/ghost_kooper.inc.c +++ b/src/battle/common/actor/ghost_kooper.inc.c @@ -169,9 +169,7 @@ EvtScript N(kooper_idle) = { EVT_END }; -s32 N(kooper_dispOffsets)[] = { - 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0, -}; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; EvtScript N(kooper_handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -242,8 +240,8 @@ EvtScript N(kooper_handleEvent) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) EVT_WAIT(1) EVT_END_THREAD - EVT_USE_BUF(N(kooper_dispOffsets)) - EVT_LOOP(22) + EVT_USE_BUF(N(FlipPosOffsets)) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 268a5ca9a9..51f5ebfbf8 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -49,7 +49,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 8c34daa270..738f2de412 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -786,7 +786,7 @@ EvtScript N(init_flying) = { }; EvtScript N(takeTurn) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -809,8 +809,8 @@ EvtScript N(takeTurn) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 90a7fc31df..db3adebb70 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -788,7 +788,7 @@ EvtScript N(init_flying) = { }; EvtScript N(takeTurn) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -811,8 +811,8 @@ EvtScript N(takeTurn) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index c68c75f7d4..4e0cfe6411 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -242,7 +242,7 @@ EvtScript N(idle) = { EVT_END }; -s32 N(bounceTable)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -306,8 +306,8 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) EVT_WAIT(1) EVT_END_CHILD_THREAD - EVT_USE_BUF(EVT_PTR(N(bounceTable))) - EVT_LOOP(22) + EVT_USE_BUF(EVT_PTR(N(FlipPosOffsets))) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index f58eb89046..858cd33e2e 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -325,9 +325,7 @@ EvtScript N(idle) = { EVT_END }; -s32 N(flipPos)[] = { - 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0, -}; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -425,8 +423,8 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) EVT_WAIT(1) EVT_END_THREAD - EVT_USE_BUF(N(flipPos)) - EVT_LOOP(22) + EVT_USE_BUF(N(FlipPosOffsets)) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) @@ -497,29 +495,29 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIKE_TAUNT) EVT_WAIT(10) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar1, 16) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_IF_FLAG(LVar3, STATUS_FLAG_DIZZY) EVT_ADD(LVar0, -14) EVT_ADD(LVar1, 20) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_IF_FLAG(LVar3, STATUS_FLAG_SLEEP) EVT_ADD(LVar0, -14) EVT_ADD(LVar1, 20) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVarA) EVT_IF_EQ(LVarA, N(STATE_CHARGED)) EVT_ADD(LVar1, 23) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_ADD(LVar1, 42) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) @@ -1001,10 +999,10 @@ EvtScript N(findTarget) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF - EVT_SET(LocalFlag(1), 0) - EVT_SET(LocalFlag(2), 0) - EVT_SET(LocalFlag(3), 0) - EVT_SET(LocalFlag(4), 0) + EVT_SET(LFlag1, FALSE) + EVT_SET(LFlag2, FALSE) + EVT_SET(LFlag3, FALSE) + EVT_SET(LFlag4, FALSE) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -1013,31 +1011,31 @@ EvtScript N(findTarget) = { EVT_MOD(LVar1, 4) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(4), 1) + EVT_SET(LFlag4, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(1), 0) + EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LVarA, 0) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarA, 1) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVarA, 2) EVT_RETURN EVT_END_IF - EVT_IF_EQ(LocalFlag(4), 0) + EVT_IF_EQ(LFlag4, FALSE) EVT_SET(LVarA, 3) EVT_RETURN EVT_END_IF diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 71e678b37f..c1201a140f 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -927,16 +927,16 @@ EvtScript N(healAll) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) @@ -968,19 +968,19 @@ EvtScript N(healAll) = { EvtScript N(attackMagicBlast) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION), N(ACTION_MAGIC_BLAST)) - EVT_SET(LocalFlag(0), 0) - EVT_SET(LocalFlag(1), 0) + EVT_SET(LFlag0, FALSE) + EVT_SET(LFlag1, FALSE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION_IS_MAKE_CLONE), LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE_ID), LVarA) EVT_END_IF EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, ACTOR_FLAG_FLYING) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -993,8 +993,8 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(MoveBattleCamOver, 10) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim02) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 17) @@ -1013,7 +1013,7 @@ EvtScript N(attackMagicBlast) = { EVT_END_IF EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim02) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -1037,17 +1037,17 @@ EvtScript N(attackMagicBlast) = { EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SPELL_CAST2) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim03) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim03) @@ -1057,8 +1057,8 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar4, LVar5, LVar6) EVT_SUB(LVar4, 50) EVT_SET(LVar5, 0) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1075,7 +1075,7 @@ EvtScript N(attackMagicBlast) = { EVT_END_IF EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar6, LVar4, LVar5, LVar6, 30) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1099,23 +1099,23 @@ EvtScript N(attackMagicBlast) = { EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, LVarA, TRUE) EVT_END_IF EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SPELL_CAST2) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim03) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim03) @@ -1123,8 +1123,8 @@ EvtScript N(attackMagicBlast) = { EVT_WAIT(5) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_IF_EQ(LocalFlag(1), 0) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag1, FALSE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1141,7 +1141,7 @@ EvtScript N(attackMagicBlast) = { EVT_END_IF EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar6, LVar4, LVar5, LVar6, 20) EVT_ELSE - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1159,7 +1159,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar6, LVar4, LVar5, LVar6, 20) EVT_END_IF EVT_WAIT(18) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE) EVT_ELSE @@ -1174,7 +1174,7 @@ EvtScript N(attackMagicBlast) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, LVarA, TRUE) EVT_END_IF EVT_RETURN @@ -1190,13 +1190,13 @@ EvtScript N(findPlaceForClone) = { EVT_MOD(LVar1, 4) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(11), 1) + EVT_SET(LFlagB, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(12), 1) + EVT_SET(LFlagC, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(13), 1) + EVT_SET(LFlagD, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(14), 1) + EVT_SET(LFlagE, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) @@ -1207,25 +1207,25 @@ EvtScript N(findPlaceForClone) = { EVT_MOD(LVar1, 4) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_IF_EQ(LocalFlag(12), 0) + EVT_IF_EQ(LFlagC, FALSE) EVT_SET(LVar0, 1) EVT_END_IF EVT_CASE_EQ(1) - EVT_IF_EQ(LocalFlag(11), 0) + EVT_IF_EQ(LFlagB, FALSE) EVT_SET(LVar0, 0) EVT_END_IF - EVT_IF_EQ(LocalFlag(13), 0) + EVT_IF_EQ(LFlagD, FALSE) EVT_SET(LVar0, 2) EVT_END_IF EVT_CASE_EQ(2) - EVT_IF_EQ(LocalFlag(12), 0) + EVT_IF_EQ(LFlagC, FALSE) EVT_SET(LVar0, 1) EVT_END_IF - EVT_IF_EQ(LocalFlag(14), 0) + EVT_IF_EQ(LFlagE, FALSE) EVT_SET(LVar0, 3) EVT_END_IF EVT_CASE_EQ(3) - EVT_IF_EQ(LocalFlag(13), 0) + EVT_IF_EQ(LFlagD, FALSE) EVT_SET(LVar0, 2) EVT_END_IF EVT_END_SWITCH @@ -1412,12 +1412,12 @@ EvtScript N(makeClone) = { EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION_IS_MAKE_CLONE), 1) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LAST_ACTION), N(ACTION_MAKE_CLONE)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, ACTOR_FLAG_FLYING) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SummonEnemy, EVT_PTR(N(formation_clone)), 0) EVT_ELSE EVT_CALL(SummonEnemy, EVT_PTR(N(formation_clone_flying)), 0) @@ -1434,7 +1434,7 @@ EvtScript N(makeClone) = { EVT_CALL(MoveBattleCamOver, 25) EVT_WAIT(25) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim02) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1481,12 +1481,12 @@ EvtScript N(makeClone) = { EVT_CALL(GetActorPos, LVar9, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVar9, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVar9) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_ELSE EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim01) EVT_CALL(SetAnimation, LVar9, 1, ANIM_Magikoopa_Anim01) EVT_ELSE @@ -1502,7 +1502,7 @@ EvtScript N(makeClone) = { #include "world/common/todo/UnkFunc52.inc.c" EvtScript N(boostAttack) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -1525,8 +1525,8 @@ EvtScript N(boostAttack) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF @@ -1614,7 +1614,7 @@ EvtScript N(boostAttack) = { }; EvtScript N(boostDefense) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -1637,8 +1637,8 @@ EvtScript N(boostDefense) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF @@ -1726,7 +1726,7 @@ EvtScript N(boostDefense) = { }; EvtScript N(electrify) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -1749,8 +1749,8 @@ EvtScript N(electrify) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF @@ -1843,7 +1843,7 @@ EvtScript N(electrify) = { }; EvtScript N(makeTransparent) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -1866,8 +1866,8 @@ EvtScript N(makeTransparent) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF @@ -1968,20 +1968,20 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_MULF(LVar2, EVT_FLOAT(100.0)) EVT_DIVF(LVar2, LVar3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_IF_LE(LVar2, 25) EVT_CALL(RandInt, 99, LVar4) EVT_ADD(LVar4, 1) @@ -2002,20 +2002,20 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(1) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_MULF(LVar2, EVT_FLOAT(100.0)) EVT_DIVF(LVar2, LVar3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_IF_LE(LVar2, 20) EVT_CALL(RandInt, 99, LVar4) EVT_ADD(LVar4, 1) @@ -2036,20 +2036,20 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(2) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_MULF(LVar2, EVT_FLOAT(100.0)) EVT_DIVF(LVar2, LVar3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_IF_LE(LVar2, 15) EVT_CALL(RandInt, 99, LVar4) EVT_ADD(LVar4, 1) @@ -2106,20 +2106,20 @@ EvtScript N(takeTurn) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(11) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_MULF(LVar2, EVT_FLOAT(100.0)) EVT_DIVF(LVar2, LVar3) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_IF_LE(LVar2, LVar9) EVT_SETF(LVar9, LVar2) EVT_SET(LVarB, LVar0) diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 1fb88d9dbd..f542e946f1 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -70,7 +70,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, }, diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index c90f7d4e95..22bdf201ca 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -55,7 +55,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, }, @@ -67,7 +67,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, }, @@ -79,7 +79,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations2), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -146,7 +146,7 @@ ActorPartBlueprint N(ActorParts_hole)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_hole), .defenseTable = NULL, - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -184,7 +184,7 @@ ActorBlueprint N(hole) = { .statusTextOffset = { 10, 20 }, }; -Vec3i N(hole_pos) = { NPC_DISPOSE_LOCATION, }; +Vec3i N(hole_pos) = { NPC_DISPOSE_LOCATION }; Formation N(formation_hole_1) = { ACTOR_BY_POS(N(hole), N(hole_pos), 0), diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 4e973a0182..eac61434cc 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -87,7 +87,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021CAFC), .defenseTable = N(DefenseTable_8021B110), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -111,7 +111,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021B3D0), .defenseTable = N(DefenseTable_8021B110), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -123,7 +123,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021B3DC), .defenseTable = N(DefenseTable_8021B110), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 3248db8ed8..473a94d76d 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -118,7 +118,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021ED98), .defenseTable = N(DefenseTable_8021EAD0), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, }, @@ -798,11 +798,7 @@ EvtScript N(idle_80220D40) = { EVT_END }; -s32 N(intTable_802211D0)[] = { - 0x00000009, 0x00000010, 0x00000016, 0x0000001A, 0x0000001E, 0x00000020, 0x00000021, 0x00000020, - 0x0000001E, 0x0000001A, 0x00000016, 0x00000010, 0x00000009, 0x00000000, 0x00000004, 0x00000006, - 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, -}; +s32 N(FlipPosOffsets)[] = { 9, 16, 22, 26, 30, 32, 33, 32, 30, 26, 22, 16, 9, 0, 4, 6, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent_80221228) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -866,8 +862,8 @@ EvtScript N(handleEvent_80221228) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -75) EVT_WAIT(1) EVT_END_CHILD_THREAD - EVT_USE_BUF(EVT_PTR(N(intTable_802211D0))) - EVT_LOOP(22) + EVT_USE_BUF(EVT_PTR(N(FlipPosOffsets))) + EVT_LOOP(ARRAY_COUNT(N(FlipPosOffsets))) EVT_BUF_READ1(LVar0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index eeb4a2f8b8..3fd8a7f4ad 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -838,10 +838,10 @@ EvtScript N(findPlaceForSummon) = { EVT_IF_NE(LVar0, 0) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(1), 0) - EVT_SET(LocalFlag(2), 0) - EVT_SET(LocalFlag(3), 0) - EVT_SET(LocalFlag(4), 0) + EVT_SET(LFlag1, FALSE) + EVT_SET(LFlag2, FALSE) + EVT_SET(LFlag3, FALSE) + EVT_SET(LFlag4, FALSE) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -850,13 +850,13 @@ EvtScript N(findPlaceForSummon) = { EVT_MOD(LVar5, 4) EVT_SWITCH(LVar5) EVT_CASE_EQ(0) - EVT_SET(LocalFlag(1), 1) + EVT_SET(LFlag1, TRUE) EVT_CASE_EQ(1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_CASE_EQ(2) - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_CASE_EQ(3) - EVT_SET(LocalFlag(4), 1) + EVT_SET(LFlag4, TRUE) EVT_END_SWITCH EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) @@ -867,15 +867,15 @@ EvtScript N(findPlaceForSummon) = { EVT_CASE_EQ(0) EVT_RETURN EVT_CASE_EQ(1) - EVT_IF_EQ(LocalFlag(1), 0) + EVT_IF_EQ(LFlag1, FALSE) EVT_SET(LVarE, 0) EVT_END_IF EVT_CASE_EQ(2) - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_SET(LVarE, 1) EVT_END_IF EVT_CASE_EQ(3) - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVarE, 2) EVT_END_IF EVT_END_SWITCH diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 107dd3e221..a65bf15b12 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -67,7 +67,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_8021B0A0), .defenseTable = N(DefenseTable_8021B0EC), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 3, -14 }, }, diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index bd3cd86308..9c7bdfa1c3 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -786,7 +786,7 @@ EvtScript N(init_flying) = { }; EvtScript N(takeTurn) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -809,8 +809,8 @@ EvtScript N(takeTurn) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index 9ef9c500e8..28237ec982 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -53,7 +53,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, }, diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index 59807bded6..de2489d46f 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -13,9 +13,9 @@ enum N(ActorPartIDs) { PRT_MAIN = 1, }; -s32 N(intTable1)[] = { 0, 1, 0, 2, 0, 2, 0, 2, }; -s32 N(intTable2)[] = { 0, 1, 0, 2, 1, 2, 0, 2, }; -s32 N(intTable3)[] = { 0, 1, 0, 2, 0, 2, 0, 2, }; +s32 N(intTable1)[] = { 0, 1, 0, 2, 0, 2, 0, 2 }; +s32 N(intTable2)[] = { 0, 1, 0, 2, 1, 2, 0, 2 }; +s32 N(intTable3)[] = { 0, 1, 0, 2, 0, 2, 0, 2 }; s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, @@ -56,7 +56,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = NULL, .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index d9ac1dd897..394876a2b1 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -172,7 +172,7 @@ EvtScript N(getAnimation) = { EVT_END }; -s32 N(bounceArray)[] = { 7, 13, 17, 21, 23, 24, 23, 21, 17, 13, 7, 0, 4, 7, 6, 4, 0, 2, 0, }; +s32 N(bounceArray)[] = { 7, 13, 17, 21, 23, 24, 23, 21, 17, 13, 7, 0, 4, 7, 6, 4, 0, 2, 0 }; EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index 1b32b3c940..c6d649d75d 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 1, 15 }, }, @@ -481,9 +481,9 @@ EvtScript N(takeTurn_flying) = { EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STATIC) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_ELSE - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_SWITCH EVT_WAIT(10) @@ -566,9 +566,9 @@ EvtScript N(takeTurn) = { EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STATIC) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_ELSE - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_SWITCH EVT_WAIT(10) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index a4c85158e6..a866bb45f3 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -486,9 +486,9 @@ EvtScript N(takeTurn_flying) = { EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STATIC) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_ELSE - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_SWITCH EVT_WAIT(10) @@ -503,7 +503,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim06) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_RETURN EVT_END_IF @@ -564,16 +564,16 @@ EvtScript N(takeTurn_flying) = { EVT_SET(LVarD, 0) EVT_LOOP(5) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(21) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF @@ -582,244 +582,244 @@ EvtScript N(takeTurn_flying) = { EVT_LOOP(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.8), EVT_FLOAT(1.3), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.5), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.8), EVT_FLOAT(1.3), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(5) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.8), EVT_FLOAT(1.3), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.5), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.6), EVT_FLOAT(1.6), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(10) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF @@ -855,16 +855,16 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(func_80269470) EVT_BREAK_LOOP EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(30) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP @@ -938,9 +938,9 @@ EvtScript N(takeTurn) = { EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STATIC) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_ELSE - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_SWITCH EVT_WAIT(10) @@ -952,7 +952,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim06) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, EASING_LINEAR) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_RETURN EVT_END_IF @@ -1014,16 +1014,16 @@ EvtScript N(takeTurn) = { EVT_SET(LVarD, 0) EVT_LOOP(5) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(21) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF @@ -1031,100 +1031,100 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.8), EVT_FLOAT(1.3), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(1) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.7), EVT_FLOAT(1.5), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.6), EVT_FLOAT(1.6), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(10) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(2) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF @@ -1160,16 +1160,16 @@ EvtScript N(takeTurn) = { EVT_CALL(func_80269470) EVT_BREAK_LOOP EVT_END_IF - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LOOP(35) EVT_CALL(GetActionSuccessCopy, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP diff --git a/src/battle/common/actor/whacka.inc.c b/src/battle/common/actor/whacka.inc.c index debb76bb8d..2d39826eeb 100644 --- a/src/battle/common/actor/whacka.inc.c +++ b/src/battle/common/actor/whacka.inc.c @@ -66,7 +66,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -5 }, }, diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index a8cb331ecc..ce450fe838 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -87,7 +87,7 @@ ActorPartBlueprint N(GroundParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80223D70), .defenseTable = N(DefenseTable_80223B20), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, }, @@ -102,7 +102,7 @@ ActorPartBlueprint N(FlyingParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80223D70), .defenseTable = N(DefenseTable_80223B2C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, }, @@ -126,7 +126,7 @@ ActorPartBlueprint N(FlyingParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations_80223E08), .defenseTable = N(DefenseTable_80223B2C), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -840,17 +840,17 @@ EvtScript N(healOne) = { EVT_ADD(LVar5, LVar6) EVT_SUB(LVar3, LVar5) EVT_SUB(LVar2, LVar4) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOriginalActorType, LVar0, LVarA) EVT_IF_EQ(LVarA, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVarA) EVT_IF_EQ(LVarA, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetOwnerID, LVarA) EVT_IF_NE(LVarA, LVar0) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetEnemyMaxHP, LVar0, LVarA) EVT_CALL(GetActorHP, LVar0, LVarB) EVT_IF_NE(LVarA, LVarB) @@ -879,17 +879,17 @@ EvtScript N(healOne) = { EVT_CALL(InitTargetIterator) EVT_LABEL(2) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOriginalActorType, LVar0, LVarA) EVT_IF_EQ(LVarA, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVarA) EVT_IF_EQ(LVarA, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetOwnerID, LVarA) EVT_IF_NE(LVarA, LVar0) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetEnemyMaxHP, LVar0, LVarA) EVT_CALL(GetActorHP, LVar0, LVarB) EVT_IF_NE(LVarA, LVarB) @@ -1081,16 +1081,16 @@ EvtScript N(healAll) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) @@ -1130,16 +1130,16 @@ EvtScript N(takeTurn_802274E4) = { EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) EVT_LABEL(0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_CALL(GetOriginalActorType, LVar0, LVar1) EVT_IF_EQ(LVar1, ACTOR_TYPE_DRY_BONES) EVT_CALL(GetActorVar, LVar0, 8, LVar1) EVT_IF_EQ(LVar1, 1) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetActorHP, LVar0, LVar2) EVT_CALL(GetEnemyMaxHP, LVar0, LVar3) EVT_IF_NE(LVar2, LVar3) diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 9c57732f9c..0e1abaf1b3 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -785,7 +785,7 @@ EvtScript N(init_flying) = { }; EvtScript N(takeTurn) = { - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000) EVT_CALL(InitTargetIterator) @@ -808,8 +808,8 @@ EvtScript N(takeTurn) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF diff --git a/src/battle/common/stage/flo_01.inc.c b/src/battle/common/stage/flo_01.inc.c index e09805b46a..06f9aea290 100644 --- a/src/battle/common/stage/flo_01.inc.c +++ b/src/battle/common/stage/flo_01.inc.c @@ -3,7 +3,7 @@ #include "mapfs/flo_bt01_shape.h" #include "effects.h" -#include "flo_RandomFlowers.inc.c" +#include "lib/RandomFlowers.inc.c" #include "common/MakeSun.inc.c" EvtScript N(EVS_PreBattle) = { diff --git a/src/battle/common/stage/flo_01b.inc.c b/src/battle/common/stage/flo_01b.inc.c index 522606da9c..196f2e22da 100644 --- a/src/battle/common/stage/flo_01b.inc.c +++ b/src/battle/common/stage/flo_01b.inc.c @@ -3,7 +3,7 @@ #include "mapfs/flo_bt01_shape.h" #include "effects.h" -#include "flo_RandomFlowers.inc.c" +#include "lib/RandomFlowers.inc.c" #include "common/MakeSun.inc.c" EvtScript N(EVS_PreBattle) = { diff --git a/src/battle/common/stage/flo_01c.inc.c b/src/battle/common/stage/flo_01c.inc.c index b9b888f8e3..975107d5a0 100644 --- a/src/battle/common/stage/flo_01c.inc.c +++ b/src/battle/common/stage/flo_01c.inc.c @@ -3,7 +3,7 @@ #include "mapfs/flo_bt01_shape.h" #include "effects.h" -#include "flo_RandomFlowers.inc.c" +#include "lib/RandomFlowers.inc.c" #include "common/MakeSun.inc.c" EvtScript N(EVS_PreBattle) = { diff --git a/src/battle/common/stage/flo_02.inc.c b/src/battle/common/stage/flo_02.inc.c index 5ac2875b1e..8480e1434a 100644 --- a/src/battle/common/stage/flo_02.inc.c +++ b/src/battle/common/stage/flo_02.inc.c @@ -3,7 +3,7 @@ #include "mapfs/flo_bt02_shape.h" #include "effects.h" -#include "flo_RandomFlowers.inc.c" +#include "lib/RandomFlowers.inc.c" #include "common/MakeSun.inc.c" EvtScript N(EVS_PreBattle) = { diff --git a/src/battle/common/stage/flo_02b.inc.c b/src/battle/common/stage/flo_02b.inc.c index f86b330c7e..42ae43d055 100644 --- a/src/battle/common/stage/flo_02b.inc.c +++ b/src/battle/common/stage/flo_02b.inc.c @@ -3,7 +3,7 @@ #include "mapfs/flo_bt02_shape.h" #include "effects.h" -#include "flo_RandomFlowers.inc.c" +#include "lib/RandomFlowers.inc.c" #include "common/MakeSun.inc.c" EvtScript N(EVS_PreBattle) = { diff --git a/src/battle/common/stage/flo_02c.inc.c b/src/battle/common/stage/flo_02c.inc.c index b84f8eb553..578cb9b456 100644 --- a/src/battle/common/stage/flo_02c.inc.c +++ b/src/battle/common/stage/flo_02c.inc.c @@ -3,7 +3,7 @@ #include "mapfs/flo_bt02_shape.h" #include "effects.h" -#include "flo_RandomFlowers.inc.c" +#include "lib/RandomFlowers.inc.c" #include "common/MakeSun.inc.c" EvtScript N(EVS_PreBattle) = { diff --git a/src/battle/common/stage/jan_00.inc.c b/src/battle/common/stage/jan_00.inc.c index 9049a6de58..99ab4d5474 100644 --- a/src/battle/common/stage/jan_00.inc.c +++ b/src/battle/common/stage/jan_00.inc.c @@ -3,7 +3,7 @@ #include "mapfs/jan_bt00_shape.h" #include "effects.h" -#include "BeachEffects.inc.c" +#include "lib/BeachEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/common/stage/jan_01.inc.c b/src/battle/common/stage/jan_01.inc.c index b48e3263a8..27e7709f5a 100644 --- a/src/battle/common/stage/jan_01.inc.c +++ b/src/battle/common/stage/jan_01.inc.c @@ -2,7 +2,7 @@ #include "battle/battle.h" #include "mapfs/jan_bt01_shape.h" -#include "BeachEffects.inc.c" +#include "lib/BeachEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/common/stage/jan_01b.inc.c b/src/battle/common/stage/jan_01b.inc.c index 08bcc31405..0fe4e36b95 100644 --- a/src/battle/common/stage/jan_01b.inc.c +++ b/src/battle/common/stage/jan_01b.inc.c @@ -2,7 +2,7 @@ #include "battle/battle.h" #include "mapfs/jan_bt01_shape.h" -#include "BeachEffects.inc.c" +#include "lib/BeachEffects.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/common/stage/kmr_03.inc.c b/src/battle/common/stage/kmr_03.inc.c index addd748c52..b96e3190d8 100644 --- a/src/battle/common/stage/kmr_03.inc.c +++ b/src/battle/common/stage/kmr_03.inc.c @@ -2,7 +2,7 @@ #include "battle/battle.h" #include "mapfs/kmr_bt03_shape.h" -#include "battle/common/stage/MovingClouds.inc.c" +#include "battle/common/stage/lib/MovingClouds.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/common/stage/kmr_04.inc.c b/src/battle/common/stage/kmr_04.inc.c index 2dd72f79f9..fc221b1f6b 100644 --- a/src/battle/common/stage/kmr_04.inc.c +++ b/src/battle/common/stage/kmr_04.inc.c @@ -2,7 +2,7 @@ #include "battle/battle.h" #include "mapfs/kmr_bt04_shape.h" -#include "battle/common/stage/MovingClouds.inc.c" +#include "battle/common/stage/lib/MovingClouds.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/common/stage/kmr_05.inc.c b/src/battle/common/stage/kmr_05.inc.c index 94689f68f3..a868003bd2 100644 --- a/src/battle/common/stage/kmr_05.inc.c +++ b/src/battle/common/stage/kmr_05.inc.c @@ -2,7 +2,7 @@ #include "battle/battle.h" #include "mapfs/kmr_bt05_shape.h" -#include "battle/common/stage/MovingClouds.inc.c" +#include "battle/common/stage/lib/MovingClouds.inc.c" EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/battle/common/stage/kmr_06.inc.c b/src/battle/common/stage/kmr_06.inc.c index 853f3593ed..f37037f3e5 100644 --- a/src/battle/common/stage/kmr_06.inc.c +++ b/src/battle/common/stage/kmr_06.inc.c @@ -2,7 +2,7 @@ #include "battle/battle.h" #include "mapfs/kmr_bt06_shape.h" -#include "battle/common/stage/MovingClouds.inc.c" +#include "battle/common/stage/lib/MovingClouds.inc.c" #include "common/UnkFogFunc.inc.c" EvtScript N(EVS_PreBattle) = { diff --git a/src/battle/common/stage/BeachEffects.inc.c b/src/battle/common/stage/lib/BeachEffects.inc.c similarity index 100% rename from src/battle/common/stage/BeachEffects.inc.c rename to src/battle/common/stage/lib/BeachEffects.inc.c diff --git a/src/battle/common/stage/MovingClouds.inc.c b/src/battle/common/stage/lib/MovingClouds.inc.c similarity index 100% rename from src/battle/common/stage/MovingClouds.inc.c rename to src/battle/common/stage/lib/MovingClouds.inc.c diff --git a/src/battle/common/stage/flo_RandomFlowers.inc.c b/src/battle/common/stage/lib/RandomFlowers.inc.c similarity index 100% rename from src/battle/common/stage/flo_RandomFlowers.inc.c rename to src/battle/common/stage/lib/RandomFlowers.inc.c diff --git a/src/battle/common/stage/sam_Snowflakes.inc.c b/src/battle/common/stage/lib/Snowflakes.inc.c similarity index 100% rename from src/battle/common/stage/sam_Snowflakes.inc.c rename to src/battle/common/stage/lib/Snowflakes.inc.c diff --git a/src/battle/common/stage/TexturePanner.inc.c b/src/battle/common/stage/lib/TexturePanner.inc.c similarity index 100% rename from src/battle/common/stage/TexturePanner.inc.c rename to src/battle/common/stage/lib/TexturePanner.inc.c diff --git a/src/battle/common/stage/WaterEffects.inc.c b/src/battle/common/stage/lib/WaterEffects.inc.c similarity index 100% rename from src/battle/common/stage/WaterEffects.inc.c rename to src/battle/common/stage/lib/WaterEffects.inc.c diff --git a/src/battle/common/stage/trd_00.inc.c b/src/battle/common/stage/trd_00.inc.c new file mode 100644 index 0000000000..4ca00e2441 --- /dev/null +++ b/src/battle/common/stage/trd_00.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt00_shape.h" + +#define NAMESPACE A(trd_00) + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_p1, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt00_shape", + .hit = "trd_bt00_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/trd_01.inc.c b/src/battle/common/stage/trd_01.inc.c new file mode 100644 index 0000000000..1ca7546815 --- /dev/null +++ b/src/battle/common/stage/trd_01.inc.c @@ -0,0 +1,25 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt01_shape.h" + +#define NAMESPACE A(trd_01) + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt01_shape", + .hit = "trd_bt01_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/trd_02.inc.c b/src/battle/common/stage/trd_02.inc.c new file mode 100644 index 0000000000..1ead1ffe2e --- /dev/null +++ b/src/battle/common/stage/trd_02.inc.c @@ -0,0 +1,47 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt02_shape.h" + +#define NAMESPACE A(trd_02) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_kabe2_2, FALSE) + EVT_THREAD + EVT_SET(LVar0, MODEL_mizu) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu2) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o298) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o297) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_saku, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt02_shape", + .hit = "trd_bt02_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/trd_02b.inc.c b/src/battle/common/stage/trd_02b.inc.c new file mode 100644 index 0000000000..29f92f2a43 --- /dev/null +++ b/src/battle/common/stage/trd_02b.inc.c @@ -0,0 +1,43 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt02_shape.h" + +#define NAMESPACE A(trd_02b) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_saku, FALSE) + EVT_CALL(EnableModel, MODEL_kiwa, FALSE) + EVT_CALL(EnableModel, MODEL_tyuu, FALSE) + EVT_THREAD + EVT_SET(LVar0, MODEL_mizu) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu2) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o298) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o297) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt02_shape", + .hit = "trd_bt02_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/trd_02c.inc.c b/src/battle/common/stage/trd_02c.inc.c new file mode 100644 index 0000000000..3b30ecf09f --- /dev/null +++ b/src/battle/common/stage/trd_02c.inc.c @@ -0,0 +1,33 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt02_shape.h" + +#define NAMESPACE A(trd_02c) + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_dai, FALSE) + EVT_CALL(EnableModel, MODEL_kusari1, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_saku, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt02_shape", + .hit = "trd_bt02_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/trd_02d.inc.c b/src/battle/common/stage/trd_02d.inc.c new file mode 100644 index 0000000000..cdaa05598a --- /dev/null +++ b/src/battle/common/stage/trd_02d.inc.c @@ -0,0 +1,39 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt02_shape.h" + +#define NAMESPACE A(trd_02d) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_mizu, FALSE) + EVT_CALL(EnableModel, MODEL_mizu2, FALSE) + EVT_CALL(EnableModel, MODEL_o298, FALSE) + EVT_CALL(EnableModel, MODEL_o297, FALSE) + EVT_CALL(EnableModel, MODEL_kiwa, FALSE) + EVT_CALL(EnableModel, MODEL_tyuu, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_saku, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt02_shape", + .hit = "trd_bt02_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/trd_03.inc.c b/src/battle/common/stage/trd_03.inc.c new file mode 100644 index 0000000000..3324511cf1 --- /dev/null +++ b/src/battle/common/stage/trd_03.inc.c @@ -0,0 +1,43 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt03_shape.h" + +#define NAMESPACE A(trd_03) + +#include "battle/common/stage/lib/MovingClouds.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SET(LVar0, MODEL_g65) + EVT_SET(LVar2, 0) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_g62) + EVT_SET(LVar2, 70) + EVT_SET(LVar3, 175) + EVT_SET(LVar4, -170) + EVT_EXEC(N(EVS_AnimateCloud_WithOffset2D)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_saku, + MODEL_kabe2, + MODEL_kabe, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt03_shape", + .hit = "trd_bt03_hit", + .bg = "nok_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/trd_04.inc.c b/src/battle/common/stage/trd_04.inc.c new file mode 100644 index 0000000000..a34a058290 --- /dev/null +++ b/src/battle/common/stage/trd_04.inc.c @@ -0,0 +1,38 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt04_shape.h" + +#define NAMESPACE A(trd_04) + +#include "battle/common/stage/lib/TexturePanner.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_SET(LVar0, MODEL_hikari1) + EVT_SET(LVar1, TEX_PANNER_0) + EVT_SET(LVar2, 40) + EVT_SET(LVar3, 0) + EVT_EXEC(N(EVS_TexturePanMain)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_hikari1, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt04_shape", + .hit = "trd_bt04_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/trd_05.inc.c b/src/battle/common/stage/trd_05.inc.c new file mode 100644 index 0000000000..e60c7242d0 --- /dev/null +++ b/src/battle/common/stage/trd_05.inc.c @@ -0,0 +1,45 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt05_shape.h" + +#define NAMESPACE A(trd_05) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_THREAD + EVT_SET(LVar0, MODEL_o318) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu4) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_END_THREAD + EVT_THREAD + EVT_SET(LVar0, MODEL_mizu3) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu2) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu1) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt05_shape", + .hit = "trd_bt05_hit", + .bg = "nok_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/trd_05b.inc.c b/src/battle/common/stage/trd_05b.inc.c new file mode 100644 index 0000000000..d9392ba1a6 --- /dev/null +++ b/src/battle/common/stage/trd_05b.inc.c @@ -0,0 +1,37 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt05_shape.h" + +#define NAMESPACE A(trd_05b) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_kai, FALSE) + EVT_CALL(EnableModel, MODEL_kusari1, FALSE) + EVT_CALL(EnableModel, MODEL_mizu1, FALSE) + EVT_CALL(EnableModel, MODEL_mizu2, FALSE) + EVT_CALL(EnableModel, MODEL_mizu3, FALSE) + EVT_CALL(EnableModel, MODEL_ori, FALSE) + EVT_CALL(EnableModel, MODEL_saku1, FALSE) + EVT_CALL(EnableModel, MODEL_saku2, FALSE) + EVT_CALL(EnableModel, MODEL_mizu4, FALSE) + EVT_CALL(EnableModel, MODEL_o318, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt05_shape", + .hit = "trd_bt05_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/trd_05c.inc.c b/src/battle/common/stage/trd_05c.inc.c new file mode 100644 index 0000000000..5f117a3ef6 --- /dev/null +++ b/src/battle/common/stage/trd_05c.inc.c @@ -0,0 +1,45 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt05_shape.h" + +#define NAMESPACE A(trd_05c) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_yuka3, FALSE) + EVT_CALL(EnableModel, MODEL_hako, FALSE) + EVT_CALL(EnableModel, MODEL_ori, FALSE) + EVT_CALL(EnableModel, MODEL_saku1, FALSE) + EVT_CALL(EnableModel, MODEL_saku2, FALSE) + EVT_CALL(EnableModel, MODEL_mizu4, FALSE) + EVT_SET(LVar0, MODEL_o318) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_THREAD + EVT_SET(LVar0, MODEL_mizu3) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu2) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu1) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt05_shape", + .hit = "trd_bt05_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/trd_05d.inc.c b/src/battle/common/stage/trd_05d.inc.c new file mode 100644 index 0000000000..261f9121cf --- /dev/null +++ b/src/battle/common/stage/trd_05d.inc.c @@ -0,0 +1,44 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt05_shape.h" + +#define NAMESPACE A(trd_05d) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_yuka3, FALSE) + EVT_CALL(EnableModel, MODEL_hako, FALSE) + EVT_CALL(EnableModel, MODEL_kai, FALSE) + EVT_CALL(EnableModel, MODEL_kusari1, FALSE) + EVT_CALL(EnableModel, MODEL_mizu4, FALSE) + EVT_CALL(EnableModel, MODEL_hikari2, FALSE) + EVT_CALL(EnableModel, MODEL_o318, FALSE) + EVT_THREAD + EVT_SET(LVar0, MODEL_mizu3) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu2) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_mizu1) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt05_shape", + .hit = "trd_bt05_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/trd_05e.inc.c b/src/battle/common/stage/trd_05e.inc.c new file mode 100644 index 0000000000..ecba95ea9b --- /dev/null +++ b/src/battle/common/stage/trd_05e.inc.c @@ -0,0 +1,35 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt05_shape.h" + +#define NAMESPACE A(trd_05e) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_o318, FALSE) + EVT_CALL(EnableModel, MODEL_mizu1, FALSE) + EVT_CALL(EnableModel, MODEL_mizu2, FALSE) + EVT_CALL(EnableModel, MODEL_mizu3, FALSE) + EVT_CALL(EnableModel, MODEL_ori, FALSE) + EVT_CALL(EnableModel, MODEL_saku1, FALSE) + EVT_CALL(EnableModel, MODEL_saku2, FALSE) + EVT_CALL(EnableModel, MODEL_mizu4, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt05_shape", + .hit = "trd_bt05_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/trd_05f.inc.c b/src/battle/common/stage/trd_05f.inc.c new file mode 100644 index 0000000000..9e90eec96b --- /dev/null +++ b/src/battle/common/stage/trd_05f.inc.c @@ -0,0 +1,37 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/trd_bt05_shape.h" + +#define NAMESPACE A(trd_05f) + +#include "battle/common/stage/lib/BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_SET(LVar0, MODEL_o318) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_CALL(EnableModel, MODEL_mizu1, FALSE) + EVT_CALL(EnableModel, MODEL_mizu2, FALSE) + EVT_CALL(EnableModel, MODEL_mizu3, FALSE) + EVT_CALL(EnableModel, MODEL_ori, FALSE) + EVT_CALL(EnableModel, MODEL_saku1, FALSE) + EVT_CALL(EnableModel, MODEL_saku2, FALSE) + EVT_CALL(EnableModel, MODEL_mizu4, FALSE) + EVT_CALL(EnableModel, MODEL_hako, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "trd_tex", + .shape = "trd_bt05_shape", + .hit = "trd_bt05_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c index d61634b506..5f72642c4b 100644 --- a/src/battle/move/hammer/hammer_charge_0.c +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -123,7 +123,7 @@ EvtScript N(EVS_802A3348) = { EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) @@ -137,7 +137,7 @@ EvtScript N(EVS_802A3348) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -149,7 +149,7 @@ EvtScript N(EVS_802A3348) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_1) diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c index a1d0d9e0c1..d5ac7d5d02 100644 --- a/src/battle/move/hammer/hammer_charge_1.c +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -132,7 +132,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) @@ -146,7 +146,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -158,7 +158,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_1) diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c index 451ff184df..5cfa2f404c 100644 --- a/src/battle/move/hammer/hammer_charge_2.c +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -132,7 +132,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) @@ -146,7 +146,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -158,7 +158,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) EVT_END_SWITCH EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_1) diff --git a/src/battle/move/item/pebble.c b/src/battle/move/item/pebble.c index fdec779939..4b64f0a955 100644 --- a/src/battle/move/item/pebble.c +++ b/src/battle/move/item/pebble.c @@ -15,10 +15,10 @@ static s32 _pad = 0; #include "battle/move/item/pebble.pal.inc.c" Vtx N(model)[] = { - { .v = { { -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }, } }, - { .v = { { 15, -16, 0 }, FALSE, { 1024, 0 }, { 0, 0, 0, 255 }, } }, - { .v = { { 15, 15, 0 }, FALSE, { 1024, 1024 }, { 0, 0, 0, 255 }, } }, - { .v = { { -16, 15, 0 }, FALSE, { 0, 1024 }, { 0, 0, 0, 255 }, } }, + { .v = { { -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 } } }, + { .v = { { 15, -16, 0 }, FALSE, { 1024, 0 }, { 0, 0, 0, 255 } } }, + { .v = { { 15, 15, 0 }, FALSE, { 1024, 1024 }, { 0, 0, 0, 255 } } }, + { .v = { { -16, 15, 0 }, FALSE, { 0, 1024 }, { 0, 0, 0, 255 } } }, }; Gfx N(displayList)[] = { diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index dac55d7ee9..7dd056ee10 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -33,16 +33,16 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetTargetListLength, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_ELSE @@ -57,7 +57,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -66,7 +66,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -74,18 +74,18 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_SWITCH EVT_CALL(func_80269524, LVarE) EVT_ADD(LVarF, 1) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) EVT_CALL(GetTargetListLength, LVar0) EVT_SUB(LVar0, 1) EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(ShowActionHud, FALSE) EVT_END_IF EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) @@ -109,7 +109,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_ELSE @@ -117,7 +117,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) EVT_END_IF EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_ELSE @@ -142,7 +142,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(FALSE) EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -151,7 +151,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(TRUE) EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -175,16 +175,16 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetTargetListLength, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_ELSE @@ -199,7 +199,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -208,26 +208,26 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(func_80269524, LVarE) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_SET(LVarF, 0) EVT_ADD(LVarF, 1) EVT_LABEL(10) EVT_CALL(GetTargetListLength, LVar0) EVT_SUB(LVar0, 1) EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(ShowActionHud, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) @@ -256,7 +256,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_ELSE @@ -264,7 +264,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) EVT_END_IF EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) EVT_ELSE @@ -289,7 +289,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(FALSE) EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -298,7 +298,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(TRUE) EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -322,16 +322,16 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetTargetListLength, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_ELSE @@ -346,7 +346,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -355,26 +355,26 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(func_80269524, LVarE) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_SET(LVarF, 0) EVT_ADD(LVarF, 1) EVT_LABEL(20) EVT_CALL(GetTargetListLength, LVar0) EVT_SUB(LVar0, 1) EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(ShowActionHud, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) @@ -396,7 +396,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_ELSE @@ -404,7 +404,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) EVT_END_IF EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) EVT_ELSE @@ -429,7 +429,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(FALSE) EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -438,7 +438,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(TRUE) EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index d04e6c0589..147e0f5636 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -40,7 +40,7 @@ extern EvtScript N(EVS_UseMove_ImplB); extern EvtScript N(EVS_UseMove_ImplC); EvtScript N(EVS_UseMove) = { - EVT_SET(LocalFlag(10), FALSE) + EVT_SET(LFlagA, FALSE) EVT_CALL(ShowActionHud, TRUE) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_AUTO_SUCCEED_ACTION, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) @@ -104,7 +104,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(func_80269524, LVarE) EVT_SET(LVarD, 0) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) @@ -140,18 +140,18 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GE(LVarF, 3) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(N(GetHitChance)) EVT_IF_GE(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE @@ -183,7 +183,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -234,7 +234,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_80269524, LVarE) EVT_SET(LVarD, 0) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) @@ -276,18 +276,18 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GT(LVarF, 3) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(N(GetHitChance)) EVT_IF_GT(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE @@ -319,7 +319,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -370,7 +370,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80269524, LVarE) EVT_SET(LVarD, 0) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) @@ -408,18 +408,18 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GT(LVarF, 3) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(N(GetHitChance)) EVT_IF_GT(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE @@ -451,7 +451,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index abd96632c8..2e71ef81eb 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -23,7 +23,7 @@ extern EvtScript N(EVS_UseMove_ImplB); extern EvtScript N(EVS_UseMove_ImplC); EvtScript N(EVS_UseMove) = { - EVT_SET(LocalFlag(10), FALSE) + EVT_SET(LFlagA, FALSE) EVT_CALL(ShowActionHud, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -129,7 +129,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_CHILD_THREAD EVT_CALL(func_80269524, LVarE) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) @@ -182,13 +182,13 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GT(LVarF, 3) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_SET(LVar0, 3) EVT_CALL(N(func_802A10E4_785C04)) EVT_IF_GT(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(InitTargetIterator) EVT_CALL(DidActionSucceed, LVarB) @@ -201,7 +201,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE @@ -235,7 +235,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVarC) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -244,7 +244,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -349,7 +349,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_CHILD_THREAD EVT_CALL(func_80269524, LVarE) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) @@ -408,13 +408,13 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GT(LVarF, 4) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_SET(LVar0, 4) EVT_CALL(N(func_802A10E4_785C04)) EVT_IF_GT(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(InitTargetIterator) EVT_CALL(DidActionSucceed, LVarB) @@ -427,7 +427,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE @@ -461,7 +461,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVarC) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -470,7 +470,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -575,7 +575,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_CHILD_THREAD EVT_CALL(func_80269524, LVarE) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) @@ -630,13 +630,13 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GT(LVarF, 5) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_SET(LVar0, 5) EVT_CALL(N(func_802A10E4_785C04)) EVT_IF_GT(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(InitTargetIterator) EVT_CALL(DidActionSucceed, LVarB) @@ -649,7 +649,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE @@ -683,7 +683,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVarC) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -692,7 +692,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index ed414ebb80..5867082181 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -46,16 +46,16 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetTargetListLength, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_ELSE @@ -70,7 +70,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -79,7 +79,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -87,18 +87,18 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_SWITCH EVT_CALL(func_80269524, LVarE) EVT_ADD(LVarF, 1) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) EVT_CALL(GetTargetListLength, LVar0) EVT_SUB(LVar0, 1) EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(ShowActionHud, FALSE) EVT_END_IF EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) @@ -122,7 +122,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_ELSE @@ -130,7 +130,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) EVT_END_IF EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_ELSE @@ -155,7 +155,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(FALSE) EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -164,7 +164,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(TRUE) EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -197,16 +197,16 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetTargetListLength, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_ELSE @@ -221,7 +221,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -230,26 +230,26 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(func_80269524, LVarE) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_SET(LVarF, 0) EVT_ADD(LVarF, 1) EVT_LABEL(10) EVT_CALL(GetTargetListLength, LVar0) EVT_SUB(LVar0, 1) EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(ShowActionHud, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) @@ -278,7 +278,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_ELSE @@ -286,7 +286,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) EVT_END_IF EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) EVT_ELSE @@ -311,7 +311,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(FALSE) EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -320,7 +320,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(TRUE) EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -353,16 +353,16 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(GetTargetListLength, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_ELSE @@ -377,7 +377,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -386,26 +386,26 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(func_80269524, LVarE) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_SET(LVarF, 0) EVT_ADD(LVarF, 1) EVT_LABEL(20) EVT_CALL(GetTargetListLength, LVar0) EVT_SUB(LVar0, 1) EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(ShowActionHud, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) @@ -427,7 +427,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_ELSE @@ -435,7 +435,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) EVT_END_IF EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) EVT_ELSE @@ -460,7 +460,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(FALSE) EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -469,7 +469,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(TRUE) EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index 09c272f958..d08ed75913 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -58,7 +58,7 @@ extern EvtScript N(EVS_UseMove_ImplB); extern EvtScript N(EVS_UseMove_ImplC); EvtScript N(EVS_UseMove) = { - EVT_SET(LocalFlag(10), FALSE) + EVT_SET(LFlagA, FALSE) EVT_CALL(ShowActionHud, TRUE) EVT_CALL(N(InitializeHitCounter)) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) @@ -124,7 +124,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(N(IncrementHitCounter)) EVT_SET(LVarD, 0) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) @@ -160,18 +160,18 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GE(LVarF, 3) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(N(GetHitChance)) EVT_IF_GE(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE @@ -198,7 +198,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -207,7 +207,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -260,7 +260,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(N(IncrementHitCounter)) EVT_SET(LVarD, 0) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) @@ -302,18 +302,18 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GT(LVarF, 3) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(N(GetHitChance)) EVT_IF_GT(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE @@ -340,7 +340,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -349,7 +349,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -402,7 +402,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(N(IncrementHitCounter)) EVT_SET(LVarD, 0) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) @@ -440,18 +440,18 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(GetCommandAutoSuccess, LVar1) EVT_IF_EQ(LVar1, 1) EVT_IF_GT(LVarF, 3) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(N(GetHitChance)) EVT_IF_GT(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_WAIT(1) EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE @@ -478,7 +478,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF @@ -487,7 +487,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END_IF diff --git a/src/battle/move/star_power/up_and_away.c b/src/battle/move/star_power/up_and_away.c index d8d3cf5e23..9cc2f0ad5f 100644 --- a/src/battle/move/star_power/up_and_away.c +++ b/src/battle/move/star_power/up_and_away.c @@ -330,11 +330,11 @@ EvtScript N(EVS_UsePower) = { EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(func_802A1628_795908) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(ItemCheckHit, LVar1, 0, 0, 0, 0) EVT_IF_EQ(LVar1, 6) EVT_SET(LVar0, 0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_SWITCH(LVar0) EVT_CASE_GT(0) @@ -397,7 +397,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(RemoveActor, LVarA) EVT_END_THREAD EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(PlayerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 0, BS_FLAGS1_FORCE_HIT_IMMUNE | BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_IF EVT_END_SWITCH diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 55b23324cf..d95d6272bd 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -27,8 +27,8 @@ enum N(ActorPartIDs) { }; enum { - LF_MashEnded = LocalFlag(0), - LF_MashStarted = LocalFlag(2), + LF_MashEnded = LFlag0, + LF_MashStarted = LFlag2, }; API_CALLABLE(N(PlayExplosionFX)) { @@ -304,7 +304,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index b1bc0d360d..2dc6cd2aba 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -523,7 +523,7 @@ EvtScript N(smack) = { EVT_SET(LVarF, 0) EVT_SET(LVarE, 0) EVT_SET(LVarD, 0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_LOOP(15) @@ -560,13 +560,13 @@ EvtScript N(smack) = { EVT_GOTO(2) EVT_END_IF EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapOnce) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetDamageSource, DMG_SRC_NEXT_SLAP_LEFT) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapBack) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(SetDamageSource, DMG_SRC_NEXT_SLAP_RIGHT) EVT_END_IF EVT_WAIT(2) @@ -616,13 +616,13 @@ EvtScript N(smack) = { EVT_CALL(MoveBattleCamOver, 5) EVT_END_IF EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapOnce) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapBack) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_RIGHT) EVT_END_IF EVT_WAIT(2) @@ -1034,7 +1034,7 @@ EvtScript N(fanSmack) = { EVT_SET(LVarF, 0) EVT_SET(LVarE, 0) EVT_SET(LVarD, 0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_CelebrateFast) @@ -1077,13 +1077,13 @@ EvtScript N(fanSmack) = { EVT_GOTO(2) EVT_END_IF EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackOnce) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetDamageSource, DMG_SRC_NEXT_FAN_SMACK_LEFT) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackBack) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(SetDamageSource, DMG_SRC_NEXT_FAN_SMACK_RIGHT) EVT_END_IF EVT_WAIT(2) @@ -1156,13 +1156,13 @@ EvtScript N(fanSmack) = { EVT_CALL(MoveBattleCamOver, 5) EVT_END_IF EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackOnce) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_FAN_SMACK_LEFT) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackBack) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_FAN_SMACK_RIGHT) EVT_END_IF EVT_WAIT(2) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index a1e0a14731..a84393da76 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -529,7 +529,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, }, }; @@ -1252,7 +1252,7 @@ EvtScript N(headbonk3) = { EVT_END }; -s32 N(actionCommandTable)[] = { 7, 6, 5, 4, 3, 2, 1, 0, }; +s32 N(actionCommandTable)[] = { 7, 6, 5, 4, 3, 2, 1, 0 }; s32 N(powerBounceChance) = 200; @@ -1326,7 +1326,7 @@ EvtScript N(multibonk) = { EVT_CALL(func_80269524, LVarF) EVT_SET(LVarD, 0) EVT_SET(LVarF, 0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_50) @@ -1378,7 +1378,7 @@ EvtScript N(multibonk) = { EVT_SUB(LVarD, 1) EVT_CALL(N(AdjustPowerBounceChance)) EVT_IF_GE(LVarF, LVar0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CHILD_THREAD EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) @@ -1391,7 +1391,7 @@ EvtScript N(multibonk) = { EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(N(GetChargeAmount)) EVT_ADD(LVar0, 3) EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_40) @@ -1404,7 +1404,7 @@ EvtScript N(multibonk) = { EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 3) EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_CALL(func_80269550, LVarE) @@ -1416,7 +1416,7 @@ EvtScript N(multibonk) = { EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_1) EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(returnHome2)) EVT_RETURN EVT_END_IF diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 0625d48c9f..f74a14e243 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -232,7 +232,7 @@ ActorPartBlueprint N(ActorParts)[] = { .opacity = 255, .idleAnimations = N(IdleAnimations), .defenseTable = N(DefenseTable), - .eventFlags = ACTOR_EVENT_FLAG_0, + .eventFlags = ACTOR_EVENT_FLAGS_NONE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, }, @@ -810,7 +810,7 @@ EvtScript N(powerShell) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 1) EVT_END_THREAD - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_WAIT(1) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -823,7 +823,7 @@ EvtScript N(powerShell) = { EVT_IF_EQ(LVar0, 6) EVT_GOTO(12) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) @@ -832,7 +832,7 @@ EvtScript N(powerShell) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH EVT_END_IF - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) @@ -846,7 +846,7 @@ EvtScript N(powerShell) = { EVT_IF_NE(LVar2, -1) EVT_GOTO(10) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) @@ -965,7 +965,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(N(SetTargetsYaw)) EVT_END_THREAD EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_WAIT(1) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -978,7 +978,7 @@ EvtScript N(dizzyShell) = { EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(12) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) @@ -987,7 +987,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH EVT_END_IF - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(GetActionResult, LVarF) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) @@ -1015,7 +1015,7 @@ EvtScript N(dizzyShell) = { EVT_IF_NE(LVar2, -1) EVT_GOTO(10) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) @@ -1211,7 +1211,7 @@ EvtScript N(fireShell) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_END_THREAD EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_LABEL(10) EVT_WAIT(1) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -1224,7 +1224,7 @@ EvtScript N(fireShell) = { EVT_IF_EQ(LVar0, 6) EVT_GOTO(12) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) @@ -1233,7 +1233,7 @@ EvtScript N(fireShell) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_END_SWITCH EVT_END_IF - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_CALL(GetActionResult, LVar0) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) @@ -1248,7 +1248,7 @@ EvtScript N(fireShell) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(10) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 7306620505..0e61ce610c 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -986,8 +986,8 @@ EvtScript N(spinySurge) = { EVT_CALL(InitTargetIterator) EVT_CALL(SetActorVar, ACTOR_PARTNER, 0, 0) EVT_SET(LVar9, 0) - EVT_SET(LocalFlag(2), 0) - EVT_SET(LocalFlag(3), 0) + EVT_SET(LFlag2, FALSE) + EVT_SET(LFlag3, FALSE) EVT_LOOP(LVarA) EVT_CALL(GetActionResult, LVar0) EVT_IF_EQ(LVar9, 2) @@ -1014,12 +1014,12 @@ EvtScript N(spinySurge) = { EVT_IF_EQ(LVar9, 0) EVT_BREAK_SWITCH EVT_END_IF - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201B) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_ELSE EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201C) - EVT_SET(LocalFlag(2), 0) + EVT_SET(LFlag2, FALSE) EVT_END_IF EVT_CALL(N(ThrowSpinyFX)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_ThrowSpinyAlt) @@ -1033,7 +1033,7 @@ EvtScript N(spinySurge) = { EVT_SUB(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_PARTNER, 0, LVar0) EVT_END_CHILD_THREAD - EVT_SET(LocalFlag(3), 1) + EVT_SET(LFlag3, TRUE) EVT_SET(LVar9, 0) EVT_END_SWITCH EVT_WAIT(1) @@ -1048,7 +1048,7 @@ EvtScript N(spinySurge) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_IF_EQ(LocalFlag(3), 0) + EVT_IF_EQ(LFlag3, FALSE) EVT_SET(LVar0, 0) EVT_SET(LVarF, 0) EVT_WAIT(15) diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 450e0c2c42..c7c2372b88 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -929,7 +929,7 @@ EvtScript N(returnHome) = { EVT_END }; -s32 N(actionCommandTable)[] = { 7, 6, 5, 4, 3, 2, 1, 0, }; +s32 N(actionCommandTable)[] = { 7, 6, 5, 4, 3, 2, 1, 0 }; EvtScript N(skyDive) = { EVT_CALL(EnableIdleScript, ACTOR_PARTNER, 0) @@ -1078,7 +1078,7 @@ EvtScript N(shellShot) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_SET_CONST(LVarA, ANIM_BattleParakarry_HurtStill) EVT_ELSE EVT_SET_CONST(LVarA, ANIM_BattleParakarry_Think) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 9bcf132a18..34560ba090 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -778,119 +778,119 @@ EvtScript N(electroDash) = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -20, 0, 0) - EVT_SET(LocalFlag(2), 0) + EVT_SET(LFlag2, FALSE) EVT_LOOP(60) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_NE(LVar0, 0) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP EVT_CALL(MoveBattleCamOver, 75) - EVT_IF_EQ(LocalFlag(2), 1) + EVT_IF_EQ(LFlag2, TRUE) EVT_CALL(action_command_body_slam_start, 0, 102, 3, 1) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_EXEC_GET_TID(N(dashToTarget), LVarA) EVT_LOOP(20) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_KILL_THREAD(LVarA) EVT_GOTO(10) EVT_END_IF EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_EXEC_GET_TID(N(charge), LVarA) EVT_LOOP(55) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_KILL_THREAD(LVarA) EVT_GOTO(10) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_EXEC_GET_TID(N(electroDash_wait), LVarA) EVT_LOOP(30) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_KILL_THREAD(LVarA) EVT_GOTO(10) EVT_END_IF EVT_END_IF EVT_ELSE - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_EXEC_GET_TID(N(dashToTarget), LVarA) EVT_LOOP(20) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_NE(LVar0, 0) - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_CALL(action_command_body_slam_start, 0, 92, 3, 1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(2), 1) + EVT_IF_EQ(LFlag2, TRUE) EVT_IF_EQ(LVar0, 0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_KILL_THREAD(LVarA) EVT_GOTO(10) EVT_END_IF EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_EXEC_GET_TID(N(charge), LVarA) EVT_LOOP(55) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_NE(LVar0, 0) - EVT_IF_EQ(LocalFlag(2), 0) + EVT_IF_EQ(LFlag2, FALSE) EVT_CALL(action_command_body_slam_start, 0, 92, 3, 1) - EVT_SET(LocalFlag(2), 1) + EVT_SET(LFlag2, TRUE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(2), 1) + EVT_IF_EQ(LFlag2, TRUE) EVT_IF_EQ(LVar0, 0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_KILL_THREAD(LVarA) EVT_GOTO(10) EVT_END_IF - EVT_IF_EQ(LocalFlag(0), 0) + EVT_IF_EQ(LFlag0, FALSE) EVT_EXEC_GET_TID(N(electroDash_wait), LVarA) EVT_LOOP(30) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_SET(LocalFlag(0), 1) + EVT_SET(LFlag0, TRUE) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_IF_EQ(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, TRUE) EVT_KILL_THREAD(LVarA) EVT_GOTO(10) EVT_END_IF @@ -968,11 +968,11 @@ EvtScript N(powerShock) = { EVT_CALL(action_command_power_shock_init) EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0) EVT_CALL(SetActionHudPrepareTime, 0) - EVT_SET(LocalFlag(15), 0) + EVT_SET(LFlagF, FALSE) EVT_CALL(GetOwnerTarget, LVarA, LVarB) EVT_CALL(GetActorFlags, LVarA, LVar0) EVT_IF_FLAG(LVar0, ACTOR_FLAG_UPSIDE_DOWN) - EVT_SET(LocalFlag(15), 1) + EVT_SET(LFlagF, TRUE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PARTNER_APPROACH) EVT_CALL(MoveBattleCamOver, 40) @@ -1064,7 +1064,7 @@ EvtScript N(powerShock) = { EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), 255, 0, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH EVT_CALL(PartnerYieldTurn) - EVT_IF_NE(LocalFlag(15), 1) + EVT_IF_NE(LFlagF, TRUE) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -25, 10, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, -10, EASING_COS_IN_OUT) EVT_ELSE @@ -1253,7 +1253,7 @@ EvtScript N(turboCharge) = { EVT_END }; -s32 D_8023B948_707438[] = { 3, 3, 4, 7, 10, 13, 16, 16, 16, 16, }; +s32 D_8023B948_707438[] = { 3, 3, 4, 7, 10, 13, 16, 16, 16, 16 }; EvtScript N(megaShock) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_MEGA_SHOCK) diff --git a/src/battle_cam.c b/src/battle_cam.c index 0406cda360..6a84579b2b 100644 --- a/src/battle_cam.c +++ b/src/battle_cam.c @@ -1501,9 +1501,9 @@ void btl_cam_use_preset_impl(s32 id) { case BTL_CAM_PRESET_06: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_G; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_G; break; case BTL_CAM_PRESET_07: BattleCam_BoomLength = 300; @@ -1513,9 +1513,9 @@ void btl_cam_use_preset_impl(s32 id) { case BTL_CAM_PRESET_08: BattleCam_BoomLength = 300; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_I; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_I; break; case BTL_CAM_PRESET_09: if (BattleCam_ControlScript != &EVS_BattleCam_Default) { @@ -1529,62 +1529,61 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - BattleCam_BoomZOffset = 15; BattleCam_BoomYaw = 0; - preset = &CamPreset_F; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_F; break; case BTL_CAM_PRESET_11: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; - preset = &CamPreset_F; BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_F; break; case BTL_CAM_PRESET_12: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; BattleCam_BoomZOffset = 30; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_F; break; case BTL_CAM_PRESET_13: BattleCam_BoomLength = 200; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_I; BattleCam_BoomZOffset = 15; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_I; break; case BTL_CAM_PRESET_14: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; - preset = &CamPreset_I; BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_I; break; case BTL_CAM_PRESET_15: BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_I; BattleCam_BoomZOffset = 30; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_I; break; case BTL_CAM_PRESET_16: BattleCam_BoomLength = 267; @@ -1606,23 +1605,23 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; - preset = &CamPreset_H; BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 0; + preset = &CamPreset_H; break; case BTL_CAM_PRESET_19: BattleCam_MoveTimeLeft = 20; preset = &CamPreset_J; break; case BTL_CAM_PRESET_20: - preset = &CamPreset_K; BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 0; + preset = &CamPreset_K; break; case BTL_CAM_PRESET_21: - preset = &CamPreset_L; BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 0; + preset = &CamPreset_L; break; case BTL_CAM_PRESET_25: BattleCam_BoomLength = 266; @@ -1688,9 +1687,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomZOffset = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_28: BattleCam_BoomLength = 340; @@ -1722,25 +1721,25 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomPitch = 8; BattleCam_BoomYaw = 0; BattleCam_MoveTimeLeft = 10; - preset = &CamPreset_N; BattleCam_BoomZOffset = 10; BattleCam_ModeY = BTL_CAM_MODEY_0; BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_PosZ = 0.0f; BattleCam_PosX = -65.0f; BattleCam_PosY = 30.0f; + preset = &CamPreset_N; break; case BTL_CAM_PLAYER_STATUS_AFFLICTED: BattleCam_BoomLength = 220; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_I; BattleCam_BoomZOffset = 24; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; + preset = &CamPreset_I; break; case BTL_CAM_PRESET_34: BattleCam_BoomLength = 280; @@ -1763,9 +1762,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_UseLinearInterp = TRUE; - preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_37: BattleCam_BoomLength = 320; @@ -1775,9 +1774,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_36: BattleCam_BoomLength = 300; @@ -1788,9 +1787,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_UseLinearInterp = TRUE; - preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_38: BattleCam_BoomLength = 320; @@ -1800,9 +1799,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_39: BattleCam_BoomLength = 320; @@ -1812,21 +1811,21 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomZOffset = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_40: BattleCam_BoomLength = 360; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_M; BattleCam_BoomZOffset = -4; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PLAYER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_41: case BTL_CAM_PRESET_42: @@ -1868,12 +1867,12 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 16; BattleCam_TargetActor = ACTOR_PLAYER; - preset = &CamPreset_N; BattleCam_ModeY = BTL_CAM_MODEY_0; BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_PosZ = 0.0f; BattleCam_PosX = 60.0f; BattleCam_PosY = 40.0f; + preset = &CamPreset_N; break; case BTL_CAM_PRESET_46: BattleCam_BoomLength = 460; @@ -1883,10 +1882,10 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomZOffset = 27; BattleCam_TargetActor = ACTOR_PLAYER; BattleCam_ModeY = BTL_CAM_MODEY_0; - preset = &CamPreset_N; BattleCam_PosZ = 0.0f; BattleCam_PosX = 60.0f; BattleCam_PosY = 40.0f; + preset = &CamPreset_N; break; case BTL_CAM_PRESET_70: BattleCam_BoomLength = 390; @@ -1925,12 +1924,12 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 1; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 17; - preset = &CamPreset_N; BattleCam_ModeY = BTL_CAM_MODEY_0; BattleCam_ModeX = BTL_CAM_MODEX_0; BattleCam_PosX = -75.0f; BattleCam_PosY = 150.0f; BattleCam_PosZ = 0.0f; + preset = &CamPreset_N; break; case BTL_CAM_PARTNER_APPROACH: BattleCam_BoomLength = 310; @@ -1938,11 +1937,11 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_MoveTimeLeft = 30; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; - preset = &CamPreset_M; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_TargetActor = ACTOR_PARTNER; D_8029F2A6 = FALSE; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_48: BattleCam_BoomLength = 250; @@ -1952,10 +1951,10 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_UseLinearInterp = TRUE; - preset = &CamPreset_M; BattleCam_BoomYaw = 0; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PARTNER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_49: BattleCam_BoomLength = 300; @@ -1965,10 +1964,10 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_UseLinearInterp = TRUE; - preset = &CamPreset_I; BattleCam_BoomYaw = 0; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PARTNER; + preset = &CamPreset_I; break; case BTL_CAM_PRESET_50: BattleCam_BoomLength = 320; @@ -1978,9 +1977,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_M; BattleCam_TargetActor = ACTOR_PARTNER; D_8029F2A6 = FALSE; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_29: case BTL_CAM_PRESET_51: @@ -1997,9 +1996,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_BoomYaw = 0; BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PARTNER; + preset = &CamPreset_M; break; case BTL_CAM_PRESET_53: BattleCam_BoomLength = 380; @@ -2010,9 +2009,9 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 0; BattleCam_ModeX = BTL_CAM_MODEX_0; - preset = &CamPreset_M; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PARTNER; + preset = &CamPreset_M; break; case BTL_CAM_PARTNER_INJURED: BattleCam_BoomLength = 220; @@ -2021,16 +2020,15 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomZOffset = 24; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; - preset = &CamPreset_I; BattleCam_BoomYaw = 0; D_8029F2A6 = FALSE; BattleCam_TargetActor = ACTOR_PARTNER; + preset = &CamPreset_I; break; case BTL_CAM_PRESET_55: BattleCam_BoomLength = 210; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_N; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 10; BattleCam_ModeY = BTL_CAM_MODEY_0; @@ -2038,6 +2036,7 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_PosZ = 0.0f; BattleCam_PosX = -95.0f; BattleCam_PosY = 22.0f; + preset = &CamPreset_N; break; case BTL_CAM_PRESET_56: BattleCam_BoomLength = 320; @@ -2065,7 +2064,6 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 30; - preset = &CamPreset_N; BattleCam_BoomYaw = 0; BattleCam_BoomZOffset = 10; BattleCam_ModeY = BTL_CAM_MODEY_0; @@ -2073,6 +2071,7 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_PosZ = 0.0f; BattleCam_PosX = 25.0f; BattleCam_PosY = 60.0f; + preset = &CamPreset_N; break; case BTL_CAM_PRESET_59: BattleCam_BoomLength = 200; @@ -2082,10 +2081,10 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; BattleCam_UseLinearInterp = TRUE; - preset = &CamPreset_I; BattleCam_BoomYaw = 0; BattleCam_TargetActor = ACTOR_PARTNER; D_8029F2A6 = FALSE; + preset = &CamPreset_I; break; case BTL_CAM_PRESET_60: BattleCam_BoomLength = 300; @@ -2115,11 +2114,11 @@ void btl_cam_use_preset_impl(s32 id) { BattleCam_BoomLength = 400; BattleCam_BoomPitch = 8; BattleCam_MoveTimeLeft = 20; - preset = &CamPreset_F; BattleCam_BoomZOffset = 27; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_F; break; case BTL_CAM_PRESET_64: BattleCam_BoomLength = 358; @@ -2149,22 +2148,22 @@ void btl_cam_use_preset_impl(s32 id) { case BTL_CAM_PRESET_67: BattleCam_BoomLength = 214; BattleCam_BoomPitch = 8; - preset = &CamPreset_F; BattleCam_MoveTimeLeft = 20; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_F; break; case BTL_CAM_PRESET_68: BattleCam_BoomLength = 300; BattleCam_BoomPitch = 8; - preset = &CamPreset_F; BattleCam_MoveTimeLeft = 4; BattleCam_BoomZOffset = 16; BattleCam_BoomYaw = 0; BattleCam_ModeY = BTL_CAM_MODEY_1; BattleCam_ModeX = BTL_CAM_MODEX_1; + preset = &CamPreset_F; break; } diff --git a/src/cd180_len_38f0.c b/src/cd180_len_38f0.c index 793bbfe609..f64f54b1dc 100644 --- a/src/cd180_len_38f0.c +++ b/src/cd180_len_38f0.c @@ -12,7 +12,7 @@ extern ScreenOverlay ScreenOverlays[2]; ScreenTransition CurrentScreenTransition = TRANSITION_END_DEMO_SCENE_BLACK; // padding? -s32 D_8014C6F4[] = { 0x00000000, 0x00000000, 0x00000000, }; +s32 D_8014C6F4[] = { 0x00000000, 0x00000000, 0x00000000 }; #include "ui/stencil/star.png.inc.c" diff --git a/src/common/GetLastActorEventType.inc.c b/src/common/GetLastActorEventType.inc.c deleted file mode 100644 index 1b35f7a812..0000000000 --- a/src/common/GetLastActorEventType.inc.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" -#include "npc.h" - -API_CALLABLE(N(GetLastActorEventType)) { - Bytecode* args = script->ptrReadPos; - Actor* actor = get_actor(script->owner1.actorID); - - actor->lastEventType = evt_get_variable(script, *args++); - return ApiStatus_DONE2; -} diff --git a/src/common/UnkEnemyFunc.inc.c b/src/common/UnkEnemyFunc.inc.c deleted file mode 100644 index aa87cf3570..0000000000 --- a/src/common/UnkEnemyFunc.inc.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "common.h" -#include "npc.h" - -Actor* N(UnkEnemyFunc)(s32 arg0) { - Actor* enemy = get_actor(ACTOR_ENEMY0); - if (enemy != NULL && enemy->state.varTable[1] == arg0) { - return enemy; - } - - enemy = get_actor(ACTOR_ENEMY1); - if (enemy != NULL && enemy->state.varTable[1] == arg0) { - return enemy; - } - - enemy = get_actor(ACTOR_ENEMY2); - if (enemy != NULL && enemy->state.varTable[1] == arg0) { - return enemy; - } - - enemy = get_actor(ACTOR_ENEMY3); - if (enemy != NULL && enemy->state.varTable[1] == arg0) { - return enemy; - } - - return NULL; -} diff --git a/src/common/UnkEnemyPosFunc.inc.c b/src/common/UnkEnemyPosFunc.inc.c deleted file mode 100644 index a05e0596b3..0000000000 --- a/src/common/UnkEnemyPosFunc.inc.c +++ /dev/null @@ -1,133 +0,0 @@ -#include "common.h" - -API_CALLABLE(N(UnkEnemyPosFunc)) { - Bytecode* args = script->ptrReadPos; - Vec3f temp; - Vec3f homePoses[4]; - s32 temp_s1; - s32 temp_v1; - Actor* enemy; - Vec3f* iVec; - Vec3f* jVec; - s32 i, j; - - temp_s1 = get_actor(ACTOR_ENEMY4)->state.varTable[3]; - switch (temp_s1) { - case 2: - enemy = N(UnkEnemyFunc(3)); - homePoses[0].x = enemy->homePos.x; - homePoses[0].y = enemy->homePos.y; - homePoses[0].z = enemy->homePos.z; - enemy = N(UnkEnemyFunc(6)); - homePoses[1].x = enemy->homePos.x; - homePoses[1].y = enemy->homePos.y; - homePoses[1].z = enemy->homePos.z; - break; - case 3: - enemy = N(UnkEnemyFunc(3)); - homePoses[0].x = enemy->homePos.x; - homePoses[0].y = enemy->homePos.y; - homePoses[0].z = enemy->homePos.z; - enemy = N(UnkEnemyFunc(5)); - homePoses[1].x = enemy->homePos.x; - homePoses[1].y = enemy->homePos.y; - homePoses[1].z = enemy->homePos.z; - enemy = N(UnkEnemyFunc(6)); - homePoses[2].x = enemy->homePos.x; - homePoses[2].y = enemy->homePos.y; - homePoses[2].z = enemy->homePos.z; - break; - case 4: - enemy = N(UnkEnemyFunc(3)); - homePoses[0].x = enemy->homePos.x; - homePoses[0].y = enemy->homePos.y; - homePoses[0].z = enemy->homePos.z; - enemy = N(UnkEnemyFunc(4)); - homePoses[1].x = enemy->homePos.x; - homePoses[1].y = enemy->homePos.y; - homePoses[1].z = enemy->homePos.z; - enemy = N(UnkEnemyFunc(5)); - homePoses[2].x = enemy->homePos.x; - homePoses[2].y = enemy->homePos.y; - homePoses[2].z = enemy->homePos.z; - enemy = N(UnkEnemyFunc(6)); - homePoses[3].x = enemy->homePos.x; - homePoses[3].y = enemy->homePos.y; - homePoses[3].z = enemy->homePos.z; - break; - } - - for (i = 0; i < temp_s1 - 1; i++) { - for (j = i; j < temp_s1; j++) { - iVec = &homePoses[i]; - jVec = &homePoses[j]; - if (iVec->x < jVec->x) { - temp = *iVec; - *iVec = *jVec; - *jVec = temp; - } - } - } - - temp_v1 = get_actor(script->owner1.enemyID)->state.varTable[1]; - switch (temp_s1) { - case 2: - switch (temp_v1) { - case 3: - evt_set_variable(script, *args++, homePoses[0].x); - evt_set_variable(script, *args++, homePoses[0].y); - evt_set_variable(script, *args++, homePoses[0].z); - break; - case 6: - evt_set_variable(script, *args++, homePoses[1].x); - evt_set_variable(script, *args++, homePoses[1].y); - evt_set_variable(script, *args++, homePoses[1].z); - break; - } - break; - case 3: - switch (temp_v1) { - case 3: - evt_set_variable(script, *args++, homePoses[0].x); - evt_set_variable(script, *args++, homePoses[0].y); - evt_set_variable(script, *args++, homePoses[0].z); - break; - case 5: - evt_set_variable(script, *args++, homePoses[1].x); - evt_set_variable(script, *args++, homePoses[1].y); - evt_set_variable(script, *args++, homePoses[1].z); - break; - case 6: - evt_set_variable(script, *args++, homePoses[2].x); - evt_set_variable(script, *args++, homePoses[2].y); - evt_set_variable(script, *args++, homePoses[2].z); - break; - } - break; - case 4: - switch (temp_v1) { - case 3: - evt_set_variable(script, *args++, homePoses[0].x); - evt_set_variable(script, *args++, homePoses[0].y); - evt_set_variable(script, *args++, homePoses[0].z); - break; - case 4: - evt_set_variable(script, *args++, homePoses[1].x); - evt_set_variable(script, *args++, homePoses[1].y); - evt_set_variable(script, *args++, homePoses[1].z); - break; - case 5: - evt_set_variable(script, *args++, homePoses[2].x); - evt_set_variable(script, *args++, homePoses[2].y); - evt_set_variable(script, *args++, homePoses[2].z); - break; - case 6: - evt_set_variable(script, *args++, homePoses[3].x); - evt_set_variable(script, *args++, homePoses[3].y); - evt_set_variable(script, *args++, homePoses[3].z); - break; - } - break; - } - return ApiStatus_DONE2; -} diff --git a/src/common/UnkWhirlwindEffectFunc.inc.c b/src/common/UnkWhirlwindEffectFunc.inc.c deleted file mode 100644 index f0574085a1..0000000000 --- a/src/common/UnkWhirlwindEffectFunc.inc.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" -#include "effects.h" - -BSS PlayerStatus N(effectUnk); - -API_CALLABLE(N(UnkWhirlwindEffectFunc)) { - Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32 var4 = evt_get_variable(script, *args++); - - N(effectUnk).position.x = var1; - N(effectUnk).position.y = var2 - 10.0f; - N(effectUnk).position.z = var3; - - fx_46(6, &N(effectUnk), 1.0f, var4); - return ApiStatus_DONE2; -} diff --git a/src/common/foliage.inc.c b/src/common/foliage.inc.c index eb739aa1dd..4d66e15bb7 100644 --- a/src/common/foliage.inc.c +++ b/src/common/foliage.inc.c @@ -8,7 +8,7 @@ EvtScript N(EVS_SearchBush) = { EVT_BUF_READ4(LVar1, LVar2, LVar3, LVar4) EVT_CALL(GetPlayerPos, LVar5, LVarF, LVar7) EVT_THREAD - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_IF_NE(LVar1, 0) EVT_LOOP(5) EVT_USE_BUF(LVar1) @@ -16,8 +16,8 @@ EvtScript N(EVS_SearchBush) = { EVT_LOOP(LVar2) EVT_BUF_READ1(LVar3) EVT_CALL(N(TransformFoliage), LVar3, EVT_FLOAT(0.1), 1, LVarF, 0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(PlaySoundAtModel, LVar3, SOUND_SEARCH_BUSH, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP @@ -76,7 +76,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_CALL(PlaySound, SOUND_SMASH_GOOMNUT_TREE) EVT_CALL(PlaySound, SOUND_SHAKE_TREE) EVT_THREAD - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_IF_NE(LVar1, 0) EVT_WAIT(1) EVT_LOOP(5) @@ -85,8 +85,8 @@ EvtScript N(EVS_ShakeTree) = { EVT_LOOP(LVar2) EVT_BUF_READ1(LVar3) EVT_CALL(N(TransformFoliage), LVar3, EVT_FLOAT(0.1), EVT_FLOAT(0.2), LVarF, 0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(PlaySoundAtModel, LVar3, SOUND_SHAKE_TREE, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP @@ -109,7 +109,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_END_IF EVT_END_THREAD EVT_THREAD - EVT_SET(LocalFlag(0), 0) + EVT_SET(LFlag0, FALSE) EVT_IF_NE(LVar2, 0) EVT_LOOP(5) EVT_USE_BUF(LVar2) @@ -117,8 +117,8 @@ EvtScript N(EVS_ShakeTree) = { EVT_LOOP(LVar3) EVT_BUF_READ1(LVar4) EVT_CALL(N(TransformFoliage), LVar4, EVT_FLOAT(0.1), EVT_FLOAT(0.2), LVarF, 0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_SET(LocalFlag(0), 1) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(PlaySoundAtModel, LVar4, SOUND_SMASH_GOOMNUT_TREE, SOUND_SPACE_MODE_0) EVT_END_IF EVT_END_LOOP diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c index 53243b1572..6eac2181eb 100644 --- a/src/effects/effect_46.c +++ b/src/effects/effect_46.c @@ -4,26 +4,28 @@ extern Gfx D_090003A0_38ED30[]; extern Gfx D_09000420_38EDB0[]; +// perhaps additional, unused colors? 36 bytes would give 12 RGB colors s32 D_E008CAF0[] = { - 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, 0xB4B4FEB4, 0xDDFEB4FE, - 0xFEB4FED5, 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC + 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, + 0xB4B4FEB4, 0xDDFEB4FE, 0xFEB4FED5, + 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC }; -u8 D_E008CB14[] = { 255, 255, 64 }; -u8 D_E008CB18[] = { 255, 64, 64 }; -u8 D_E008CB1C[] = { 255, 64, 255 }; +u8 ColorsR[] = { 255, 255, 64 }; +u8 ColorsG[] = { 255, 64, 64 }; +u8 ColorsB[] = { 255, 64, 255 }; void effect_46_init(EffectInstance* effect); void effect_46_update(EffectInstance* effect); void effect_46_render(EffectInstance* effect); void effect_46_appendGfx(void* effect); -EffectInstance* effect_46_main(s32 arg0, PlayerStatus* arg1, f32 arg2, s32 arg3) { +EffectInstance* effect_46_main(s32 type, PlayerStatus* player, f32 scale, s32 duration) { EffectBlueprint bp; EffectInstance* effect; - Effect46FXData* part; + SpinFXData* part; s32 numParts = 5; - s32 index; + s32 colorIdx; s32 i; bp.init = effect_46_init; @@ -35,89 +37,89 @@ EffectInstance* effect_46_main(s32 arg0, PlayerStatus* arg1, f32 arg2, s32 arg3) effect = shim_create_effect_instance(&bp); effect->numParts = numParts; - part = effect->data.unk_46 = shim_general_heap_malloc(numParts * sizeof(*part)); - ASSERT(effect->data.unk_46 != NULL); + part = effect->data.spin = shim_general_heap_malloc(numParts * sizeof(*part)); + ASSERT(effect->data.spin != NULL); - part->unk_00 = arg0; - part->unk_04 = arg1; - part->unk_14 = arg2 * 1.2; - part->unk_18 = arg2 * 1.2; - part->unk_20 = arg3; - part->unk_24 = arg3; - part->unk_1C = 0; - part->unk_28 = 0; + part->type = type; + part->player = player; + part->scale = scale * 1.2; + part->initialScale = scale * 1.2; + part->duration = duration; + part->timeLeft = duration; + part->alpha = 0; + part->lifetime = 0; part++; for (i = 1; i < numParts; i++, part++) { - switch (arg0) { + switch (type) { case 0: case 2: case 4: case 6: - part->unk_08 = 0.0f; - part->unk_0C = i * 7 + 4; - part->unk_10 = 0.0f; - part->unk_38 = 0.0f; - part->unk_3C = 60.0f; - part->unk_40 = 0.0f; - part->unk_2C = 0.0f; - part->unk_30 = i * 120; - part->unk_34 = 0.0f; - part->unk_14 = 1.0f; + part->pos.x = 0.0f; + part->pos.y = i * 7 + 4; + part->pos.z = 0.0f; + part->rotVel.x = 0.0f; + part->rotVel.y = 60.0f; + part->rotVel.z = 0.0f; + part->rot.x = 0.0f; + part->rot.y = i * 120; + part->rot.z = 0.0f; + part->scale = 1.0f; break; case 1: case 3: case 5: case 7: - part->unk_08 = 0.0f; - part->unk_0C = i * 7 + 4; - part->unk_10 = 0.0f; - part->unk_38 = 0.0f; - part->unk_3C = -60.0f; - part->unk_40 = 0.0f; - part->unk_2C = 0.0f; - part->unk_30 = i * 120; - part->unk_34 = 0.0f; - part->unk_14 = 1.0f; - part->unk_46 = 255; - part->unk_45 = 255; - part->unk_44 = 255; + part->pos.x = 0.0f; + part->pos.y = i * 7 + 4; + part->pos.z = 0.0f; + part->rotVel.x = 0.0f; + part->rotVel.y = -60.0f; + part->rotVel.z = 0.0f; + part->rot.x = 0.0f; + part->rot.y = i * 120; + part->rot.z = 0.0f; + part->scale = 1.0f; + part->color.b = 255; + part->color.g = 255; + part->color.r = 255; break; default: - part->unk_08 = 0; - part->unk_0C = arg1->colliderHeight * 0.5; - part->unk_10 = 0; - part->unk_38 = effect_rand_int(1) * 8 - 4; - part->unk_3C = 0; - part->unk_40 = effect_rand_int(1) * 8 - 4; - part->unk_2C = i * 25; - part->unk_30 = (i - 1) * 360 / (numParts - 1); - part->unk_34 = 360 - i * 38; - part->unk_14 = (f32) (i - 1) / (numParts - 1) * 0.5 + 0.5; + part->pos.x = 0; + part->pos.y = player->colliderHeight * 0.5; + part->pos.z = 0; + part->rotVel.x = effect_rand_int(1) * 8 - 4; + part->rotVel.y = 0; + part->rotVel.z = effect_rand_int(1) * 8 - 4; + part->rot.x = i * 25; + part->rot.y = (i - 1) * 360 / (numParts - 1); + part->rot.z = 360 - i * 38; + part->scale = (f32) (i - 1) / (numParts - 1) * 0.5 + 0.5; break; } - switch (arg0) { + switch (type) { case 2: case 3: - index = 1; + colorIdx = 1; break; case 4: case 5: - index = 2; + colorIdx = 2; break; case 6: case 7: - index = (i & 1) + 1; + colorIdx = (i & 1) + 1; break; default: - index = 0; + colorIdx = 0; break; } - part->unk_44 = D_E008CB14[index]; - part->unk_45 = D_E008CB18[index]; - part->unk_46 = D_E008CB1C[index]; + part->color.r = ColorsR[colorIdx]; + part->color.g = ColorsG[colorIdx]; + part->color.b = ColorsB[colorIdx]; } return effect; @@ -127,59 +129,59 @@ void effect_46_init(EffectInstance* effect) { } void effect_46_update(EffectInstance* effect) { - Effect46FXData* part = effect->data.unk_46; - s32 unk_00; - s32 unk_24; + SpinFXData* part = effect->data.spin; + s32 type; + s32 time; s32 i; - part->unk_24--; - part->unk_28++; + part->timeLeft--; + part->lifetime++; - if (part->unk_24 < 0) { + if (part->timeLeft < 0) { shim_remove_effect(effect); return; } - unk_00 = part->unk_00; - unk_24 = part->unk_24; + type = part->type; + time = part->timeLeft; - if (unk_00 == 8) { - if (unk_24 >= 6) { - part->unk_1C += (255 - part->unk_1C) * 0.05; + if (type == 8) { + if (time >= 6) { + part->alpha += (255 - part->alpha) * 0.05; } - part->unk_14 = (part->unk_18 * unk_24) / part->unk_20; - if (unk_24 < 10) { - part->unk_1C = unk_24 * 25; + part->scale = (part->initialScale * time) / part->duration; + if (time < 10) { + part->alpha = time * 25; } } else { - if (unk_24 >= 6) { - part->unk_1C += (100 - part->unk_1C) * 0.3; + if (time >= 6) { + part->alpha += (100 - part->alpha) * 0.3; } - if (unk_24 < 10) { - part->unk_1C *= 0.8; - part->unk_14 += (2.0f * part->unk_18 - part->unk_14) * 0.1; + if (time < 10) { + part->alpha *= 0.8; + part->scale += (2.0f * part->initialScale - part->scale) * 0.1; } } - part->unk_08 = part->unk_04->position.x; - part->unk_0C = part->unk_04->position.y; - part->unk_10 = part->unk_04->position.z; + part->pos.x = part->player->position.x; + part->pos.y = part->player->position.y; + part->pos.z = part->player->position.z; part++; for (i = 1; i < effect->numParts; i++, part++) { - if (unk_00 == 8) { + if (type == 8) { if (i % 2) { - part->unk_3C += (40.0f - part->unk_3C) * 0.2; + part->rotVel.y += (40.0f - part->rotVel.y) * 0.2; } else { - part->unk_3C += (-40.0f - part->unk_3C) * 0.2; + part->rotVel.y += (-40.0f - part->rotVel.y) * 0.2; } - part->unk_2C += part->unk_38; - part->unk_30 += part->unk_3C; - part->unk_34 += part->unk_40; - } else if (unk_24 < 10) { - part->unk_30 += (part->unk_3C * unk_24) / 10.0f; + part->rot.x += part->rotVel.x; + part->rot.y += part->rotVel.y; + part->rot.z += part->rotVel.z; + } else if (time < 10) { + part->rot.y += (part->rotVel.y * time) / 10.0f; } else { - part->unk_30 += part->unk_3C; + part->rot.y += part->rotVel.y; } } } @@ -198,45 +200,45 @@ void effect_46_render(EffectInstance* effect) { } void effect_46_appendGfx(void* effect) { - Effect46FXData* part = ((EffectInstance*)effect)->data.unk_46; - s32 unk_00; - s32 unk_1C = part->unk_1C; - f32 unk_14 = part->unk_14; - f32 unk_18 = part->unk_18; - Matrix4f sp20; - Matrix4f sp60; + SpinFXData* part = ((EffectInstance*)effect)->data.spin; + s32 type; + s32 alpha = part->alpha; + f32 curScale = part->scale; + f32 initialScale = part->initialScale; + Matrix4f mtxTransform; + Matrix4f mtxTemp; s32 i; - unk_00 = part->unk_00; + type = part->type; gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09000420_38EDB0); - shim_guTranslateF(sp20, part->unk_08, part->unk_0C, part->unk_10); - shim_guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guTranslateF(mtxTransform, part->pos.x, part->pos.y, part->pos.z); + shim_guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { - shim_guPositionF(sp20, part->unk_2C, 0.0f, part->unk_34, unk_14 * part->unk_14, part->unk_08, part->unk_0C, part->unk_10); - shim_guRotateF(sp60, part->unk_30, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); + shim_guPositionF(mtxTransform, part->rot.x, 0.0f, part->rot.z, curScale * part->scale, part->pos.x, part->pos.y, part->pos.z); + shim_guRotateF(mtxTemp, part->rot.y, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - if (unk_00 < 8) { - shim_guTranslateF(sp60, 3.0f - (unk_14 - unk_18) * 3.0f / unk_18, 0.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); + if (type < 8) { + shim_guTranslateF(mtxTemp, 3.0f - (curScale - initialScale) * 3.0f / initialScale, 0.0f, 0.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); } else { - shim_guTranslateF(sp60, 2.0f, 0.0f, 0.0f); - shim_guMtxCatF(sp60, sp20, sp20); + shim_guTranslateF(mtxTemp, 2.0f, 0.0f, 0.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); } - gDPSetPrimColor(gMainGfxPos++, 0, 0, part->unk_44, part->unk_45, part->unk_46, unk_1C); + gDPSetPrimColor(gMainGfxPos++, 0, 0, part->color.r, part->color.g, part->color.b, alpha); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_090003A0_38ED30); diff --git a/src/effects/recover.c b/src/effects/recover.c index d12fbf7d34..74dc30330c 100644 --- a/src/effects/recover.c +++ b/src/effects/recover.c @@ -29,7 +29,7 @@ extern Gfx D_09003800_385600[]; Gfx* D_E0080AC0[] = { D_09003540_385340, D_09003580_385380, D_090035C0_3853C0, D_09003600_385400, D_09003640_385440, D_09003680_385480, D_090036C0_3854C0, D_09003700_385500, D_09003740_385540, - D_09003780_385580, D_090037C0_3855C0, D_09003800_385600, }; + D_09003780_385580, D_090037C0_3855C0, D_09003800_385600 }; f32 D_E0080AF0[] = { 0.25f, 0.5f, 0.75f, 1.0f, 0.9f, 1.1f, 1.0f }; diff --git a/src/entity/model/UltraBlockContent.c b/src/entity/model/UltraBlockContent.c index 3487f4412f..367bbf5071 100644 --- a/src/entity/model/UltraBlockContent.c +++ b/src/entity/model/UltraBlockContent.c @@ -1,16 +1,16 @@ #include "common.h" unsigned char D_0A000000_E4AA80[] = { -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, 7, 119, 119, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 119, 119, 119, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 113, 17, 34, 34, 34, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 119, 18, 102, 102, 102, 102, 34, 119, 0, 0, 0, 0, 0, 0, 0, 7, 113, 102, 0, 0, 0, 0, 102, 39, 112, 0, 0, 0, 0, 0, 0, 119, 22, 0, 0, 0, 0, 0, 0, 98, 119, 0, 0, 0, 0, 0, 7, 113, 96, 0, 0, 0, 0, 0, 0, 6, 39, 112, 0, 0, 0, 0, 119, 22, 0, 0, 0, 0, 0, 0, 0, 0, 98, 119, 0, 0, 0, 7, 118, 102, 0, 0, 0, 0, 0, 0, 0, 0, 102, 39, 112, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 0, 2, 103, 112, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 0, 2, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 34, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 0, 119, 98, 0, 0, 0, 0, 0, 0, 0, 0, 33, 103, 112, 0, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 22, 119, 0, 0, 0, 0, 0, 119, 98, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 0, 0, 0, 7, 118, 34, 0, 0, 0, 0, 2, 22, 119, 0, 0, 0, 0, 0, 0, 0, 119, 98, 17, 17, 18, 34, 34, 103, 112, 0, 0, 0, 0, 0, 0, 0, 7, 118, 102, 102, 102, 102, 102, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 119, 119, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 119, 119, 119, 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, 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, 7, 119, 119, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 119, 119, 119, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 113, 17, 34, 34, 34, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 119, 18, 102, 102, 102, 102, 34, 119, 0, 0, 0, 0, 0, 0, 0, 7, 113, 102, 0, 0, 0, 0, 102, 39, 112, 0, 0, 0, 0, 0, 0, 119, 22, 0, 0, 0, 0, 0, 0, 98, 119, 0, 0, 0, 0, 0, 7, 113, 96, 0, 0, 0, 0, 0, 0, 6, 39, 112, 0, 0, 0, 0, 119, 22, 0, 0, 0, 0, 0, 0, 0, 0, 98, 119, 0, 0, 0, 7, 118, 102, 0, 0, 0, 0, 0, 0, 0, 0, 102, 39, 112, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 0, 2, 103, 112, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 0, 2, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 34, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 0, 119, 98, 0, 0, 0, 0, 0, 0, 0, 0, 33, 103, 112, 0, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 22, 119, 0, 0, 0, 0, 0, 119, 98, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 0, 0, 0, 7, 118, 34, 0, 0, 0, 0, 2, 22, 119, 0, 0, 0, 0, 0, 0, 0, 119, 98, 17, 17, 18, 34, 34, 103, 112, 0, 0, 0, 0, 0, 0, 0, 7, 118, 102, 102, 102, 102, 102, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 119, 119, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 119, 119, 119, 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 }; unsigned char D_0A000200_E4AC80[] = { -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, 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, 221, 221, 221, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 221, 221, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 221, 221, 216, 136, 136, 153, 160, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 216, 136, 137, 154, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 221, 210, 42, 136, 137, 34, 170, 170, 0, 0, 0, 0, 0, 0, 0, 13, 221, 210, 36, 169, 138, 34, 74, 170, 160, 0, 0, 0, 0, 0, 0, 13, 221, 209, 36, 169, 138, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 13, 221, 129, 36, 170, 154, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 221, 129, 36, 186, 154, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 221, 129, 36, 186, 170, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 141, 129, 20, 186, 170, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 136, 130, 18, 75, 162, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 9, 136, 130, 17, 36, 65, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 0, 152, 137, 33, 17, 17, 36, 187, 170, 160, 0, 0, 0, 0, 0, 0, 0, 152, 153, 148, 34, 36, 75, 186, 170, 0, 0, 0, 0, 0, 0, 0, 0, 9, 153, 154, 171, 187, 187, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 153, 170, 170, 170, 170, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 153, 154, 170, 160, 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 221, 221, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 221, 221, 216, 136, 136, 153, 160, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 216, 136, 137, 154, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 221, 210, 42, 136, 137, 34, 170, 170, 0, 0, 0, 0, 0, 0, 0, 13, 221, 210, 36, 169, 138, 34, 74, 170, 160, 0, 0, 0, 0, 0, 0, 13, 221, 209, 36, 169, 138, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 13, 221, 129, 36, 170, 154, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 221, 129, 36, 186, 154, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 221, 129, 36, 186, 170, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 141, 129, 20, 186, 170, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 136, 130, 18, 75, 162, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 9, 136, 130, 17, 36, 65, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 0, 152, 137, 33, 17, 17, 36, 187, 170, 160, 0, 0, 0, 0, 0, 0, 0, 152, 153, 148, 34, 36, 75, 186, 170, 0, 0, 0, 0, 0, 0, 0, 0, 9, 153, 154, 171, 187, 187, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 153, 170, 170, 170, 170, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 153, 154, 170, 160, 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, 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 }; unsigned char D_0A000400_E4AE80[] = { -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, 119, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 17, 18, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 114, 102, 102, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 38, 221, 137, 98, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 113, 109, 221, 221, 150, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 119, 22, 221, 221, 136, 137, 98, 119, 0, 0, 0, 0, 0, 0, 0, 7, 113, 109, 221, 152, 137, 170, 166, 39, 112, 0, 0, 0, 0, 0, 0, 119, 38, 221, 210, 169, 138, 42, 170, 98, 119, 0, 0, 0, 0, 0, 7, 114, 109, 221, 209, 74, 138, 20, 170, 166, 103, 112, 0, 0, 0, 0, 119, 98, 221, 221, 209, 74, 138, 20, 186, 170, 38, 119, 0, 0, 0, 0, 119, 98, 141, 221, 129, 74, 154, 20, 186, 170, 22, 119, 0, 0, 0, 0, 119, 98, 141, 221, 129, 74, 170, 20, 186, 170, 22, 119, 0, 0, 0, 0, 119, 98, 152, 221, 130, 20, 164, 20, 186, 170, 22, 119, 0, 0, 0, 0, 7, 118, 41, 141, 132, 33, 17, 68, 186, 161, 103, 112, 0, 0, 0, 0, 0, 119, 98, 152, 137, 66, 36, 75, 170, 22, 119, 0, 0, 0, 0, 0, 0, 7, 118, 41, 137, 171, 187, 186, 161, 103, 112, 0, 0, 0, 0, 0, 0, 0, 119, 98, 153, 153, 170, 170, 22, 119, 0, 0, 0, 0, 0, 0, 0, 0, 7, 118, 41, 153, 153, 146, 103, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 98, 153, 153, 38, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 118, 33, 18, 103, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 102, 102, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 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, 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, 119, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 17, 18, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 114, 102, 102, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 38, 221, 137, 98, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 113, 109, 221, 221, 150, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 119, 22, 221, 221, 136, 137, 98, 119, 0, 0, 0, 0, 0, 0, 0, 7, 113, 109, 221, 152, 137, 170, 166, 39, 112, 0, 0, 0, 0, 0, 0, 119, 38, 221, 210, 169, 138, 42, 170, 98, 119, 0, 0, 0, 0, 0, 7, 114, 109, 221, 209, 74, 138, 20, 170, 166, 103, 112, 0, 0, 0, 0, 119, 98, 221, 221, 209, 74, 138, 20, 186, 170, 38, 119, 0, 0, 0, 0, 119, 98, 141, 221, 129, 74, 154, 20, 186, 170, 22, 119, 0, 0, 0, 0, 119, 98, 141, 221, 129, 74, 170, 20, 186, 170, 22, 119, 0, 0, 0, 0, 119, 98, 152, 221, 130, 20, 164, 20, 186, 170, 22, 119, 0, 0, 0, 0, 7, 118, 41, 141, 132, 33, 17, 68, 186, 161, 103, 112, 0, 0, 0, 0, 0, 119, 98, 152, 137, 66, 36, 75, 170, 22, 119, 0, 0, 0, 0, 0, 0, 7, 118, 41, 137, 171, 187, 186, 161, 103, 112, 0, 0, 0, 0, 0, 0, 0, 119, 98, 153, 153, 170, 170, 22, 119, 0, 0, 0, 0, 0, 0, 0, 0, 7, 118, 41, 153, 153, 146, 103, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 98, 153, 153, 38, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 118, 33, 18, 103, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 102, 102, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 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 }; unsigned char D_0A000600_E4B080[] = { -89, 138, 247, 171, 231, 69, 49, 193, 196, 193, 230, 231, 204, 145, 89, 139, 83, 183, 59, 47, 42, 101, 0, 209, 93, 119, 92, 183, 0, 1, 0, 1, }; +89, 138, 247, 171, 231, 69, 49, 193, 196, 193, 230, 231, 204, 145, 89, 139, 83, 183, 59, 47, 42, 101, 0, 209, 93, 119, 92, 183, 0, 1, 0, 1 }; Vtx Entity_UltraBlockContent_vtx[] = { diff --git a/src/filemenu/filemenu_msg.c b/src/filemenu/filemenu_msg.c index 8dfb342de1..1c21fd0fb1 100644 --- a/src/filemenu/filemenu_msg.c +++ b/src/filemenu/filemenu_msg.c @@ -36,10 +36,10 @@ u8 filemenu_msg_CA[] = { 0x25, 0x2E, 0x24, 0xFD }; // END[End] #if VERSION_PAL u8* filemenu_specialSymbols[][5] = { - [LANGUAGE_EN] = { filemenu_msg_C8, filemenu_msg_C6, filemenu_msg_C7, filemenu_msg_C9, filemenu_msg_CA, }, - [LANGUAGE_DE] = { filemenu_msg_C8, filemenu_msg_C6, filemenu_msg_C7, filemenu_msg_C9, filemenu_msg_CA_de, }, - [LANGUAGE_FR] = { filemenu_msg_C8, filemenu_msg_C6, filemenu_msg_C7, filemenu_msg_C9, filemenu_msg_CA_fr, }, - [LANGUAGE_ES] = { filemenu_msg_C8, filemenu_msg_C6, filemenu_msg_C7, filemenu_msg_C9, filemenu_msg_CA_es, }, + [LANGUAGE_EN] = { filemenu_msg_C8, filemenu_msg_C6, filemenu_msg_C7, filemenu_msg_C9, filemenu_msg_CA }, + [LANGUAGE_DE] = { filemenu_msg_C8, filemenu_msg_C6, filemenu_msg_C7, filemenu_msg_C9, filemenu_msg_CA_de }, + [LANGUAGE_FR] = { filemenu_msg_C8, filemenu_msg_C6, filemenu_msg_C7, filemenu_msg_C9, filemenu_msg_CA_fr }, + [LANGUAGE_ES] = { filemenu_msg_C8, filemenu_msg_C6, filemenu_msg_C7, filemenu_msg_C9, filemenu_msg_CA_es }, }; #else s32 filemenu_specialSymbols[] = { (s32)filemenu_msg_C6, (s32)filemenu_msg_C7, (s32)filemenu_msg_C8, (s32)filemenu_msg_C9, (s32)filemenu_msg_CA }; @@ -71,40 +71,40 @@ u32 filemenu_glyphBufferIndex = 0; #endif #if VERSION_PAL -u8 D_filemenu_802508D0[] = {0x21, 0x24, 0x26, 0x26,}; -u8 D_filemenu_802508D4[] = {0x07, 0x07, 0x05, 0x05,}; -u8 D_filemenu_802508D8[] = {0x22, 0x22, 0x1A, 0x26,}; -u8 D_filemenu_802508DC[] = {0x0B, 0x0B, 0x1A, 0x1A,}; -u8 D_filemenu_802508E0[] = {0x32, 0x32, 0x26, 0x2C,}; -u8 D_filemenu_802508E4[] = {0x1E, 0x19, 0x0A, 0x18,}; -u8 D_filemenu_802508E8[] = {0x08, 0x10, 0x10, 0x14,}; -u8 D_filemenu_802508EC[] = {0x0E, 0x0E, 0x16, 0x15,}; -u8 D_filemenu_802508F0[] = {0x14, 0x08, 0x12, 0x19,}; -u8 D_filemenu_802508F4[] = {0x14, 0x08, 0x12, 0x19,}; -u8 D_filemenu_802508F8[] = {0x26, 0x33, 0x3B, 0x3C,}; -u8 D_filemenu_802508FC[] = {0x26, 0x33, 0x3C, 0x3F,}; -u16 D_filemenu_80250900[] = {0x00B4, 0x00C8, 0x0124, 0x00B4,}; -u8 D_filemenu_80250908[] = {0x75, 0x3E, 0xD0, 0x96,}; -u8 D_filemenu_8025090C[] = {0xFD, 0x00, 0xFD, 0xFD,}; -u8 D_filemenu_80250910[] = {0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xC8, 0xC8, 0xC8, 0xA2, 0xB2, 0xA2, 0xA6, 0xA2, 0xC8, 0xA2, 0xA2,}; -u8 D_filemenu_80250920[] = {0x76, 0x8A, 0x9A, 0xA2,}; -u8 D_filemenu_80250924[] = {0x0A, 0x42, 0x0A, 0x0A,}; -u8 D_filemenu_80250928[] = {0x3C, 0x0A, 0x4B, 0x4F,}; -u8 D_filemenu_8025092C[] = {0x01, 0x3B, 0x01, 0x01,}; -u8 D_filemenu_80250930[] = {0xB6, 0xB6, 0xC2, 0xD4,}; -u8 D_filemenu_80250934[] = {0x00, 0x00, 0x14, 0x11,}; -u8 D_filemenu_80250938[] = {0x19, 0x0A, 0x19, 0x0A,}; -u8 D_filemenu_8025093C[] = {0x10, 0x0A, 0x0A, 0x14,}; -u16 D_filemenu_80250940[] = {0x00B6, 0x0113, 0x00BE, 0x00C6,}; -u8 D_filemenu_80250948[] = {0x4A, 0x1E, 0x46, 0x44,}; -u8 D_filemenu_8025094C[] = {0x14, 0x25, 0x15, 0x12,}; -u8 D_filemenu_80250950[] = {0xFD, 0x02, 0xFD, 0xFD,}; -u8 D_filemenu_80250954[] = {0x9A, 0xAE, 0x9A, 0x9A,}; -u8 D_filemenu_80250958[] = {0xA4, 0xA4, 0xC0, 0xA4,}; -u8 D_filemenu_8025095C[] = {0x24, 0x24, 0x32, 0x24,}; -u8 D_filemenu_80250960[] = {0xA4, 0xA4, 0xA4, 0xB4,}; -u8 D_filemenu_80250964[] = {0xB8, 0xB4, 0xA0, 0xCC,}; -u8 D_filemenu_80250968[] = {0x00, 0x00, 0x00, 0x10,}; +u8 D_filemenu_802508D0[] = {0x21, 0x24, 0x26, 0x26}; +u8 D_filemenu_802508D4[] = {0x07, 0x07, 0x05, 0x05}; +u8 D_filemenu_802508D8[] = {0x22, 0x22, 0x1A, 0x26}; +u8 D_filemenu_802508DC[] = {0x0B, 0x0B, 0x1A, 0x1A}; +u8 D_filemenu_802508E0[] = {0x32, 0x32, 0x26, 0x2C}; +u8 D_filemenu_802508E4[] = {0x1E, 0x19, 0x0A, 0x18}; +u8 D_filemenu_802508E8[] = {0x08, 0x10, 0x10, 0x14}; +u8 D_filemenu_802508EC[] = {0x0E, 0x0E, 0x16, 0x15}; +u8 D_filemenu_802508F0[] = {0x14, 0x08, 0x12, 0x19}; +u8 D_filemenu_802508F4[] = {0x14, 0x08, 0x12, 0x19}; +u8 D_filemenu_802508F8[] = {0x26, 0x33, 0x3B, 0x3C}; +u8 D_filemenu_802508FC[] = {0x26, 0x33, 0x3C, 0x3F}; +u16 D_filemenu_80250900[] = {0x00B4, 0x00C8, 0x0124, 0x00B4}; +u8 D_filemenu_80250908[] = {0x75, 0x3E, 0xD0, 0x96}; +u8 D_filemenu_8025090C[] = {0xFD, 0x00, 0xFD, 0xFD}; +u8 D_filemenu_80250910[] = {0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xC8, 0xC8, 0xC8, 0xA2, 0xB2, 0xA2, 0xA6, 0xA2, 0xC8, 0xA2, 0xA2}; +u8 D_filemenu_80250920[] = {0x76, 0x8A, 0x9A, 0xA2}; +u8 D_filemenu_80250924[] = {0x0A, 0x42, 0x0A, 0x0A}; +u8 D_filemenu_80250928[] = {0x3C, 0x0A, 0x4B, 0x4F}; +u8 D_filemenu_8025092C[] = {0x01, 0x3B, 0x01, 0x01}; +u8 D_filemenu_80250930[] = {0xB6, 0xB6, 0xC2, 0xD4}; +u8 D_filemenu_80250934[] = {0x00, 0x00, 0x14, 0x11}; +u8 D_filemenu_80250938[] = {0x19, 0x0A, 0x19, 0x0A}; +u8 D_filemenu_8025093C[] = {0x10, 0x0A, 0x0A, 0x14}; +u16 D_filemenu_80250940[] = {0x00B6, 0x0113, 0x00BE, 0x00C6}; +u8 D_filemenu_80250948[] = {0x4A, 0x1E, 0x46, 0x44}; +u8 D_filemenu_8025094C[] = {0x14, 0x25, 0x15, 0x12}; +u8 D_filemenu_80250950[] = {0xFD, 0x02, 0xFD, 0xFD}; +u8 D_filemenu_80250954[] = {0x9A, 0xAE, 0x9A, 0x9A}; +u8 D_filemenu_80250958[] = {0xA4, 0xA4, 0xC0, 0xA4}; +u8 D_filemenu_8025095C[] = {0x24, 0x24, 0x32, 0x24}; +u8 D_filemenu_80250960[] = {0xA4, 0xA4, 0xA4, 0xB4}; +u8 D_filemenu_80250964[] = {0xB8, 0xB4, 0xA0, 0xCC}; +u8 D_filemenu_80250968[] = {0x00, 0x00, 0x00, 0x10}; #endif diff --git a/src/msg.c b/src/msg.c index a2c67a65d3..5cb1843517 100644 --- a/src/msg.c +++ b/src/msg.c @@ -35,7 +35,7 @@ enum RewindArrowStates { typedef MessageImageData* MessageImageDataList[1]; -s32 D_8014C280[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, }; +s32 D_8014C280[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000 }; u8 MessagePlural[] = { MSG_CHAR_LOWER_S, MSG_CHAR_READ_END }; diff --git a/src/msg_data_2.c b/src/msg_data_2.c index a7a0e9d73d..1e20167914 100644 --- a/src/msg_data_2.c +++ b/src/msg_data_2.c @@ -74,22 +74,22 @@ s16 D_802EB644[] = { // TODO: make assets unsigned char ui_msg_palettes[16][32] = { - {115,158,255,255,247,187,231,57,222,245,198,47,156,229,123,221,189,239,222,247,156,229,115,157,0,1,0,1,0,1,0,1,}, - {115,158,231,59,222,249,214,183,206,117,181,175,140,101,107,93,173,109,206,117,140,101,99,27,0,1,0,1,0,1,0,1,}, - {115,158,255,255,246,245,246,113,245,171,204,229,172,97,131,155,197,173,230,181,164,163,115,157,0,1,0,1,0,1,0,1,}, - {115,158,255,255,214,189,198,63,181,191,156,245,140,107,115,161,181,177,214,185,148,169,115,157,0,1,0,1,0,1,0,1,}, - {115,158,255,255,247,179,247,169,247,95,206,29,165,29,123,219,198,43,231,51,165,35,115,157,0,1,0,1,0,1,0,1,}, - {115,158,231,57,246,159,139,79,171,207,180,85,213,89,171,209,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1,}, - {115,158,231,57,246,159,188,81,168,63,180,85,213,89,168,63,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1,}, - {115,158,231,57,246,159,131,13,168,63,180,19,213,89,168,63,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1,}, - {115,158,255,255,247,187,231,57,222,245,198,47,156,229,123,221,189,239,222,247,156,229,115,157,0,1,0,1,0,1,0,1,}, - {115,158,66,15,132,29,181,171,214,179,181,171,123,221,66,15,66,15,66,15,66,15,115,157,0,1,0,1,0,1,0,1,}, - {115,158,255,255,247,57,238,247,230,115,197,107,172,97,131,155,197,173,230,181,164,163,115,157,0,1,0,1,0,1,0,1,}, - {115,158,255,255,231,61,214,187,206,121,173,113,140,107,115,161,181,177,214,185,148,169,115,157,0,1,0,1,0,1,0,1,}, - {115,158,255,255,247,183,239,115,231,45,198,39,165,31,123,219,198,43,231,51,165,35,115,157,0,1,0,1,0,1,0,1,}, - {115,158,231,57,230,29,147,143,188,21,196,79,213,87,171,209,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1,}, - {115,158,231,57,230,29,172,83,172,19,196,79,213,87,163,141,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1,}, - {115,158,231,57,230,29,155,75,168,63,196,79,205,23,168,63,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1,}, + {115,158,255,255,247,187,231,57,222,245,198,47,156,229,123,221,189,239,222,247,156,229,115,157,0,1,0,1,0,1,0,1}, + {115,158,231,59,222,249,214,183,206,117,181,175,140,101,107,93,173,109,206,117,140,101,99,27,0,1,0,1,0,1,0,1}, + {115,158,255,255,246,245,246,113,245,171,204,229,172,97,131,155,197,173,230,181,164,163,115,157,0,1,0,1,0,1,0,1}, + {115,158,255,255,214,189,198,63,181,191,156,245,140,107,115,161,181,177,214,185,148,169,115,157,0,1,0,1,0,1,0,1}, + {115,158,255,255,247,179,247,169,247,95,206,29,165,29,123,219,198,43,231,51,165,35,115,157,0,1,0,1,0,1,0,1}, + {115,158,231,57,246,159,139,79,171,207,180,85,213,89,171,209,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1}, + {115,158,231,57,246,159,188,81,168,63,180,85,213,89,168,63,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1}, + {115,158,231,57,246,159,131,13,168,63,180,19,213,89,168,63,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1}, + {115,158,255,255,247,187,231,57,222,245,198,47,156,229,123,221,189,239,222,247,156,229,115,157,0,1,0,1,0,1,0,1}, + {115,158,66,15,132,29,181,171,214,179,181,171,123,221,66,15,66,15,66,15,66,15,115,157,0,1,0,1,0,1,0,1}, + {115,158,255,255,247,57,238,247,230,115,197,107,172,97,131,155,197,173,230,181,164,163,115,157,0,1,0,1,0,1,0,1}, + {115,158,255,255,231,61,214,187,206,121,173,113,140,107,115,161,181,177,214,185,148,169,115,157,0,1,0,1,0,1,0,1}, + {115,158,255,255,247,183,239,115,231,45,198,39,165,31,123,219,198,43,231,51,165,35,115,157,0,1,0,1,0,1,0,1}, + {115,158,231,57,230,29,147,143,188,21,196,79,213,87,171,209,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1}, + {115,158,231,57,230,29,172,83,172,19,196,79,213,87,163,141,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1}, + {115,158,231,57,230,29,155,75,168,63,196,79,205,23,168,63,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1}, }; #include "ui/msg/sign_corner_topleft.png.inc.c" diff --git a/src/pause/pause_map.c b/src/pause/pause_map.c index 1a8e986557..0590f74885 100644 --- a/src/pause/pause_map.c +++ b/src/pause/pause_map.c @@ -35,7 +35,7 @@ static s32 gPauseMapSpacesInSnapRange; HudScript* gPauseMapIconScripts[] = { &HES_MapWalk0 }; s32 D_8024FA34 = -1; Vec2b gPauseMapPaths[][32] = { - { { 1, -10 }, { 1, -8 }, { -9, -2 }, { -8, 0 }, { -8, 0 }, { -7, -3 }, { -5, -3 }, }, + { { 1, -10 }, { 1, -8 }, { -9, -2 }, { -8, 0 }, { -8, 0 }, { -7, -3 }, { -5, -3 } }, { { -1, 24 }, { 1, -8 }, { 2, -7 } }, { { -3, 7 }, { -7, 4 }, { -8, 2 } }, { }, diff --git a/src/state_title_screen.c b/src/state_title_screen.c index fe8c7c973f..02ba8f78c9 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -26,10 +26,10 @@ s16 D_800779C0[2] = {0, 0}; SaveMetadata gSaveSlotMetadata[4] = { - { .filename = {FILENAME_ERROR}, }, - { .filename = {FILENAME_ERROR}, }, - { .filename = {FILENAME_ERROR}, }, - { .filename = {FILENAME_ERROR}, }, + { .filename = {FILENAME_ERROR} }, + { .filename = {FILENAME_ERROR} }, + { .filename = {FILENAME_ERROR} }, + { .filename = {FILENAME_ERROR} }, }; u8 gSaveSlotHasData[4] = {TRUE, TRUE, TRUE, TRUE}; diff --git a/src/world/area_end/end_00/end_00_3_parade_setup.c b/src/world/area_end/end_00/end_00_3_parade_setup.c index 9479244de8..24c2bd4e51 100644 --- a/src/world/area_end/end_00/end_00_3_parade_setup.c +++ b/src/world/area_end/end_00/end_00_3_parade_setup.c @@ -432,42 +432,42 @@ ParadeNpcInfo N(ParadeNpcsTable)[] = { .yaw = 270.0f }, [NPC_KoopaBrosRed] { - .initialAnim = ANIM_KoopaBros_Red_Anim1A, + .initialAnim = ANIM_KoopaBros_Red_ThumbsUp, .pos = { -1860.0f, 65.0f, 10.0f }, .yaw = 270.0f }, [NPC_KoopaBrosBlack] { - .initialAnim = ANIM_KoopaBros_Black_Anim1A, + .initialAnim = ANIM_KoopaBros_Black_ThumbsUp, .pos = { -1840.0f, 65.0f, 10.0f }, .yaw = 90.0f }, [NPC_KoopaBrosYellow] { - .initialAnim = ANIM_KoopaBros_Yellow_Anim1A, + .initialAnim = ANIM_KoopaBros_Yellow_ThumbsUp, .pos = { -1870.0f, 12.0f, 37.0f }, .yaw = 270.0f }, [NPC_KoopaBrosGreen] { - .initialAnim = ANIM_KoopaBros_Green_Anim1A, + .initialAnim = ANIM_KoopaBros_Green_ThumbsUp, .pos = { -1830.0f, 12.0f, 37.0f }, .yaw = 90.0f }, [NPC_Bobomb1] { - .initialAnim = ANIM_Bobomb_Anim05, + .initialAnim = ANIM_Bobomb_WalkLit, .pos = { -1750.0f, 0.0f, 43.0f }, .yaw = 270.0f }, [NPC_Bobomb2] { - .initialAnim = ANIM_Bobomb_Anim05, + .initialAnim = ANIM_Bobomb_WalkLit, .pos = { -1720.0f, 0.0f, 43.0f }, .yaw = 270.0f }, [NPC_Bobomb3] { - .initialAnim = ANIM_Bobomb_Anim05, + .initialAnim = ANIM_Bobomb_WalkLit, .pos = { -1690.0f, 0.0f, 43.0f }, .yaw = 270.0f }, [NPC_Bobomb4] { - .initialAnim = ANIM_Bobomb_Anim05, + .initialAnim = ANIM_Bobomb_WalkLit, .pos = { -1660.0f, 0.0f, 43.0f }, .yaw = 270.0f }, diff --git a/src/world/area_end/end_00/end_00_5_koopas.c b/src/world/area_end/end_00/end_00_5_koopas.c index 0b6fea5d8d..d986d517a1 100644 --- a/src/world/area_end/end_00/end_00_5_koopas.c +++ b/src/world/area_end/end_00/end_00_5_koopas.c @@ -36,13 +36,13 @@ EvtScript N(EVS_KoopaBros_Red) = { EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_WAIT(100) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_ExitShell) EVT_WAIT(60) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim0E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_BurnHurt) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosRed, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_KoopaBrosRed, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBrosRed, LVar0, LVar1, LVar2, 20) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim0F) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_BurnStill) EVT_RETURN EVT_END }; @@ -55,13 +55,13 @@ EvtScript N(EVS_KoopaBros_Black) = { EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_WAIT(95) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_ExitShell) EVT_WAIT(60) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim0E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_BurnHurt) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosBlack, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_KoopaBrosBlack, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBrosBlack, LVar0, LVar1, LVar2, 20) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim0F) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_BurnStill) EVT_RETURN EVT_END }; @@ -74,13 +74,13 @@ EvtScript N(EVS_KoopaBros_Yellow) = { EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_WAIT(90) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_ExitShell) EVT_WAIT(60) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim0E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_BurnHurt) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosYellow, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_KoopaBrosYellow, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBrosYellow, LVar0, LVar1, LVar2, 20) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim0F) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_BurnStill) EVT_RETURN EVT_END }; @@ -93,13 +93,13 @@ EvtScript N(EVS_KoopaBros_Green) = { EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_WAIT(85) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_ExitShell) EVT_WAIT(60) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim0E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_BurnHurt) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosGreen, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_KoopaBrosGreen, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBrosGreen, LVar0, LVar1, LVar2, 20) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim0F) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_BurnStill) EVT_RETURN EVT_END }; @@ -108,11 +108,11 @@ EvtScript N(EVS_Bobomb1) = { EVT_CALL(SetNpcFlagBits, NPC_Bobomb1, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_WAIT(180) EVT_CALL(NpcMoveTo, NPC_Bobomb1, -1900, 43, 70) - EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_AngryIdle) EVT_WAIT(40) - EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim14) + EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Buildup) EVT_WAIT(20) - EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim16) + EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_FaceFwd) EVT_CALL(GetNpcPos, NPC_Bobomb1, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2) EVT_CALL(EnableNpcShadow, NPC_Bobomb1, FALSE) @@ -121,7 +121,7 @@ EvtScript N(EVS_Bobomb1) = { EVT_CALL(NpcFlyTo, NPC_Bobomb1, -1870, 12, 40, 20, 0, EASING_LINEAR) EVT_CALL(SetNpcYaw, NPC_Bobomb1, 270) EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim17) + EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_WaveFwd) EVT_RETURN EVT_END }; @@ -130,11 +130,11 @@ EvtScript N(EVS_Bobomb2) = { EVT_CALL(SetNpcFlagBits, NPC_Bobomb2, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_WAIT(180) EVT_CALL(NpcMoveTo, NPC_Bobomb2, -1870, 43, 70) - EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_AngryIdle) EVT_WAIT(40) - EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim14) + EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Buildup) EVT_WAIT(20) - EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim16) + EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_FaceFwd) EVT_CALL(GetNpcPos, NPC_Bobomb2, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2) EVT_CALL(EnableNpcShadow, NPC_Bobomb2, FALSE) @@ -143,7 +143,7 @@ EvtScript N(EVS_Bobomb2) = { EVT_CALL(NpcFlyTo, NPC_Bobomb2, -1860, 65, 13, 20, 0, EASING_LINEAR) EVT_CALL(SetNpcYaw, NPC_Bobomb2, 270) EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim17) + EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_WaveFwd) EVT_RETURN EVT_END }; @@ -152,11 +152,11 @@ EvtScript N(EVS_Bobomb3) = { EVT_CALL(SetNpcFlagBits, NPC_Bobomb3, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_WAIT(180) EVT_CALL(NpcMoveTo, NPC_Bobomb3, -1840, 43, 70) - EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_AngryIdle) EVT_WAIT(40) - EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim14) + EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Buildup) EVT_WAIT(20) - EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim16) + EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_FaceFwd) EVT_CALL(GetNpcPos, NPC_Bobomb3, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2) EVT_CALL(EnableNpcShadow, NPC_Bobomb3, FALSE) @@ -165,7 +165,7 @@ EvtScript N(EVS_Bobomb3) = { EVT_CALL(NpcFlyTo, NPC_Bobomb3, -1840, 65, 13, 20, 0, EASING_LINEAR) EVT_CALL(SetNpcYaw, NPC_Bobomb3, 90) EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim17) + EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_WaveFwd) EVT_RETURN EVT_END }; @@ -174,11 +174,11 @@ EvtScript N(EVS_Bobomb4) = { EVT_CALL(SetNpcFlagBits, NPC_Bobomb4, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_ENTITY_COLLISION, TRUE) EVT_WAIT(180) EVT_CALL(NpcMoveTo, NPC_Bobomb4, -1810, 43, 70) - EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_AngryIdle) EVT_WAIT(40) - EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim14) + EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Buildup) EVT_WAIT(20) - EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim16) + EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_FaceFwd) EVT_CALL(GetNpcPos, NPC_Bobomb4, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2) EVT_CALL(EnableNpcShadow, NPC_Bobomb4, FALSE) @@ -187,7 +187,7 @@ EvtScript N(EVS_Bobomb4) = { EVT_CALL(NpcFlyTo, NPC_Bobomb4, -1830, 12, 40, 20, 0, EASING_LINEAR) EVT_CALL(SetNpcYaw, NPC_Bobomb4, 90) EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim17) + EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_WaveFwd) EVT_RETURN EVT_END }; diff --git a/src/world/area_iwa/iwa_10/iwa_10_4_train.c b/src/world/area_iwa/iwa_10/iwa_10_4_train.c index 82f676205d..9c1476c91c 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_4_train.c +++ b/src/world/area_iwa/iwa_10/iwa_10_4_train.c @@ -193,46 +193,46 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_EQ(MF_TrainArriveDoorOpen, TRUE) EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_MODE_0, -435, 84, 37) EVT_SET(LVar8, 10) - EVT_SET(LocalFlag(1), TRUE) + EVT_SET(LFlag1, TRUE) EVT_SET(MF_TrainArriveDoorOpen, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainArrivePlayerDisembark, TRUE) EVT_SET(LVar8, -10) - EVT_SET(LocalFlag(1), TRUE) + EVT_SET(LFlag1, TRUE) EVT_SET(MF_TrainArrivePlayerDisembark, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainDepartDoorOpen, TRUE) EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_MODE_0, -413, 84, 38) EVT_SET(LVar8, 10) - EVT_SET(LocalFlag(2), TRUE) + EVT_SET(LFlag2, TRUE) EVT_SET(MF_TrainDepartDoorOpen, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainDepartPlayerBoard, TRUE) EVT_SET(LVar8, -10) - EVT_SET(LocalFlag(2), TRUE) + EVT_SET(LFlag2, TRUE) EVT_SET(MF_TrainDepartPlayerBoard, FALSE) EVT_END_IF - EVT_IF_EQ(LocalFlag(1), TRUE) + EVT_IF_EQ(LFlag1, TRUE) EVT_ADD(LVar9, LVar8) EVT_IF_GE(LVar9, 90) EVT_SET(LVar9, 90) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag1, FALSE) EVT_END_IF EVT_IF_LE(LVar9, 0) EVT_SET(LVar9, 0) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag1, FALSE) EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_MODE_0, -435, 84, 37) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(2), TRUE) + EVT_IF_EQ(LFlag2, TRUE) EVT_ADD(LVarA, LVar8) EVT_IF_GE(LVarA, 90) EVT_SET(LVarA, 90) - EVT_SET(LocalFlag(2), FALSE) + EVT_SET(LFlag2, FALSE) EVT_END_IF EVT_IF_LE(LVarA, 0) EVT_SET(LVarA, 0) - EVT_SET(LocalFlag(2), FALSE) + EVT_SET(LFlag2, FALSE) EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_MODE_0, -413, 84, 38) EVT_END_IF EVT_END_IF diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c index 9d85383db4..f7d3319a78 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c @@ -164,7 +164,7 @@ s32 N(LetterList)[] = { }; EvtScript N(EVS_NpcInteract_Parakarry) = { - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_IF_EQ(GB_IWA10_ReturnedLetterCount, 2) EVT_SET(LVar0, 0) EVT_IF_EQ(GF_IWA01_Item_Letter01, TRUE) @@ -211,7 +211,7 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_RETURN EVT_END_IF - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_SWITCH EVT_CASE_EQ(-1) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0013) @@ -239,10 +239,10 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_RETURN EVT_END_IF EVT_END_IF - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_SWITCH EVT_END_SWITCH - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(ContinueSpeech, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_001D) EVT_CALL(N(ChangeNpcToPartner), 4, 4) diff --git a/src/world/area_iwa/iwa_11/iwa_11_3_train.c b/src/world/area_iwa/iwa_11/iwa_11_3_train.c index 3acb9574b7..a004b9ea8f 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_3_train.c +++ b/src/world/area_iwa/iwa_11/iwa_11_3_train.c @@ -169,44 +169,44 @@ EvtScript N(EVS_AnimateTrain) = { EVT_END_IF EVT_IF_EQ(MF_TrainArriveDoorOpen, TRUE) EVT_SET(LVar8, 10) - EVT_SET(LocalFlag(1), TRUE) + EVT_SET(LFlag1, TRUE) EVT_SET(MF_TrainArriveDoorOpen, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainArrivePlayerDisembark, TRUE) EVT_SET(LVar8, -10) - EVT_SET(LocalFlag(1), TRUE) + EVT_SET(LFlag1, TRUE) EVT_SET(MF_TrainArrivePlayerDisembark, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainDepartDoorOpen, TRUE) EVT_SET(LVar8, 10) - EVT_SET(LocalFlag(2), TRUE) + EVT_SET(LFlag2, TRUE) EVT_SET(MF_TrainDepartDoorOpen, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainDepartPlayerBoard, TRUE) EVT_SET(LVar8, -10) - EVT_SET(LocalFlag(2), TRUE) + EVT_SET(LFlag2, TRUE) EVT_SET(MF_TrainDepartPlayerBoard, FALSE) EVT_END_IF - EVT_IF_EQ(LocalFlag(1), TRUE) + EVT_IF_EQ(LFlag1, TRUE) EVT_ADD(LVar9, LVar8) EVT_IF_GE(LVar9, 90) EVT_SET(LVar9, 90) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag1, FALSE) EVT_END_IF EVT_IF_LE(LVar9, 0) EVT_SET(LVar9, 0) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag1, FALSE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(2), TRUE) + EVT_IF_EQ(LFlag2, TRUE) EVT_ADD(LVarA, LVar8) EVT_IF_GE(LVarA, 90) EVT_SET(LVarA, 90) - EVT_SET(LocalFlag(2), FALSE) + EVT_SET(LFlag2, FALSE) EVT_END_IF EVT_IF_LE(LVarA, 0) EVT_SET(LVarA, 0) - EVT_SET(LocalFlag(2), FALSE) + EVT_SET(LFlag2, FALSE) EVT_END_IF EVT_END_IF EVT_CALL(RotateModel, MODEL_omote, LVar9, 0, -1, 0) diff --git a/src/world/area_jan/jan_13/jan_13_2_puzzle.c b/src/world/area_jan/jan_13/jan_13_2_puzzle.c index b30c9874b5..13a00be43a 100644 --- a/src/world/area_jan/jan_13/jan_13_2_puzzle.c +++ b/src/world/area_jan/jan_13/jan_13_2_puzzle.c @@ -260,13 +260,13 @@ EvtScript N(EVS_BoulderTremble) = { }; EvtScript N(EVS_ManagePuzzle) = { - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_SET(AB_JAN_2, 0) EVT_SET(AB_JAN13_LastPuzzleProgress, -1) EVT_EXEC(N(EVS_ManageGeyserSounds)) EVT_LABEL(0) EVT_IF_EQ(GF_JAN13_SolvedBlockPuzzle, TRUE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(EnableModel, MODEL_o33, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o33, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(SetPushBlock, 0, 15, 0, PUSH_GRID_EMPTY) @@ -284,7 +284,7 @@ EvtScript N(EVS_ManagePuzzle) = { EVT_CALL(SetPushBlock, 0, 17, 2, PUSH_GRID_EMPTY) EVT_CALL(SetPushBlock, 0, 18, 2, PUSH_GRID_EMPTY) EVT_CALL(SetPushBlock, 0, 19, 2, PUSH_GRID_EMPTY) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF EVT_CALL(GetPushBlock, 0, POS_0_I, POS_0_J, LVar0) @@ -433,7 +433,7 @@ EvtScript N(EVS_ManagePuzzle) = { EVT_CALL(EnableModel, MODEL_o33, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o33, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GF_JAN13_SolvedBlockPuzzle, TRUE) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) EVT_CALL(DisablePlayerInput, FALSE) EVT_ELSE diff --git a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c index 671d37d2b5..32bebc8449 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c @@ -178,7 +178,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_WAIT(20 * DT) EVT_THREAD EVT_CALL(SetNpcPos, NPC_KoopaBros_02, 300, 180, -60) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim12) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Land) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, TRUE) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_02, EVT_FLOAT(0.5)) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_02, NPC_FLAG_GRAVITY, TRUE) @@ -187,12 +187,12 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_3E9, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 100, 0, -40, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, FALSE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_IdleCrouch) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, 328, 180, -15) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim12) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Land) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, TRUE) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.5)) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_GRAVITY, TRUE) @@ -201,12 +201,12 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_3E9, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 128, 0, -15, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, FALSE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_IdleCrouch) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_KoopaBros_03, 340, 180, -90) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim12) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Land) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, TRUE) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_03, EVT_FLOAT(0.5)) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_03, NPC_FLAG_GRAVITY, TRUE) @@ -215,12 +215,12 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_3E9, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 140, 0, -90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, FALSE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_IdleCrouch) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) EVT_CALL(SetNpcPos, NPC_KoopaBros_04, 368, 180, -45) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim12) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Land) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, TRUE) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_04, EVT_FLOAT(0.5)) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_04, NPC_FLAG_GRAVITY, TRUE) @@ -229,7 +229,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_3E9, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 168, 0, -45, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, FALSE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_IdleCrouch) EVT_END_THREAD EVT_WAIT(50) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 128, 0, -15) @@ -245,7 +245,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_ThumbsUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) @@ -254,7 +254,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_ThumbsUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) @@ -263,7 +263,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_ThumbsUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) @@ -272,33 +272,33 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_ThumbsUp) EVT_END_THREAD EVT_WAIT(45) - EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim1A, ANIM_KoopaBros_Red_Anim1A, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0009) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_ThumbsUp, ANIM_KoopaBros_Red_ThumbsUp, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0009) EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_FocusCam_BowserWide)) EVT_WAIT(15 * DT) EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Kammy, MSG_Peach_CH1_KoopaBros_000A) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Idle) EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) EVT_WAIT(10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim02) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Walk) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 80, -40, 10) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) - EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_000B) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Idle) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_000B) EVT_EXEC_WAIT(N(EVS_FocusCam_WholeRoom)) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, 80, 0, -40) EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 5) EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_000C) - EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_000D) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_000D) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 5) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 5, MSG_Peach_CH1_KoopaBros_000E) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 5, MSG_Peach_CH1_KoopaBros_000E) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -50, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) @@ -319,10 +319,10 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_WAIT(30 * DT) EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0010) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0010) EVT_EXEC_WAIT(N(EVS_FocusCam_WholeRoom)) EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_0011) - EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0012) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0012) EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-17.0)) @@ -341,30 +341,30 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30 * DT) - EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0014) + EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0014) EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 0, 0) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0 / DT)) EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim0A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_HurtStill) EVT_CALL(NpcJump0, NPC_KoopaBros_02, 80, 0, -40, 10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim0A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_HurtStill) EVT_CALL(NpcJump0, NPC_KoopaBros_01, 128, 0, -15, 10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim0A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_HurtStill) EVT_CALL(NpcJump0, NPC_KoopaBros_03, 140, 0, -90, 10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim0A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_HurtStill) EVT_CALL(NpcJump0, NPC_KoopaBros_04, 168, 0, -45, 10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Idle) EVT_END_THREAD EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) @@ -374,7 +374,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_173, 0) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, TRUE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Run) EVT_WAIT(30 * DT) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_174, 0) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 200, -60, 10 * DT) @@ -382,7 +382,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, TRUE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Run) EVT_WAIT(30 * DT) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, TRUE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 200, -60, 10 * DT) @@ -390,7 +390,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_KoopaBros_03, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, TRUE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Run) EVT_WAIT(30 * DT) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, TRUE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_03, 200, -60, 10 * DT) @@ -398,7 +398,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_THREAD EVT_CALL(InterpNpcYaw, NPC_KoopaBros_04, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, TRUE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Run) EVT_WAIT(30 * DT) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, TRUE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_04, 200, -60, 10 * DT) diff --git a/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c index 48106d9170..50cc22c8ad 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c @@ -33,15 +33,15 @@ AnimID N(ExtraAnims_Kammy)[] = { }; AnimID N(ExtraAnims_KoopaBros)[] = { - ANIM_KoopaBros_Black_Anim02, - ANIM_KoopaBros_Black_Anim03, - ANIM_KoopaBros_Black_Anim04, - ANIM_KoopaBros_Black_Anim05, - ANIM_KoopaBros_Black_Anim0A, - ANIM_KoopaBros_Black_Anim11, - ANIM_KoopaBros_Black_Anim12, - ANIM_KoopaBros_Black_Anim14, - ANIM_KoopaBros_Black_Anim1A, + ANIM_KoopaBros_Black_Walk, + ANIM_KoopaBros_Black_Run, + ANIM_KoopaBros_Black_Idle, + ANIM_KoopaBros_Black_IdleCrouch, + ANIM_KoopaBros_Black_HurtStill, + ANIM_KoopaBros_Black_Midair, + ANIM_KoopaBros_Black_Land, + ANIM_KoopaBros_Black_Talk, + ANIM_KoopaBros_Black_ThumbsUp, ANIM_LIST_END }; diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c index fc7c1a139c..b335086939 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c +++ b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c @@ -59,18 +59,18 @@ EvtScript N(EVS_OnReadBillboard) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Sign_BewareOfGoombas, 160, 40) EVT_RESUME_GROUP(EVT_GROUP_01) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(N(GetAmbushEnemy)) EVT_IF_NE(LVar0, NULL) EVT_CALL(GetNpcVar, NPC_Goomba_Ambush, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(SetNpcVar, NPC_Goomba_Ambush, 0, 1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_WAIT(10) EVT_END_IF EVT_END_IF EVT_CALL(DisablePlayerInput, FALSE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_UNBIND EVT_END_IF EVT_END diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c index 76061c49de..394ee9fc2a 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c +++ b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c @@ -14,18 +14,18 @@ EvtScript N(EVS_OnReadBillboard) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Sign_EatMushroomsTrap, 160, 40) EVT_RESUME_GROUP(EVT_GROUP_01) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_CALL(N(GetAmbushEnemy)) EVT_IF_NE(LVar0, NULL) EVT_CALL(GetNpcVar, NPC_Goomba_Ambush, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(SetNpcVar, NPC_Goomba_Ambush, 0, 1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_WAIT(10) EVT_END_IF EVT_END_IF EVT_CALL(DisablePlayerInput, FALSE) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_UNBIND EVT_END_IF EVT_END diff --git a/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c index d7c7ba08a8..7144a2c39b 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c @@ -6,7 +6,7 @@ EvtScript N(EVS_NpcInit_Eldstar) = { }; EvtScript N(EVS_NpcInit_KoopaBros) = { - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1B) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_PointForward) EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_FILL_COLOR, 80, 80, 80, 0) EVT_RETURN EVT_END diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index e74b3daff7..3ccc350dd8 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -126,25 +126,25 @@ EvtScript N(EVS_KoopaBros_FlingAway) = { EVT_END_THREAD EVT_SWITCH(LVar0) EVT_CASE_EQ(NPC_KoopaBrosRed) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Shock) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosRed, EVT_FLOAT(0.7)) EVT_CALL(NpcJump0, NPC_KoopaBrosRed, -50, 200, 170, 40) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_KoopaBrosRed, NPC_DISPOSE_LOCATION) EVT_CASE_EQ(NPC_KoopaBrosBlk) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim1E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Shock) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosBlk, EVT_FLOAT(0.7)) EVT_CALL(NpcJump0, NPC_KoopaBrosBlk, 0, 200, 127, 40) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_KoopaBrosBlk, NPC_DISPOSE_LOCATION) EVT_CASE_EQ(NPC_KoopaBrosYlw) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim1E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Shock) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosYlw, EVT_FLOAT(0.7)) EVT_CALL(NpcJump0, NPC_KoopaBrosYlw, 100, 200, 200, 40) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_KoopaBrosYlw, NPC_DISPOSE_LOCATION) EVT_CASE_EQ(NPC_KoopaBrosGrn) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim1E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Shock) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosGrn, EVT_FLOAT(0.7)) EVT_CALL(NpcJump0, NPC_KoopaBrosGrn, 150, 200, 150, 40) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_GRAVITY, FALSE) @@ -194,7 +194,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) EVT_THREAD EVT_CALL(SetNpcPos, NPC_KoopaBrosRed, 220, 180, 160) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim11) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Midair) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosRed, TRUE) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosRed, EVT_FLOAT(1.0)) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_GRAVITY, TRUE) @@ -203,13 +203,13 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_3E9, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 20, 0, 160, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosRed, FALSE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_IdleCrouch) EVT_CALL(SetNpcYaw, NPC_KoopaBrosRed, 270) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) EVT_CALL(SetNpcPos, NPC_KoopaBrosBlk, 248, 180, 185) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim11) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Midair) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosBlk, TRUE) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosBlk, EVT_FLOAT(1.0)) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosBlk, NPC_FLAG_GRAVITY, TRUE) @@ -218,13 +218,13 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_3E9, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 48, 0, 185, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosBlk, FALSE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_IdleCrouch) EVT_CALL(SetNpcYaw, NPC_KoopaBrosBlk, 270) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_KoopaBrosYlw, 260, 180, 110) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim11) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Midair) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosYlw, TRUE) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosYlw, EVT_FLOAT(1.0)) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_GRAVITY, TRUE) @@ -233,13 +233,13 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_3E9, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 60, 0, 110, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosYlw, FALSE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_IdleCrouch) EVT_CALL(SetNpcYaw, NPC_KoopaBrosYlw, 270) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) EVT_CALL(SetNpcPos, NPC_KoopaBrosGrn, 288, 180, 155) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim11) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Midair) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosGrn, TRUE) EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosGrn, EVT_FLOAT(1.0)) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_GRAVITY, TRUE) @@ -248,7 +248,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_3E9, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 88, 0, 155, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosGrn, FALSE) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_IdleCrouch) EVT_CALL(SetNpcYaw, NPC_KoopaBrosGrn, 270) EVT_END_THREAD EVT_WAIT(65) @@ -259,7 +259,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_20F3, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_ThumbsUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) @@ -268,7 +268,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_20F3, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_ThumbsUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) @@ -277,7 +277,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_20F3, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_ThumbsUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) @@ -286,33 +286,33 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_20F3, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_ThumbsUp) EVT_END_THREAD EVT_WAIT(45) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1A) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim1A) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim1A) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_ThumbsUp) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_ThumbsUp) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_ThumbsUp) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_ThumbsUp) EVT_THREAD EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0 / DT)) EVT_CALL(PlayerMoveTo, -50, 150, 0) EVT_END_THREAD - EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim1A, ANIM_KoopaBros_Red_Anim1A, 0, MSG_CH8_0054) + EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_ThumbsUp, ANIM_KoopaBros_Red_ThumbsUp, 0, MSG_CH8_0054) EVT_SET(LVar3, 0) EVT_SET(LVar4, 0) EVT_SET(LVar5, 150) EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_MidRoom)) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Anim04) - EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0055) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_Idle) + EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, MSG_CH8_0055) EVT_CALL(ShowChoice, MSG_Choice_0013) EVT_IF_EQ(LVar0, 0) - EVT_CALL(ContinueSpeech, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0056) + EVT_CALL(ContinueSpeech, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, MSG_CH8_0056) EVT_ELSE - EVT_CALL(ContinueSpeech, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0057) + EVT_CALL(ContinueSpeech, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, MSG_CH8_0057) EVT_END_IF EVT_SET(LVar6, EVT_FLOAT(3.0 / DT)) EVT_EXEC_WAIT(N(EVS_FocusCam_LookAtDoor)) @@ -322,7 +322,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_SET(LVar5, 150) EVT_SET(LVar6, EVT_FLOAT(90.0)) EVT_EXEC_WAIT(N(EVS_FocusCam_MidRoom)) - EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH8_0059) + EVT_CALL(SpeakToPlayer, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, MSG_CH8_0059) EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 1, 8) EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_005A, 0, 150) EVT_CALL(InterpPlayerYaw, 270, 0) @@ -499,14 +499,14 @@ EvtScript N(EVS_NpcInit_JrTroopa) = { }; AnimID N(ExtraAnims_KoopaBros)[] = { - ANIM_KoopaBros_Black_Anim1E, - ANIM_KoopaBros_Black_Anim04, - ANIM_KoopaBros_Black_Anim05, - ANIM_KoopaBros_Black_Anim11, - ANIM_KoopaBros_Black_Anim1A, - ANIM_KoopaBros_Black_Anim14, - ANIM_KoopaBros_Black_Anim10, - ANIM_KoopaBros_Black_Anim15, + ANIM_KoopaBros_Black_Shock, + ANIM_KoopaBros_Black_Idle, + ANIM_KoopaBros_Black_IdleCrouch, + ANIM_KoopaBros_Black_Midair, + ANIM_KoopaBros_Black_ThumbsUp, + ANIM_KoopaBros_Black_Talk, + ANIM_KoopaBros_Black_Leap, + ANIM_KoopaBros_Black_Sleep, ANIM_LIST_END }; diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 9b18094323..f19439a962 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -601,7 +601,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_THREAD EVT_SET(MF_KoopaBrosSceneLock, FALSE) EVT_WAIT(5) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim0B, ANIM_KoopaBros_Red_Anim0B, 5, MSG_MAC_Plaza_002F) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Hurt, ANIM_KoopaBros_Red_Hurt, 5, MSG_MAC_Plaza_002F) EVT_SET(MF_KoopaBrosSceneLock, TRUE) EVT_END_THREAD EVT_THREAD @@ -617,7 +617,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcPos, NPC_DarkToad_01, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Hurt) EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar3, LVar4, LVar5, 10 * DT) EVT_END_THREAD EVT_THREAD @@ -634,7 +634,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcPos, NPC_DarkToad_02, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_02, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Black_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Black_Hurt) EVT_CALL(NpcJump0, NPC_KoopaBros_02, LVar3, LVar4, LVar5, 10 * DT) EVT_END_THREAD EVT_THREAD @@ -651,7 +651,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcPos, NPC_DarkToad_03, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_03, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_03, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Hurt) EVT_CALL(NpcJump0, NPC_KoopaBros_03, LVar3, LVar4, LVar5, 10 * DT) EVT_END_THREAD EVT_WAIT(30 * DT) @@ -667,7 +667,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcPos, NPC_DarkToad_04, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_04, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_04, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Hurt) EVT_CALL(NpcJump0, NPC_KoopaBros_04, LVar3, LVar4, LVar5, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_LOOP(0) @@ -676,24 +676,24 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Black_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim04) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Black_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Idle) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Idle) EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0030) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, MSG_MAC_Plaza_0031) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, MSG_MAC_Plaza_0031) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 0) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 5, MSG_MAC_Plaza_0032) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 5, MSG_MAC_Plaza_0032) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 0) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 0) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_03, 90, 0) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_04, 90, 0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Anim03) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Black_Anim03) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim03) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Red_Run) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Black_Run) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Run) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Run) EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_174, SOUND_SPACE_MODE_0) EVT_THREAD @@ -1132,10 +1132,10 @@ NpcData N(NpcData_DarkToads)[] = { }; AnimID N(ExtraAnims_KoopaBros)[] = { - ANIM_KoopaBros_Black_Anim03, - ANIM_KoopaBros_Black_Anim04, - ANIM_KoopaBros_Black_Anim0B, - ANIM_KoopaBros_Black_Anim14, + ANIM_KoopaBros_Black_Run, + ANIM_KoopaBros_Black_Idle, + ANIM_KoopaBros_Black_Hurt, + ANIM_KoopaBros_Black_Talk, ANIM_LIST_END }; @@ -1148,22 +1148,22 @@ NpcData N(NpcData_KoopaBros)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Black_Anim04, - .walk = ANIM_KoopaBros_Black_Anim02, - .run = ANIM_KoopaBros_Black_Anim03, - .chase = ANIM_KoopaBros_Black_Anim03, - .anim_4 = ANIM_KoopaBros_Black_Anim04, - .anim_5 = ANIM_KoopaBros_Black_Anim04, - .death = ANIM_KoopaBros_Black_Anim0A, - .hit = ANIM_KoopaBros_Black_Anim0A, - .anim_8 = ANIM_KoopaBros_Black_Anim03, - .anim_9 = ANIM_KoopaBros_Black_Anim03, - .anim_A = ANIM_KoopaBros_Black_Anim03, - .anim_B = ANIM_KoopaBros_Black_Anim03, - .anim_C = ANIM_KoopaBros_Black_Anim03, - .anim_D = ANIM_KoopaBros_Black_Anim03, - .anim_E = ANIM_KoopaBros_Black_Anim03, - .anim_F = ANIM_KoopaBros_Black_Anim03, + .idle = ANIM_KoopaBros_Black_Idle, + .walk = ANIM_KoopaBros_Black_Walk, + .run = ANIM_KoopaBros_Black_Run, + .chase = ANIM_KoopaBros_Black_Run, + .anim_4 = ANIM_KoopaBros_Black_Idle, + .anim_5 = ANIM_KoopaBros_Black_Idle, + .death = ANIM_KoopaBros_Black_HurtStill, + .hit = ANIM_KoopaBros_Black_HurtStill, + .anim_8 = ANIM_KoopaBros_Black_Run, + .anim_9 = ANIM_KoopaBros_Black_Run, + .anim_A = ANIM_KoopaBros_Black_Run, + .anim_B = ANIM_KoopaBros_Black_Run, + .anim_C = ANIM_KoopaBros_Black_Run, + .anim_D = ANIM_KoopaBros_Black_Run, + .anim_E = ANIM_KoopaBros_Black_Run, + .anim_F = ANIM_KoopaBros_Black_Run, }, .extraAnimations = N(ExtraAnims_KoopaBros), }, @@ -1175,22 +1175,22 @@ NpcData N(NpcData_KoopaBros)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Red_Anim04, - .walk = ANIM_KoopaBros_Red_Anim02, - .run = ANIM_KoopaBros_Red_Anim03, - .chase = ANIM_KoopaBros_Red_Anim03, - .anim_4 = ANIM_KoopaBros_Red_Anim04, - .anim_5 = ANIM_KoopaBros_Red_Anim04, - .death = ANIM_KoopaBros_Red_Anim0A, - .hit = ANIM_KoopaBros_Red_Anim0A, - .anim_8 = ANIM_KoopaBros_Red_Anim03, - .anim_9 = ANIM_KoopaBros_Red_Anim03, - .anim_A = ANIM_KoopaBros_Red_Anim03, - .anim_B = ANIM_KoopaBros_Red_Anim03, - .anim_C = ANIM_KoopaBros_Red_Anim03, - .anim_D = ANIM_KoopaBros_Red_Anim03, - .anim_E = ANIM_KoopaBros_Red_Anim03, - .anim_F = ANIM_KoopaBros_Red_Anim03, + .idle = ANIM_KoopaBros_Red_Idle, + .walk = ANIM_KoopaBros_Red_Walk, + .run = ANIM_KoopaBros_Red_Run, + .chase = ANIM_KoopaBros_Red_Run, + .anim_4 = ANIM_KoopaBros_Red_Idle, + .anim_5 = ANIM_KoopaBros_Red_Idle, + .death = ANIM_KoopaBros_Red_HurtStill, + .hit = ANIM_KoopaBros_Red_HurtStill, + .anim_8 = ANIM_KoopaBros_Red_Run, + .anim_9 = ANIM_KoopaBros_Red_Run, + .anim_A = ANIM_KoopaBros_Red_Run, + .anim_B = ANIM_KoopaBros_Red_Run, + .anim_C = ANIM_KoopaBros_Red_Run, + .anim_D = ANIM_KoopaBros_Red_Run, + .anim_E = ANIM_KoopaBros_Red_Run, + .anim_F = ANIM_KoopaBros_Red_Run, }, .extraAnimations = N(ExtraAnims_KoopaBros), }, @@ -1202,22 +1202,22 @@ NpcData N(NpcData_KoopaBros)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Yellow_Anim04, - .walk = ANIM_KoopaBros_Yellow_Anim02, - .run = ANIM_KoopaBros_Yellow_Anim03, - .chase = ANIM_KoopaBros_Yellow_Anim03, - .anim_4 = ANIM_KoopaBros_Yellow_Anim04, - .anim_5 = ANIM_KoopaBros_Yellow_Anim04, - .death = ANIM_KoopaBros_Yellow_Anim0A, - .hit = ANIM_KoopaBros_Yellow_Anim0A, - .anim_8 = ANIM_KoopaBros_Yellow_Anim03, - .anim_9 = ANIM_KoopaBros_Yellow_Anim03, - .anim_A = ANIM_KoopaBros_Yellow_Anim03, - .anim_B = ANIM_KoopaBros_Yellow_Anim03, - .anim_C = ANIM_KoopaBros_Yellow_Anim03, - .anim_D = ANIM_KoopaBros_Yellow_Anim03, - .anim_E = ANIM_KoopaBros_Yellow_Anim03, - .anim_F = ANIM_KoopaBros_Yellow_Anim03, + .idle = ANIM_KoopaBros_Yellow_Idle, + .walk = ANIM_KoopaBros_Yellow_Walk, + .run = ANIM_KoopaBros_Yellow_Run, + .chase = ANIM_KoopaBros_Yellow_Run, + .anim_4 = ANIM_KoopaBros_Yellow_Idle, + .anim_5 = ANIM_KoopaBros_Yellow_Idle, + .death = ANIM_KoopaBros_Yellow_HurtStill, + .hit = ANIM_KoopaBros_Yellow_HurtStill, + .anim_8 = ANIM_KoopaBros_Yellow_Run, + .anim_9 = ANIM_KoopaBros_Yellow_Run, + .anim_A = ANIM_KoopaBros_Yellow_Run, + .anim_B = ANIM_KoopaBros_Yellow_Run, + .anim_C = ANIM_KoopaBros_Yellow_Run, + .anim_D = ANIM_KoopaBros_Yellow_Run, + .anim_E = ANIM_KoopaBros_Yellow_Run, + .anim_F = ANIM_KoopaBros_Yellow_Run, }, .extraAnimations = N(ExtraAnims_KoopaBros), }, @@ -1229,22 +1229,22 @@ NpcData N(NpcData_KoopaBros)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Green_Anim04, - .walk = ANIM_KoopaBros_Green_Anim02, - .run = ANIM_KoopaBros_Green_Anim03, - .chase = ANIM_KoopaBros_Green_Anim03, - .anim_4 = ANIM_KoopaBros_Green_Anim04, - .anim_5 = ANIM_KoopaBros_Green_Anim04, - .death = ANIM_KoopaBros_Green_Anim0A, - .hit = ANIM_KoopaBros_Green_Anim0A, - .anim_8 = ANIM_KoopaBros_Green_Anim03, - .anim_9 = ANIM_KoopaBros_Green_Anim03, - .anim_A = ANIM_KoopaBros_Green_Anim03, - .anim_B = ANIM_KoopaBros_Green_Anim03, - .anim_C = ANIM_KoopaBros_Green_Anim03, - .anim_D = ANIM_KoopaBros_Green_Anim03, - .anim_E = ANIM_KoopaBros_Green_Anim03, - .anim_F = ANIM_KoopaBros_Green_Anim03, + .idle = ANIM_KoopaBros_Green_Idle, + .walk = ANIM_KoopaBros_Green_Walk, + .run = ANIM_KoopaBros_Green_Run, + .chase = ANIM_KoopaBros_Green_Run, + .anim_4 = ANIM_KoopaBros_Green_Idle, + .anim_5 = ANIM_KoopaBros_Green_Idle, + .death = ANIM_KoopaBros_Green_HurtStill, + .hit = ANIM_KoopaBros_Green_HurtStill, + .anim_8 = ANIM_KoopaBros_Green_Run, + .anim_9 = ANIM_KoopaBros_Green_Run, + .anim_A = ANIM_KoopaBros_Green_Run, + .anim_B = ANIM_KoopaBros_Green_Run, + .anim_C = ANIM_KoopaBros_Green_Run, + .anim_D = ANIM_KoopaBros_Green_Run, + .anim_E = ANIM_KoopaBros_Green_Run, + .anim_F = ANIM_KoopaBros_Green_Run, }, .extraAnimations = N(ExtraAnims_KoopaBros), }, diff --git a/src/world/area_mac/mac_03/mac_03_3_train.c b/src/world/area_mac/mac_03/mac_03_3_train.c index 6df10c7cb5..f475e5e219 100644 --- a/src/world/area_mac/mac_03/mac_03_3_train.c +++ b/src/world/area_mac/mac_03/mac_03_3_train.c @@ -198,46 +198,46 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_EQ(MF_TrainDepartDoorOpen, TRUE) EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_MODE_0, -435, 84, 37) EVT_SET(LVar8, 10) - EVT_SET(LocalFlag(1), TRUE) + EVT_SET(LFlag1, TRUE) EVT_SET(MF_TrainDepartDoorOpen, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainDepartPlayerBoard, TRUE) EVT_SET(LVar8, -10) - EVT_SET(LocalFlag(1), TRUE) + EVT_SET(LFlag1, TRUE) EVT_SET(MF_TrainDepartPlayerBoard, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainArriveDoorOpen, TRUE) EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_MODE_0, -413, 84, 38) EVT_SET(LVar8, 10) - EVT_SET(LocalFlag(2), TRUE) + EVT_SET(LFlag2, TRUE) EVT_SET(MF_TrainArriveDoorOpen, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainArrivePlayerDisembark, TRUE) EVT_SET(LVar8, -10) - EVT_SET(LocalFlag(2), TRUE) + EVT_SET(LFlag2, TRUE) EVT_SET(MF_TrainArrivePlayerDisembark, FALSE) EVT_END_IF - EVT_IF_EQ(LocalFlag(1), TRUE) + EVT_IF_EQ(LFlag1, TRUE) EVT_ADD(LVar9, LVar8) EVT_IF_GE(LVar9, 90) EVT_SET(LVar9, 90) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag1, FALSE) EVT_END_IF EVT_IF_LE(LVar9, 0) EVT_SET(LVar9, 0) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag1, FALSE) EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_MODE_0, -435, 84, 37) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(2), TRUE) + EVT_IF_EQ(LFlag2, TRUE) EVT_ADD(LVarA, LVar8) EVT_IF_GE(LVarA, 90) EVT_SET(LVarA, 90) - EVT_SET(LocalFlag(2), FALSE) + EVT_SET(LFlag2, FALSE) EVT_END_IF EVT_IF_LE(LVarA, 0) EVT_SET(LVarA, 0) - EVT_SET(LocalFlag(2), FALSE) + EVT_SET(LFlag2, FALSE) EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_MODE_0, -413, 84, 38) EVT_END_IF EVT_END_IF @@ -247,21 +247,21 @@ EvtScript N(EVS_AnimateTrain) = { EVT_CALL(RotateModel, MODEL_ura2, LVarA, 0, 1, 0) EVT_IF_GT(MV_TrainMoveDist, 100) EVT_IF_LT(MV_TrainMoveDist, 600) - EVT_IF_EQ(LocalFlag(0), FALSE) - EVT_SET(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_EXEC(N(EVS_OpenCrossingGates)) EVT_END_IF EVT_END_IF EVT_END_IF EVT_IF_LE(MV_TrainMoveDist, 100) - EVT_IF_EQ(LocalFlag(0), TRUE) - EVT_SET(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, TRUE) + EVT_SET(LFlag0, FALSE) EVT_EXEC(N(EVS_CloseCrossingGates)) EVT_END_IF EVT_END_IF EVT_IF_GE(MV_TrainMoveDist, 600) - EVT_IF_EQ(LocalFlag(0), TRUE) - EVT_SET(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, TRUE) + EVT_SET(LFlag0, FALSE) EVT_EXEC(N(EVS_CloseCrossingGates)) EVT_END_IF EVT_END_IF diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index 58932770bc..e2b9d38301 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -731,7 +731,7 @@ EvtScript N(D_80249E84_85BFF4) = { EVT_END_IF EVT_IF_EQ(LVar5, 2) EVT_IF_EQ(LVarA, 2) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_RETURN EVT_ELSE EVT_CALL(DisablePlayerInput, TRUE) @@ -759,14 +759,14 @@ EvtScript N(D_80249E84_85BFF4) = { EVT_END_IF EVT_END_IF EVT_IF_EQ(LVar1, ACTION_STATE_SPIN_POUND) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_RETURN EVT_END_IF EVT_END_IF EVT_CALL(N(func_802430B4_855224), LVar2) EVT_IF_EQ(LVar2, 29) EVT_IF_EQ(LVar0, 29) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_RETURN EVT_END_IF @@ -785,14 +785,14 @@ EvtScript N(D_8024A1F8_85C368) = { EVT_WAIT(10) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_EXEC_GET_TID(N(D_802486EC_85A85C), LVarA) - EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC(N(D_80249C34_85BDA4)) EVT_END_IF EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Run) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Run, ANIM_Kolorado_Run, 5, MSG_MAC_Port_0090) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_EXEC(N(D_80249D80_85BEF0)) EVT_END_IF EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_kujira, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_mac/mac_06/mac_06_3_npc.c b/src/world/area_mac/mac_06/mac_06_3_npc.c index 8c206f7948..47a8c27b8d 100644 --- a/src/world/area_mac/mac_06/mac_06_3_npc.c +++ b/src/world/area_mac/mac_06/mac_06_3_npc.c @@ -229,11 +229,11 @@ API_CALLABLE(N(SeagullYawInterp)) { f32 lastYaw = evt_get_float_variable(script, LVar7); f32 newYaw, deltaYaw; - if (evt_get_variable(script, LocalFlag(0))) { + if (evt_get_variable(script, LFlag0)) { evt_set_float_variable(script, LVar6, 0.0f); evt_set_float_variable(script, LVar7, 0.0f); - evt_set_variable(script, LocalFlag(0), 0); - evt_set_variable(script, LocalFlag(1), 1); + evt_set_variable(script, LFlag0, FALSE); + evt_set_variable(script, LFlag1, TRUE); return ApiStatus_DONE2; } @@ -241,11 +241,11 @@ API_CALLABLE(N(SeagullYawInterp)) { return ApiStatus_DONE2; } - if (evt_get_variable(script, LocalFlag(1))) { + if (evt_get_variable(script, LFlag1)) { newYaw = atan2(-x1, y1, -x2, y2); evt_set_float_variable(script, LVar6, newYaw); evt_set_float_variable(script, LVar7, newYaw); - evt_set_variable(script, LocalFlag(1), 0); + evt_set_variable(script, LFlag1, FALSE); return ApiStatus_DONE2; } @@ -362,8 +362,8 @@ Vec3f N(FlightPath)[] = { EvtScript N(EVS_FlyingGull) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(CloneModel, MODEL_hontai, CLONED_MODEL_GULL) - EVT_SET(LocalFlag(0), TRUE) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag0, TRUE) + EVT_SET(LFlag1, FALSE) EVT_SETF(LVar7, 0) EVT_LABEL(10) EVT_CALL(LoadPath, 500, EVT_PTR(N(FlightPath)), ARRAY_COUNT(N(FlightPath)), EASING_LINEAR) @@ -391,8 +391,8 @@ EvtScript N(EVS_FlyingGull) = { EvtScript N(EVS_UnusedGull) = { EVT_CALL(CloneModel, MODEL_hontai, LVar0) EVT_SET(LVarF, LVar0) - EVT_SET(LocalFlag(0), TRUE) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag0, TRUE) + EVT_SET(LFlag1, FALSE) EVT_SETF(LVar7, 0) EVT_SET(LVar8, 0) EVT_SET(LVar9, 0) diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index 002293a2ba..7cf471d9f9 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -618,7 +618,7 @@ API_CALLABLE(N(RunMinigame)) { case BOX_STATE_BOMB_HIT: enable_npc_shadow(npc); npc->duration = 15; - npc->currentAnim = ANIM_Bobomb_Anim05; + npc->currentAnim = ANIM_Bobomb_WalkLit; data->stunFlags |= (STUN_FLAG_STUNNED | STUN_FLAG_CHANGED); data->box[i].state = BOX_STATE_BOMB_ATTACK; get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); @@ -959,7 +959,7 @@ API_CALLABLE(N(CleanupGame)) { if (data->box[i].state != BOX_STATE_BOMB_END) { data->box[i].state = BOX_STATE_BOMB_END; fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 30, &writeback); - npc->currentAnim = ANIM_Bobomb_Anim1C; + npc->currentAnim = ANIM_Bobomb_Dizzy; enable_npc_shadow(npc); } break; @@ -1841,7 +1841,7 @@ EvtScript N(EVS_NpcInit_Fuzzy) = { }; EvtScript N(EVS_NpcInit_Bobomb) = { - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bobomb_Anim0B) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bobomb_AngryIdle) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_JUMPING, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) diff --git a/src/world/area_nok/nok_01/nok_01_2_main.c b/src/world/area_nok/nok_01/nok_01_2_main.c index 283e2a3781..9c8d1dcea5 100644 --- a/src/world/area_nok/nok_01/nok_01_2_main.c +++ b/src/world/area_nok/nok_01/nok_01_2_main.c @@ -40,17 +40,17 @@ EvtScript N(EVS_EnterMap) = { EVT_RETURN EVT_END_IF EVT_CALL(GetEntryID, LVar0) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_IF_EQ(LVar0, nok_01_ENTRY_0) EVT_IF_LT(GB_StoryProgress, STORY_CH1_ARRIVED_AT_KOOPA_VILLAGE) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_THREAD EVT_WAIT(30) EVT_EXEC(N(EVS_BindExitTriggers)) EVT_END_THREAD EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_END_IF diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index 0f97c09fbf..34eea65325 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -466,13 +466,13 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { EVT_CALL(N(GetTreeHidingSpotPos), LVarA, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Fuzzy_01, LVar0, LVar1, LVar2, LVarD) EVT_END_THREAD - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_IF_EQ(LVarB, 0) EVT_IF_EQ(LVarC, 3) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_END_IF - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_THREAD EVT_CALL(N(GetTreeHidingSpotPos), LVarB, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_Fuzzy_02, LVar0, LVar1, LVar2) @@ -553,7 +553,7 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { EvtScript N(EVS_FuzzyBoss_TauntFromTree) = { EVT_SET(AF_NOK04_PlayingGame, TRUE) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(DisablePlayerInput, TRUE) EVT_THREAD EVT_WAIT(20 * DT) @@ -598,7 +598,7 @@ EvtScript N(EVS_Scene_HideInTree) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_EXEC(N(EVS_FuzzyBoss_TauntFromTree)) EVT_RETURN EVT_CASE_GE(STORY_CH1_KOOPER_JOINED_PARTY) @@ -671,7 +671,7 @@ EvtScript N(EVS_Scene_HideInTree) = { EVT_CALL(PlaySound, SOUND_SHAKE_TREE) EVT_CALL(SetPlayerPos, -152, 0, 235) EVT_CALL(PlayerMoveTo, 58, 227, 60 * DT) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_EXEC(N(EVS_FuzzyBoss_TauntFromTree)) EVT_RETURN EVT_END @@ -828,14 +828,14 @@ API_CALLABLE(N(SetShellChosen)) { } EvtScript N(EVS_ShellPrompt) = { - EVT_SET(LocalFlag(10), FALSE) + EVT_SET(LFlagA, FALSE) EVT_CALL(DisablePlayerInput, TRUE) EVT_LABEL(0) EVT_CALL(ShowKeyChoicePopup) EVT_CALL(CloseChoicePopup) EVT_IF_NE(LVar0, 25) - EVT_IF_EQ(LocalFlag(10), FALSE) - EVT_SET(LocalFlag(10), TRUE) + EVT_IF_EQ(LFlagA, FALSE) + EVT_SET(LFlagA, TRUE) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0, MSG_CH1_00C5) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0, MSG_CH1_00C6) diff --git a/src/world/area_omo/common/ToyTrain.inc.c b/src/world/area_omo/common/ToyTrain.inc.c index 922ecaa327..2b5e13d9e3 100644 --- a/src/world/area_omo/common/ToyTrain.inc.c +++ b/src/world/area_omo/common/ToyTrain.inc.c @@ -114,7 +114,7 @@ EvtScript N(EVS_Scene_RideTrain) = { EVT_IF_EQ(ArrayVar(2), -1) EVT_SET(MV_TrainUnk_00, 100) EVT_SET(MF_TrainUnk_00, FALSE) - EVT_SET(LocalFlag(1), TRUE) + EVT_SET(LFlag1, TRUE) EVT_ELSE EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(2), ArrayVar(3)) EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), LVar1, LVar0) @@ -137,14 +137,14 @@ EvtScript N(EVS_Scene_RideTrain) = { EVT_IF_EQ(ArrayVar(7), -1) EVT_SET(MV_TrainUnk_00, 100) EVT_SET(MF_TrainUnk_00, FALSE) - EVT_SET(LocalFlag(1), FALSE) + EVT_SET(LFlag1, FALSE) EVT_ELSE EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(7), ArrayVar(8)) EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), LVar1, LVar0) EVT_END_IF EVT_END_IF EVT_IF_EQ(MV_TrainUnk_00, 100) - EVT_IF_EQ(LocalFlag(1), TRUE) + EVT_IF_EQ(LFlag1, TRUE) EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(5), ArrayVar(6)) EVT_SETF(ArrayVar(5), ArrayVar(0)) EVT_SETF(ArrayVar(6), ArrayVar(1)) @@ -170,7 +170,7 @@ EvtScript N(EVS_Scene_RideTrain) = { EVT_ADDF(ArrayVar(13), LVar3) EVT_SETF(ArrayVar(14), ArrayVar(13)) EVT_MULF(ArrayVar(14), EVT_FLOAT(1.432)) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_SETF(LVar0, ArrayVar(10)) EVT_IF_LT(LVar0, 1) EVT_SETF(LVar0, EVT_FLOAT(1.0)) @@ -179,7 +179,7 @@ EvtScript N(EVS_Scene_RideTrain) = { EVT_SUBF(ArrayVar(15), LVar0) EVT_IF_LT(ArrayVar(15), -10) EVT_SETF(ArrayVar(15), EVT_FLOAT(-10.0)) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_IF_EQ(AF_OMO_03, FALSE) EVT_CALL(PlaySound, SOUND_1FF) EVT_ELSE @@ -195,7 +195,7 @@ EvtScript N(EVS_Scene_RideTrain) = { EVT_ADDF(ArrayVar(15), LVar0) EVT_IF_GT(ArrayVar(15), 10) EVT_SETF(ArrayVar(15), EVT_FLOAT(10.0)) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_IF_EQ(AF_OMO_03, FALSE) EVT_CALL(PlaySound, SOUND_1FE) EVT_SET(AF_OMO_03, TRUE) diff --git a/src/world/area_sam/sam_05/sam_05_5_scenes.c b/src/world/area_sam/sam_05/sam_05_5_scenes.c index 3136164864..c5cc869c8f 100644 --- a/src/world/area_sam/sam_05/sam_05_5_scenes.c +++ b/src/world/area_sam/sam_05/sam_05_5_scenes.c @@ -2,7 +2,7 @@ #include "effects.h" EvtScript N(EVS_Scene_MonstarAppears) = { - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_LABEL(0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) @@ -26,10 +26,10 @@ EvtScript N(EVS_Scene_MonstarAppears) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetNpcPos, NPC_Monstar, 615, 85, 0) EVT_WAIT(1) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_Monstar, ANIM_Monstar_Talk, ANIM_Monstar_Idle1, 256, 50, 100, MSG_CH7_00E1) EVT_CALL(SetPlayerPos, 495, 80, 0) @@ -78,7 +78,7 @@ EvtScript N(EVS_Scene_MonstarAppears) = { EVT_GOTO(4) EVT_END_IF EVT_CALL(SetNpcPos, NPC_Monstar, NPC_DISPOSE_LOCATION) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_GOTO(0) EVT_ELSE EVT_CALL(CloseMessage) diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c index e169aea3cb..9eb5dc49be 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c +++ b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c @@ -615,10 +615,10 @@ EvtScript N(EVS_OnInteract_Pedestal) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_LT(LVar0, 0) EVT_SET(LVar0, -80) - EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LFlag0, FALSE) EVT_ELSE EVT_SET(LVar0, 80) - EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LFlag0, TRUE) EVT_END_IF EVT_THREAD EVT_WAIT(10) @@ -645,7 +645,7 @@ EvtScript N(EVS_OnInteract_Pedestal) = { EVT_EXEC(N(EVS_InterpChompStatueRotation)) EVT_WAIT(60) EVT_WAIT(50) - EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(GotoMap, EVT_PTR("sbk_30"), sbk_30_ENTRY_4) EVT_ELSE EVT_CALL(GotoMap, EVT_PTR("sbk_30"), sbk_30_ENTRY_5) diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 6df9891519..3652c476f7 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -48,22 +48,22 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Run) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -556, 180, 0) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ANIM, IMGFX_ANIM_STARTLE, 2, 1, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1E) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Shock) EVT_WAIT(12 * DT) EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_CLEAR, 0, 0, 0, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim04) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Idle) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Black_Anim14, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00D2) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim02) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Black_Talk, ANIM_KoopaBros_Black_Idle, 0, MSG_CH1_00D2) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Walk) EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 2) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_173, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Run) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 8 * DT) @@ -313,22 +313,22 @@ NpcData N(NpcData_KoopaBros) = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Green_Anim04, - .walk = ANIM_KoopaBros_Green_Anim02, - .run = ANIM_KoopaBros_Green_Anim03, - .chase = ANIM_KoopaBros_Green_Anim03, - .anim_4 = ANIM_KoopaBros_Green_Anim04, - .anim_5 = ANIM_KoopaBros_Green_Anim04, - .death = ANIM_KoopaBros_Green_Anim0A, - .hit = ANIM_KoopaBros_Green_Anim0A, - .anim_8 = ANIM_KoopaBros_Green_Anim03, - .anim_9 = ANIM_KoopaBros_Green_Anim03, - .anim_A = ANIM_KoopaBros_Green_Anim03, - .anim_B = ANIM_KoopaBros_Green_Anim03, - .anim_C = ANIM_KoopaBros_Green_Anim03, - .anim_D = ANIM_KoopaBros_Green_Anim03, - .anim_E = ANIM_KoopaBros_Green_Anim03, - .anim_F = ANIM_KoopaBros_Green_Anim03, + .idle = ANIM_KoopaBros_Green_Idle, + .walk = ANIM_KoopaBros_Green_Walk, + .run = ANIM_KoopaBros_Green_Run, + .chase = ANIM_KoopaBros_Green_Run, + .anim_4 = ANIM_KoopaBros_Green_Idle, + .anim_5 = ANIM_KoopaBros_Green_Idle, + .death = ANIM_KoopaBros_Green_HurtStill, + .hit = ANIM_KoopaBros_Green_HurtStill, + .anim_8 = ANIM_KoopaBros_Green_Run, + .anim_9 = ANIM_KoopaBros_Green_Run, + .anim_A = ANIM_KoopaBros_Green_Run, + .anim_B = ANIM_KoopaBros_Green_Run, + .anim_C = ANIM_KoopaBros_Green_Run, + .anim_D = ANIM_KoopaBros_Green_Run, + .anim_E = ANIM_KoopaBros_Green_Run, + .anim_F = ANIM_KoopaBros_Green_Run, }, }; diff --git a/src/world/area_trd/trd_01/trd_01_1_main.c b/src/world/area_trd/trd_01/trd_01_1_main.c index e9972d9045..dfeb275074 100644 --- a/src/world/area_trd/trd_01/trd_01_1_main.c +++ b/src/world/area_trd/trd_01/trd_01_1_main.c @@ -185,8 +185,8 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET(LVar2, LVar0) EVT_ADD(LVar2, 400) EVT_IF_GE(LVar2, -20) - EVT_IF_EQ(LocalFlag(0), FALSE) - EVT_SET(LocalFlag(0), TRUE) + EVT_IF_EQ(LFlag0, FALSE) + EVT_SET(LFlag0, TRUE) EVT_CALL(PlaySound, SOUND_23) EVT_CALL(EnableModel, MODEL_o145, TRUE) EVT_END_IF @@ -194,8 +194,8 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET(LVar2, LVar0) EVT_ADD(LVar2, 375) EVT_IF_GE(LVar2, -20) - EVT_IF_EQ(LocalFlag(1), FALSE) - EVT_SET(LocalFlag(1), TRUE) + EVT_IF_EQ(LFlag1, FALSE) + EVT_SET(LFlag1, TRUE) EVT_CALL(PlaySound, SOUND_23) EVT_CALL(TranslateModel, MODEL_o145, 50, 0, 0) EVT_END_IF @@ -203,8 +203,8 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET(LVar2, LVar0) EVT_ADD(LVar2, 350) EVT_IF_GE(LVar2, -20) - EVT_IF_EQ(LocalFlag(2), FALSE) - EVT_SET(LocalFlag(2), TRUE) + EVT_IF_EQ(LFlag2, FALSE) + EVT_SET(LFlag2, TRUE) EVT_CALL(PlaySound, SOUND_23) EVT_CALL(TranslateModel, MODEL_o145, 100, 0, 0) EVT_END_IF @@ -212,8 +212,8 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET(LVar2, LVar0) EVT_ADD(LVar2, 325) EVT_IF_GE(LVar2, -20) - EVT_IF_EQ(LocalFlag(3), FALSE) - EVT_SET(LocalFlag(3), TRUE) + EVT_IF_EQ(LFlag3, FALSE) + EVT_SET(LFlag3, TRUE) EVT_CALL(PlaySound, SOUND_23) EVT_CALL(TranslateModel, MODEL_o145, 150, 0, 0) EVT_END_IF @@ -221,8 +221,8 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET(LVar2, LVar0) EVT_ADD(LVar2, 299) EVT_IF_GE(LVar2, -20) - EVT_IF_EQ(LocalFlag(4), FALSE) - EVT_SET(LocalFlag(4), TRUE) + EVT_IF_EQ(LFlag4, FALSE) + EVT_SET(LFlag4, TRUE) EVT_CALL(PlaySound, SOUND_23) EVT_CALL(TranslateModel, MODEL_o145, 200, 0, 0) EVT_END_IF @@ -230,8 +230,8 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET(LVar2, LVar0) EVT_ADD(LVar2, 273) EVT_IF_GE(LVar2, -20) - EVT_IF_EQ(LocalFlag(5), FALSE) - EVT_SET(LocalFlag(5), TRUE) + EVT_IF_EQ(LFlag5, FALSE) + EVT_SET(LFlag5, TRUE) EVT_CALL(PlaySound, SOUND_23) EVT_CALL(TranslateModel, MODEL_o145, 250, 0, 0) EVT_END_IF @@ -239,8 +239,8 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET(LVar2, LVar0) EVT_ADD(LVar2, 245) EVT_IF_GE(LVar2, -20) - EVT_IF_EQ(LocalFlag(6), FALSE) - EVT_SET(LocalFlag(6), TRUE) + EVT_IF_EQ(LFlag6, FALSE) + EVT_SET(LFlag6, TRUE) EVT_CALL(PlaySound, SOUND_23) EVT_CALL(TranslateModel, MODEL_o145, 300, 0, 0) EVT_END_IF @@ -248,8 +248,8 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_SET(LVar2, LVar0) EVT_ADD(LVar2, 220) EVT_IF_GE(LVar2, -20) - EVT_IF_EQ(LocalFlag(7), FALSE) - EVT_SET(LocalFlag(7), TRUE) + EVT_IF_EQ(LFlag7, FALSE) + EVT_SET(LFlag7, TRUE) EVT_CALL(PlaySound, SOUND_23) EVT_CALL(EnableModel, MODEL_o145, FALSE) EVT_END_IF diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index bf5bc42777..0a7a4bd35e 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, -720, 0, 75) EVT_CALL(SetPlayerPos, -700, 0, 80) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_IdleCrouch) EVT_CALL(SetNpcPos, NPC_KoopaBros, -570, 0, -57) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 270, 0) EVT_THREAD @@ -33,20 +33,20 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD EVT_WAIT(10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Idle) EVT_WAIT(15 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 90, 0) EVT_WAIT(3 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Run) EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(2.6 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros, -555, 20, 0) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_01, 270, 0) EVT_WAIT(15 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Idle) EVT_WAIT(2 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Talk) EVT_WAIT(25 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Idle) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Salute) EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Idle) @@ -65,13 +65,13 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_WAIT(10 * DT) EVT_END_THREAD EVT_WAIT(10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Run) EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(2.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros, -550, 70, 0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Idle) EVT_WAIT(15 * DT) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04, 5, MSG_CH1_00D3) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Talk, ANIM_KoopaBros_Green_Idle, 5, MSG_CH1_00D3) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0 / DT)) EVT_WAIT(10 * DT) @@ -90,16 +90,16 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_EXEC_WAIT(N(EVS_EnterMap)) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 270, 5) EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros, IMGFX_SET_ANIM, IMGFX_ANIM_STARTLE, 2, 1, 0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim1E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Shock) EVT_WAIT(12 * DT) EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros, IMGFX_CLEAR, 0, 0, 0, 0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Idle) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04, 0, MSG_CH1_00D4) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim02) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Talk, ANIM_KoopaBros_Green_Idle, 0, MSG_CH1_00D4) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Walk) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 45, 2) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_173, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Run) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_KoopaBros, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBros, LVar0, LVar1, LVar2, 8 * DT) @@ -189,22 +189,22 @@ NpcData N(NpcData_KoopaBros) = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Green_Anim04, - .walk = ANIM_KoopaBros_Green_Anim02, - .run = ANIM_KoopaBros_Green_Anim03, - .chase = ANIM_KoopaBros_Green_Anim03, - .anim_4 = ANIM_KoopaBros_Green_Anim04, - .anim_5 = ANIM_KoopaBros_Green_Anim04, - .death = ANIM_KoopaBros_Green_Anim0A, - .hit = ANIM_KoopaBros_Green_Anim0A, - .anim_8 = ANIM_KoopaBros_Green_Anim03, - .anim_9 = ANIM_KoopaBros_Green_Anim03, - .anim_A = ANIM_KoopaBros_Green_Anim03, - .anim_B = ANIM_KoopaBros_Green_Anim03, - .anim_C = ANIM_KoopaBros_Green_Anim03, - .anim_D = ANIM_KoopaBros_Green_Anim03, - .anim_E = ANIM_KoopaBros_Green_Anim03, - .anim_F = ANIM_KoopaBros_Green_Anim03, + .idle = ANIM_KoopaBros_Green_Idle, + .walk = ANIM_KoopaBros_Green_Walk, + .run = ANIM_KoopaBros_Green_Run, + .chase = ANIM_KoopaBros_Green_Run, + .anim_4 = ANIM_KoopaBros_Green_Idle, + .anim_5 = ANIM_KoopaBros_Green_Idle, + .death = ANIM_KoopaBros_Green_HurtStill, + .hit = ANIM_KoopaBros_Green_HurtStill, + .anim_8 = ANIM_KoopaBros_Green_Run, + .anim_9 = ANIM_KoopaBros_Green_Run, + .anim_A = ANIM_KoopaBros_Green_Run, + .anim_B = ANIM_KoopaBros_Green_Run, + .anim_C = ANIM_KoopaBros_Green_Run, + .anim_D = ANIM_KoopaBros_Green_Run, + .anim_E = ANIM_KoopaBros_Green_Run, + .anim_F = ANIM_KoopaBros_Green_Run, }, }; diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index 3716b143c9..4a480b34cd 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -342,19 +342,19 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(N(DeleteFallingSprite)) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -250, 240, -25) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Walk) EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -150, -25, 0) EVT_WAIT(5) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_ThumbsUp) EVT_WAIT(20) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_WAIT(5) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 5, MSG_CH1_00D7) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Talk, ANIM_KoopaBros_Yellow_Idle, 5, MSG_CH1_00D7) EVT_THREAD EVT_WAIT(10) EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(2.5)) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Walk) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -200, -25, 0) EVT_END_THREAD EVT_WAIT(20) diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c index 2bc4bdcc96..f6dbd3a27d 100644 --- a/src/world/area_trd/trd_05/trd_05_4_npc.c +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -28,7 +28,7 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, -70, 240, -10) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_THREAD EVT_LOOP(8) EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_01, IMGFX_SET_ALPHA, 0, 0, 0, 0) @@ -54,32 +54,32 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_END_THREAD EVT_THREAD EVT_CALL(PlaySound, SOUND_29) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -100, 240, 30) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_2A) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -35, 240, -75) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_29) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -40, 240, 10) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_2A) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -110, 240, -20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_29) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -90, 240, 30) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) EVT_WAIT(15 * DT) EVT_CALL(PlaySound, SOUND_2A) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Hammering) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -30, 240, -50) EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) EVT_WAIT(15 * DT) @@ -93,9 +93,9 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -30, 6 * DT) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_PointForward) EVT_WAIT(15 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -110, 240, -70) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) EVT_WAIT(1) @@ -104,9 +104,9 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_CALL(NpcJump0, NPC_KoopaBros_01, -110, 240, -70, 6 * DT) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -35, 240, -51) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 270) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_PointForward) EVT_WAIT(14 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -45, 240, -25) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 270) EVT_WAIT(1) @@ -116,48 +116,48 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_WAIT(1) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_PointForward) EVT_WAIT(20 * DT) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_ThumbsUp) EVT_WAIT(26 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_WAIT(10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Walk) EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -25, -15, 0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_WAIT(10 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 4) EVT_WAIT(10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_IdleCrouch) EVT_WAIT(25 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_WAIT(10 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Walk) EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(4.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -122, -15, 0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_WAIT(3 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 5) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 5, MSG_CH1_00D5) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Talk, ANIM_KoopaBros_Yellow_Idle, 5, MSG_CH1_00D5) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, 0, 25, EMOTER_POS, LVar0, LVar1, LVar2, 40) EVT_WAIT(25 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 2) EVT_WAIT(7 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim05) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_IdleCrouch) EVT_WAIT(25 * DT) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Idle) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(3.0)) EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 5 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 0, MSG_CH1_00D6) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Talk, ANIM_KoopaBros_Yellow_Idle, 0, MSG_CH1_00D6) EVT_CALL(PlaySound, SOUND_173) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim03) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Run) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 8 * DT) @@ -211,22 +211,22 @@ NpcData N(NpcData_KoopaBros)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Yellow_Anim04, - .walk = ANIM_KoopaBros_Yellow_Anim02, - .run = ANIM_KoopaBros_Yellow_Anim03, - .chase = ANIM_KoopaBros_Yellow_Anim03, - .anim_4 = ANIM_KoopaBros_Yellow_Anim04, - .anim_5 = ANIM_KoopaBros_Yellow_Anim04, - .death = ANIM_KoopaBros_Yellow_Anim0A, - .hit = ANIM_KoopaBros_Yellow_Anim0A, - .anim_8 = ANIM_KoopaBros_Yellow_Anim03, - .anim_9 = ANIM_KoopaBros_Yellow_Anim03, - .anim_A = ANIM_KoopaBros_Yellow_Anim03, - .anim_B = ANIM_KoopaBros_Yellow_Anim03, - .anim_C = ANIM_KoopaBros_Yellow_Anim03, - .anim_D = ANIM_KoopaBros_Yellow_Anim03, - .anim_E = ANIM_KoopaBros_Yellow_Anim03, - .anim_F = ANIM_KoopaBros_Yellow_Anim03, + .idle = ANIM_KoopaBros_Yellow_Idle, + .walk = ANIM_KoopaBros_Yellow_Walk, + .run = ANIM_KoopaBros_Yellow_Run, + .chase = ANIM_KoopaBros_Yellow_Run, + .anim_4 = ANIM_KoopaBros_Yellow_Idle, + .anim_5 = ANIM_KoopaBros_Yellow_Idle, + .death = ANIM_KoopaBros_Yellow_HurtStill, + .hit = ANIM_KoopaBros_Yellow_HurtStill, + .anim_8 = ANIM_KoopaBros_Yellow_Run, + .anim_9 = ANIM_KoopaBros_Yellow_Run, + .anim_A = ANIM_KoopaBros_Yellow_Run, + .anim_B = ANIM_KoopaBros_Yellow_Run, + .anim_C = ANIM_KoopaBros_Yellow_Run, + .anim_D = ANIM_KoopaBros_Yellow_Run, + .anim_E = ANIM_KoopaBros_Yellow_Run, + .anim_F = ANIM_KoopaBros_Yellow_Run, }, }, { @@ -238,22 +238,22 @@ NpcData N(NpcData_KoopaBros)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Yellow_Anim04, - .walk = ANIM_KoopaBros_Yellow_Anim02, - .run = ANIM_KoopaBros_Yellow_Anim03, - .chase = ANIM_KoopaBros_Yellow_Anim03, - .anim_4 = ANIM_KoopaBros_Yellow_Anim04, - .anim_5 = ANIM_KoopaBros_Yellow_Anim04, - .death = ANIM_KoopaBros_Yellow_Anim0A, - .hit = ANIM_KoopaBros_Yellow_Anim0A, - .anim_8 = ANIM_KoopaBros_Yellow_Anim03, - .anim_9 = ANIM_KoopaBros_Yellow_Anim03, - .anim_A = ANIM_KoopaBros_Yellow_Anim03, - .anim_B = ANIM_KoopaBros_Yellow_Anim03, - .anim_C = ANIM_KoopaBros_Yellow_Anim03, - .anim_D = ANIM_KoopaBros_Yellow_Anim03, - .anim_E = ANIM_KoopaBros_Yellow_Anim03, - .anim_F = ANIM_KoopaBros_Yellow_Anim03, + .idle = ANIM_KoopaBros_Yellow_Idle, + .walk = ANIM_KoopaBros_Yellow_Walk, + .run = ANIM_KoopaBros_Yellow_Run, + .chase = ANIM_KoopaBros_Yellow_Run, + .anim_4 = ANIM_KoopaBros_Yellow_Idle, + .anim_5 = ANIM_KoopaBros_Yellow_Idle, + .death = ANIM_KoopaBros_Yellow_HurtStill, + .hit = ANIM_KoopaBros_Yellow_HurtStill, + .anim_8 = ANIM_KoopaBros_Yellow_Run, + .anim_9 = ANIM_KoopaBros_Yellow_Run, + .anim_A = ANIM_KoopaBros_Yellow_Run, + .anim_B = ANIM_KoopaBros_Yellow_Run, + .anim_C = ANIM_KoopaBros_Yellow_Run, + .anim_D = ANIM_KoopaBros_Yellow_Run, + .anim_E = ANIM_KoopaBros_Yellow_Run, + .anim_F = ANIM_KoopaBros_Yellow_Run, }, }, }; diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index da0cf545d4..9564970ef8 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -156,8 +156,8 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { EVT_CALL(SetNpcSpeed, NPC_Jailer_Bobomb_01, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetNpcSpeed, NPC_Jailer_Bobomb_02, EVT_FLOAT(4.0 / DT)) EVT_CALL(SetNpcAnimation, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim06) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Run) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Run) EVT_CALL(SetNpcFlagBits, NPC_Jailer_KoopaTroopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Jailer_Bobomb_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Jailer_Bobomb_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) @@ -175,11 +175,11 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim02) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim02) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Idle) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Idle) EVT_CALL(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run, ANIM_KoopaTroopa_Idle, 0, MSG_CH1_00F0) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim06) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Run) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Run) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_THREAD EVT_WAIT(60) @@ -209,11 +209,11 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { EVT_CALL(SetNpcJumpscale, NPC_Jailer_KoopaTroopa, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Jailer_KoopaTroopa, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Jailer_KoopaTroopa, LVar0, LVar1, LVar2, 10 * DT) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim02) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim02) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Idle) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Idle) EVT_CALL(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run, ANIM_KoopaTroopa_Idle, 0, MSG_CH1_00F1) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim06) - EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Run) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Run) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) EVT_RETURN @@ -413,22 +413,22 @@ NpcData N(NpcData_Jailers)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = { - .idle = ANIM_Bobomb_Anim02, - .walk = ANIM_Bobomb_Anim04, - .run = ANIM_Bobomb_Anim06, - .chase = ANIM_Bobomb_Anim06, - .anim_4 = ANIM_Bobomb_Anim02, - .anim_5 = ANIM_Bobomb_Anim02, - .death = ANIM_Bobomb_Anim0E, - .hit = ANIM_Bobomb_Anim0E, - .anim_8 = ANIM_Bobomb_Anim06, - .anim_9 = ANIM_Bobomb_Anim06, - .anim_A = ANIM_Bobomb_Anim06, - .anim_B = ANIM_Bobomb_Anim06, - .anim_C = ANIM_Bobomb_Anim06, - .anim_D = ANIM_Bobomb_Anim06, - .anim_E = ANIM_Bobomb_Anim06, - .anim_F = ANIM_Bobomb_Anim06, + .idle = ANIM_Bobomb_Idle, + .walk = ANIM_Bobomb_Walk, + .run = ANIM_Bobomb_Run, + .chase = ANIM_Bobomb_Run, + .anim_4 = ANIM_Bobomb_Idle, + .anim_5 = ANIM_Bobomb_Idle, + .death = ANIM_Bobomb_Hurt, + .hit = ANIM_Bobomb_Hurt, + .anim_8 = ANIM_Bobomb_Run, + .anim_9 = ANIM_Bobomb_Run, + .anim_A = ANIM_Bobomb_Run, + .anim_B = ANIM_Bobomb_Run, + .anim_C = ANIM_Bobomb_Run, + .anim_D = ANIM_Bobomb_Run, + .anim_E = ANIM_Bobomb_Run, + .anim_F = ANIM_Bobomb_Run, }, }, { @@ -440,22 +440,22 @@ NpcData N(NpcData_Jailers)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .drops = NO_DROPS, .animations = { - .idle = ANIM_Bobomb_Anim02, - .walk = ANIM_Bobomb_Anim04, - .run = ANIM_Bobomb_Anim06, - .chase = ANIM_Bobomb_Anim06, - .anim_4 = ANIM_Bobomb_Anim02, - .anim_5 = ANIM_Bobomb_Anim02, - .death = ANIM_Bobomb_Anim0E, - .hit = ANIM_Bobomb_Anim0E, - .anim_8 = ANIM_Bobomb_Anim06, - .anim_9 = ANIM_Bobomb_Anim06, - .anim_A = ANIM_Bobomb_Anim06, - .anim_B = ANIM_Bobomb_Anim06, - .anim_C = ANIM_Bobomb_Anim06, - .anim_D = ANIM_Bobomb_Anim06, - .anim_E = ANIM_Bobomb_Anim06, - .anim_F = ANIM_Bobomb_Anim06, + .idle = ANIM_Bobomb_Idle, + .walk = ANIM_Bobomb_Walk, + .run = ANIM_Bobomb_Run, + .chase = ANIM_Bobomb_Run, + .anim_4 = ANIM_Bobomb_Idle, + .anim_5 = ANIM_Bobomb_Idle, + .death = ANIM_Bobomb_Hurt, + .hit = ANIM_Bobomb_Hurt, + .anim_8 = ANIM_Bobomb_Run, + .anim_9 = ANIM_Bobomb_Run, + .anim_A = ANIM_Bobomb_Run, + .anim_B = ANIM_Bobomb_Run, + .anim_C = ANIM_Bobomb_Run, + .anim_D = ANIM_Bobomb_Run, + .anim_E = ANIM_Bobomb_Run, + .anim_F = ANIM_Bobomb_Run, }, }, }; diff --git a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c index 9be808ffb5..2395524850 100644 --- a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c +++ b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c @@ -34,7 +34,7 @@ NpcSettings N(NpcSettings_Unused) = { EvtScript N(EVS_Scene_ImprisonedKoopaBros) = { EVT_WAIT(60) EVT_CALL(EnableNpcAI, NPC_KoopaBros_Red, FALSE) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_Red, ANIM_KoopaBros_Red_Anim18, ANIM_KoopaBros_Red_Anim18, 0, MSG_CH1_010C) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_Red, ANIM_KoopaBros_Red_Dizzy, ANIM_KoopaBros_Red_Dizzy, 0, MSG_CH1_010C) EVT_CALL(EnableNpcAI, NPC_KoopaBros_Red, TRUE) EVT_WAIT(30) EVT_CALL(FadeOutMusic, 0, 2000) diff --git a/src/world/area_trd/trd_09/trd_09_3_npc.c b/src/world/area_trd/trd_09/trd_09_3_npc.c index 89a09300ef..e30263d59c 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npc.c +++ b/src/world/area_trd/trd_09/trd_09_3_npc.c @@ -36,16 +36,16 @@ EvtScript N(D_80240844_9BDEA4) = { EVT_SET(LVar1, 1) EVT_CALL(GetNpcYaw, NPC_SELF, LVar2) EVT_SET(LVar3, 10) - EVT_SET(LVarA, ANIM_BillBlaster_Anim01) - EVT_SET(LVarB, ANIM_BillBlaster_Anim01) + EVT_SET(LVarA, ANIM_BillBlaster_Idle) + EVT_SET(LVarB, ANIM_BillBlaster_Idle) EVT_EXEC_WAIT(EVS_800936C0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim02) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Fire) EVT_WAIT(15) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetNpcYaw, NPC_SELF, LVar3) EVT_CALL(AddVectorPolar, LVar0, LVar2, EVT_FLOAT(20.0), LVar3) EVT_ADD(LVar1, 12) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim01) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Idle) EVT_CALL(GetSelfNpcID, LVar0) EVT_ADD(LVar0, 1) EVT_CALL(SetNpcVar, LVar0, 0, 1) @@ -73,7 +73,7 @@ EvtScript N(EVS_NpcHit_BillBlaster) = { EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) - EVT_SET(LVar0, ANIM_BillBlaster_Anim03) + EVT_SET(LVar0, ANIM_BillBlaster_Hurt) EVT_EXEC_WAIT(EVS_NpcHitRecoil) EVT_CASE_EQ(ENCOUNTER_TRIGGER_SPIN) EVT_THREAD @@ -133,7 +133,7 @@ EvtScript N(D_80240C2C_9BE28C) = { }; NpcSettings N(missing_80240CE4) = { - .defaultAnim = ANIM_BillBlaster_Anim01, + .defaultAnim = ANIM_BillBlaster_Idle, .height = 26, .radius = 32, .level = 10, @@ -144,7 +144,7 @@ NpcSettings N(missing_80240CE4) = { }; NpcSettings N(missing_80240D10) = { - .defaultAnim = ANIM_BulletBill_Anim01, + .defaultAnim = ANIM_BulletBill_Idle, .height = 14, .radius = 31, .level = 5, @@ -201,25 +201,25 @@ EvtScript N(EVS_NpcAI_KoopaBros_Red) = { EVT_CALL(SetNpcVar, NPC_KoopaBros_Yellow, 0, 1) EVT_CALL(SetNpcVar, NPC_KoopaBros_Black, 0, 1) EVT_WAIT(60 * DT) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Run) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcMoveTo, NPC_SELF, 1490, 0, 0) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Red_Anim1B, ANIM_KoopaBros_Red_Anim1B, 0, MSG_CH1_00F2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Red_PointForward, ANIM_KoopaBros_Red_PointForward, 0, MSG_CH1_00F2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1300, 0, 0) EVT_CALL(SetCamPosB, CAM_DEFAULT, 1466, EVT_FLOAT(41.6)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 1250, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim12) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Land) EVT_CALL(NpcJump0, NPC_SELF, 1440, 30, 0, 20 * DT) EVT_CALL(NpcJump0, NPC_SELF, 1380, 0, 0, 20 * DT) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 1360, 0, 0) EVT_WAIT(20 * DT) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim04) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Red_Anim1B, ANIM_KoopaBros_Red_Anim1B, 0, MSG_CH1_00F3) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Idle) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Red_PointForward, ANIM_KoopaBros_Red_PointForward, 0, MSG_CH1_00F3) EVT_CALL(SetNpcVar, NPC_KoopaBros_Green, 0, 2) EVT_CALL(SetNpcVar, NPC_KoopaBros_Yellow, 0, 2) EVT_CALL(SetNpcVar, NPC_KoopaBros_Black, 0, 2) @@ -272,23 +272,23 @@ EvtScript N(EVS_NpcAI_KoopaBros_Black) = { EVT_WAIT(1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Run) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcMoveTo, NPC_SELF, 1520, 20, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim12) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Land) EVT_CALL(NpcJump0, NPC_SELF, 1470, 30, 30, 20 * DT) EVT_CALL(NpcJump0, NPC_SELF, 1410, 0, 40, 20 * DT) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 1330, 50, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim01) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_StillCrouch) EVT_LABEL(20) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_WAIT(1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1B) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_PointForward) EVT_WAIT(100 * DT) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN @@ -303,23 +303,23 @@ EvtScript N(EVS_NpcAI_KoopaBros_Yellow) = { EVT_WAIT(1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Run) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcMoveTo, NPC_SELF, 1505, 5, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim12) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Land) EVT_CALL(NpcJump0, NPC_SELF, 1455, 30, 5, 20 * DT) EVT_CALL(NpcJump0, NPC_SELF, 1395, 0, 5, 20 * DT) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 1315, 5, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim01) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_StillCrouch) EVT_LABEL(20) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_WAIT(1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim1B) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_PointForward) EVT_WAIT(100 * DT) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN @@ -334,23 +334,23 @@ EvtScript N(EVS_NpcAI_KoopaBros_Green) = { EVT_WAIT(1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Run) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(NpcMoveTo, NPC_SELF, 1490, -10, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim12) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Land) EVT_CALL(NpcJump0, NPC_SELF, 1440, 30, -20, 20 * DT) EVT_CALL(NpcJump0, NPC_SELF, 1380, 0, -30, 20 * DT) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 1300, -40, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim01) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_StillCrouch) EVT_LABEL(20) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_WAIT(1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim1B) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_PointForward) EVT_WAIT(100 * DT) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN @@ -373,9 +373,9 @@ EvtScript N(EVS_NpcAI_BillBlaster) = { EVT_IF_EQ(LVar0, 0) EVT_CALL(GetSelfNpcID, LVar0) EVT_CALL(SetNpcVar, LVarA, 0, LVar0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim02) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Fire) EVT_WAIT(15) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim01) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Idle) EVT_CALL(RandInt, 100, LVar0) EVT_ADD(LVar0, 60) EVT_WAIT(LVar0) @@ -403,7 +403,7 @@ EvtScript N(EVS_NpcAI_BulletBill) = { EVT_GOTO(2) EVT_END_IF EVT_WAIT(15) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Anim04) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Fire) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) EVT_CALL(SelfEnemyOverrideSyncPos, 1) @@ -431,7 +431,7 @@ EvtScript N(EVS_NpcAI_BulletBill) = { EVT_CALL(NpcMoveTo, NPC_SELF, -450, LVar3, 0) EVT_END_SWITCH EVT_CALL(func_80045838, -1, SOUND_B0000018, 0) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Anim05) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Hurt) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 5) EVT_ADD(LVar2, 1) @@ -464,7 +464,7 @@ EvtScript N(EVS_NpcDefeat_BulletBill) = { }; NpcSettings N(NpcSettings_KoopaBros_Red) = { - .defaultAnim = ANIM_KoopaBros_Red_Anim02, + .defaultAnim = ANIM_KoopaBros_Red_Walk, .height = 34, .radius = 24, .level = 99, @@ -474,7 +474,7 @@ NpcSettings N(NpcSettings_KoopaBros_Red) = { }; NpcSettings N(NpcSettings_KoopaBros_Black) = { - .defaultAnim = ANIM_KoopaBros_Black_Anim02, + .defaultAnim = ANIM_KoopaBros_Black_Walk, .height = 34, .radius = 24, .level = 99, @@ -484,7 +484,7 @@ NpcSettings N(NpcSettings_KoopaBros_Black) = { }; NpcSettings N(NpcSettings_KoopaBros_Yellow) = { - .defaultAnim = ANIM_KoopaBros_Yellow_Anim02, + .defaultAnim = ANIM_KoopaBros_Yellow_Walk, .height = 34, .radius = 24, .level = 99, @@ -494,7 +494,7 @@ NpcSettings N(NpcSettings_KoopaBros_Yellow) = { }; NpcSettings N(NpcSettings_KoopaBros_Green) = { - .defaultAnim = ANIM_KoopaBros_Green_Anim02, + .defaultAnim = ANIM_KoopaBros_Green_Walk, .height = 34, .radius = 24, .level = 99, @@ -504,7 +504,7 @@ NpcSettings N(NpcSettings_KoopaBros_Green) = { }; NpcSettings N(NpcSettings_BillBlaster) = { - .defaultAnim = ANIM_BillBlaster_Anim01, + .defaultAnim = ANIM_BillBlaster_Idle, .height = 26, .radius = 32, .level = 10, @@ -514,7 +514,7 @@ NpcSettings N(NpcSettings_BillBlaster) = { }; NpcSettings N(NpcSettings_BulletBill) = { - .defaultAnim = ANIM_BulletBill_Anim01, + .defaultAnim = ANIM_BulletBill_Idle, .height = 14, .radius = 31, .level = 5, @@ -721,22 +721,22 @@ NpcData N(NpcData_BulletBill_Demo1) = { .flowerDrops = STANDARD_FLOWER_DROPS(2), }, .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, + .idle = ANIM_BulletBill_Idle, + .walk = ANIM_BulletBill_TenseCopy, + .run = ANIM_BulletBill_Tense, + .chase = ANIM_BulletBill_Tense, + .anim_4 = ANIM_BulletBill_Idle, + .anim_5 = ANIM_BulletBill_Fire, + .death = ANIM_BulletBill_Hurt, + .hit = ANIM_BulletBill_Hurt, + .anim_8 = ANIM_BulletBill_Idle, + .anim_9 = ANIM_BulletBill_Idle, + .anim_A = ANIM_BulletBill_Idle, + .anim_B = ANIM_BulletBill_Idle, + .anim_C = ANIM_BulletBill_Idle, + .anim_D = ANIM_BulletBill_Idle, + .anim_E = ANIM_BulletBill_Idle, + .anim_F = ANIM_BulletBill_Idle, }, }; @@ -771,22 +771,22 @@ NpcData N(NpcData_BulletBill_Demo2) = { .flowerDrops = STANDARD_FLOWER_DROPS(2), }, .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, + .idle = ANIM_BulletBill_Idle, + .walk = ANIM_BulletBill_TenseCopy, + .run = ANIM_BulletBill_Tense, + .chase = ANIM_BulletBill_Tense, + .anim_4 = ANIM_BulletBill_Idle, + .anim_5 = ANIM_BulletBill_Fire, + .death = ANIM_BulletBill_Hurt, + .hit = ANIM_BulletBill_Hurt, + .anim_8 = ANIM_BulletBill_Idle, + .anim_9 = ANIM_BulletBill_Idle, + .anim_A = ANIM_BulletBill_Idle, + .anim_B = ANIM_BulletBill_Idle, + .anim_C = ANIM_BulletBill_Idle, + .anim_D = ANIM_BulletBill_Idle, + .anim_E = ANIM_BulletBill_Idle, + .anim_F = ANIM_BulletBill_Idle, }, }; @@ -821,22 +821,22 @@ NpcData N(NpcData_BulletBill_Demo3) = { .flowerDrops = STANDARD_FLOWER_DROPS(2), }, .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, + .idle = ANIM_BulletBill_Idle, + .walk = ANIM_BulletBill_TenseCopy, + .run = ANIM_BulletBill_Tense, + .chase = ANIM_BulletBill_Tense, + .anim_4 = ANIM_BulletBill_Idle, + .anim_5 = ANIM_BulletBill_Fire, + .death = ANIM_BulletBill_Hurt, + .hit = ANIM_BulletBill_Hurt, + .anim_8 = ANIM_BulletBill_Idle, + .anim_9 = ANIM_BulletBill_Idle, + .anim_A = ANIM_BulletBill_Idle, + .anim_B = ANIM_BulletBill_Idle, + .anim_C = ANIM_BulletBill_Idle, + .anim_D = ANIM_BulletBill_Idle, + .anim_E = ANIM_BulletBill_Idle, + .anim_F = ANIM_BulletBill_Idle, }, }; @@ -871,22 +871,22 @@ NpcData N(NpcData_BulletBill_Demo4) = { .flowerDrops = STANDARD_FLOWER_DROPS(2), }, .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, + .idle = ANIM_BulletBill_Idle, + .walk = ANIM_BulletBill_TenseCopy, + .run = ANIM_BulletBill_Tense, + .chase = ANIM_BulletBill_Tense, + .anim_4 = ANIM_BulletBill_Idle, + .anim_5 = ANIM_BulletBill_Fire, + .death = ANIM_BulletBill_Hurt, + .hit = ANIM_BulletBill_Hurt, + .anim_8 = ANIM_BulletBill_Idle, + .anim_9 = ANIM_BulletBill_Idle, + .anim_A = ANIM_BulletBill_Idle, + .anim_B = ANIM_BulletBill_Idle, + .anim_C = ANIM_BulletBill_Idle, + .anim_D = ANIM_BulletBill_Idle, + .anim_E = ANIM_BulletBill_Idle, + .anim_F = ANIM_BulletBill_Idle, }, }; @@ -921,22 +921,22 @@ NpcData N(NpcData_BulletBill_Demo5) = { .flowerDrops = STANDARD_FLOWER_DROPS(2), }, .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, + .idle = ANIM_BulletBill_Idle, + .walk = ANIM_BulletBill_TenseCopy, + .run = ANIM_BulletBill_Tense, + .chase = ANIM_BulletBill_Tense, + .anim_4 = ANIM_BulletBill_Idle, + .anim_5 = ANIM_BulletBill_Fire, + .death = ANIM_BulletBill_Hurt, + .hit = ANIM_BulletBill_Hurt, + .anim_8 = ANIM_BulletBill_Idle, + .anim_9 = ANIM_BulletBill_Idle, + .anim_A = ANIM_BulletBill_Idle, + .anim_B = ANIM_BulletBill_Idle, + .anim_C = ANIM_BulletBill_Idle, + .anim_D = ANIM_BulletBill_Idle, + .anim_E = ANIM_BulletBill_Idle, + .anim_F = ANIM_BulletBill_Idle, }, }; diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c index cfdaa0915c..4cfc35f42a 100644 --- a/src/world/area_trd/trd_10/trd_10_2_npc.c +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -67,15 +67,15 @@ EvtScript N(EVS_NpcAI_KoopaBros_01) = { EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -88, 0, 15 * DT) EVT_WAIT(10 * DT) EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_01, IMGFX_SET_ANIM, IMGFX_ANIM_STARTLE, 2, 1, 0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim1E) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Shock) EVT_WAIT(12 * DT) EVT_CALL(SetNpcImgFXParams, NPC_KoopaBros_01, IMGFX_CLEAR, 0, 0, 0, 0) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Idle) EVT_WAIT(10 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim02, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00F4) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Walk, ANIM_KoopaBros_Black_Idle, 0, MSG_CH1_00F4) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -32, 0, 0) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, -64, 0, 10 * DT) - EVT_CALL(SpeakToPlayer, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim02, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH1_00F5) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Walk, ANIM_KoopaBros_Red_Idle, 0, MSG_CH1_00F5) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 0, 0, 10 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, -10, 4) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 0, 0, 10 * DT) @@ -138,10 +138,10 @@ EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -150, 30, 55) EVT_CALL(SetNpcPos, NPC_KoopaBros_03, -130, 30, -55) EVT_CALL(SetNpcPos, NPC_KoopaBros_04, -110, 30, 55) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim1C) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim1C) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim1C) - EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim1C) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Launched) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Launched) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Launched) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Launched) EVT_WAIT(1) EVT_THREAD EVT_WAIT(30 * DT) @@ -284,7 +284,7 @@ EvtScript N(EVS_NpcDefeat_KoopaBros_04) = { }; NpcSettings N(NpcSettings_KoopaBros_01) = { - .defaultAnim = ANIM_KoopaBros_Black_Anim02, + .defaultAnim = ANIM_KoopaBros_Black_Walk, .height = 34, .radius = 24, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_01), @@ -297,7 +297,7 @@ NpcSettings N(NpcSettings_KoopaBros_01) = { }; NpcSettings N(NpcSettings_KoopaBros_02) = { - .defaultAnim = ANIM_KoopaBros_Red_Anim02, + .defaultAnim = ANIM_KoopaBros_Red_Walk, .height = 34, .radius = 24, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_02), @@ -310,7 +310,7 @@ NpcSettings N(NpcSettings_KoopaBros_02) = { }; NpcSettings N(NpcSettings_KoopaBros_03) = { - .defaultAnim = ANIM_KoopaBros_Yellow_Anim02, + .defaultAnim = ANIM_KoopaBros_Yellow_Walk, .height = 34, .radius = 24, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_03), @@ -323,7 +323,7 @@ NpcSettings N(NpcSettings_KoopaBros_03) = { }; NpcSettings N(NpcSettings_KoopaBros_04) = { - .defaultAnim = ANIM_KoopaBros_Green_Anim02, + .defaultAnim = ANIM_KoopaBros_Green_Walk, .height = 34, .radius = 24, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_04), @@ -344,22 +344,22 @@ NpcData N(NpcData_KoopaBros_01)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Black_Anim04, - .walk = ANIM_KoopaBros_Black_Anim02, - .run = ANIM_KoopaBros_Black_Anim03, - .chase = ANIM_KoopaBros_Black_Anim03, - .anim_4 = ANIM_KoopaBros_Black_Anim04, - .anim_5 = ANIM_KoopaBros_Black_Anim04, - .death = ANIM_KoopaBros_Black_Anim0A, - .hit = ANIM_KoopaBros_Black_Anim0A, - .anim_8 = ANIM_KoopaBros_Black_Anim03, - .anim_9 = ANIM_KoopaBros_Black_Anim03, - .anim_A = ANIM_KoopaBros_Black_Anim03, - .anim_B = ANIM_KoopaBros_Black_Anim03, - .anim_C = ANIM_KoopaBros_Black_Anim03, - .anim_D = ANIM_KoopaBros_Black_Anim03, - .anim_E = ANIM_KoopaBros_Black_Anim03, - .anim_F = ANIM_KoopaBros_Black_Anim03, + .idle = ANIM_KoopaBros_Black_Idle, + .walk = ANIM_KoopaBros_Black_Walk, + .run = ANIM_KoopaBros_Black_Run, + .chase = ANIM_KoopaBros_Black_Run, + .anim_4 = ANIM_KoopaBros_Black_Idle, + .anim_5 = ANIM_KoopaBros_Black_Idle, + .death = ANIM_KoopaBros_Black_HurtStill, + .hit = ANIM_KoopaBros_Black_HurtStill, + .anim_8 = ANIM_KoopaBros_Black_Run, + .anim_9 = ANIM_KoopaBros_Black_Run, + .anim_A = ANIM_KoopaBros_Black_Run, + .anim_B = ANIM_KoopaBros_Black_Run, + .anim_C = ANIM_KoopaBros_Black_Run, + .anim_D = ANIM_KoopaBros_Black_Run, + .anim_E = ANIM_KoopaBros_Black_Run, + .anim_F = ANIM_KoopaBros_Black_Run, }, }, { @@ -370,22 +370,22 @@ NpcData N(NpcData_KoopaBros_01)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Red_Anim04, - .walk = ANIM_KoopaBros_Red_Anim02, - .run = ANIM_KoopaBros_Red_Anim03, - .chase = ANIM_KoopaBros_Red_Anim03, - .anim_4 = ANIM_KoopaBros_Red_Anim04, - .anim_5 = ANIM_KoopaBros_Red_Anim04, - .death = ANIM_KoopaBros_Red_Anim0A, - .hit = ANIM_KoopaBros_Red_Anim0A, - .anim_8 = ANIM_KoopaBros_Red_Anim03, - .anim_9 = ANIM_KoopaBros_Red_Anim03, - .anim_A = ANIM_KoopaBros_Red_Anim03, - .anim_B = ANIM_KoopaBros_Red_Anim03, - .anim_C = ANIM_KoopaBros_Red_Anim03, - .anim_D = ANIM_KoopaBros_Red_Anim03, - .anim_E = ANIM_KoopaBros_Red_Anim03, - .anim_F = ANIM_KoopaBros_Red_Anim03, + .idle = ANIM_KoopaBros_Red_Idle, + .walk = ANIM_KoopaBros_Red_Walk, + .run = ANIM_KoopaBros_Red_Run, + .chase = ANIM_KoopaBros_Red_Run, + .anim_4 = ANIM_KoopaBros_Red_Idle, + .anim_5 = ANIM_KoopaBros_Red_Idle, + .death = ANIM_KoopaBros_Red_HurtStill, + .hit = ANIM_KoopaBros_Red_HurtStill, + .anim_8 = ANIM_KoopaBros_Red_Run, + .anim_9 = ANIM_KoopaBros_Red_Run, + .anim_A = ANIM_KoopaBros_Red_Run, + .anim_B = ANIM_KoopaBros_Red_Run, + .anim_C = ANIM_KoopaBros_Red_Run, + .anim_D = ANIM_KoopaBros_Red_Run, + .anim_E = ANIM_KoopaBros_Red_Run, + .anim_F = ANIM_KoopaBros_Red_Run, }, }, { @@ -396,22 +396,22 @@ NpcData N(NpcData_KoopaBros_01)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Yellow_Anim04, - .walk = ANIM_KoopaBros_Yellow_Anim02, - .run = ANIM_KoopaBros_Yellow_Anim03, - .chase = ANIM_KoopaBros_Yellow_Anim03, - .anim_4 = ANIM_KoopaBros_Yellow_Anim04, - .anim_5 = ANIM_KoopaBros_Yellow_Anim04, - .death = ANIM_KoopaBros_Yellow_Anim0A, - .hit = ANIM_KoopaBros_Yellow_Anim0A, - .anim_8 = ANIM_KoopaBros_Yellow_Anim03, - .anim_9 = ANIM_KoopaBros_Yellow_Anim03, - .anim_A = ANIM_KoopaBros_Yellow_Anim03, - .anim_B = ANIM_KoopaBros_Yellow_Anim03, - .anim_C = ANIM_KoopaBros_Yellow_Anim03, - .anim_D = ANIM_KoopaBros_Yellow_Anim03, - .anim_E = ANIM_KoopaBros_Yellow_Anim03, - .anim_F = ANIM_KoopaBros_Yellow_Anim03, + .idle = ANIM_KoopaBros_Yellow_Idle, + .walk = ANIM_KoopaBros_Yellow_Walk, + .run = ANIM_KoopaBros_Yellow_Run, + .chase = ANIM_KoopaBros_Yellow_Run, + .anim_4 = ANIM_KoopaBros_Yellow_Idle, + .anim_5 = ANIM_KoopaBros_Yellow_Idle, + .death = ANIM_KoopaBros_Yellow_HurtStill, + .hit = ANIM_KoopaBros_Yellow_HurtStill, + .anim_8 = ANIM_KoopaBros_Yellow_Run, + .anim_9 = ANIM_KoopaBros_Yellow_Run, + .anim_A = ANIM_KoopaBros_Yellow_Run, + .anim_B = ANIM_KoopaBros_Yellow_Run, + .anim_C = ANIM_KoopaBros_Yellow_Run, + .anim_D = ANIM_KoopaBros_Yellow_Run, + .anim_E = ANIM_KoopaBros_Yellow_Run, + .anim_F = ANIM_KoopaBros_Yellow_Run, }, }, { @@ -422,22 +422,22 @@ NpcData N(NpcData_KoopaBros_01)[] = { .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { - .idle = ANIM_KoopaBros_Green_Anim04, - .walk = ANIM_KoopaBros_Green_Anim02, - .run = ANIM_KoopaBros_Green_Anim03, - .chase = ANIM_KoopaBros_Green_Anim03, - .anim_4 = ANIM_KoopaBros_Green_Anim04, - .anim_5 = ANIM_KoopaBros_Green_Anim04, - .death = ANIM_KoopaBros_Green_Anim0A, - .hit = ANIM_KoopaBros_Green_Anim0A, - .anim_8 = ANIM_KoopaBros_Green_Anim03, - .anim_9 = ANIM_KoopaBros_Green_Anim03, - .anim_A = ANIM_KoopaBros_Green_Anim03, - .anim_B = ANIM_KoopaBros_Green_Anim03, - .anim_C = ANIM_KoopaBros_Green_Anim03, - .anim_D = ANIM_KoopaBros_Green_Anim03, - .anim_E = ANIM_KoopaBros_Green_Anim03, - .anim_F = ANIM_KoopaBros_Green_Anim03, + .idle = ANIM_KoopaBros_Green_Idle, + .walk = ANIM_KoopaBros_Green_Walk, + .run = ANIM_KoopaBros_Green_Run, + .chase = ANIM_KoopaBros_Green_Run, + .anim_4 = ANIM_KoopaBros_Green_Idle, + .anim_5 = ANIM_KoopaBros_Green_Idle, + .death = ANIM_KoopaBros_Green_HurtStill, + .hit = ANIM_KoopaBros_Green_HurtStill, + .anim_8 = ANIM_KoopaBros_Green_Run, + .anim_9 = ANIM_KoopaBros_Green_Run, + .anim_A = ANIM_KoopaBros_Green_Run, + .anim_B = ANIM_KoopaBros_Green_Run, + .anim_C = ANIM_KoopaBros_Green_Run, + .anim_D = ANIM_KoopaBros_Green_Run, + .anim_E = ANIM_KoopaBros_Green_Run, + .anim_F = ANIM_KoopaBros_Green_Run, }, }, }; diff --git a/src/world/common/enemy/Bobomb.h b/src/world/common/enemy/Bobomb.h index de3cfff4eb..3bc9e29f03 100644 --- a/src/world/common/enemy/Bobomb.h +++ b/src/world/common/enemy/Bobomb.h @@ -17,20 +17,20 @@ #define BOBOMB_ANIMS \ { \ - .idle = ANIM_Bobomb_Anim02, \ - .walk = ANIM_Bobomb_Anim04, \ - .run = ANIM_Bobomb_Anim06, \ - .chase = ANIM_Bobomb_Anim06, \ - .anim_4 = ANIM_Bobomb_Anim02, \ - .anim_5 = ANIM_Bobomb_Anim02, \ - .death = ANIM_Bobomb_Anim0E, \ - .hit = ANIM_Bobomb_Anim0E, \ - .anim_8 = ANIM_Bobomb_Anim06, \ - .anim_9 = ANIM_Bobomb_Anim06, \ - .anim_A = ANIM_Bobomb_Anim06, \ - .anim_B = ANIM_Bobomb_Anim06, \ - .anim_C = ANIM_Bobomb_Anim06, \ - .anim_D = ANIM_Bobomb_Anim06, \ - .anim_E = ANIM_Bobomb_Anim06, \ - .anim_F = ANIM_Bobomb_Anim06, \ + .idle = ANIM_Bobomb_Idle, \ + .walk = ANIM_Bobomb_Walk, \ + .run = ANIM_Bobomb_Run, \ + .chase = ANIM_Bobomb_Run, \ + .anim_4 = ANIM_Bobomb_Idle, \ + .anim_5 = ANIM_Bobomb_Idle, \ + .death = ANIM_Bobomb_Hurt, \ + .hit = ANIM_Bobomb_Hurt, \ + .anim_8 = ANIM_Bobomb_Run, \ + .anim_9 = ANIM_Bobomb_Run, \ + .anim_A = ANIM_Bobomb_Run, \ + .anim_B = ANIM_Bobomb_Run, \ + .anim_C = ANIM_Bobomb_Run, \ + .anim_D = ANIM_Bobomb_Run, \ + .anim_E = ANIM_Bobomb_Run, \ + .anim_F = ANIM_Bobomb_Run, \ } diff --git a/src/world/common/enemy/BombshellBill.h b/src/world/common/enemy/BombshellBill.h index 349cf4026f..16af29c938 100644 --- a/src/world/common/enemy/BombshellBill.h +++ b/src/world/common/enemy/BombshellBill.h @@ -12,22 +12,22 @@ #define BOMBSHELL_BLASTER_ANIMS \ { \ - .idle = ANIM_BillBlaster_Gold_Anim01, \ - .walk = ANIM_BillBlaster_Gold_Anim01, \ - .run = ANIM_BillBlaster_Gold_Anim01, \ - .chase = ANIM_BillBlaster_Gold_Anim01, \ - .anim_4 = ANIM_BillBlaster_Gold_Anim01, \ - .anim_5 = ANIM_BillBlaster_Gold_Anim01, \ - .death = ANIM_BillBlaster_Gold_Anim03, \ - .hit = ANIM_BillBlaster_Gold_Anim03, \ - .anim_8 = ANIM_BillBlaster_Gold_Anim02, \ - .anim_9 = ANIM_BillBlaster_Gold_Anim01, \ - .anim_A = ANIM_BillBlaster_Gold_Anim01, \ - .anim_B = ANIM_BillBlaster_Gold_Anim01, \ - .anim_C = ANIM_BillBlaster_Gold_Anim01, \ - .anim_D = ANIM_BillBlaster_Gold_Anim01, \ - .anim_E = ANIM_BillBlaster_Gold_Anim01, \ - .anim_F = ANIM_BillBlaster_Gold_Anim01, \ + .idle = ANIM_BillBlaster_Gold_Idle, \ + .walk = ANIM_BillBlaster_Gold_Idle, \ + .run = ANIM_BillBlaster_Gold_Idle, \ + .chase = ANIM_BillBlaster_Gold_Idle, \ + .anim_4 = ANIM_BillBlaster_Gold_Idle, \ + .anim_5 = ANIM_BillBlaster_Gold_Idle, \ + .death = ANIM_BillBlaster_Gold_Hurt, \ + .hit = ANIM_BillBlaster_Gold_Hurt, \ + .anim_8 = ANIM_BillBlaster_Gold_Fire, \ + .anim_9 = ANIM_BillBlaster_Gold_Idle, \ + .anim_A = ANIM_BillBlaster_Gold_Idle, \ + .anim_B = ANIM_BillBlaster_Gold_Idle, \ + .anim_C = ANIM_BillBlaster_Gold_Idle, \ + .anim_D = ANIM_BillBlaster_Gold_Idle, \ + .anim_E = ANIM_BillBlaster_Gold_Idle, \ + .anim_F = ANIM_BillBlaster_Gold_Idle, \ } #define BOMBSHELL_BILL_DROPS \ @@ -45,22 +45,22 @@ #define BOMBSHELL_BILL_ANIMS \ { \ - .idle = ANIM_BulletBill_Gold_Anim00, \ - .walk = ANIM_BulletBill_Gold_Anim02, \ - .run = ANIM_BulletBill_Gold_Anim03, \ - .chase = ANIM_BulletBill_Gold_Anim03, \ - .anim_4 = ANIM_BulletBill_Gold_Anim00, \ - .anim_5 = ANIM_BulletBill_Gold_Anim04, \ - .death = ANIM_BulletBill_Gold_Anim05, \ - .hit = ANIM_BulletBill_Gold_Anim05, \ - .anim_8 = ANIM_BulletBill_Gold_Anim00, \ - .anim_9 = ANIM_BulletBill_Gold_Anim00, \ - .anim_A = ANIM_BulletBill_Gold_Anim00, \ - .anim_B = ANIM_BulletBill_Gold_Anim00, \ - .anim_C = ANIM_BulletBill_Gold_Anim00, \ - .anim_D = ANIM_BulletBill_Gold_Anim00, \ - .anim_E = ANIM_BulletBill_Gold_Anim00, \ - .anim_F = ANIM_BulletBill_Gold_Anim00, \ + .idle = ANIM_BulletBill_Gold_Still, \ + .walk = ANIM_BulletBill_Gold_TenseCopy, \ + .run = ANIM_BulletBill_Gold_Tense, \ + .chase = ANIM_BulletBill_Gold_Tense, \ + .anim_4 = ANIM_BulletBill_Gold_Still, \ + .anim_5 = ANIM_BulletBill_Gold_Fire, \ + .death = ANIM_BulletBill_Gold_Hurt, \ + .hit = ANIM_BulletBill_Gold_Hurt, \ + .anim_8 = ANIM_BulletBill_Gold_Still, \ + .anim_9 = ANIM_BulletBill_Gold_Still, \ + .anim_A = ANIM_BulletBill_Gold_Still, \ + .anim_B = ANIM_BulletBill_Gold_Still, \ + .anim_C = ANIM_BulletBill_Gold_Still, \ + .anim_D = ANIM_BulletBill_Gold_Still, \ + .anim_E = ANIM_BulletBill_Gold_Still, \ + .anim_F = ANIM_BulletBill_Gold_Still, \ } #define BOMBSHELL_BILL_NPC(npcID) \ diff --git a/src/world/common/enemy/BulletBill.h b/src/world/common/enemy/BulletBill.h index 1c8474e84d..d0fdd7b569 100644 --- a/src/world/common/enemy/BulletBill.h +++ b/src/world/common/enemy/BulletBill.h @@ -12,22 +12,22 @@ #define BILL_BLASTER_ANIMS \ { \ - .idle = ANIM_BillBlaster_Anim01, \ - .walk = ANIM_BillBlaster_Anim01, \ - .run = ANIM_BillBlaster_Anim01, \ - .chase = ANIM_BillBlaster_Anim01, \ - .anim_4 = ANIM_BillBlaster_Anim01, \ - .anim_5 = ANIM_BillBlaster_Anim01, \ - .death = ANIM_BillBlaster_Anim03, \ - .hit = ANIM_BillBlaster_Anim03, \ - .anim_8 = ANIM_BillBlaster_Anim01, \ - .anim_9 = ANIM_BillBlaster_Anim01, \ - .anim_A = ANIM_BillBlaster_Anim01, \ - .anim_B = ANIM_BillBlaster_Anim01, \ - .anim_C = ANIM_BillBlaster_Anim01, \ - .anim_D = ANIM_BillBlaster_Anim01, \ - .anim_E = ANIM_BillBlaster_Anim01, \ - .anim_F = ANIM_BillBlaster_Anim01, \ + .idle = ANIM_BillBlaster_Idle, \ + .walk = ANIM_BillBlaster_Idle, \ + .run = ANIM_BillBlaster_Idle, \ + .chase = ANIM_BillBlaster_Idle, \ + .anim_4 = ANIM_BillBlaster_Idle, \ + .anim_5 = ANIM_BillBlaster_Idle, \ + .death = ANIM_BillBlaster_Hurt, \ + .hit = ANIM_BillBlaster_Hurt, \ + .anim_8 = ANIM_BillBlaster_Idle, \ + .anim_9 = ANIM_BillBlaster_Idle, \ + .anim_A = ANIM_BillBlaster_Idle, \ + .anim_B = ANIM_BillBlaster_Idle, \ + .anim_C = ANIM_BillBlaster_Idle, \ + .anim_D = ANIM_BillBlaster_Idle, \ + .anim_E = ANIM_BillBlaster_Idle, \ + .anim_F = ANIM_BillBlaster_Idle, \ } #define BULLET_BILL_DROPS \ @@ -43,22 +43,22 @@ #define BULLET_BILL_ANIMS \ { \ - .idle = ANIM_BulletBill_Anim01, \ - .walk = ANIM_BulletBill_Anim02, \ - .run = ANIM_BulletBill_Anim03, \ - .chase = ANIM_BulletBill_Anim03, \ - .anim_4 = ANIM_BulletBill_Anim01, \ - .anim_5 = ANIM_BulletBill_Anim04, \ - .death = ANIM_BulletBill_Anim05, \ - .hit = ANIM_BulletBill_Anim05, \ - .anim_8 = ANIM_BulletBill_Anim01, \ - .anim_9 = ANIM_BulletBill_Anim01, \ - .anim_A = ANIM_BulletBill_Anim01, \ - .anim_B = ANIM_BulletBill_Anim01, \ - .anim_C = ANIM_BulletBill_Anim01, \ - .anim_D = ANIM_BulletBill_Anim01, \ - .anim_E = ANIM_BulletBill_Anim01, \ - .anim_F = ANIM_BulletBill_Anim01, \ + .idle = ANIM_BulletBill_Idle, \ + .walk = ANIM_BulletBill_TenseCopy, \ + .run = ANIM_BulletBill_Tense, \ + .chase = ANIM_BulletBill_Tense, \ + .anim_4 = ANIM_BulletBill_Idle, \ + .anim_5 = ANIM_BulletBill_Fire, \ + .death = ANIM_BulletBill_Hurt, \ + .hit = ANIM_BulletBill_Hurt, \ + .anim_8 = ANIM_BulletBill_Idle, \ + .anim_9 = ANIM_BulletBill_Idle, \ + .anim_A = ANIM_BulletBill_Idle, \ + .anim_B = ANIM_BulletBill_Idle, \ + .anim_C = ANIM_BulletBill_Idle, \ + .anim_D = ANIM_BulletBill_Idle, \ + .anim_E = ANIM_BulletBill_Idle, \ + .anim_F = ANIM_BulletBill_Idle, \ } #define BULLET_BILL_NPC(npcID) \ diff --git a/src/world/common/npc/KoopaBros.h b/src/world/common/npc/KoopaBros.h index d1911f1828..3c8f52635e 100644 --- a/src/world/common/npc/KoopaBros.h +++ b/src/world/common/npc/KoopaBros.h @@ -3,80 +3,80 @@ #define BLACK_KOOPA_BROS_ANIMS \ { \ - .idle = ANIM_KoopaBros_Black_Anim04, \ - .walk = ANIM_KoopaBros_Black_Anim02, \ - .run = ANIM_KoopaBros_Black_Anim03, \ - .chase = ANIM_KoopaBros_Black_Anim03, \ - .anim_4 = ANIM_KoopaBros_Black_Anim04, \ - .anim_5 = ANIM_KoopaBros_Black_Anim04, \ - .death = ANIM_KoopaBros_Black_Anim0A, \ - .hit = ANIM_KoopaBros_Black_Anim0A, \ - .anim_8 = ANIM_KoopaBros_Black_Anim03, \ - .anim_9 = ANIM_KoopaBros_Black_Anim03, \ - .anim_A = ANIM_KoopaBros_Black_Anim03, \ - .anim_B = ANIM_KoopaBros_Black_Anim03, \ - .anim_C = ANIM_KoopaBros_Black_Anim03, \ - .anim_D = ANIM_KoopaBros_Black_Anim03, \ - .anim_E = ANIM_KoopaBros_Black_Anim03, \ - .anim_F = ANIM_KoopaBros_Black_Anim03, \ + .idle = ANIM_KoopaBros_Black_Idle, \ + .walk = ANIM_KoopaBros_Black_Walk, \ + .run = ANIM_KoopaBros_Black_Run, \ + .chase = ANIM_KoopaBros_Black_Run, \ + .anim_4 = ANIM_KoopaBros_Black_Idle, \ + .anim_5 = ANIM_KoopaBros_Black_Idle, \ + .death = ANIM_KoopaBros_Black_HurtStill, \ + .hit = ANIM_KoopaBros_Black_HurtStill, \ + .anim_8 = ANIM_KoopaBros_Black_Run, \ + .anim_9 = ANIM_KoopaBros_Black_Run, \ + .anim_A = ANIM_KoopaBros_Black_Run, \ + .anim_B = ANIM_KoopaBros_Black_Run, \ + .anim_C = ANIM_KoopaBros_Black_Run, \ + .anim_D = ANIM_KoopaBros_Black_Run, \ + .anim_E = ANIM_KoopaBros_Black_Run, \ + .anim_F = ANIM_KoopaBros_Black_Run, \ } #define RED_KOOPA_BROS_ANIMS \ { \ - .idle = ANIM_KoopaBros_Red_Anim04, \ - .walk = ANIM_KoopaBros_Red_Anim02, \ - .run = ANIM_KoopaBros_Red_Anim03, \ - .chase = ANIM_KoopaBros_Red_Anim03, \ - .anim_4 = ANIM_KoopaBros_Red_Anim04, \ - .anim_5 = ANIM_KoopaBros_Red_Anim04, \ - .death = ANIM_KoopaBros_Red_Anim0A, \ - .hit = ANIM_KoopaBros_Red_Anim0A, \ - .anim_8 = ANIM_KoopaBros_Red_Anim03, \ - .anim_9 = ANIM_KoopaBros_Red_Anim03, \ - .anim_A = ANIM_KoopaBros_Red_Anim03, \ - .anim_B = ANIM_KoopaBros_Red_Anim03, \ - .anim_C = ANIM_KoopaBros_Red_Anim03, \ - .anim_D = ANIM_KoopaBros_Red_Anim03, \ - .anim_E = ANIM_KoopaBros_Red_Anim03, \ - .anim_F = ANIM_KoopaBros_Red_Anim03, \ + .idle = ANIM_KoopaBros_Red_Idle, \ + .walk = ANIM_KoopaBros_Red_Walk, \ + .run = ANIM_KoopaBros_Red_Run, \ + .chase = ANIM_KoopaBros_Red_Run, \ + .anim_4 = ANIM_KoopaBros_Red_Idle, \ + .anim_5 = ANIM_KoopaBros_Red_Idle, \ + .death = ANIM_KoopaBros_Red_HurtStill, \ + .hit = ANIM_KoopaBros_Red_HurtStill, \ + .anim_8 = ANIM_KoopaBros_Red_Run, \ + .anim_9 = ANIM_KoopaBros_Red_Run, \ + .anim_A = ANIM_KoopaBros_Red_Run, \ + .anim_B = ANIM_KoopaBros_Red_Run, \ + .anim_C = ANIM_KoopaBros_Red_Run, \ + .anim_D = ANIM_KoopaBros_Red_Run, \ + .anim_E = ANIM_KoopaBros_Red_Run, \ + .anim_F = ANIM_KoopaBros_Red_Run, \ } #define YELLOW_KOOPA_BROS_ANIMS \ { \ - .idle = ANIM_KoopaBros_Yellow_Anim04, \ - .walk = ANIM_KoopaBros_Yellow_Anim02, \ - .run = ANIM_KoopaBros_Yellow_Anim03, \ - .chase = ANIM_KoopaBros_Yellow_Anim03, \ - .anim_4 = ANIM_KoopaBros_Yellow_Anim04, \ - .anim_5 = ANIM_KoopaBros_Yellow_Anim04, \ - .death = ANIM_KoopaBros_Yellow_Anim0A, \ - .hit = ANIM_KoopaBros_Yellow_Anim0A, \ - .anim_8 = ANIM_KoopaBros_Yellow_Anim03, \ - .anim_9 = ANIM_KoopaBros_Yellow_Anim03, \ - .anim_A = ANIM_KoopaBros_Yellow_Anim03, \ - .anim_B = ANIM_KoopaBros_Yellow_Anim03, \ - .anim_C = ANIM_KoopaBros_Yellow_Anim03, \ - .anim_D = ANIM_KoopaBros_Yellow_Anim03, \ - .anim_E = ANIM_KoopaBros_Yellow_Anim03, \ - .anim_F = ANIM_KoopaBros_Yellow_Anim03, \ + .idle = ANIM_KoopaBros_Yellow_Idle, \ + .walk = ANIM_KoopaBros_Yellow_Walk, \ + .run = ANIM_KoopaBros_Yellow_Run, \ + .chase = ANIM_KoopaBros_Yellow_Run, \ + .anim_4 = ANIM_KoopaBros_Yellow_Idle, \ + .anim_5 = ANIM_KoopaBros_Yellow_Idle, \ + .death = ANIM_KoopaBros_Yellow_HurtStill, \ + .hit = ANIM_KoopaBros_Yellow_HurtStill, \ + .anim_8 = ANIM_KoopaBros_Yellow_Run, \ + .anim_9 = ANIM_KoopaBros_Yellow_Run, \ + .anim_A = ANIM_KoopaBros_Yellow_Run, \ + .anim_B = ANIM_KoopaBros_Yellow_Run, \ + .anim_C = ANIM_KoopaBros_Yellow_Run, \ + .anim_D = ANIM_KoopaBros_Yellow_Run, \ + .anim_E = ANIM_KoopaBros_Yellow_Run, \ + .anim_F = ANIM_KoopaBros_Yellow_Run, \ } #define GREEN_KOOPA_BROS_ANIMS \ { \ - .idle = ANIM_KoopaBros_Green_Anim04, \ - .walk = ANIM_KoopaBros_Green_Anim02, \ - .run = ANIM_KoopaBros_Green_Anim03, \ - .chase = ANIM_KoopaBros_Green_Anim03, \ - .anim_4 = ANIM_KoopaBros_Green_Anim04, \ - .anim_5 = ANIM_KoopaBros_Green_Anim04, \ - .death = ANIM_KoopaBros_Green_Anim0A, \ - .hit = ANIM_KoopaBros_Green_Anim0A, \ - .anim_8 = ANIM_KoopaBros_Green_Anim03, \ - .anim_9 = ANIM_KoopaBros_Green_Anim03, \ - .anim_A = ANIM_KoopaBros_Green_Anim03, \ - .anim_B = ANIM_KoopaBros_Green_Anim03, \ - .anim_C = ANIM_KoopaBros_Green_Anim03, \ - .anim_D = ANIM_KoopaBros_Green_Anim03, \ - .anim_E = ANIM_KoopaBros_Green_Anim03, \ - .anim_F = ANIM_KoopaBros_Green_Anim03, \ + .idle = ANIM_KoopaBros_Green_Idle, \ + .walk = ANIM_KoopaBros_Green_Walk, \ + .run = ANIM_KoopaBros_Green_Run, \ + .chase = ANIM_KoopaBros_Green_Run, \ + .anim_4 = ANIM_KoopaBros_Green_Idle, \ + .anim_5 = ANIM_KoopaBros_Green_Idle, \ + .death = ANIM_KoopaBros_Green_HurtStill, \ + .hit = ANIM_KoopaBros_Green_HurtStill, \ + .anim_8 = ANIM_KoopaBros_Green_Run, \ + .anim_9 = ANIM_KoopaBros_Green_Run, \ + .anim_A = ANIM_KoopaBros_Green_Run, \ + .anim_B = ANIM_KoopaBros_Green_Run, \ + .anim_C = ANIM_KoopaBros_Green_Run, \ + .anim_D = ANIM_KoopaBros_Green_Run, \ + .anim_E = ANIM_KoopaBros_Green_Run, \ + .anim_F = ANIM_KoopaBros_Green_Run, \ } diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index b49c5ec0eb..fc50594914 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -33,8 +33,8 @@ extern Addr D_8020A000; #include "./kzn_19_anim2.c" #include "./kzn_19_anim3.c" -unsigned char N(lava_piranha_vine_img)[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x22, 0x22, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x12, 0x22, 0x22, 0x22, 0x11, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x22, 0x22, 0x22, 0x22, 0x21, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x11, 0x22, 0x22, 0x22, 0x22, 0x21, 0x13, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x12, 0x22, 0x22, 0x22, 0x22, 0x21, 0x13, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x12, 0x22, 0x22, 0x22, 0x22, 0x21, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x11, 0x22, 0x22, 0x22, 0x22, 0x11, 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x22, 0x22, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x22, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -unsigned short N(lava_piranha_vine_pal)[] = { 0x0140, 0x41C1, 0xE739, 0x0241, 0x044F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, }; +unsigned char N(lava_piranha_vine_img)[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x22, 0x22, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x12, 0x22, 0x22, 0x22, 0x11, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x22, 0x22, 0x22, 0x22, 0x21, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x11, 0x22, 0x22, 0x22, 0x22, 0x21, 0x13, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x12, 0x22, 0x22, 0x22, 0x22, 0x21, 0x13, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x12, 0x22, 0x22, 0x22, 0x22, 0x21, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x11, 0x22, 0x22, 0x22, 0x22, 0x11, 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x22, 0x22, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x22, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +unsigned short N(lava_piranha_vine_pal)[] = { 0x0140, 0x41C1, 0xE739, 0x0241, 0x044F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; //#include "world/area_kzn/kzn_19/lava_piranha_vine.png.inc.c" //#include "world/area_kzn/kzn_19/lava_piranha_vine.pal.inc.c" diff --git a/tools/splat_ext/npc.yaml b/tools/splat_ext/npc.yaml index dfe87d21e8..b8a873fd3e 100644 --- a/tools/splat_ext/npc.yaml +++ b/tools/splat_ext/npc.yaml @@ -226,8 +226,8 @@ WorldBombette: - Burnt animations: - Still - - HappyStill - - LitStill + - StillHappy + - StillLit - Idle - HappyIdle - Walk @@ -2406,56 +2406,56 @@ Bobomb: - Variant02 - Variant03 frames: - - Raster00 - - Raster01 - - Raster02 - - Raster03 - - Raster04 - - Raster05 - - Raster06 - - Raster07 - - Raster08 - - Raster09 - - Raster0A - - Raster0B - - Raster0C - - Raster0D - - Raster0E - - Raster0F - - Raster10 - - Raster11 - - Raster12 - - Raster13 - - Raster14 - - Raster15 - - Raster16 - - Raster17 - - Raster18 - - Raster19 - - Raster1A - - Raster1B - - Raster1C - - Raster1D - - Raster1E - - Raster1F - - Raster20 - - Raster21 - - Raster22 - - Raster23 - - Raster24 - - Raster25 - - Raster26 - - Raster27 - - Raster28 - - Raster29 - - Raster2A - - Raster2B - - Raster2C - - Raster2D - - Raster2E - - Raster2F - - Raster30 - - Raster31 + - Step1 + - Step2 + - Step3 + - Idle + - FaceFwd + - WaveFwd + - Blink + - Hurt1 + - Hurt2 + - BurnHurt1 + - BurnHurt2 + - Neutral + - BurnStill + - Sleep1 + - Sleep2 + - Wake1 + - Wake2 + - Boom + - Gear1 + - Gear2 + - Gear3 + - Gear4 + - Gear5 + - Gear6 + - Fuse1 + - Fuse2 + - Fuse3 + - BubbleSleep1 + - BubbleSleep2 + - BubblePop1 + - BubblePop2 + - KO + - Dizzy1 + - Dizzy2 + - Dizzy3 + - Dizzy4 + - Dizzy5 + - Dizzy6 + - Cower + - BurnedGear1 + - BurnedGear2 + - BurnedGear3 + - BurnedGear4 + - BurnedGear5 + - BurnedGear6 + - StepLit1 + - StepLit2 + - StepLit3 + - Buildup + - CowerLit palettes: - Default - Red @@ -2475,53 +2475,53 @@ Bobomb: - Fuse_Shocked - Burnt animations: - - Anim00 - - Anim01 - - Anim02 - - Anim03 - - Anim04 - - Anim05 - - Anim06 - - Anim07 - - Anim08 - - Anim09 - - Anim0A - - Anim0B - - Anim0C - - Anim0D - - Anim0E - - Anim0F - - Anim10 - - Anim11 - - Anim12 - - Anim13 - - Anim14 - - Anim15 - - Anim16 - - Anim17 - - Anim18 - - Anim19 - - Anim1A - - Anim1B - - Anim1C - - Anim1D + - Still + - StillLit + - Idle + - IdleLit + - Walk + - WalkLit + - Run + - RunLit + - Cower + - Panic + - KO + - AngryIdle + - AngryChase + - AngryKO + - Hurt + - HurtLit + - BurnHurt + - BurnStill + - BurnHurtLit + - BurnStillLit + - Buildup + - Boom + - FaceFwd + - WaveFwd + - Sleep + - Wake + - SleepLit + - WakeLit + - Dizzy + - DizzyLit BulletBill: variations: - - Variant00 - - Variant01 + - Black + - Gold frames: - - Raster00 - - Raster01 - - Raster02 - - Raster03 - - Raster04 - - Raster05 - - Raster06 - - Raster07 - - Raster08 - - Raster09 - - Raster0A - - Raster0B + - Neutral + - Tense + - Windup1 + - Windup2 + - Windup3 + - Launch1 + - Launch2 + - Launch3 + - Launch4 + - Hurt + - Burned + - BurnedPuffy palettes: - Default - Gold @@ -2533,29 +2533,29 @@ BulletBill: - Gold_Shocked - Burnt animations: - - Anim00 - - Anim01 - - Anim02 - - Anim03 - - Anim04 - - Anim05 - - Anim06 - - Anim07 + - Still + - Idle + - TenseCopy + - Tense + - Fire + - Hurt + - Recover + - BurnHurt BillBlaster: variations: - - Variant00 - - Variant01 + - Black + - Gold frames: - - Raster00 - - Raster01 - - Raster02 - - Raster03 - - Raster04 - - Raster05 - - Raster06 - - Raster07 - - Raster08 - - Raster09 + - Barrel + - BaseFront + - BaseBack + - BarrelFire1 + - BarrelFire2 + - BarrelFire3 + - BarrelFire4 + - BurnedBarrel + - BurnedBaseFront + - BurnedBaseBack palettes: - Default - Gold @@ -2568,14 +2568,14 @@ BillBlaster: - Burnt - Gold_Burnt animations: - - Anim00 - - Anim01 - - Anim02 - - Anim03 - - Anim04 - - Anim05 - - Anim06 - - Anim07 + - Still + - Idle + - Fire + - Hurt + - Collapse + - Burned + - Buildup + - Release MontyMole: variations: - Variant00 @@ -6051,55 +6051,55 @@ KoopaBros: - Variant02 - Variant03 frames: - - Raster00 - - Raster01 - - Raster02 - - Raster03 - - Raster04 - - Raster05 - - Raster06 - - Raster07 - - Raster08 - - Raster09 - - Raster0A - - Raster0B - - Raster0C - - Raster0D - - Raster0E - - Raster0F - - Raster10 - - Raster11 - - Raster12 - - Raster13 - - Raster14 - - Raster15 - - Raster16 - - Raster17 - - Raster18 - - Raster19 - - Raster1A - - Raster1B - - Raster1C - - Raster1D - - Raster1E - - Raster1F - - Raster20 - - Raster21 - - Raster22 - - Raster23 - - Raster24 - - Raster25 - - Raster26 - - Raster27 - - Raster28 - - Raster29 - - Raster2A - - Raster2B - - Raster2C - - Raster2D - - Raster2E - - Raster2F - - Raster30 + - Neutral + - Idle1 + - Idle2 + - CrouchNeutral + - CrouchIdle1 + - CrouchIdle2 + - Step1 + - Step2 + - Step3 + - ShellNeutral + - ShellSpin1 + - ShellSpin2 + - ShellSpin3 + - ShellSpin4 + - ShellSpin5 + - Shock1 + - Shock2 + - Hurt1 + - Hurt2 + - IdleToppled1 + - IdleToppled2 + - Talk1 + - Talk2 + - Talk3 + - Leap1 + - Leap2 + - Leap3 + - Leap4 + - Land + - IdleTipping1 + - IdleTipping2 + - IdleTipping3 + - ExitShell1 + - ExitShell2 + - ExitShell3 + - LayingDown + - Tipping1 + - Tipping2 + - Tipping3 + - BurnHurt1 + - BurnHurt2 + - PointForward1 + - PointForward2 + - ThumbsUp1 + - ThumbsUp2 + - ThumbsUp3 + - Hammer1 + - Hammer2 + - Blink palettes: - Black - Red @@ -6119,41 +6119,41 @@ KoopaBros: - Green_Shocked - Burnt animations: - - Anim00 - - Anim01 - - Anim02 - - Anim03 - - Anim04 - - Anim05 - - Anim06 - - Anim07 - - Anim08 - - Anim09 - - Anim0A - - Anim0B - - Anim0C - - Anim0D - - Anim0E - - Anim0F - - Anim10 - - Anim11 - - Anim12 - - Anim13 - - Anim14 - - Anim15 - - Anim16 - - Anim17 - - Anim18 - - Anim19 - - Anim1A - - Anim1B - - Anim1C - - Anim1D - - Anim1E - - Anim1F - - Anim20 - - Anim21 - - Anim22 + - Still + - StillCrouch + - Walk + - Run + - Idle + - IdleCrouch + - ShellStill + - ShellSpin + - TopEnterShell + - TopExitShell + - HurtStill + - Hurt + - IdleToppled + - IdleTipping + - BurnHurt + - BurnStill + - Leap + - Midair + - Land + - UnusedShell + - Talk + - Sleep + - UnusedIdleCrouch1 + - StillToppled + - Dizzy + - UnusedIdleCrouch2 + - ThumbsUp + - PointForward + - Launched + - Hammering + - Shock + - EnterShell + - ExitShell + - UnusedToppled + - DizzyToppled Buzzar: frames: - Raster00 diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml index b0d736ed7f..71a2ba6e65 100644 --- a/ver/pal/splat.yaml +++ b/ver/pal/splat.yaml @@ -4820,10 +4820,10 @@ segments: subsegments: - [0x503F40, c, area] - [0x503F40, c, actor/fake_bowser] - - [0x504320, c, actor/green_ninja_koopa] - - [0x504AE0, c, actor/red_ninja_koopa] - - [0x5052A0, c, actor/blue_ninja_koopa] - - [0x505A60, c, actor/yellow_ninja_koopa] + - [0x504320, c, actor/koopa_bros_green] + - [0x504AE0, c, actor/koopa_bros_red] + - [0x5052A0, c, actor/koopa_bros_black] + - [0x505A60, c, actor/koopa_bros_yellow] - [0x506220, c, stage/trd_00] - [0x506220, c, stage/trd_01] - [0x506220, c, stage/trd_02] diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index 4a684b5390..18310c26b5 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -705,7 +705,7 @@ GetOwnerID = 0x8026E1F0; SetOwnerID = 0x8026E218; ActorExists = 0x8026E24C; func_8026DF88 = 0x8026E378; -SetBattleMenuDisableFlags = 0x8026E410; +SetBattleMenuEnabledFlags = 0x8026E410; SetEnabledStarPowers = 0x8026E428; CheckButtonPress = 0x8026E488; CheckButtonDown = 0x8026E4F8; diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 3851b86826..1c8a1ed3ac 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -7354,10 +7354,10 @@ segments: subsegments: - [0x4B11F0, c, area] - [0x4B11F0, c, actor/fake_bowser] - - [0x4B15D0, c, actor/green_ninja_koopa] - - [0x4B1D90, c, actor/red_ninja_koopa] - - [0x4B2550, c, actor/blue_ninja_koopa] - - [0x4B2D10, c, actor/yellow_ninja_koopa] + - [0x4B15D0, c, actor/koopa_bros_green] + - [0x4B1D90, c, actor/koopa_bros_red] + - [0x4B2550, c, actor/koopa_bros_black] + - [0x4B2D10, c, actor/koopa_bros_yellow] - [0x4B34D0, c, stage/trd_00] - [0x4B34D0, c, stage/trd_01] - [0x4B34D0, c, stage/trd_02] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 1bd6aef156..81dec756da 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -7047,7 +7047,7 @@ SetOwnerID = 0x8026DE28; // type:func rom:0x19C708 ActorExists = 0x8026DE5C; // type:func rom:0x19C73C func_8026DEF0 = 0x8026DEF0; // type:func rom:0x19C7D0 func_8026DF88 = 0x8026DF88; // type:func rom:0x19C868 -SetBattleMenuDisableFlags = 0x8026E020; // type:func rom:0x19C900 +SetBattleMenuEnabledFlags = 0x8026E020; // type:func rom:0x19C900 SetEnabledStarPowers = 0x8026E038; // type:func rom:0x19C918 SetBattleInputMask = 0x8026E050; // type:func rom:0x19C930 SetBattleInputButtons = 0x8026E068; // type:func rom:0x19C948 @@ -9977,7 +9977,7 @@ b_area_mac_lee_KooperParts = 0x8022069C; // type:data rom:0x46CB2C b_area_mac_lee_kooper = 0x802206C0; // type:data rom:0x46CB50 b_area_mac_lee_init_Kooper = 0x802206E8; // type:data rom:0x46CB78 b_area_mac_lee_idle_80220790 = 0x80220790; // type:data rom:0x46CC20 -b_area_mac_lee_intTable_802208B0 = 0x802208B0; // type:data rom:0x46CD40 +b_area_mac_lee_FlipPosOffsets = 0x802208B0; // type:data rom:0x46CD40 b_area_mac_lee_handleEvent_80220908 = 0x80220908; // type:data rom:0x46CD98 b_area_mac_lee_takeTurn_80221200 = 0x80221200; // type:data rom:0x46D690 b_area_mac_lee_nextTurn_802221A0 = 0x802221A0; // type:data rom:0x46E630 @@ -10364,10 +10364,10 @@ b_area_nok_paratroopa_IdleAnimations_80220B38 = 0x80225968; // type:data rom:0x4 b_area_nok_paratroopa_80220B84 = 0x802259B4; // type:data rom:0x49AB54 b_area_nok_paratroopa_80220BE8 = 0x80225A18; // type:data rom:0x49ABB8 b_area_nok_paratroopa_idle_80220D40 = 0x80225B70; // type:data rom:0x49AD10 -b_area_nok_paratroopa_intTable_802211D0 = 0x80226000; // type:data rom:0x49B1A0 +b_area_nok_paratroopa_FlipPosOffsets = 0x80226000; // type:data rom:0x49B1A0 b_area_nok_paratroopa_handleEvent_80221228 = 0x80226058; // type:data rom:0x49B1F8 b_area_nok_paratroopa_takeTurn_80221DAC = 0x80226BDC; // type:data rom:0x49BD7C -b_area_nok_kent_c_koopa_intTable_80227910 = 0x80227910; // type:data rom:0x49CAB0 +b_area_nok_kent_c_koopa_FlipPosOffsets = 0x80227910; // type:data rom:0x49CAB0 b_area_nok_kent_c_koopa_IdleAnimations_80227968 = 0x80227968; // type:data rom:0x49CB08 b_area_nok_kent_c_koopa_IdleAnimations_802279B4 = 0x802279B4; // type:data rom:0x49CB54 b_area_nok_kent_c_koopa_IdleAnimations_802279D0 = 0x802279D0; // type:data rom:0x49CB70 @@ -10525,7 +10525,7 @@ b_area_trd_part_1_paratroopa_IdleAnimations_80220B38 = 0x80220B38; // type:data b_area_trd_part_1_paratroopa_80220B84 = 0x80220B84; // type:data rom:0x4A9C24 b_area_trd_part_1_paratroopa_80220BE8 = 0x80220BE8; // type:data rom:0x4A9C88 b_area_trd_part_1_paratroopa_idle_80220D40 = 0x80220D40; // type:data rom:0x4A9DE0 -b_area_trd_part_1_paratroopa_intTable_802211D0 = 0x802211D0; // type:data rom:0x4AA270 +b_area_trd_part_1_paratroopa_FlipPosOffsets = 0x802211D0; // type:data rom:0x4AA270 b_area_trd_part_1_paratroopa_handleEvent_80221228 = 0x80221228; // type:data rom:0x4AA2C8 b_area_trd_part_1_paratroopa_takeTurn_80221DAC = 0x80221DAC; // type:data rom:0x4AAE4C b_area_trd_part_1_trd_01_EVS_PreBattle = 0x80222AE0; // type:data rom:0x4ABB80 @@ -10603,163 +10603,163 @@ b_area_trd_part_1_trd_05f = 0x80227C9C; // type:data rom:0x4B0D3C b_area_trd_part_2_fake_bowser_StartRumbleWithParams = 0x80218000; // type:func rom:0x4B11F0 b_area_trd_part_2_fake_bowser_UnkFunc27 = 0x80218058; // type:func rom:0x4B1248 b_area_trd_part_2_fake_bowser_UnkFunc26 = 0x8021817C; // type:func rom:0x4B136C -func_80218350_4B1540 = 0x80218350; // type:func rom:0x4B1540 -func_8021837C_4B156C = 0x8021837C; // type:func rom:0x4B156C +b_area_trd_part_2_PlayKoopaBrosSong = 0x80218350; // type:func rom:0x4B1540 +b_area_trd_part_2_PlayLandOnTowerFX = 0x8021837C; // type:func rom:0x4B156C b_area_trd_part_2_green_ninja_koopa_StartRumbleWithParams = 0x802183E0; // type:func rom:0x4B15D0 -b_area_trd_part_2_green_ninja_koopa_UnkWhirlwindEffectFunc = 0x80218438; // type:func rom:0x4B1628 -b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc = 0x80218510; // type:func rom:0x4B1700 -b_area_trd_part_2_green_ninja_koopa_UnkEnemyPosFunc = 0x802185B0; // type:func rom:0x4B17A0 +b_area_trd_part_2_green_ninja_koopa_SpawnSpinEffect = 0x80218438; // type:func rom:0x4B1628 +b_area_trd_part_2_green_ninja_koopa_GetKoopaBrosWithState = 0x80218510; // type:func rom:0x4B1700 +b_area_trd_part_2_green_ninja_koopa_GetTowerFallPosition = 0x802185B0; // type:func rom:0x4B17A0 b_area_trd_part_2_green_ninja_koopa_GetLastActorEventType = 0x80218B48; // type:func rom:0x4B1D38 b_area_trd_part_2_red_ninja_koopa_StartRumbleWithParams = 0x80218BA0; // type:func rom:0x4B1D90 -b_area_trd_part_2_red_ninja_koopa_UnkWhirlwindEffectFunc = 0x80218BF8; // type:func rom:0x4B1DE8 -b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc = 0x80218CD0; // type:func rom:0x4B1EC0 -b_area_trd_part_2_red_ninja_koopa_UnkEnemyPosFunc = 0x80218D70; // type:func rom:0x4B1F60 +b_area_trd_part_2_red_ninja_koopa_SpawnSpinEffect = 0x80218BF8; // type:func rom:0x4B1DE8 +b_area_trd_part_2_red_ninja_koopa_GetKoopaBrosWithState = 0x80218CD0; // type:func rom:0x4B1EC0 +b_area_trd_part_2_red_ninja_koopa_GetTowerFallPosition = 0x80218D70; // type:func rom:0x4B1F60 b_area_trd_part_2_red_ninja_koopa_GetLastActorEventType = 0x80219308; // type:func rom:0x4B24F8 -b_area_trd_part_2_blue_ninja_koopa_StartRumbleWithParams = 0x80219360; // type:func rom:0x4B2550 -b_area_trd_part_2_blue_ninja_koopa_UnkWhirlwindEffectFunc = 0x802193B8; // type:func rom:0x4B25A8 -b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc = 0x80219490; // type:func rom:0x4B2680 -b_area_trd_part_2_blue_ninja_koopa_UnkEnemyPosFunc = 0x80219530; // type:func rom:0x4B2720 -b_area_trd_part_2_blue_ninja_koopa_GetLastActorEventType = 0x80219AC8; // type:func rom:0x4B2CB8 +b_area_trd_part_2_black_ninja_koopa_StartRumbleWithParams = 0x80219360; // type:func rom:0x4B2550 +b_area_trd_part_2_black_ninja_koopa_SpawnSpinEffect = 0x802193B8; // type:func rom:0x4B25A8 +b_area_trd_part_2_black_ninja_koopa_GetKoopaBrosWithState = 0x80219490; // type:func rom:0x4B2680 +b_area_trd_part_2_black_ninja_koopa_GetTowerFallPosition = 0x80219530; // type:func rom:0x4B2720 +b_area_trd_part_2_black_ninja_koopa_GetLastActorEventType = 0x80219AC8; // type:func rom:0x4B2CB8 b_area_trd_part_2_yellow_ninja_koopa_StartRumbleWithParams = 0x80219B20; // type:func rom:0x4B2D10 -b_area_trd_part_2_yellow_ninja_koopa_UnkWhirlwindEffectFunc = 0x80219B78; // type:func rom:0x4B2D68 -b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc = 0x80219C50; // type:func rom:0x4B2E40 -b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyPosFunc = 0x80219CF0; // type:func rom:0x4B2EE0 +b_area_trd_part_2_yellow_ninja_koopa_SpawnSpinEffect = 0x80219B78; // type:func rom:0x4B2D68 +b_area_trd_part_2_yellow_ninja_koopa_GetKoopaBrosWithState = 0x80219C50; // type:func rom:0x4B2E40 +b_area_trd_part_2_yellow_ninja_koopa_GetTowerFallPosition = 0x80219CF0; // type:func rom:0x4B2EE0 b_area_trd_part_2_yellow_ninja_koopa_GetLastActorEventType = 0x8021A288; // type:func rom:0x4B3478 b_area_trd_part_2_trd_03_InterpCloudTransform = 0x8021A2E0; // type:func rom:0x4B34D0 b_area_trd_part_2_Formation_00 = 0x8021A550; // type:data rom:0x4B3740 b_area_trd_part_2_Formations = 0x8021A5DC; // type:data rom:0x4B37CC b_area_trd_part_2_Stages = 0x8021A604; // type:data rom:0x4B37F4 -b_area_trd_part_2_fake_bowser_DefenseTable_8021A670 = 0x8021A670; // type:data rom:0x4B3860 -b_area_trd_part_2_fake_bowser_DefenseTable_8021A684 = 0x8021A684; // type:data rom:0x4B3874 -b_area_trd_part_2_fake_bowser_StatusTable_8021A690 = 0x8021A690; // type:data rom:0x4B3880 -b_area_trd_part_2_fake_bowser_IdleAnimations_8021A73C = 0x8021A73C; // type:data rom:0x4B392C +b_area_trd_part_2_fake_bowser_BowserDefense = 0x8021A670; // type:data rom:0x4B3860 +b_area_trd_part_2_fake_bowser_TowerDefense = 0x8021A684; // type:data rom:0x4B3874 +b_area_trd_part_2_fake_bowser_StatusTable = 0x8021A690; // type:data rom:0x4B3880 +b_area_trd_part_2_fake_bowser_PlaceholderAnims = 0x8021A73C; // type:data rom:0x4B392C b_area_trd_part_2_fake_bowser_ActorParts = 0x8021A748; // type:data rom:0x4B3938 b_area_trd_part_2_fake_bowser = 0x8021A8D4; // type:data rom:0x4B3AC4 -b_area_trd_part_2_fake_bowser_D_8021A8FC_48BAEC = 0x8021A8FC; // type:data rom:0x4B3AEC -b_area_trd_part_2_fake_bowser_init_8021A968 = 0x8021A968; // type:data rom:0x4B3B58 -b_area_trd_part_2_fake_bowser_D_8021AAC4_48BCB4 = 0x8021AAC4; // type:data rom:0x4B3CB4 -b_area_trd_part_2_fake_bowser_8021ABE4 = 0x8021ABE4; // type:data rom:0x4B3DD4 -b_area_trd_part_2_fake_bowser_D_8021ACCC_48BEBC = 0x8021ACCC; // type:data rom:0x4B3EBC -b_area_trd_part_2_fake_bowser_8021AD68 = 0x8021AD68; // type:data rom:0x4B3F58 -b_area_trd_part_2_fake_bowser_D_8021AE50_48C040 = 0x8021AE50; // type:data rom:0x4B4040 -b_area_trd_part_2_fake_bowser_8021AF70 = 0x8021AF70; // type:data rom:0x4B4160 -b_area_trd_part_2_fake_bowser_8021B0E4 = 0x8021B0E4; // type:data rom:0x4B42D4 -b_area_trd_part_2_fake_bowser_intTable_8021B5D0 = 0x8021B5D0; // type:data rom:0x4B47C0 -b_area_trd_part_2_fake_bowser_8021B6F0 = 0x8021B6F0; // type:data rom:0x4B48E0 -b_area_trd_part_2_fake_bowser_intTable_8021B7D4 = 0x8021B7D4; // type:data rom:0x4B49C4 -b_area_trd_part_2_fake_bowser_8021B864 = 0x8021B864; // type:data rom:0x4B4A54 -b_area_trd_part_2_fake_bowser_intTable_8021B948 = 0x8021B948; // type:data rom:0x4B4B38 -b_area_trd_part_2_fake_bowser_8021BA68 = 0x8021BA68; // type:data rom:0x4B4C58 -b_area_trd_part_2_fake_bowser_intTable_8021BB68 = 0x8021BB68; // type:data rom:0x4B4D58 -b_area_trd_part_2_fake_bowser_8021BC88 = 0x8021BC88; // type:data rom:0x4B4E78 -b_area_trd_part_2_fake_bowser_8021BD6C = 0x8021BD6C; // type:data rom:0x4B4F5C -b_area_trd_part_2_fake_bowser_8021BF14 = 0x8021BF14; // type:data rom:0x4B5104 -b_area_trd_part_2_fake_bowser_intTable_8021C0CC = 0x8021C0CC; // type:data rom:0x4B52BC -b_area_trd_part_2_fake_bowser_8021C1EC = 0x8021C1EC; // type:data rom:0x4B53DC -b_area_trd_part_2_fake_bowser_intTable_8021C2D4 = 0x8021C2D4; // type:data rom:0x4B54C4 -b_area_trd_part_2_fake_bowser_8021C3F4 = 0x8021C3F4; // type:data rom:0x4B55E4 -b_area_trd_part_2_fake_bowser_intTable_8021C4F8 = 0x8021C4F8; // type:data rom:0x4B56E8 -b_area_trd_part_2_fake_bowser_8021C594 = 0x8021C594; // type:data rom:0x4B5784 -b_area_trd_part_2_fake_bowser_8021C67C = 0x8021C67C; // type:data rom:0x4B586C -b_area_trd_part_2_fake_bowser_D_8021C7F4_48D9E4 = 0x8021C7F4; // type:data rom:0x4B59E4 -b_area_trd_part_2_fake_bowser_8021C9A4 = 0x8021C9A4; // type:data rom:0x4B5B94 -b_area_trd_part_2_fake_bowser_8021CAE4 = 0x8021CAE4; // type:data rom:0x4B5CD4 -b_area_trd_part_2_fake_bowser_8021CB98 = 0x8021CB98; // type:data rom:0x4B5D88 -b_area_trd_part_2_fake_bowser_8021CD50 = 0x8021CD50; // type:data rom:0x4B5F40 -b_area_trd_part_2_fake_bowser_D_8021CE68_48E058 = 0x8021CE68; // type:data rom:0x4B6058 -b_area_trd_part_2_fake_bowser_8021CF4C = 0x8021CF4C; // type:data rom:0x4B613C -b_area_trd_part_2_fake_bowser_8021D054 = 0x8021D054; // type:data rom:0x4B6244 -b_area_trd_part_2_fake_bowser_8021D1CC = 0x8021D1CC; // type:data rom:0x4B63BC -b_area_trd_part_2_fake_bowser_8021D350 = 0x8021D350; // type:data rom:0x4B6540 -b_area_trd_part_2_fake_bowser_idle_8021D508 = 0x8021D508; // type:data rom:0x4B66F8 -b_area_trd_part_2_fake_bowser_8021E3A0 = 0x8021E3A0; // type:data rom:0x4B7590 -b_area_trd_part_2_fake_bowser_handleEvent_8021E6F0 = 0x8021E6F0; // type:data rom:0x4B78E0 -b_area_trd_part_2_fake_bowser_takeTurn_8021EC98 = 0x8021EC98; // type:data rom:0x4B7E88 -b_area_trd_part_2_fake_bowser_nextTurn_8021F410 = 0x8021F410; // type:data rom:0x4B8600 -b_area_trd_part_2_fake_bowser_8021F630 = 0x8021F630; // type:data rom:0x4B8820 -b_area_trd_part_2_fake_bowser_80220588 = 0x80220588; // type:data rom:0x4B9778 -b_area_trd_part_2_fake_bowser_80221DB4 = 0x80221DB4; // type:data rom:0x4BAFA4 -b_area_trd_part_2_fake_bowser_80222C44 = 0x80222C44; // type:data rom:0x4BBE34 -b_area_trd_part_2_fake_bowser_802230E8 = 0x802230E8; // type:data rom:0x4BC2D8 -b_area_trd_part_2_fake_bowser_802235E0 = 0x802235E0; // type:data rom:0x4BC7D0 -b_area_trd_part_2_fake_bowser_80223718 = 0x80223718; // type:data rom:0x4BC908 -b_area_trd_part_2_fake_bowser_80223870 = 0x80223870; // type:data rom:0x4BCA60 -b_area_trd_part_2_fake_bowser_idle_802239BC = 0x802239BC; // type:data rom:0x4BCBAC -b_area_trd_part_2_fake_bowser_handleEvent_802242FC = 0x802242FC; // type:data rom:0x4BD4EC -b_area_trd_part_2_fake_bowser_takeTurn_80224D84 = 0x80224D84; // type:data rom:0x4BDF74 -b_area_trd_part_2_fake_bowser_nextTurn_80225438 = 0x80225438; // type:data rom:0x4BE628 -b_area_trd_part_2_green_ninja_koopa_DefenseTable_80225560 = 0x80225560; // type:data rom:0x4BE750 -b_area_trd_part_2_green_ninja_koopa_DefenseTable_8022556C = 0x8022556C; // type:data rom:0x4BE75C -b_area_trd_part_2_green_ninja_koopa_StatusTable_80225578 = 0x80225578; // type:data rom:0x4BE768 -b_area_trd_part_2_green_ninja_koopa_ActorParts_80225624 = 0x80225624; // type:data rom:0x4BE814 +b_area_trd_part_2_fake_bowser_BowserModels = 0x8021A8FC; // type:data rom:0x4B3AEC +b_area_trd_part_2_fake_bowser_EVS_Init = 0x8021A968; // type:data rom:0x4B3B58 +b_area_trd_part_2_fake_bowser_IdleHeadAngles = 0x8021AAC4; // type:data rom:0x4B3CB4 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_IdleHead = 0x8021ABE4; // type:data rom:0x4B3DD4 +b_area_trd_part_2_fake_bowser_MoveHeadAngles = 0x8021ACCC; // type:data rom:0x4B3EBC +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_MoveHead = 0x8021AD68; // type:data rom:0x4B3F58 +b_area_trd_part_2_fake_bowser_HurtHeadAngles = 0x8021AE50; // type:data rom:0x4B4040 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_HurtHead = 0x8021AF70; // type:data rom:0x4B4160 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathMain = 0x8021B0E4; // type:data rom:0x4B42D4 +b_area_trd_part_2_fake_bowser_IdleBodyOffsets = 0x8021B5D0; // type:data rom:0x4B47C0 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_IdleBody = 0x8021B6F0; // type:data rom:0x4B48E0 +b_area_trd_part_2_fake_bowser_MoveBodyOffsets = 0x8021B7D4; // type:data rom:0x4B49C4 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_MoveBody = 0x8021B864; // type:data rom:0x4B4A54 +b_area_trd_part_2_fake_bowser_StrikeBodyOffsets = 0x8021B948; // type:data rom:0x4B4B38 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_StrikeBody = 0x8021BA68; // type:data rom:0x4B4C58 +b_area_trd_part_2_fake_bowser_HurtBodyOffsets = 0x8021BB68; // type:data rom:0x4B4D58 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_HurtBody = 0x8021BC88; // type:data rom:0x4B4E78 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathBody = 0x8021BD6C; // type:data rom:0x4B4F5C +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathShell = 0x8021BF14; // type:data rom:0x4B5104 +b_area_trd_part_2_fake_bowser_IdleFeetOffsets = 0x8021C0CC; // type:data rom:0x4B52BC +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_IdleFeet = 0x8021C1EC; // type:data rom:0x4B53DC +b_area_trd_part_2_fake_bowser_StrikeFeetOffsets = 0x8021C2D4; // type:data rom:0x4B54C4 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_StrikeFeet = 0x8021C3F4; // type:data rom:0x4B55E4 +b_area_trd_part_2_fake_bowser_MoveFeetOffsets = 0x8021C4F8; // type:data rom:0x4B56E8 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_MoveFeet = 0x8021C594; // type:data rom:0x4B5784 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathFeet = 0x8021C67C; // type:data rom:0x4B586C +b_area_trd_part_2_fake_bowser_StrikeArmAngles = 0x8021C7F4; // type:data rom:0x4B59E4 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_StrikeArm = 0x8021C9A4; // type:data rom:0x4B5B94 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_BlockArm = 0x8021CAE4; // type:data rom:0x4B5CD4 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathLeftArm = 0x8021CB98; // type:data rom:0x4B5D88 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathRightArm = 0x8021CD50; // type:data rom:0x4B5F40 +b_area_trd_part_2_fake_bowser_MoveWheelAngles = 0x8021CE68; // type:data rom:0x4B6058 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_MoveWheels = 0x8021CF4C; // type:data rom:0x4B613C +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathFrontWheels = 0x8021D054; // type:data rom:0x4B6244 +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathBackWheels = 0x8021D1CC; // type:data rom:0x4B63BC +b_area_trd_part_2_fake_bowser_EVS_AnimBowser_DeathTail = 0x8021D350; // type:data rom:0x4B6540 +b_area_trd_part_2_fake_bowser_EVS_FakeBowser_Idle = 0x8021D508; // type:data rom:0x4B66F8 +b_area_trd_part_2_fake_bowser_EVS_SpawnDamageFX = 0x8021E3A0; // type:data rom:0x4B7590 +b_area_trd_part_2_fake_bowser_EVS_FakeBowser_HandleEvent = 0x8021E6F0; // type:data rom:0x4B78E0 +b_area_trd_part_2_fake_bowser_EVS_FakeBowser_TakeTurn = 0x8021EC98; // type:data rom:0x4B7E88 +b_area_trd_part_2_fake_bowser_EVS_FakeBowser_HandlePhase = 0x8021F410; // type:data rom:0x4B8600 +b_area_trd_part_2_fake_bowser_EVS_KoopaBrosEnter = 0x8021F630; // type:data rom:0x4B8820 +b_area_trd_part_2_fake_bowser_EVS_BuildTowerWithKoopa = 0x80220588; // type:data rom:0x4B9778 +b_area_trd_part_2_fake_bowser_EVS_UpdateTowerWithKoopa = 0x80221DB4; // type:data rom:0x4BAFA4 +b_area_trd_part_2_fake_bowser_EVS_TryFormingTower = 0x80222C44; // type:data rom:0x4BBE34 +b_area_trd_part_2_fake_bowser_EVS_TryJoiningTower = 0x802230E8; // type:data rom:0x4BC2D8 +b_area_trd_part_2_fake_bowser_EVS_BroadcastTowerUnstable = 0x802235E0; // type:data rom:0x4BC7D0 +b_area_trd_part_2_fake_bowser_EVS_BroadcastToppleHit = 0x80223718; // type:data rom:0x4BC908 +b_area_trd_part_2_fake_bowser_EVS_BroadcastToKoopaBros = 0x80223870; // type:data rom:0x4BCA60 +b_area_trd_part_2_fake_bowser_EVS_KoopaBros_Idle = 0x802239BC; // type:data rom:0x4BCBAC +b_area_trd_part_2_fake_bowser_EVS_KoopaBros_HandleEvent = 0x802242FC; // type:data rom:0x4BD4EC +b_area_trd_part_2_fake_bowser_EVS_KoopaBros_TakeTurn = 0x80224D84; // type:data rom:0x4BDF74 +b_area_trd_part_2_fake_bowser_EVS_KoopaBros_HandlePhase = 0x80225438; // type:data rom:0x4BE628 +b_area_trd_part_2_green_ninja_koopa_DefaultDefense = 0x80225560; // type:data rom:0x4BE750 +b_area_trd_part_2_green_ninja_koopa_ToppledDefense = 0x8022556C; // type:data rom:0x4BE75C +b_area_trd_part_2_green_ninja_koopa_StatusTable = 0x80225578; // type:data rom:0x4BE768 +b_area_trd_part_2_green_ninja_koopa_ActorParts = 0x80225624; // type:data rom:0x4BE814 b_area_trd_part_2_green_ninja_koopa = 0x80225648; // type:data rom:0x4BE838 -b_area_trd_part_2_green_ninja_koopa_IdleAnimations_80225670 = 0x80225670; // type:data rom:0x4BE860 +b_area_trd_part_2_green_ninja_koopa_DefaultAnims = 0x80225670; // type:data rom:0x4BE860 b_area_trd_part_2_green_ninja_koopa_IdleAnimations_802256C4 = 0x802256C4; // type:data rom:0x4BE8B4 b_area_trd_part_2_green_ninja_koopa_IdleAnimations_80225700 = 0x80225700; // type:data rom:0x4BE8F0 b_area_trd_part_2_green_ninja_koopa_IdleAnimations_8022573C = 0x8022573C; // type:data rom:0x4BE92C b_area_trd_part_2_green_ninja_koopa_IdleAnimations_80225790 = 0x80225790; // type:data rom:0x4BE980 b_area_trd_part_2_green_ninja_koopa_IdleAnimations_8022579C = 0x8022579C; // type:data rom:0x4BE98C b_area_trd_part_2_green_ninja_koopa_802257A8 = 0x802257A8; // type:data rom:0x4BE998 -b_area_trd_part_2_green_ninja_koopa_init_80227CEC = 0x80227CEC; // type:data rom:0x4C0EDC -b_area_trd_part_2_green_ninja_koopa_idle_80227DE0 = 0x80227DE0; // type:data rom:0x4C0FD0 -b_area_trd_part_2_green_ninja_koopa_intTable_80227DF0 = 0x80227DF0; // type:data rom:0x4C0FE0 -b_area_trd_part_2_green_ninja_koopa_handleEvent_80227E48 = 0x80227E48; // type:data rom:0x4C1038 -b_area_trd_part_2_green_ninja_koopa_takeTurn_802284D4 = 0x802284D4; // type:data rom:0x4C16C4 -b_area_trd_part_2_green_ninja_koopa_nextTurn_802284E4 = 0x802284E4; // type:data rom:0x4C16D4 -b_area_trd_part_2_red_ninja_koopa_DefenseTable_80228500 = 0x80228500; // type:data rom:0x4C16F0 -b_area_trd_part_2_red_ninja_koopa_DefenseTable_8022850C = 0x8022850C; // type:data rom:0x4C16FC -b_area_trd_part_2_red_ninja_koopa_StatusTable_80228518 = 0x80228518; // type:data rom:0x4C1708 -b_area_trd_part_2_red_ninja_koopa_ActorParts_802285C4 = 0x802285C4; // type:data rom:0x4C17B4 +b_area_trd_part_2_green_ninja_koopa_EVS_Init = 0x80227CEC; // type:data rom:0x4C0EDC +b_area_trd_part_2_green_ninja_koopa_EVS_Idle = 0x80227DE0; // type:data rom:0x4C0FD0 +b_area_trd_part_2_green_ninja_koopa_FlipPosOffsets = 0x80227DF0; // type:data rom:0x4C0FE0 +b_area_trd_part_2_green_ninja_koopa_EVS_HandleEvent = 0x80227E48; // type:data rom:0x4C1038 +b_area_trd_part_2_green_ninja_koopa_EVS_TakeTurn = 0x802284D4; // type:data rom:0x4C16C4 +b_area_trd_part_2_green_ninja_koopa_EVS_HandlePhase = 0x802284E4; // type:data rom:0x4C16D4 +b_area_trd_part_2_red_ninja_koopa_DefaultDefense = 0x80228500; // type:data rom:0x4C16F0 +b_area_trd_part_2_red_ninja_koopa_ToppledDefense = 0x8022850C; // type:data rom:0x4C16FC +b_area_trd_part_2_red_ninja_koopa_StatusTable = 0x80228518; // type:data rom:0x4C1708 +b_area_trd_part_2_red_ninja_koopa_ActorParts = 0x802285C4; // type:data rom:0x4C17B4 b_area_trd_part_2_red_ninja_koopa = 0x802285E8; // type:data rom:0x4C17D8 -b_area_trd_part_2_red_ninja_koopa_IdleAnimations_80228610 = 0x80228610; // type:data rom:0x4C1800 -b_area_trd_part_2_red_ninja_koopa_IdleAnimations_80228664 = 0x80228664; // type:data rom:0x4C1854 -b_area_trd_part_2_red_ninja_koopa_IdleAnimations_802286A0 = 0x802286A0; // type:data rom:0x4C1890 -b_area_trd_part_2_red_ninja_koopa_IdleAnimations_802286DC = 0x802286DC; // type:data rom:0x4C18CC +b_area_trd_part_2_red_ninja_koopa_DefaultAnims = 0x80228610; // type:data rom:0x4C1800 +b_area_trd_part_2_red_ninja_koopa_TowerAnims = 0x80228664; // type:data rom:0x4C1854 +b_area_trd_part_2_red_ninja_koopa_TippingAnims = 0x802286A0; // type:data rom:0x4C1890 +b_area_trd_part_2_red_ninja_koopa_ToppledAnims = 0x802286DC; // type:data rom:0x4C18CC b_area_trd_part_2_red_ninja_koopa_IdleAnimations_80228730 = 0x80228730; // type:data rom:0x4C1920 b_area_trd_part_2_red_ninja_koopa_IdleAnimations_8022873C = 0x8022873C; // type:data rom:0x4C192C -b_area_trd_part_2_red_ninja_koopa_80228748 = 0x80228748; // type:data rom:0x4C1938 -b_area_trd_part_2_red_ninja_koopa_init_8022AC8C = 0x8022AC8C; // type:data rom:0x4C3E7C +b_area_trd_part_2_red_ninja_koopa_HandleCommand = 0x80228748; // type:data rom:0x4C1938 +b_area_trd_part_2_red_ninja_koopa_EVS_Init = 0x8022AC8C; // type:data rom:0x4C3E7C D_8022AD80_4C3F70 = 0x8022AD80; // type:data rom:0x4C3F70 -b_area_trd_part_2_red_ninja_koopa_intTable_8022AD90 = 0x8022AD90; // type:data rom:0x4C3F80 -b_area_trd_part_2_red_ninja_koopa_handleEvent_8022ADE8 = 0x8022ADE8; // type:data rom:0x4C3FD8 -b_area_trd_part_2_red_ninja_koopa_takeTurn_8022B474 = 0x8022B474; // type:data rom:0x4C4664 -b_area_trd_part_2_red_ninja_koopa_nextTurn_8022B484 = 0x8022B484; // type:data rom:0x4C4674 -b_area_trd_part_2_blue_ninja_koopa_DefenseTable_8022B4A0 = 0x8022B4A0; // type:data rom:0x4C4690 -b_area_trd_part_2_blue_ninja_koopa_DefenseTable_8022B4AC = 0x8022B4AC; // type:data rom:0x4C469C -b_area_trd_part_2_blue_ninja_koopa_StatusTable_8022B4B8 = 0x8022B4B8; // type:data rom:0x4C46A8 -b_area_trd_part_2_blue_ninja_koopa_ActorParts_8022B564 = 0x8022B564; // type:data rom:0x4C4754 -b_area_trd_part_2_blue_ninja_koopa = 0x8022B588; // type:data rom:0x4C4778 -b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B5B0 = 0x8022B5B0; // type:data rom:0x4C47A0 -b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B604 = 0x8022B604; // type:data rom:0x4C47F4 -b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B640 = 0x8022B640; // type:data rom:0x4C4830 -b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B67C = 0x8022B67C; // type:data rom:0x4C486C -b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B6D0 = 0x8022B6D0; // type:data rom:0x4C48C0 -b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B6DC = 0x8022B6DC; // type:data rom:0x4C48CC -b_area_trd_part_2_blue_ninja_koopa_8022B6E8 = 0x8022B6E8; // type:data rom:0x4C48D8 -b_area_trd_part_2_blue_ninja_koopa_init_8022DC2C = 0x8022DC2C; // type:data rom:0x4C6E1C -b_area_trd_part_2_blue_ninja_koopa_idle_8022DD20 = 0x8022DD20; // type:data rom:0x4C6F10 -b_area_trd_part_2_blue_ninja_koopa_intTable_8022DD30 = 0x8022DD30; // type:data rom:0x4C6F20 -b_area_trd_part_2_blue_ninja_koopa_handleEvent_8022DD88 = 0x8022DD88; // type:data rom:0x4C6F78 -b_area_trd_part_2_blue_ninja_koopa_takeTurn_8022E414 = 0x8022E414; // type:data rom:0x4C7604 -b_area_trd_part_2_blue_ninja_koopa_nextTurn_8022E424 = 0x8022E424; // type:data rom:0x4C7614 -b_area_trd_part_2_yellow_ninja_koopa_DefenseTable_8022E440 = 0x8022E440; // type:data rom:0x4C7630 -b_area_trd_part_2_yellow_ninja_koopa_DefenseTable_8022E44C = 0x8022E44C; // type:data rom:0x4C763C -b_area_trd_part_2_yellow_ninja_koopa_StatusTable_8022E458 = 0x8022E458; // type:data rom:0x4C7648 -b_area_trd_part_2_yellow_ninja_koopa_ActorParts_8022E504 = 0x8022E504; // type:data rom:0x4C76F4 +b_area_trd_part_2_red_ninja_koopa_FlipPosOffsets = 0x8022AD90; // type:data rom:0x4C3F80 +b_area_trd_part_2_red_ninja_koopa_EVS_HandleEvent = 0x8022ADE8; // type:data rom:0x4C3FD8 +b_area_trd_part_2_red_ninja_koopa_EVS_TakeTurn = 0x8022B474; // type:data rom:0x4C4664 +b_area_trd_part_2_red_ninja_koopa_EVS_HandlePhase = 0x8022B484; // type:data rom:0x4C4674 +b_area_trd_part_2_black_ninja_koopa_DefaultDefense = 0x8022B4A0; // type:data rom:0x4C4690 +b_area_trd_part_2_black_ninja_koopa_ToppledDefense = 0x8022B4AC; // type:data rom:0x4C469C +b_area_trd_part_2_black_ninja_koopa_StatusTable = 0x8022B4B8; // type:data rom:0x4C46A8 +b_area_trd_part_2_black_ninja_koopa_ActorParts = 0x8022B564; // type:data rom:0x4C4754 +b_area_trd_part_2_black_ninja_koopa = 0x8022B588; // type:data rom:0x4C4778 +b_area_trd_part_2_black_ninja_koopa_DefaultAnims = 0x8022B5B0; // type:data rom:0x4C47A0 +b_area_trd_part_2_black_ninja_koopa_TowerAnims = 0x8022B604; // type:data rom:0x4C47F4 +b_area_trd_part_2_black_ninja_koopa_TippingAnims = 0x8022B640; // type:data rom:0x4C4830 +b_area_trd_part_2_black_ninja_koopa_ToppledAnims = 0x8022B67C; // type:data rom:0x4C486C +b_area_trd_part_2_black_ninja_koopa_IdleAnimations_8022B6D0 = 0x8022B6D0; // type:data rom:0x4C48C0 +b_area_trd_part_2_black_ninja_koopa_IdleAnimations_8022B6DC = 0x8022B6DC; // type:data rom:0x4C48CC +b_area_trd_part_2_black_ninja_koopa_8022B6E8 = 0x8022B6E8; // type:data rom:0x4C48D8 +b_area_trd_part_2_black_ninja_koopa_EVS_Init = 0x8022DC2C; // type:data rom:0x4C6E1C +b_area_trd_part_2_black_ninja_koopa_EVS_Idle = 0x8022DD20; // type:data rom:0x4C6F10 +b_area_trd_part_2_black_ninja_koopa_FlipPosOffsets = 0x8022DD30; // type:data rom:0x4C6F20 +b_area_trd_part_2_black_ninja_koopa_EVS_HandleEvent = 0x8022DD88; // type:data rom:0x4C6F78 +b_area_trd_part_2_black_ninja_koopa_EVS_TakeTurn = 0x8022E414; // type:data rom:0x4C7604 +b_area_trd_part_2_black_ninja_koopa_EVS_HandlePhase = 0x8022E424; // type:data rom:0x4C7614 +b_area_trd_part_2_yellow_ninja_koopa_DefaultDefense = 0x8022E440; // type:data rom:0x4C7630 +b_area_trd_part_2_yellow_ninja_koopa_ToppledDefense = 0x8022E44C; // type:data rom:0x4C763C +b_area_trd_part_2_yellow_ninja_koopa_StatusTable = 0x8022E458; // type:data rom:0x4C7648 +b_area_trd_part_2_yellow_ninja_koopa_ActorParts = 0x8022E504; // type:data rom:0x4C76F4 b_area_trd_part_2_yellow_ninja_koopa = 0x8022E528; // type:data rom:0x4C7718 -b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E550 = 0x8022E550; // type:data rom:0x4C7740 -b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E5A4 = 0x8022E5A4; // type:data rom:0x4C7794 -b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E5E0 = 0x8022E5E0; // type:data rom:0x4C77D0 -b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E61C = 0x8022E61C; // type:data rom:0x4C780C +b_area_trd_part_2_yellow_ninja_koopa_DefaultAnims = 0x8022E550; // type:data rom:0x4C7740 +b_area_trd_part_2_yellow_ninja_koopa_TowerAnims = 0x8022E5A4; // type:data rom:0x4C7794 +b_area_trd_part_2_yellow_ninja_koopa_TippingAnims = 0x8022E5E0; // type:data rom:0x4C77D0 +b_area_trd_part_2_yellow_ninja_koopa_ToppledAnims = 0x8022E61C; // type:data rom:0x4C780C b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E670 = 0x8022E670; // type:data rom:0x4C7860 b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E67C = 0x8022E67C; // type:data rom:0x4C786C b_area_trd_part_2_yellow_ninja_koopa_8022E688 = 0x8022E688; // type:data rom:0x4C7878 -b_area_trd_part_2_yellow_ninja_koopa_init_80230BCC = 0x80230BCC; // type:data rom:0x4C9DBC -b_area_trd_part_2_yellow_ninja_koopa_idle_80230CC0 = 0x80230CC0; // type:data rom:0x4C9EB0 -b_area_trd_part_2_yellow_ninja_koopa_intTable_80230CD0 = 0x80230CD0; // type:data rom:0x4C9EC0 -b_area_trd_part_2_yellow_ninja_koopa_handleEvent_80230D28 = 0x80230D28; // type:data rom:0x4C9F18 -b_area_trd_part_2_yellow_ninja_koopa_takeTurn_802313B4 = 0x802313B4; // type:data rom:0x4CA5A4 -b_area_trd_part_2_yellow_ninja_koopa_nextTurn_802313C4 = 0x802313C4; // type:data rom:0x4CA5B4 +b_area_trd_part_2_yellow_ninja_koopa_EVS_Init = 0x80230BCC; // type:data rom:0x4C9DBC +b_area_trd_part_2_yellow_ninja_koopa_EVS_Idle = 0x80230CC0; // type:data rom:0x4C9EB0 +b_area_trd_part_2_yellow_ninja_koopa_FlipPosOffsets = 0x80230CD0; // type:data rom:0x4C9EC0 +b_area_trd_part_2_yellow_ninja_koopa_EVS_HandleEvent = 0x80230D28; // type:data rom:0x4C9F18 +b_area_trd_part_2_yellow_ninja_koopa_EVS_TakeTurn = 0x802313B4; // type:data rom:0x4CA5A4 +b_area_trd_part_2_yellow_ninja_koopa_EVS_HandlePhase = 0x802313C4; // type:data rom:0x4CA5B4 b_area_trd_part_2_trd_00_EVS_PreBattle = 0x802313E0; // type:data rom:0x4CA5D0 b_area_trd_part_2_trd_00_EVS_PostBattle = 0x8023141C; // type:data rom:0x4CA60C b_area_trd_part_2_trd_00_ForegroundModels = 0x8023142C; // type:data rom:0x4CA61C @@ -10822,23 +10822,23 @@ b_area_trd_part_2_trd_05f_80235678 = 0x80235678; // type:data rom:0x4CE868 b_area_trd_part_2_trd_05f_EVS_PreBattle = 0x80235C24; // type:data rom:0x4CEE14 b_area_trd_part_2_trd_05f_EVS_PostBattle = 0x80235D1C; // type:data rom:0x4CEF0C b_area_trd_part_2_trd_05f = 0x80235D2C; // type:data rom:0x4CEF1C -D_80235FC0 = 0x80218000; // type:func rom:0x4CF1B0 -b_area_trd_part_2_green_ninja_koopa_effectUnk = 0x80236040; // type:data rom:0x4CF230 -func_802180C8_4CF278 = 0x802180C8; // type:func rom:0x4CF278 -func_802180E8_4CF298 = 0x802180E8; // type:func rom:0x4CF298 -func_80218108_4CF2B8 = 0x80218108; // type:func rom:0x4CF2B8 -func_80218130_4CF2E0 = 0x80218130; // type:func rom:0x4CF2E0 -func_80218158_4CF308 = 0x80218158; // type:func rom:0x4CF308 -func_80218170_4CF320 = 0x80218170; // type:func rom:0x4CF320 -func_802181B4_4CF364 = 0x802181B4; // type:func rom:0x4CF364 -func_802181F8_4CF3A8 = 0x802181F8; // type:func rom:0x4CF3A8 +FakeBowserAnimState = 0x80218000; // type:func rom:0x4CF1B0 +b_area_trd_part_2_green_ninja_koopa_DummyPlayerStatus = 0x80236040; // type:data rom:0x4CF230 +b_area_trd_part_3_StartBlinkingSP = 0x802180C8; // type:func rom:0x4CF278 +b_area_trd_part_3_StopBlinkingSP = 0x802180E8; // type:func rom:0x4CF298 +b_area_trd_part_3_StartBlinkingHPandFP = 0x80218108; // type:func rom:0x4CF2B8 +b_area_trd_part_3_StopBlinkingHPandFP = 0x80218130; // type:func rom:0x4CF2E0 +b_area_trd_part_3_ClearPlayerMenuSelections = 0x80218158; // type:func rom:0x4CF308 +b_area_trd_part_3_func_80218170_4CF320 = 0x80218170; // type:func rom:0x4CF320 +b_area_trd_part_3_func_802181B4_4CF364 = 0x802181B4; // type:func rom:0x4CF364 +b_area_trd_part_3_AddStarPower = 0x802181F8; // type:func rom:0x4CF3A8 b_area_trd_part_3_Formation_00 = 0x80218220; // type:data rom:0x4CF3D0 b_area_trd_part_3_Formations = 0x8021823C; // type:data rom:0x4CF3EC b_area_trd_part_3_Stages = 0x80218264; // type:data rom:0x4CF414 b_area_trd_part_3_eldstar_IdleAnimations_80218280 = 0x80218280; // type:data rom:0x4CF430 b_area_trd_part_3_eldstar_DefenseTable_8021828C = 0x8021828C; // type:data rom:0x4CF43C b_area_trd_part_3_eldstar_StatusTable_80218298 = 0x80218298; // type:data rom:0x4CF448 -b_area_trd_part_2_red_ninja_koopa_effectUnk = 0x802362D0; // type:data rom:0x4CF4C0 +b_area_trd_part_2_red_ninja_koopa_DummyPlayerStatus = 0x802362D0; // type:data rom:0x4CF4C0 b_area_trd_part_3_eldstar_ActorParts = 0x80218344; // type:data rom:0x4CF4F4 b_area_trd_part_3_eldstar = 0x80218368; // type:data rom:0x4CF518 b_area_trd_part_3_eldstar_init_80218390 = 0x80218390; // type:data rom:0x4CF540 @@ -10846,8 +10846,8 @@ b_area_trd_part_3_eldstar_idle_802183E8 = 0x802183E8; // type:data rom:0x4CF598 b_area_trd_part_3_eldstar_handleEvent_80218404 = 0x80218404; // type:data rom:0x4CF5B4 b_area_trd_part_3_eldstar_takeTurn_80218414 = 0x80218414; // type:data rom:0x4CF5C4 b_area_trd_part_3_eldstar_80218424 = 0x80218424; // type:data rom:0x4CF5D4 -b_area_trd_part_2_blue_ninja_koopa_effectUnk = 0x80236560; // type:data rom:0x4CF750 -b_area_trd_part_2_yellow_ninja_koopa_effectUnk = 0x802367F0; // type:data rom:0x4CF9E0 +b_area_trd_part_2_black_ninja_koopa_DummyPlayerStatus = 0x80236560; // type:data rom:0x4CF750 +b_area_trd_part_2_yellow_ninja_koopa_DummyPlayerStatus = 0x802367F0; // type:data rom:0x4CF9E0 b_area_trd_part_3_nok_01_80218DD0 = 0x80218DD0; // type:data rom:0x4CFF80 b_area_trd_part_3_nok_01_EVS_PreBattle = 0x80218ED8; // type:data rom:0x4D0088 b_area_trd_part_3_nok_01_EVS_PostBattle = 0x80218FA0; // type:data rom:0x4D0150 @@ -12839,7 +12839,7 @@ b_area_sam_duplighost_kooper_ActorParts = 0x8021E7D8; // type:data rom:0x62A378 b_area_sam_duplighost_kooper = 0x8021E7FC; // type:data rom:0x62A39C b_area_sam_duplighost_kooper_init = 0x8021E824; // type:data rom:0x62A3C4 b_area_sam_duplighost_kooper_idle = 0x8021E8A0; // type:data rom:0x62A440 -b_area_sam_duplighost_kooper_dispOffsets = 0x8021E9C0; // type:data rom:0x62A560 +b_area_sam_duplighost_FlipPosOffsets = 0x8021E9C0; // type:data rom:0x62A560 b_area_sam_duplighost_kooper_handleEvent = 0x8021EA18; // type:data rom:0x62A5B8 b_area_sam_duplighost_kooper_takeTurn = 0x8021F374; // type:data rom:0x62AF14 b_area_sam_duplighost_formation_kooper = 0x80220314; // type:data rom:0x62BEB4 @@ -13439,7 +13439,7 @@ b_area_pra3_duplighost_kooper_ActorParts = 0x8021D858; // type:data rom:0x66F5D8 b_area_pra3_duplighost_kooper = 0x8021D87C; // type:data rom:0x66F5FC b_area_pra3_duplighost_kooper_init = 0x8021D8A4; // type:data rom:0x66F624 b_area_pra3_duplighost_kooper_idle = 0x8021D920; // type:data rom:0x66F6A0 -b_area_pra3_duplighost_kooper_dispOffsets = 0x8021DA40; // type:data rom:0x66F7C0 +b_area_pra3_duplighost_FlipPosOffsets = 0x8021DA40; // type:data rom:0x66F7C0 b_area_pra3_duplighost_kooper_handleEvent = 0x8021DA98; // type:data rom:0x66F818 b_area_pra3_duplighost_kooper_takeTurn = 0x8021E3F4; // type:data rom:0x670174 b_area_pra3_duplighost_formation_kooper = 0x8021F394; // type:data rom:0x671114 @@ -26048,7 +26048,7 @@ AuHeapBase = 0x801AA000; // type:data D_80200000 = 0x80200000; // type:data gBackgroundImage = 0x80200000; // gMapShapeData = 0x80210000; // type:data -D_80219040 = 0x80219040; // type:data +b_area_trd_part_3_HoverOffset = 0x80219040; // type:data spiked_goomba = 0x8021B0AC; // type:data paragoomba = 0x8021CD00; // type:data b_area_pra2_crystal_king_paths = 0x80221630; // type:data