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

battle area trd 1/2/3 (#1062)

Browse Source 
* check

* flips

* trailing ,

* koopa bros

* more koopa bros

* fake bowser

* progress

* progress

* koopa bros done

* koopa bros anims

* reverted overly specific name

* wayward stages

* areas use headers

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-05-23 08:57:34 -04:00 committed by GitHub
parent 9457e315a8
commit edd9111b63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
281 changed files with 5837 additions and 9150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common_structs.h
View File

@ -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 */

38
include/effects.h
View File

@ -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;

28
include/enums.h
View File

@ -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 {

4
include/npc.h
View File

@ -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) { \

2
include/script_api/battle.h
View File

@ -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);

19
include/script_api/macros.h
View File

@ -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

4
src/16F740.c
View File

@ -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;

8
src/17D6A0.c
View File

@ -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 },

2
src/18C790.c
View File

@ -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)

38
src/415D90.c
View File

@ -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;

24
src/5B320.c
View File

@ -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 },
};

2
src/7E9D0.c
View File

@ -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;
}
}

2
src/a5dd0_len_114e0.c
View File

@ -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;

6
src/actor_api.c
View File

@ -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;
}

8
src/battle/action_cmd/air_raid.c
View File

@ -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[];

4
src/battle/action_cmd/squirt.c
View File

@ -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[];

6
src/battle/area/arn/actor/hyper_paragoomba.c
View File

@ -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 },
},

2
src/battle/area/arn/actor/hypergoomba.c
View File

@ -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 },
},

2
src/battle/area/arn/actor/tubba_blubba.c
View File

@ -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 },
},

4
src/battle/area/arn/actor/tubbas_heart.c
View File

@ -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 },
},

2
src/battle/area/dgb/actor/tubba_blubba.c
View File

@ -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 },
},

14
src/battle/area/flo/actor/amazy_dayzee.c
View File

@ -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))

14
src/battle/area/flo/actor/crazee_dayzee.c
View File

@ -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))

28
src/battle/area/flo/actor/lakitu.c
View File

@ -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

2
src/battle/area/flo/actor/ruff_puff.c
View File

@ -28,7 +28,7 @@ s32 N(IdleAnimations)[] = {
s32 N(DefenseTable)[] = {
ELEMENT_NORMAL, 0,
ELEMENT_MYSTERY, 0,
ELEMENT_MYSTERY, 0,
ELEMENT_END,
};

20
src/battle/area/flo2/actor/huff_n_puff.c
View File

@ -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)

2
src/battle/area/flo2/actor/tuff_puff.c
View File

@ -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,

8
src/battle/area/hos/actor/goombario_tutor.c
View File

@ -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)

144
src/battle/area/hos/actor/magikoopa.c
View File

@ -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)

20
src/battle/area/isk_part_1/actor/stone_chomp.c
View File

@ -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 },
},

18
src/battle/area/isk_part_1/area.c
View File

@ -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)),
{},
};

20
src/battle/area/isk_part_2/actor/chain_chomp.c
View File

@ -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 },
},

16
src/battle/area/isk_part_2/actor/tutankoopa.c
View File

@ -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 },
},

10
src/battle/area/iwa/actor/buzzar.c
View File

@ -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 },
},

6
src/battle/area/iwa/area.c
View File

@ -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)),
{},
};

2
src/battle/area/jan/actor/hurt_plant.c
View File

@ -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 },
},

90
src/battle/area/jan/actor/jungle_fuzzy.c
View File

@ -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

2
src/battle/area/jan/actor/m_bush.c
View File

@ -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 },
},

54
src/battle/area/jan/actor/spear_guy.c
View File

@ -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)

16
src/battle/area/kgr/actor/fuzzipede.c
View File

@ -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)

2
src/battle/area/kgr/stage/kgr_01.c
View File

@ -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)

2
src/battle/area/kmr_part_2/actor/blue_goomba_1.c
View File

@ -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 },
},

22
src/battle/area/kmr_part_2/actor/goomnut_tree.c
View File

@ -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

2
src/battle/area/kmr_part_3/actor/egg_jr_troopa.c
View File

@ -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 },
},

4
src/battle/area/kmr_part_3/actor/final_jr_troopa.c
View File

@ -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 },
},

2
src/battle/area/kmr_part_3/actor/jr_troopa.c
View File

@ -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 },
},

4
src/battle/area/kmr_part_3/actor/mage_jr_troopa.c
View File

@ -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 },
},

4
src/battle/area/kmr_part_3/actor/para_jr_troopa.c
View File

@ -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 },
},

6
src/battle/area/kmr_part_3/actor/paragoomba.c
View File

@ -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 },
},

2
src/battle/area/kmr_part_3/stage/kmr_05.c
View File

@ -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)

2
src/battle/area/kmr_part_3/stage/mac_01.c
View File

@ -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)

2
src/battle/area/kmr_part_3/stage/sam_01.c
View File

@ -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)

18
src/battle/area/kpa/actor/bony_beetle.c
View File

@ -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)

22
src/battle/area/kpa2/actor/bowser_intro.c
View File

@ -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

2
src/battle/area/kpa2/actor/bowser_phase_1.c
View File

@ -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)

2
src/battle/area/kpa3/actor/anti_guy.c
View File

@ -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 },
},

38
src/battle/area/kpa4/actor/bombshell_bill.c
View File

@ -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

30
src/battle/area/kpa4/actor/bombshell_bill_blaster.c
View File

@ -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))

8
src/battle/area/kzn/actor/lava_bubble.c
View File

@ -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 },
},

72
src/battle/area/kzn2/actor/lava_piranha.c
View File

@ -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)

6
src/battle/area/mac/actor/chan.c
View File

@ -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)

36
src/battle/area/mac/actor/lee.c
View File

@ -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 },
},

8
src/battle/area/mac/actor/master1.c
View File

@ -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)

8
src/battle/area/mac/actor/master2.c
View File

@ -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)

10
src/battle/area/mac/actor/master3.c
View File

@ -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)

2
src/battle/area/mac/stage/mac_01.c
View File

@ -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)

36
src/battle/area/mim/actor/forest_fuzzy.c
View File

@ -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

26
src/battle/area/nok/actor/kent_c_koopa.c
View File

@ -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)

2
src/battle/area/omo/actor/anti_guy.c
View File

@ -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 },
},

2
src/battle/area/omo/actor/blue_shy_guy.c
View File

@ -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 },
},

2
src/battle/area/omo/actor/green_shy_guy.c
View File

@ -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 },
},

26
src/battle/area/omo/actor/groove_guy.c
View File

@ -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

2
src/battle/area/omo/actor/pink_shy_guy.c
View File

@ -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 },
},

12
src/battle/area/omo/actor/sky_guy.c
View File

@ -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 },
},

10
src/battle/area/omo/actor/spy_guy.c
View File

@ -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)

2
src/battle/area/omo/actor/yellow_shy_guy.c
View File

@ -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 },
},

14
src/battle/area/omo/area.c
View File

@ -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)),
{},
};

2
src/battle/area/omo2_2/actor/stilt_guy.c
View File

@ -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)

24
src/battle/area/pra2/actor/crystal_king.c
View File

@ -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)

2
src/battle/area/pra2/stage/sam_04.c
View File

@ -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();

2
src/battle/area/sam/stage/sam_01.c
View File

@ -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)

2
src/battle/area/sam/stage/sam_02.c
View File

@ -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)

2
src/battle/area/sam/stage/sam_02b.c
View File

@ -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)

2
src/battle/area/sam/stage/sam_02c.c
View File

@ -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)

2
src/battle/area/sam/stage/sam_02d.c
View File

@ -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)

2
src/battle/area/sam/stage/sam_03.c
View File

@ -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();

2
src/battle/area/sam2/actor/monstar.c
View File

@ -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)

2
src/battle/area/sam2/stage/sam_01.c
View File

@ -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)

2
src/battle/area/sam2/stage/sam_02.c
View File

@ -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)

2
src/battle/area/sam2/stage/sam_02b.c
View File

@ -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)

2
src/battle/area/sam2/stage/sam_02c.c
View File

@ -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)

2
src/battle/area/sam2/stage/sam_02d.c
View File

@ -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)

2
src/battle/area/sam2/stage/sam_03.c
View File

@ -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();

6
src/battle/area/tik/actor/dark_koopa.c
View File

@ -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)

6
src/battle/area/tik/actor/dark_paratroopa.c
View File

@ -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)

2
src/battle/area/tik/stage/tik_04.c
View File

@ -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)

54
src/battle/area/tik2/actor/blooper_baby.c
View File

@ -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

2
src/battle/area/tik2/stage/tik_04.c
View File

@ -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)

2
src/battle/area/tik3/stage/tik_04.c
View File

@ -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)

37
src/battle/area/trd_part_1/actor/bill_blaster.c
View File

@ -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))

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