From 78a729a7a3bc3e36bcd21536ea9e70c25e9e58d2 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 24 Aug 2021 17:42:29 +0100 Subject: [PATCH] NPC animation cleanup (#384) * remove BattleID and NpcAnimId typedefs * change NPC_ANIM generation * struct for StaticNpc.animations * ~peach_make_disguise_npc --- include/functions.h | 15 - include/map.h | 25 +- include/types.h | 5 +- include/variables.h | 5 - src/7E9D0.c | 45 ++ src/battle/area_kmr_part_1/actor/goomba.c | 116 ++-- src/battle/area_kmr_part_1/actor/paragoomba.c | 230 +++---- .../area_kmr_part_1/actor/spiked_goomba.c | 120 ++-- src/battle/partner/goombario.c | 132 ++-- src/npc.c | 4 +- src/npc.h | 4 +- src/world/action/idle.c | 4 +- src/world/actions.c | 16 +- src/world/actions.h | 15 +- src/world/area_arn/arn_02/events.c | 96 +-- src/world/area_arn/arn_03/events.c | 368 +++++------ src/world/area_arn/arn_04/events.c | 128 ++-- src/world/area_arn/arn_05/events.c | 456 ++++++------- src/world/area_arn/arn_07/BECDF0.c | 10 +- src/world/area_arn/arn_07/events.c | 518 +++++++-------- src/world/area_arn/arn_08/events.c | 86 +-- src/world/area_arn/arn_09/events.c | 36 +- src/world/area_arn/arn_10/events.c | 74 +-- src/world/area_arn/arn_11/events.c | 40 +- src/world/area_arn/arn_12/events.c | 74 +-- src/world/area_arn/arn_13/events.c | 74 +-- src/world/area_dgb/dgb_00/BFA100.c | 296 ++++----- src/world/area_dgb/dgb_01/BFD9A0.c | 280 ++++---- src/world/area_dgb/dgb_02/C2EBA0.c | 152 ++--- src/world/area_dgb/dgb_03/C31730.c | 196 +++--- src/world/area_dgb/dgb_04/C36530.c | 34 +- src/world/area_dgb/dgb_05/C3AA10.c | 132 ++-- src/world/area_dgb/dgb_06/C3D080.c | 36 +- src/world/area_dgb/dgb_07/C3DBF0.c | 88 +-- src/world/area_dgb/dgb_08/C3FDB0.c | 400 ++++++------ src/world/area_dgb/dgb_09/C46BE0.c | 186 +++--- src/world/area_dgb/dgb_15/C4F510.c | 40 +- src/world/area_dgb/dgb_16/C52540.c | 408 ++++++------ src/world/area_dgb/dgb_18/C55F40.c | 128 ++-- src/world/area_dro/dro_01/95B7E0.c | 592 ++++++++--------- src/world/area_dro/dro_02/9694C0.c | 440 ++++++------- src/world/area_flo/flo_00/C9DF60.c | 487 +++++++------- src/world/area_flo/flo_03/CA72E0.c | 304 ++++----- src/world/area_flo/flo_07/CAC5D0.c | 82 +-- src/world/area_flo/flo_08/CAFAC0.c | 326 +++++----- src/world/area_flo/flo_09/CB50E0.c | 128 ++-- src/world/area_flo/flo_10/CB9280.c | 86 +-- src/world/area_flo/flo_11/CBDCD0.c | 72 +- src/world/area_flo/flo_12/CC0E70.c | 116 ++-- src/world/area_flo/flo_13/CC3850.c | 436 +++++++------ src/world/area_flo/flo_14/CCBE20.c | 64 +- src/world/area_flo/flo_15/CD06C0.c | 82 +-- src/world/area_flo/flo_16/CD2C80.c | 64 +- src/world/area_flo/flo_17/CD7350.c | 192 +++--- src/world/area_flo/flo_18/CDC6A0.c | 200 +++--- src/world/area_flo/flo_21/CE6700.c | 614 +++++++++--------- src/world/area_flo/flo_22/CEC240.c | 76 +-- src/world/area_flo/flo_23/CEE2A0.c | 134 ++-- src/world/area_flo/flo_25/CF2C10.c | 134 ++-- src/world/area_kmr/kmr_03/8C8140.c | 50 +- src/world/area_kmr/kmr_12/events.c | 40 +- src/world/area_sbk/sbk_00/9292B0.c | 64 +- src/world/area_sbk/sbk_01/929AD0.c | 64 +- src/world/partner/goombario.c | 2 +- src/world/partners.c | 22 +- src/world/partners.h | 2 +- tools/build/sprites/header.py | 11 +- tools/make_npc_structs.py | 4 +- tools/star_rod_idx_to_c.py | 10 +- 69 files changed, 5006 insertions(+), 4964 deletions(-) diff --git a/include/functions.h b/include/functions.h index d9848124bc..2cbc9341ee 100644 --- a/include/functions.h +++ b/include/functions.h @@ -7,8 +7,6 @@ #include "enums.h" f32 fabsf(f32 f); -f32 sqrtf(f32 f); -f64 sqrt(f64 d); f32 cosine(s16 arg0); s32 strcmp(const char* str1, const char* str2); @@ -54,7 +52,6 @@ void player_input_to_move_vector(f32* angle, f32* magnitude); void exec_ShakeCamX(s32 arg0, s32 arg1, s32 arg2, f32 arg3); f32 func_800E5348(void); -void transform_point(Matrix4f mtx, f32, f32, f32, f32, f32*, f32*, f32*, f32*); void draw_number(s32 value, s32 x, s32 y, s32 arg3, s32 palette, s32 opacity, s32 style); void set_entity_model_render_command_list(s32 idx, u32* commandList); @@ -114,9 +111,6 @@ void entity_HugeBlueSwitch_init(Entity* entity); s32 dispatch_damage_event_actor_0(Actor* actor, s32 damageAmount, s32 event); -// todo remove once we have libultra's def -extern void guOrtho(Mtx *m, float l, float r, float b, float t, - float n, float f, float scale); // Text MessagePrintState* msg_get_printer_for_string(s32 stringID, s32* a1); @@ -323,8 +317,6 @@ void enemy_create_target_list(Actor* actor); void set_actor_yaw(ActorID actorID, s32 yaw); void set_part_yaw(ActorID actorID, s32 partIndex, s32 value); -ActorPart* get_actor_part(Actor* actor, s32 partIndex); - void add_part_decoration(ActorPart* part, s32 decorationIndex, DecorationID decorationType); void add_actor_decoration(Actor* actor, s32 decorationIndex, DecorationID decorationType); void remove_part_decoration(ActorPart* part, s32 decorationIndex); @@ -380,7 +372,6 @@ void func_80036430(void); void func_8003646C(void); void func_80036640(void); void state_init_enter_world(void); -void state_step_enter_world(void); void state_drawUI_enter_world(void); void state_init_world(void); void state_step_world(void); @@ -417,11 +408,6 @@ void state_step_demo(void); void state_drawUI_demo(void); void func_802B2078(void); -extern f32 gCurtainScale; -extern f32 gCurtainScaleGoal; -extern f32 gCurtainFade; -extern f32 gCurtainFadeGoal; -extern UNK_FUN_PTR(gCurtainDrawCallback); void spr_update_player_sprite(s32, s32, f32); void initialize_curtains(void); @@ -463,7 +449,6 @@ void DeadUnkNpcAIFunc1(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi s32* spr_get_npc_palettes(u16 arg0); void spr_draw_player_sprite(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4); void spr_draw_npc_sprite(s32 arg0, s32 arg1, s32 arg2, s32 arg3, Matrix4f* arg4); -void guRotateRPYF(float mf[4][4], f32 x, f32 y, f32 z); s32 spr_update_sprite(s32 arg0, s32 arg1, f32 arg2); s32 npc_raycast_down_ahead(s32, f32*, f32*, f32*, f32*, f32, f32); void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); diff --git a/include/map.h b/include/map.h index a96fe31cca..c537ebdf32 100644 --- a/include/map.h +++ b/include/map.h @@ -62,7 +62,7 @@ typedef struct Area { typedef struct NpcBlueprint { /* 0x00 */ s32 flags; - /* 0x04 */ NpcAnimID initialAnim; + /* 0x04 */ s32 initialAnim; /* 0x08 */ void (*onUpdate)(struct Npc*); /* 0x0C */ void (*onRender)(struct Npc*); } NpcBlueprint; // size = 0x10 @@ -205,9 +205,26 @@ typedef struct StaticNpc { /* 0x0DA */ s16 minCoinBonus; /* 0x0DC */ s16 maxCoinBonus; /* 0x0E0 */ s32 movement[48]; // TODO: type - /* 0x1A0 */ NpcAnimID animations[16]; + /* 0x1A0 */ struct { + /* 0x00 */ s32 idle; + /* 0x04 */ s32 walk; + /* 0x08 */ s32 run; + /* 0x0C */ s32 chase; + /* 0x10 */ s32 unk_10; + /* 0x14 */ s32 unk_14; + /* 0x18 */ s32 death; + /* 0x1C */ s32 hit; + /* 0x20 */ s32 unk_20; + /* 0x24 */ s32 unk_24; + /* 0x28 */ s32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ s32 unk_30; + /* 0x34 */ s32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; + } animations; /* 0x1E0 */ char unk_1E0[8]; - /* 0x1E8 */ NpcAnimID* extraAnimations; + /* 0x1E8 */ s32* extraAnimations; /* 0x1EC */ MessageID tattle; } StaticNpc; // size = 0x1F0 @@ -307,7 +324,7 @@ typedef struct Enemy { typedef struct { /* 0x00 */ s32 npcCount; /* 0x04 */ StaticNpc* npcs; - /* 0x08 */ BattleID battle; + /* 0x08 */ s32 battle; } NpcGroupList[]; // size = 0x0C #define NPC_GROUP(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle } diff --git a/include/types.h b/include/types.h index 81e3986d20..b9918b18a0 100644 --- a/include/types.h +++ b/include/types.h @@ -16,10 +16,9 @@ typedef void (*StateFunc)(void); /// Linker symbol address, as in `ld_addrs.h`. typedef u8 Addr[]; -typedef s32 BattleID; #define BATTLE_ID(unk, area, stage, index) ((unk << 24) + (area << 16) + (stage << 8) + index) -typedef s32 NpcAnimID; -#define NPC_ANIM(sprite, palette, anim) (((_NPC_SPRITE_##sprite << 16) + (_NPC_PALETTE_##sprite##_##palette << 8) + _NPC_ANIM_##sprite##_##anim)) +/// Terminates an extraAnimationList #define ANIM_END -1 + #endif diff --git a/include/variables.h b/include/variables.h index f951b7627d..a333611db8 100644 --- a/include/variables.h +++ b/include/variables.h @@ -319,9 +319,6 @@ extern u8 D_800779B0; extern u32 D_80078174; extern u8 D_800A0963; -extern s32 D_8009A5D0; -extern s32 D_8009A678; - extern UNK_TYPE D_802EB3B0; extern UNK_TYPE D_00000094; extern UNK_TYPE D_00000094_2; // two symbols resolve to the same addr. Required for matching @@ -372,7 +369,6 @@ extern u32* D_802EAE7C; extern s32 D_80291FA8[]; extern s32 D_80291FD0[]; extern s32 D_80291FF8[]; -extern s32 D_80291FF8[]; extern s32 D_80292020[]; extern s32 D_80292048[]; extern s32 D_80292070[]; @@ -380,7 +376,6 @@ extern s32 D_80292098[]; extern s32 D_80292098[]; extern s32 D_802920C0[]; extern s32 D_802920E8[]; -extern s32 D_802920E8[]; extern s32 D_80292110[]; extern s32 D_800F7BE8[]; diff --git a/src/7E9D0.c b/src/7E9D0.c index 1e813267ab..b8eb4a3d84 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -1,5 +1,9 @@ +// this file and world/actions.c are candidates for merging + #include "common.h" #include "world/partners.h" +#include "world/actions.h" +#include "npc.h" extern s32 D_8010C924; extern s32 D_8010C964; @@ -311,7 +315,48 @@ void peach_sync_disguise_npc(void) { } } + +#ifdef NON_MATCHING +Npc* peach_make_disguise_npc(s32 peachDisguise) { + PlayerStatus* playerStatus = &gPlayerStatus; + NpcBlueprint blueprint; + Npc* npc; + f32 yaw; + + if (peachDisguise == 0) { + return NULL; + } + + playerStatus->colliderHeight = 37; + playerStatus->colliderDiameter = 38; + playerStatus->peachDisguise = gGameStatusPtr->peachDisguise = peachDisguise; + + blueprint.flags = NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_100 | NPC_FLAG_40000; + blueprint.initialAnim = world_actions_peachDisguises[playerStatus->peachDisguise].idle; + blueprint.onRender = NULL; + blueprint.onUpdate = NULL; + D_8010C96C = _create_npc_standard(&blueprint, &D_800F7C7C[playerStatus->peachDisguise]); + npc = get_npc_by_index(D_8010C96C); + + disable_npc_shadow(npc); + + if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) { + yaw = 180.0f; + } else { + yaw = 0.0f; + } + + set_npc_yaw(npc, yaw); + + npc->pos.x = playerStatus->position.x; + npc->pos.y = playerStatus->position.y; + npc->pos.z = playerStatus->position.z; + + return npc; +} +#else INCLUDE_ASM(Npc*, "7bb60_len_41b0", peach_make_disguise_npc, s32 peachDisguise); +#endif INCLUDE_ASM(s32, "7bb60_len_41b0", peach_disguise_check_overlaps); diff --git a/src/battle/area_kmr_part_1/actor/goomba.c b/src/battle/area_kmr_part_1/actor/goomba.c index 418b6c6e22..8f252143d3 100644 --- a/src/battle/area_kmr_part_1/actor/goomba.c +++ b/src/battle/area_kmr_part_1/actor/goomba.c @@ -77,28 +77,28 @@ ActorDesc NAMESPACE = { }; s32 N(idleAnimations_80219714)[] = { - STATUS_NORMAL, NPC_ANIM(goomba, normal, idle), - STATUS_STONE, NPC_ANIM(goomba, normal, still), - STATUS_SLEEP, NPC_ANIM(goomba, normal, asleep), - STATUS_POISON, NPC_ANIM(goomba, normal, idle), - STATUS_STOP, NPC_ANIM(goomba, normal, still), - STATUS_STATIC, NPC_ANIM(goomba, normal, idle), - STATUS_PARALYZE, NPC_ANIM(goomba, normal, still), - STATUS_DIZZY, NPC_ANIM(goomba, normal, dizzy), - STATUS_FEAR, NPC_ANIM(goomba, normal, dizzy), + STATUS_NORMAL, NPC_ANIM_goomba_normal_idle, + STATUS_STONE, NPC_ANIM_goomba_normal_still, + STATUS_SLEEP, NPC_ANIM_goomba_normal_asleep, + STATUS_POISON, NPC_ANIM_goomba_normal_idle, + STATUS_STOP, NPC_ANIM_goomba_normal_still, + STATUS_STATIC, NPC_ANIM_goomba_normal_idle, + STATUS_PARALYZE, NPC_ANIM_goomba_normal_still, + STATUS_DIZZY, NPC_ANIM_goomba_normal_dizzy, + STATUS_FEAR, NPC_ANIM_goomba_normal_dizzy, STATUS_END, }; s32 N(idleAnimations_80219760)[] = { - STATUS_NORMAL, NPC_ANIM(goomba, normal, run), - STATUS_STONE, NPC_ANIM(goomba, normal, still), - STATUS_SLEEP, NPC_ANIM(goomba, normal, asleep), - STATUS_POISON, NPC_ANIM(goomba, normal, idle), - STATUS_STOP, NPC_ANIM(goomba, normal, still), - STATUS_STATIC, NPC_ANIM(goomba, normal, run), - STATUS_PARALYZE, NPC_ANIM(goomba, normal, still), - STATUS_DIZZY, NPC_ANIM(goomba, normal, dizzy), - STATUS_FEAR, NPC_ANIM(goomba, normal, dizzy), + STATUS_NORMAL, NPC_ANIM_goomba_normal_run, + STATUS_STONE, NPC_ANIM_goomba_normal_still, + STATUS_SLEEP, NPC_ANIM_goomba_normal_asleep, + STATUS_POISON, NPC_ANIM_goomba_normal_idle, + STATUS_STOP, NPC_ANIM_goomba_normal_still, + STATUS_STATIC, NPC_ANIM_goomba_normal_run, + STATUS_PARALYZE, NPC_ANIM_goomba_normal_still, + STATUS_DIZZY, NPC_ANIM_goomba_normal_dizzy, + STATUS_FEAR, NPC_ANIM_goomba_normal_dizzy, STATUS_END, }; @@ -168,85 +168,85 @@ EvtSource N(handleEvent_80219AD4) = SCRIPT({ match SI_VAR(0) { EVENT_HIT_COMBO, EVENT_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoNormalHit; } == EVENT_BURN_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_pain); - SI_VAR(2) = (const) NPC_ANIM(goomba, normal, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain; + SI_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead; await DoBurnHit; } == EVENT_BURN_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_pain); - SI_VAR(2) = (const) NPC_ANIM(goomba, normal, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain; + SI_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead; await DoBurnHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_dead; await DoDeath; return; } == EVENT_SPIN_SMASH_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoSpinSmashHit; } == EVENT_SPIN_SMASH_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoSpinSmashHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead; await DoDeath; return; } == EVENT_SHOCK_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, electrocute); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute; await DoShockHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoJumpBack; JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, dizzy)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_dizzy); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 8.0); RunToGoal(ACTOR_SELF, 0, FALSE); SetAnimationRate(ACTOR_SELF, 1, 1.0); sleep 5; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); SetActorJumpGravity(ACTOR_SELF, 1.6); JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); } == EVENT_SHOCK_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, electrocute); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute; await DoShockHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead; await DoDeath; return; } == EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, idle); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_idle; await DoImmune; } == EVENT_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoNormalHit; sleep 10; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead; await DoDeath; return; } == EVENT_END_FIRST_STRIKE { SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_run); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 4.0); RunToGoal(ACTOR_SELF, 0, FALSE); @@ -255,31 +255,31 @@ EvtSource N(handleEvent_80219AD4) = SCRIPT({ } == EVENT_RECOVER_STATUS { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, idle); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_idle; await DoRecover; } == EVENT_SCARE_AWAY { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, run); - SI_VAR(2) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_run; + SI_VAR(2) = (const) NPC_ANIM_goomba_normal_pain; await DoScareAway; return; } == EVENT_BEGIN_AIR_LIFT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, run); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_run; await DoAirLift; } == EVENT_BLOW_AWAY { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoBlowAway; return; } else { } } - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); EnableIdleScript(ACTOR_SELF, TRUE); UseIdleAnimation(ACTOR_SELF, TRUE); }); @@ -293,18 +293,18 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({ UseBattleCamPreset(63); BattleCamTargetActor(ACTOR_SELF); func_8024ECF8(-1, 1, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_run); SetGoalToTarget(ACTOR_SELF); AddGoalPos(ACTOR_SELF, 50, 0, 0); SetActorSpeed(ACTOR_SELF, 6.0); RunToGoal(ACTOR_SELF, 0, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); SetActorDispOffset(ACTOR_SELF, 0, -1, 0); sleep 1; SetActorDispOffset(ACTOR_SELF, 0, -2, 0); sleep 5; SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 1, 16); match SI_VAR(0) { HIT_RESULT_MISS, HIT_RESULT_LUCKY { @@ -331,10 +331,10 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({ } spawn { sleep 6; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); } JumpToGoal(ACTOR_SELF, 16, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, asleep)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_asleep); SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0); SetActorDispOffset(ACTOR_SELF, 0, 5, 0); sleep 1; @@ -343,14 +343,14 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({ sleep 1; SetActorScale(ACTOR_SELF, 1.0, 1.0, 1.0); SetActorDispOffset(ACTOR_SELF, 0, 7, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, pain)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pain); sleep 5; if (SI_VAR(10) == 5) { EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0x80000000)), 0, 0, 0); } sleep 5; SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); SetGoalToTarget(ACTOR_SELF); GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 20; @@ -365,10 +365,10 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({ SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0)); sleep 1; } - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); } JumpToGoal(ACTOR_SELF, 15, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, dizzy)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_dizzy); sleep 5; UseBattleCamPreset(2); YieldTurn(); @@ -381,7 +381,7 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({ SetAnimationRate(ACTOR_SELF, 1, 1.0); SetActorYaw(ACTOR_SELF, 0); sleep 5; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); SetActorJumpGravity(ACTOR_SELF, 1.6); JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); RemoveActorDecoration(ACTOR_SELF, 1, 0); @@ -407,10 +407,10 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({ } spawn { sleep 6; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); } JumpToGoal(ACTOR_SELF, 16, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, pre_headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pre_headbonk); SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0); sleep 1; SetActorScale(ACTOR_SELF, 1.3, 0.5, 1.0); @@ -427,7 +427,7 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({ sleep 1; SetActorRotation(ACTOR_SELF, 0, 0, 0); SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 40; SI_VAR(1) = 0; @@ -440,11 +440,11 @@ EvtSource N(takeTurn_8021A300) = SCRIPT({ SI_VAR(0) += 20; SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); JumpToGoal(ACTOR_SELF, 6, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); sleep 3; YieldTurn(); SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_run); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 8.0); RunToGoal(ACTOR_SELF, 0, FALSE); diff --git a/src/battle/area_kmr_part_1/actor/paragoomba.c b/src/battle/area_kmr_part_1/actor/paragoomba.c index b58dc60754..70b8970b7f 100644 --- a/src/battle/area_kmr_part_1/actor/paragoomba.c +++ b/src/battle/area_kmr_part_1/actor/paragoomba.c @@ -149,38 +149,38 @@ ActorDesc NAMESPACE = { }; s32 N(idleAnimations_8021CD28)[] = { - STATUS_NORMAL, NPC_ANIM(paragoomba, default, idle), - STATUS_STONE, NPC_ANIM(paragoomba, default, still), - STATUS_SLEEP, NPC_ANIM(paragoomba, default, sleep), - STATUS_POISON, NPC_ANIM(paragoomba, default, idle), - STATUS_STOP, NPC_ANIM(paragoomba, default, still), - STATUS_STATIC, NPC_ANIM(paragoomba, default, idle), - STATUS_PARALYZE, NPC_ANIM(paragoomba, default, still), - STATUS_DIZZY, NPC_ANIM(paragoomba, default, dizzy), - STATUS_FEAR, NPC_ANIM(paragoomba, default, dizzy), + STATUS_NORMAL, NPC_ANIM_paragoomba_default_idle, + STATUS_STONE, NPC_ANIM_paragoomba_default_still, + STATUS_SLEEP, NPC_ANIM_paragoomba_default_sleep, + STATUS_POISON, NPC_ANIM_paragoomba_default_idle, + STATUS_STOP, NPC_ANIM_paragoomba_default_still, + STATUS_STATIC, NPC_ANIM_paragoomba_default_idle, + STATUS_PARALYZE, NPC_ANIM_paragoomba_default_still, + STATUS_DIZZY, NPC_ANIM_paragoomba_default_dizzy, + STATUS_FEAR, NPC_ANIM_paragoomba_default_dizzy, STATUS_END, }; s32 N(idleAnimations_8021CD74)[] = { - STATUS_NORMAL, NPC_ANIM(paragoomba, default, run), - STATUS_STONE, NPC_ANIM(paragoomba, default, still), - STATUS_SLEEP, NPC_ANIM(paragoomba, default, sleep), - STATUS_POISON, NPC_ANIM(paragoomba, default, idle), - STATUS_STOP, NPC_ANIM(paragoomba, default, still), - STATUS_STATIC, NPC_ANIM(paragoomba, default, run), - STATUS_PARALYZE, NPC_ANIM(paragoomba, default, still), - STATUS_DIZZY, NPC_ANIM(paragoomba, default, dizzy), - STATUS_FEAR, NPC_ANIM(paragoomba, default, dizzy), + STATUS_NORMAL, NPC_ANIM_paragoomba_default_run, + STATUS_STONE, NPC_ANIM_paragoomba_default_still, + STATUS_SLEEP, NPC_ANIM_paragoomba_default_sleep, + STATUS_POISON, NPC_ANIM_paragoomba_default_idle, + STATUS_STOP, NPC_ANIM_paragoomba_default_still, + STATUS_STATIC, NPC_ANIM_paragoomba_default_run, + STATUS_PARALYZE, NPC_ANIM_paragoomba_default_still, + STATUS_DIZZY, NPC_ANIM_paragoomba_default_dizzy, + STATUS_FEAR, NPC_ANIM_paragoomba_default_dizzy, STATUS_END, }; s32 N(idleAnimations_8021CDC0)[] = { - STATUS_NORMAL, NPC_ANIM(paragoomba, default, left_wing_only), + STATUS_NORMAL, NPC_ANIM_paragoomba_default_left_wing_only, STATUS_END, }; s32 N(idleAnimations_8021CDCC)[] = { - STATUS_NORMAL, NPC_ANIM(paragoomba, default, right_wing_only), + STATUS_NORMAL, NPC_ANIM_paragoomba_default_right_wing_only, STATUS_END, }; @@ -245,7 +245,7 @@ EvtSource N(8021D0E0) = SCRIPT({ SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 7.0); FlyToGoal(ACTOR_SELF, 0, 1, 11); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, idle)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_idle); }); EvtSource N(8021DF64); @@ -257,7 +257,7 @@ EvtSource N(handleEvent_8021D158) = SCRIPT({ match SI_VAR(0) { EVENT_HIT_COMBO, EVENT_HIT { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain; await DoNormalHit; GetBattlePhase(SI_VAR(0)); if (SI_VAR(0) == 1) { @@ -269,64 +269,64 @@ EvtSource N(handleEvent_8021D158) = SCRIPT({ } == EVENT_BURN_HIT { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, burn_pain); - SI_VAR(2) = (const) NPC_ANIM(paragoomba, default, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain; + SI_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead; await DoBurnHit; } == EVENT_BURN_DEATH { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, burn_pain); - SI_VAR(2) = (const) NPC_ANIM(paragoomba, default, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain; + SI_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead; await DoBurnHit; SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_dead; await DoDeath; return; } == EVENT_FALL_TRIGGER { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain; await DoNormalHit; await N(8021DF64); } == 15 { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, burn_pain); - SI_VAR(2) = (const) NPC_ANIM(paragoomba, default, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_burn_pain; + SI_VAR(2) = (const) NPC_ANIM_paragoomba_default_burn_dead; await DoBurnHit; await N(8021DF64); } == EVENT_SHOCK_HIT { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, electrocute); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_electrocute; await DoShockHit; SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain; await DoJumpBack; - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, dizzy)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_dizzy); await N(8021D0E0); } == EVENT_SHOCK_DEATH { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, electrocute); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_electrocute; await DoShockHit; SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, dead); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_dead; await DoDeath; return; } == EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, idle); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_idle; await DoImmune; } == EVENT_DEATH { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain; await DoNormalHit; sleep 10; SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, dead); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_dead; await DoDeath; return; } @@ -335,31 +335,31 @@ EvtSource N(handleEvent_8021D158) = SCRIPT({ HPBarToCurrent(ACTOR_SELF); } == EVENT_END_FIRST_STRIKE { - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, run)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_run); await N(8021D0E0); HPBarToHome(ACTOR_SELF); } == EVENT_RECOVER_STATUS { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, idle); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_idle; await DoRecover; } == EVENT_SCARE_AWAY { SetActorFlagBits(ACTOR_SELF, 512, 0); SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, run); - SI_VAR(2) = (const) NPC_ANIM(paragoomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_run; + SI_VAR(2) = (const) NPC_ANIM_paragoomba_default_pain; await DoScareAway; return; } == EVENT_BEGIN_AIR_LIFT { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, run); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_run; await DoAirLift; } == EVENT_BLOW_AWAY { SI_VAR(0) = (const) 2; - SI_VAR(1) = (const) NPC_ANIM(paragoomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_paragoomba_default_pain; await DoBlowAway; return; } @@ -378,7 +378,7 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({ UseBattleCamPreset(63); BattleCamTargetActor(ACTOR_SELF); func_8024ECF8(-1, 1, 0); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, run)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_run); SetGoalToTarget(ACTOR_SELF); AddGoalPos(ACTOR_SELF, 50, 0, 0); SetActorSpeed(ACTOR_SELF, 6.0); @@ -396,7 +396,7 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({ SetActorSounds(ACTOR_SELF, 2, 0, 0); SetActorSpeed(ACTOR_SELF, 5.0); SetActorJumpGravity(ACTOR_SELF, 1.8); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, attack)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_attack); GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); JumpToGoal(ACTOR_SELF, 10, FALSE, FALSE, FALSE); @@ -407,7 +407,7 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({ SI_VAR(1) = 20; SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetActorSpeed(ACTOR_SELF, 8.0); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, attack)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_attack); FlyToGoal(ACTOR_SELF, 0, -10, 4); spawn { loop 4 { @@ -415,7 +415,7 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({ sleep 4; } } - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, aim)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_aim); AddActorDecoration(ACTOR_SELF, 2, 0, 2); SetAnimationRate(ACTOR_SELF, 2, 3.0); sleep 10; @@ -427,7 +427,7 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({ UseBattleCamPreset(2); ResetAllActorSounds(ACTOR_SELF); YieldTurn(); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, run)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_run); SetActorYaw(ACTOR_SELF, 180); await N(8021D0E0); SetActorYaw(ACTOR_SELF, 0); @@ -446,7 +446,7 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({ SetActorSounds(ACTOR_SELF, 2, 0, 0); SetActorSpeed(ACTOR_SELF, 5.0); SetActorJumpGravity(ACTOR_SELF, 1.8); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, attack)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_attack); GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); JumpToGoal(ACTOR_SELF, 10, FALSE, FALSE, FALSE); @@ -454,7 +454,7 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({ SetActorSounds(ACTOR_SELF, 1, 0, 0); SetGoalToTarget(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 8.0); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, attack)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_attack); FlyToGoal(ACTOR_SELF, 0, -10, 0); } } @@ -466,12 +466,12 @@ EvtSource N(takeTurn_8021D74C) = SCRIPT({ SetGoalToTarget(ACTOR_SELF); AddGoalPos(ACTOR_SELF, 50, 10, 0); SetActorSpeed(ACTOR_SELF, 6.0); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, run)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_run); FlyToGoal(ACTOR_SELF, 0, -10, 0); ResetAllActorSounds(ACTOR_SELF); sleep 5; YieldTurn(); - SetAnimation(ACTOR_SELF, 2, NPC_ANIM(paragoomba, default, run)); + SetAnimation(ACTOR_SELF, 2, NPC_ANIM_paragoomba_default_run); await N(8021D0E0); } } @@ -496,9 +496,9 @@ EvtSource N(8021DF64) = SCRIPT({ SetPartDispOffset(ACTOR_SELF, 4, 11, 7, -2); GetLastEvent(ACTOR_SELF, SI_VAR(0)); if (SI_VAR(0) == 15) { - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, burn_dead)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_burn_dead); } else { - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, pain)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pain); } SetActorSounds(ACTOR_SELF, 2, 769, 0); GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -513,7 +513,7 @@ EvtSource N(8021DF64) = SCRIPT({ ResetActorSounds(ACTOR_SELF, 2); GetLastEvent(ACTOR_SELF, SI_VAR(3)); if (SI_VAR(3) == 15) { - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, pain)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pain); GetActorPos(ACTOR_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); SI_VAR(4) += 10; SI_VAR(5) += 5; @@ -538,7 +538,7 @@ EvtSource N(8021DF64) = SCRIPT({ SetGoalToIndex(ACTOR_SELF, SI_VAR(0)); GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetHomePos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); SetActorFlagBits(ACTOR_SELF, 512, 0); SetStatusTable(ACTOR_SELF, N(statusTable_8021CB18)); SetActorType(ACTOR_SELF, ACTOR_TYPE_goomba); @@ -552,28 +552,28 @@ EvtSource N(8021DF64) = SCRIPT({ // TODO: deduplicate s32 N(idleAnimations_8021E4EC)[] = { - STATUS_NORMAL, NPC_ANIM(goomba, normal, idle), - STATUS_STONE, NPC_ANIM(goomba, normal, still), - STATUS_SLEEP, NPC_ANIM(goomba, normal, asleep), - STATUS_POISON, NPC_ANIM(goomba, normal, idle), - STATUS_STOP, NPC_ANIM(goomba, normal, still), - STATUS_STATIC, NPC_ANIM(goomba, normal, idle), - STATUS_PARALYZE, NPC_ANIM(goomba, normal, still), - STATUS_DIZZY, NPC_ANIM(goomba, normal, dizzy), - STATUS_FEAR, NPC_ANIM(goomba, normal, dizzy), + STATUS_NORMAL, NPC_ANIM_goomba_normal_idle, + STATUS_STONE, NPC_ANIM_goomba_normal_still, + STATUS_SLEEP, NPC_ANIM_goomba_normal_asleep, + STATUS_POISON, NPC_ANIM_goomba_normal_idle, + STATUS_STOP, NPC_ANIM_goomba_normal_still, + STATUS_STATIC, NPC_ANIM_goomba_normal_idle, + STATUS_PARALYZE, NPC_ANIM_goomba_normal_still, + STATUS_DIZZY, NPC_ANIM_goomba_normal_dizzy, + STATUS_FEAR, NPC_ANIM_goomba_normal_dizzy, STATUS_END, }; s32 N(idleAnimations_8021E538)[] = { - STATUS_NORMAL, NPC_ANIM(goomba, normal, run), - STATUS_STONE, NPC_ANIM(goomba, normal, still), - STATUS_SLEEP, NPC_ANIM(goomba, normal, asleep), - STATUS_POISON, NPC_ANIM(goomba, normal, idle), - STATUS_STOP, NPC_ANIM(goomba, normal, still), - STATUS_STATIC, NPC_ANIM(goomba, normal, run), - STATUS_PARALYZE, NPC_ANIM(goomba, normal, still), - STATUS_DIZZY, NPC_ANIM(goomba, normal, dizzy), - STATUS_FEAR, NPC_ANIM(goomba, normal, dizzy), + STATUS_NORMAL, NPC_ANIM_goomba_normal_run, + STATUS_STONE, NPC_ANIM_goomba_normal_still, + STATUS_SLEEP, NPC_ANIM_goomba_normal_asleep, + STATUS_POISON, NPC_ANIM_goomba_normal_idle, + STATUS_STOP, NPC_ANIM_goomba_normal_still, + STATUS_STATIC, NPC_ANIM_goomba_normal_run, + STATUS_PARALYZE, NPC_ANIM_goomba_normal_still, + STATUS_DIZZY, NPC_ANIM_goomba_normal_dizzy, + STATUS_FEAR, NPC_ANIM_goomba_normal_dizzy, STATUS_END, }; @@ -643,85 +643,85 @@ EvtSource N(handleEvent_8021E8AC) = SCRIPT({ match SI_VAR(0) { EVENT_HIT_COMBO, EVENT_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoNormalHit; } == EVENT_BURN_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_pain); - SI_VAR(2) = (const) NPC_ANIM(goomba, normal, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain; + SI_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead; await DoBurnHit; } == EVENT_BURN_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_pain); - SI_VAR(2) = (const) NPC_ANIM(goomba, normal, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_pain; + SI_VAR(2) = (const) NPC_ANIM_goomba_normal_burn_dead; await DoBurnHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_burn_dead; await DoDeath; return; } == EVENT_SPIN_SMASH_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoSpinSmashHit; } == EVENT_SPIN_SMASH_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoSpinSmashHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead; await DoDeath; return; } == EVENT_SHOCK_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, electrocute); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute; await DoShockHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoJumpBack; JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, dizzy)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_dizzy); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 8.0); RunToGoal(ACTOR_SELF, 0, FALSE); SetAnimationRate(ACTOR_SELF, 1, 1.0); sleep 5; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); SetActorJumpGravity(ACTOR_SELF, 1.6); JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); } == EVENT_SHOCK_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, electrocute); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_electrocute; await DoShockHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead; await DoDeath; return; } == EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, idle); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_idle; await DoImmune; } == EVENT_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoNormalHit; sleep 10; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, dead); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_dead; await DoDeath; return; } == EVENT_END_FIRST_STRIKE { SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_run); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 4.0); RunToGoal(ACTOR_SELF, 0, FALSE); @@ -730,31 +730,31 @@ EvtSource N(handleEvent_8021E8AC) = SCRIPT({ } == EVENT_RECOVER_STATUS { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, idle); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_idle; await DoRecover; } == EVENT_SCARE_AWAY { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, run); - SI_VAR(2) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_run; + SI_VAR(2) = (const) NPC_ANIM_goomba_normal_pain; await DoScareAway; return; } == EVENT_BEGIN_AIR_LIFT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, run); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_run; await DoAirLift; } == EVENT_BLOW_AWAY { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(goomba, normal, pain); + SI_VAR(1) = (const) NPC_ANIM_goomba_normal_pain; await DoBlowAway; return; } else { } } - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); EnableIdleScript(ACTOR_SELF, TRUE); UseIdleAnimation(ACTOR_SELF, TRUE); }); @@ -768,18 +768,18 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({ UseBattleCamPreset(63); BattleCamTargetActor(ACTOR_SELF); func_8024ECF8(-1, 1, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_run); SetGoalToTarget(ACTOR_SELF); AddGoalPos(ACTOR_SELF, 50, 0, 0); SetActorSpeed(ACTOR_SELF, 6.0); RunToGoal(ACTOR_SELF, 0, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); SetActorDispOffset(ACTOR_SELF, 0, -1, 0); sleep 1; SetActorDispOffset(ACTOR_SELF, 0, -2, 0); sleep 5; SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 1, 16); match SI_VAR(0) { HIT_RESULT_MISS, HIT_RESULT_LUCKY { @@ -806,10 +806,10 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({ } spawn { sleep 6; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); } JumpToGoal(ACTOR_SELF, 16, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, asleep)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_asleep); SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0); SetActorDispOffset(ACTOR_SELF, 0, 5, 0); sleep 1; @@ -818,14 +818,14 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({ sleep 1; SetActorScale(ACTOR_SELF, 1.0, 1.0, 1.0); SetActorDispOffset(ACTOR_SELF, 0, 7, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, pain)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pain); sleep 5; if (SI_VAR(10) == 5) { EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0x80000000)), 0, 0, 0); } sleep 5; SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); SetGoalToTarget(ACTOR_SELF); GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 20; @@ -840,10 +840,10 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({ SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0)); sleep 1; } - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); } JumpToGoal(ACTOR_SELF, 15, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, dizzy)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_dizzy); sleep 5; UseBattleCamPreset(2); YieldTurn(); @@ -856,7 +856,7 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({ SetAnimationRate(ACTOR_SELF, 1, 1.0); SetActorYaw(ACTOR_SELF, 0); sleep 5; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); SetActorJumpGravity(ACTOR_SELF, 1.6); JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); RemoveActorDecoration(ACTOR_SELF, 1, 0); @@ -882,10 +882,10 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({ } spawn { sleep 6; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_headbonk); } JumpToGoal(ACTOR_SELF, 16, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, pre_headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_pre_headbonk); SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0); sleep 1; SetActorScale(ACTOR_SELF, 1.3, 0.5, 1.0); @@ -902,7 +902,7 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({ sleep 1; SetActorRotation(ACTOR_SELF, 0, 0, 0); SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 40; SI_VAR(1) = 0; @@ -915,11 +915,11 @@ EvtSource N(takeTurn_8021F0D8) = SCRIPT({ SI_VAR(0) += 20; SetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); JumpToGoal(ACTOR_SELF, 6, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_idle); sleep 3; YieldTurn(); SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(goomba, normal, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_goomba_normal_run); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 8.0); RunToGoal(ACTOR_SELF, 0, FALSE); diff --git a/src/battle/area_kmr_part_1/actor/spiked_goomba.c b/src/battle/area_kmr_part_1/actor/spiked_goomba.c index b100bdea8e..daa19fa9e7 100644 --- a/src/battle/area_kmr_part_1/actor/spiked_goomba.c +++ b/src/battle/area_kmr_part_1/actor/spiked_goomba.c @@ -77,28 +77,28 @@ ActorDesc NAMESPACE = { }; s32 N(idleAnimations_8021B0D4)[] = { - STATUS_NORMAL, NPC_ANIM(spiked_goomba, default, idle), - STATUS_STONE, NPC_ANIM(spiked_goomba, default, still), - STATUS_SLEEP, NPC_ANIM(spiked_goomba, default, sleep), - STATUS_POISON, NPC_ANIM(spiked_goomba, default, idle), - STATUS_STOP, NPC_ANIM(spiked_goomba, default, still), - STATUS_STATIC, NPC_ANIM(spiked_goomba, default, idle), - STATUS_PARALYZE, NPC_ANIM(spiked_goomba, default, still), - STATUS_DIZZY, NPC_ANIM(spiked_goomba, default, dizzy), - STATUS_FEAR, NPC_ANIM(spiked_goomba, default, dizzy), + STATUS_NORMAL, NPC_ANIM_spiked_goomba_default_idle, + STATUS_STONE, NPC_ANIM_spiked_goomba_default_still, + STATUS_SLEEP, NPC_ANIM_spiked_goomba_default_sleep, + STATUS_POISON, NPC_ANIM_spiked_goomba_default_idle, + STATUS_STOP, NPC_ANIM_spiked_goomba_default_still, + STATUS_STATIC, NPC_ANIM_spiked_goomba_default_idle, + STATUS_PARALYZE, NPC_ANIM_spiked_goomba_default_still, + STATUS_DIZZY, NPC_ANIM_spiked_goomba_default_dizzy, + STATUS_FEAR, NPC_ANIM_spiked_goomba_default_dizzy, STATUS_END, }; s32 N(idleAnimations_8021B120)[] = { - STATUS_NORMAL, NPC_ANIM(spiked_goomba, default, run), - STATUS_STONE, NPC_ANIM(spiked_goomba, default, still), - STATUS_SLEEP, NPC_ANIM(spiked_goomba, default, sleep), - STATUS_POISON, NPC_ANIM(spiked_goomba, default, idle), - STATUS_STOP, NPC_ANIM(spiked_goomba, default, still), - STATUS_STATIC, NPC_ANIM(spiked_goomba, default, run), - STATUS_PARALYZE, NPC_ANIM(spiked_goomba, default, still), - STATUS_DIZZY, NPC_ANIM(spiked_goomba, default, dizzy), - STATUS_FEAR, NPC_ANIM(spiked_goomba, default, dizzy), + STATUS_NORMAL, NPC_ANIM_spiked_goomba_default_run, + STATUS_STONE, NPC_ANIM_spiked_goomba_default_still, + STATUS_SLEEP, NPC_ANIM_spiked_goomba_default_sleep, + STATUS_POISON, NPC_ANIM_spiked_goomba_default_idle, + STATUS_STOP, NPC_ANIM_spiked_goomba_default_still, + STATUS_STATIC, NPC_ANIM_spiked_goomba_default_run, + STATUS_PARALYZE, NPC_ANIM_spiked_goomba_default_still, + STATUS_DIZZY, NPC_ANIM_spiked_goomba_default_dizzy, + STATUS_FEAR, NPC_ANIM_spiked_goomba_default_dizzy, STATUS_END, }; @@ -168,85 +168,85 @@ EvtSource N(handleEvent_8021B494) = SCRIPT({ match SI_VAR(0) { EVENT_HIT_COMBO, EVENT_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain; await DoNormalHit; } == EVENT_BURN_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, burn_dead); - SI_VAR(2) = (const) NPC_ANIM(spiked_goomba, default, burn_pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_dead; + SI_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_burn_pain; await DoBurnHit; } == EVENT_BURN_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, burn_dead); - SI_VAR(2) = (const) NPC_ANIM(spiked_goomba, default, burn_pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_dead; + SI_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_burn_pain; await DoBurnHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, burn_pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_burn_pain; await DoDeath; return; } == EVENT_SPIN_SMASH_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain; await DoSpinSmashHit; } == EVENT_SPIN_SMASH_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain; await DoSpinSmashHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, dead); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead; await DoDeath; return; } == EVENT_SHOCK_HIT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, electrocute); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_electrocute; await DoShockHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain; await DoJumpBack; JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, dizzy)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_dizzy); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 8.0); RunToGoal(ACTOR_SELF, 0, FALSE); SetAnimationRate(ACTOR_SELF, 1, 1.0); sleep 5; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_idle); SetActorJumpGravity(ACTOR_SELF, 1.6); JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); } == EVENT_SHOCK_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, electrocute); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_electrocute; await DoShockHit; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, dead); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead; await DoDeath; return; } == EVENT_STAR_BEAM, 23, EVENT_IMMUNE, EVENT_AIR_LIFT_FAILED { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, idle); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_idle; await DoImmune; } == EVENT_DEATH { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain; await DoNormalHit; sleep 10; SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, dead); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_dead; await DoDeath; return; } == EVENT_END_FIRST_STRIKE { SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_run); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 4.0); RunToGoal(ACTOR_SELF, 0, FALSE); @@ -255,31 +255,31 @@ EvtSource N(handleEvent_8021B494) = SCRIPT({ } == EVENT_RECOVER_STATUS { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, idle); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_idle; await DoRecover; } == EVENT_SCARE_AWAY { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, run); - SI_VAR(2) = (const) NPC_ANIM(spiked_goomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_run; + SI_VAR(2) = (const) NPC_ANIM_spiked_goomba_default_pain; await DoScareAway; return; } == EVENT_BEGIN_AIR_LIFT { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, run); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_run; await DoAirLift; } == EVENT_BLOW_AWAY { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(spiked_goomba, default, pain); + SI_VAR(1) = (const) NPC_ANIM_spiked_goomba_default_pain; await DoBlowAway; return; } == EVENT_SPIKE_TAUNT { GetStatusFlags(ACTOR_SELF, SI_VAR(0)); if (SI_VAR(0) !& 3526656) { - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, laugh)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_laugh); } sleep 10; GetActorPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -295,7 +295,7 @@ EvtSource N(handleEvent_8021B494) = SCRIPT({ else { } } - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_idle); EnableIdleScript(ACTOR_SELF, TRUE); UseIdleAnimation(ACTOR_SELF, TRUE); }); @@ -309,18 +309,18 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({ UseBattleCamPreset(63); BattleCamTargetActor(ACTOR_SELF); func_8024ECF8(-1, 1, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_run); SetGoalToTarget(ACTOR_SELF); AddGoalPos(ACTOR_SELF, 50, 0, 0); SetActorSpeed(ACTOR_SELF, 6.0); RunToGoal(ACTOR_SELF, 0, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_idle); SetActorDispOffset(ACTOR_SELF, 0, -1, 0); sleep 1; SetActorDispOffset(ACTOR_SELF, 0, -2, 0); sleep 5; SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk); EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0)), 0, 1, 16); match SI_VAR(0) { HIT_RESULT_MISS, HIT_RESULT_LUCKY { @@ -347,10 +347,10 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({ } spawn { sleep 6; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk); } JumpToGoal(ACTOR_SELF, 16, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, sleep)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_sleep); SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0); SetActorDispOffset(ACTOR_SELF, 0, 5, 0); sleep 1; @@ -359,14 +359,14 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({ sleep 1; SetActorScale(ACTOR_SELF, 1.0, 1.0, 1.0); SetActorDispOffset(ACTOR_SELF, 0, 7, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, pain)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_pain); sleep 5; if (SI_VAR(10) == 5) { EnemyTestTarget(ACTOR_SELF, SI_VAR(0), ((0x80000000)), 0, 0, 0); } sleep 5; SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk); SetGoalToTarget(ACTOR_SELF); GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 20; @@ -381,10 +381,10 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({ SetActorRotation(ACTOR_SELF, 0, 0, SI_VAR(0)); sleep 1; } - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk); } JumpToGoal(ACTOR_SELF, 15, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, dizzy)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_dizzy); sleep 5; UseBattleCamPreset(2); YieldTurn(); @@ -397,7 +397,7 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({ SetAnimationRate(ACTOR_SELF, 1, 1.0); SetActorYaw(ACTOR_SELF, 0); sleep 5; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_idle); SetActorJumpGravity(ACTOR_SELF, 1.6); JumpToGoal(ACTOR_SELF, 5, FALSE, TRUE, FALSE); RemoveActorDecoration(ACTOR_SELF, 1, 0); @@ -423,10 +423,10 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({ } spawn { sleep 6; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk); } JumpToGoal(ACTOR_SELF, 16, FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_headbonk); SetActorScale(ACTOR_SELF, 1.1, 0.8, 1.0); sleep 1; SetActorScale(ACTOR_SELF, 1.3, 0.5, 1.0); @@ -443,7 +443,7 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({ sleep 1; SetActorRotation(ACTOR_SELF, 0, 0, 0); SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_idle); GetGoalPos(ACTOR_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 40; SI_VAR(1) = 0; @@ -458,15 +458,15 @@ EvtSource N(takeTurn_8021BDDC) = SCRIPT({ JumpToGoal(ACTOR_SELF, 6, FALSE, TRUE, FALSE); GetLastDamage(0, SI_VAR(0)); if (SI_VAR(0) > 0) { - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, laugh)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_laugh); sleep 15; } else { - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_idle); sleep 3; } YieldTurn(); SetAnimationRate(ACTOR_SELF, 1, 2.0); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(spiked_goomba, default, run)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_spiked_goomba_default_run); SetGoalToHome(ACTOR_SELF); SetActorSpeed(ACTOR_SELF, 8.0); RunToGoal(ACTOR_SELF, 0, FALSE); diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 3f6063759f..34b992d2ae 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -236,13 +236,13 @@ ApiStatus N(func_80239190_6F2270)(Evt* script, s32 isInitialCall) { } s32 N(idleAnimations_802391B0)[] = { - STATUS_NORMAL, NPC_ANIM(battle_goombario, default, walk), - STATUS_STONE, NPC_ANIM(battle_goombario, default, still), - STATUS_SLEEP, NPC_ANIM(battle_goombario, default, sleep), - STATUS_POISON, NPC_ANIM(battle_goombario, default, still), - STATUS_STOP, NPC_ANIM(battle_goombario, default, still), - STATUS_DAZE, NPC_ANIM(battle_goombario, default, daze), - STATUS_TURN_DONE, NPC_ANIM(battle_goombario, default, still), + STATUS_NORMAL, NPC_ANIM_battle_goombario_default_walk, + STATUS_STONE, NPC_ANIM_battle_goombario_default_still, + STATUS_SLEEP, NPC_ANIM_battle_goombario_default_sleep, + STATUS_POISON, NPC_ANIM_battle_goombario_default_still, + STATUS_STOP, NPC_ANIM_battle_goombario_default_still, + STATUS_DAZE, NPC_ANIM_battle_goombario_default_daze, + STATUS_TURN_DONE, NPC_ANIM_battle_goombario_default_still, STATUS_END, }; @@ -332,61 +332,61 @@ EvtSource N(handleEvent_80239360) = SCRIPT({ GetLastEvent(ACTOR_PARTNER, SI_VAR(0)); match SI_VAR(0) { EVENT_HIT_COMBO, EVENT_HIT { - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); - SI_VAR(2) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; + SI_VAR(2) = (const) NPC_ANIM_battle_goombario_default_pain; await 0x802977BC; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; await 0x80296014; } 23, EVENT_IMMUNE { PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_208C); SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; await 0x80297814; } == EVENT_SPIKE_CONTACT { - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; SI_VAR(2) = 12; await 0x80294FE4; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; await 0x80296014; } == EVENT_BURN_CONTACT { - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, burn_pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_burn_pain; SI_VAR(2) = 12; - SI_VAR(3) = (const) NPC_ANIM(battle_goombario, default, burn_dead); + SI_VAR(3) = (const) NPC_ANIM_battle_goombario_default_burn_dead; await 0x80294C68; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; await 0x80296014; } == EVENT_BURN_HIT { - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, burn_pain); - SI_VAR(2) = (const) NPC_ANIM(battle_goombario, default, burn_dead); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_burn_pain; + SI_VAR(2) = (const) NPC_ANIM_battle_goombario_default_burn_dead; await 0x8029621C; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; await 0x80296014; } == EVENT_SHOCK_HIT { - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; SI_VAR(2) = 12; await 0x80295744; } == 51 { N(StopGlowing)(); - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, pain); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_pain; await 0x80296014; } == 52 { SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, idle); - SI_VAR(2) = (const) NPC_ANIM(battle_goombario, default, run); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_idle; + SI_VAR(2) = (const) NPC_ANIM_battle_goombario_default_run; SI_VAR(3) = 0; await 0x80295EC4; } 24, EVENT_BLOCK { PlaySoundAtActor(ACTOR_PARTNER, SOUND_UNKNOWN_208C); SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, block); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_block; await 0x80297814; sleep 10; } @@ -419,9 +419,9 @@ EvtSource N(takeTurn_802396D8) = SCRIPT({ EvtSource N(80239784) = SCRIPT({ SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, celebrate); - SI_VAR(2) = (const) NPC_ANIM(battle_goombario, default, celebrate_still); - SI_VAR(3) = (const) NPC_ANIM(battle_goombario, default, idle); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_celebrate; + SI_VAR(2) = (const) NPC_ANIM_battle_goombario_default_celebrate_still; + SI_VAR(3) = (const) NPC_ANIM_battle_goombario_default_idle; await 0x80294720; }); @@ -469,7 +469,7 @@ EvtSource N(8023993C) = SCRIPT({ EvtSource N(8023994C) = SCRIPT({ SI_VAR(0) = (const) 1; - SI_VAR(1) = (const) NPC_ANIM(battle_goombario, default, run); + SI_VAR(1) = (const) NPC_ANIM_battle_goombario_default_run; await 0x80294AFC; }); @@ -477,10 +477,10 @@ EvtSource N(80239988) = SCRIPT({ UseIdleAnimation(ACTOR_PARTNER, FALSE); SetGoalToHome(ACTOR_PARTNER); SetActorSpeed(ACTOR_PARTNER, 6.0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, run)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_run); SetActorYaw(ACTOR_PARTNER, 0); RunToGoal(ACTOR_PARTNER, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); UseIdleAnimation(ACTOR_PARTNER, 1); }); @@ -529,7 +529,7 @@ EvtSource N(nextTurn_80239A3C) = SCRIPT({ EvtSource N(80239CA8) = SCRIPT({ func_80280818(); UseBattleCamPreset(51); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); spawn { sleep 4; SetActorRotationOffset(-127, 0, 12, 0); @@ -549,36 +549,36 @@ EvtSource N(80239CA8) = SCRIPT({ SetActorJumpGravity(ACTOR_PARTNER, 1.2); N(func_80238000_6F10E0)(); JumpToGoal(ACTOR_PARTNER, SI_VAR(0), FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 1; SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0); sleep 1; SetActorRotation(ACTOR_SELF, 0, 0, 0); SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); AddGoalPos(ACTOR_PARTNER, -10, 0, 0); JumpToGoal(ACTOR_PARTNER, 6, FALSE, FALSE, TRUE); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 1; SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0); sleep 1; - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_idle); SetActorDispOffset(ACTOR_SELF, 0, 0, 0); sleep 2; SetGoalToHome(ACTOR_PARTNER); SetActorSpeed(ACTOR_PARTNER, 8.0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, run)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_run); RunToGoal(ACTOR_PARTNER, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); }); EvtSource N(8023A06C) = SCRIPT({ func_80280818(); UseBattleCamPreset(3); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); SetGoalToHome(ACTOR_PARTNER); GetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 60; @@ -611,32 +611,32 @@ EvtSource N(8023A06C) = SCRIPT({ SetActorRotationOffset(-127, 0, 0, 0); } JumpToGoal(ACTOR_PARTNER, SI_VAR(0), FALSE, TRUE, FALSE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 1; SetActorRotation(ACTOR_SELF, 0, 0, 0); SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); AddGoalPos(ACTOR_PARTNER, -20, 0, 0); JumpToGoal(ACTOR_PARTNER, 6, FALSE, FALSE, TRUE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 1; AddGoalPos(ACTOR_PARTNER, -10, 0, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); SetActorDispOffset(ACTOR_SELF, 0, 0, 0); JumpToGoal(ACTOR_PARTNER, 4, FALSE, FALSE, TRUE); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 1; SetActorDispOffset(ACTOR_SELF, 0, 0, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); sleep 2; SetGoalToHome(ACTOR_PARTNER); SetActorSpeed(ACTOR_PARTNER, 8.0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, run)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_run); RunToGoal(ACTOR_PARTNER, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); }); EvtSource N(8023A52C) = SCRIPT({ @@ -653,9 +653,9 @@ EvtSource N(8023A52C) = SCRIPT({ SetGoalPos(ACTOR_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5)); UseBattleCamPreset(47); SetActorSpeed(ACTOR_PARTNER, 5.0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, run)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_run); RunToGoal(ACTOR_PARTNER, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); }); EvtSource N(8023A66C) = SCRIPT({ @@ -679,7 +679,7 @@ EvtSource N(8023A754) = SCRIPT({ func_802A9000_430020(); await N(8023A52C); await N(8023A66C); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 5; SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0); @@ -687,7 +687,7 @@ EvtSource N(8023A754) = SCRIPT({ UseBattleCamPreset(52); func_802A9120_421B10(SI_VAR(10), 3); UseBattleCamPreset(52); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk); SetActorDispOffset(ACTOR_PARTNER, 0, 9, 0); SetGoalToTarget(ACTOR_PARTNER); SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006); @@ -781,7 +781,7 @@ EvtSource N(8023ADC4) = SCRIPT({ func_802A9000_430020(); await N(8023A52C); await N(8023A66C); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 5; SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0); @@ -789,7 +789,7 @@ EvtSource N(8023ADC4) = SCRIPT({ UseBattleCamPreset(52); func_802A9120_421B10(SI_VAR(10), 3); UseBattleCamPreset(52); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk); SetActorDispOffset(ACTOR_PARTNER, 0, 9, 0); SetGoalToTarget(ACTOR_PARTNER); SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006); @@ -885,7 +885,7 @@ EvtSource N(8023B45C) = SCRIPT({ func_802A9000_430020(); await N(8023A52C); await N(8023A66C); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 5; SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0); @@ -893,7 +893,7 @@ EvtSource N(8023B45C) = SCRIPT({ UseBattleCamPreset(52); func_802A9120_421B10(SI_VAR(10), 3); UseBattleCamPreset(52); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk); SetActorDispOffset(ACTOR_PARTNER, 0, 9, 0); SetGoalToTarget(ACTOR_PARTNER); SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006); @@ -961,7 +961,7 @@ EvtSource N(8023B45C) = SCRIPT({ SetActorRotation(ACTOR_SELF, 0, -250000000, SI_VAR(0)); sleep 1; } - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk); } spawn { SI_VAR(0) = 0; @@ -1004,7 +1004,7 @@ EvtSource N(8023BB9C) = SCRIPT({ func_802A9000_430020(); await N(8023A52C); await N(8023A66C); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 18, 0); sleep 5; SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0); @@ -1012,7 +1012,7 @@ EvtSource N(8023BB9C) = SCRIPT({ UseBattleCamPreset(52); func_802A9120_421B10(SI_VAR(10), 1); UseBattleCamPreset(52); - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk); SetActorDispOffset(ACTOR_PARTNER, 0, 9, 0); SetGoalToTarget(ACTOR_PARTNER); SetJumpAnimations(ACTOR_PARTNER, 0, ANIM_90006, ANIM_90006, ANIM_90006); @@ -1106,7 +1106,7 @@ EvtSource N(8023BB9C) = SCRIPT({ SetActorRotation(ACTOR_SELF, 0, -250000000, SI_VAR(0)); sleep 1; } - SetAnimation(ACTOR_SELF, 1, NPC_ANIM(battle_goombario, default, headbonk)); + SetAnimation(ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk); } spawn { SI_VAR(0) = 0; @@ -1177,10 +1177,10 @@ EvtSource N(8023C5B8) = SCRIPT({ GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 30; SetActorSpeed(ACTOR_PARTNER, 6.0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, run)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_run); SetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); RunToGoal(ACTOR_PARTNER, 0, FALSE); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); InitTargetIterator(); SetGoalToTarget(ACTOR_PARTNER); SetBattleFlagBits(4, 1); @@ -1213,15 +1213,15 @@ EvtSource N(8023C5B8) = SCRIPT({ SetGoalToHome(ACTOR_PARTNER); SetActorSpeed(ACTOR_PARTNER, 4.0); SetActorJumpGravity(ACTOR_PARTNER, 1.80078125); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, run)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_run); RunToGoal(ACTOR_PARTNER, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); }); EvtSource N(8023C90C) = SCRIPT({ UseBattleCamPreset(55); sleep 10; - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, charge)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_charge); SetActorDispOffset(ACTOR_PARTNER, 0, 19, 0); GetActorPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(1) += 15; @@ -1238,7 +1238,7 @@ EvtSource N(8023C90C) = SCRIPT({ PlayEffect(0x52, 9, SI_VAR(0), SI_VAR(1), SI_VAR(2), 2.0, 20, 0, 0, 0, 0, 0, 0, 0); } sleep 30; - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); SetActorDispOffset(ACTOR_PARTNER, 0, 0, 0); UseBattleCamPreset(2); MoveBattleCamOver(10); @@ -1256,7 +1256,7 @@ EvtSource N(8023C90C) = SCRIPT({ SetJumpAnimations(ACTOR_PARTNER, 589828, ANIM_1, ANIM_90004, ANIM_90004); SetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); JumpToGoal(ACTOR_PARTNER, 20, 1, 1, 0); - SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM(battle_goombario, default, idle)); + SetAnimation(ACTOR_PARTNER, -1, NPC_ANIM_battle_goombario_default_idle); GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2)); match SI_VAR(2) { == 134 { diff --git a/src/npc.c b/src/npc.c index 3b855168f7..402120358b 100644 --- a/src/npc.c +++ b/src/npc.c @@ -67,7 +67,7 @@ void npc_iter_no_op(void) { } } -s32 _create_npc(NpcBlueprint* blueprint, NpcAnimID** animList, s32 skipLoadingAnims) { +s32 _create_npc(NpcBlueprint* blueprint, s32** animList, s32 skipLoadingAnims) { Npc* npc; s32 i; s32 j; @@ -173,7 +173,7 @@ s32 _create_npc_basic(NpcBlueprint* blueprint) { return _create_npc(blueprint, NULL, FALSE); } -void _create_npc_standard(NpcBlueprint* blueprint, NpcAnimID** animList) { +s32 _create_npc_standard(NpcBlueprint* blueprint, s32** animList) { _create_npc(blueprint, animList, FALSE); } diff --git a/src/npc.h b/src/npc.h index 90fe086654..cb570e420f 100644 --- a/src/npc.h +++ b/src/npc.h @@ -20,11 +20,11 @@ void init_npc_list(void); /// Presumably did something once upon a time but got commented out. void npc_iter_no_op(void); -s32 _create_npc(NpcBlueprint* blueprint, NpcAnimID** animList, s32 skipLoadingAnims); +s32 _create_npc(NpcBlueprint* blueprint, s32** animList, s32 skipLoadingAnims); s32 _create_npc_basic(NpcBlueprint* blueprint); -void _create_npc_standard(NpcBlueprint* blueprint, NpcAnimID** animList); +s32 _create_npc_standard(NpcBlueprint* blueprint, s32** animList); void _create_npc_partner(NpcBlueprint* blueprint); diff --git a/src/world/action/idle.c b/src/world/action/idle.c index 195d77e0cd..b33540700a 100644 --- a/src/world/action/idle.c +++ b/src/world/action/idle.c @@ -7,7 +7,7 @@ s32 check_input_hammer(void); void func_802B61E4_E23444(void); -NpcAnimID world_action_idle_peachAnims[] = { +s32 world_action_idle_peachAnims[] = { 0x000A0001, // Idle // Cooking: @@ -29,7 +29,7 @@ void world_action_idle_update(void) { playerStatus->framesOnGround++; if (playerStatus->flags & 0x80000000) { - NpcAnimID anim; + s32 anim; playerStatus->flags &= ~0x8008000E; wasMoving = TRUE; diff --git a/src/world/actions.c b/src/world/actions.c index 7b5d74fc25..9fde10c958 100644 --- a/src/world/actions.c +++ b/src/world/actions.c @@ -33,18 +33,24 @@ f32 D_800F7B70[] = { 2.0f, 4.0f, 32.0f, -32.0f }; s16 D_800F7B80 = 0; s32 D_800F7B84[] = { 0, 0, 0}; f32 D_800F7B90 = 0.0; -s32 D_800F7B94[] = { 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390008, 0x00390007, 0x00390013, 0x00390014, 0xFFFFFFFF, }; -s32 D_800F7BBC[] = { 0x005A0000, 0x005A0002, 0x005A0003, 0x005A0004, 0x005A0006, 0x005A0007, 0x005A0009, 0x005A000A, 0x005A000B, 0x005A001A, 0xFFFFFFFF, }; -s32 D_800F7BE8[] = { 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, 0xFFFFFFFF}; + +// koopatrol animations +s32 D_800F7B94[] = { 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390008, 0x00390007, 0x00390013, 0x00390014, ANIM_END }; + +// hammer bro animations +s32 D_800F7BBC[] = { 0x005A0000, 0x005A0002, 0x005A0003, 0x005A0004, 0x005A0006, 0x005A0007, 0x005A0009, 0x005A000A, 0x005A000B, 0x005A001A, ANIM_END }; + +// clubba animations +s32 D_800F7BE8[] = { 0x00580000, 0x00580001, 0x00580002, 0x00580004, 0x00580005, 0x00580006, 0x00580007, 0x00580008, 0x00580009, 0x00580012, 0x00580014, 0x0058001B, ANIM_END }; DisguiseAnims world_actions_peachDisguises[] = { - {0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580000, 0x0058001B}, + {0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580000, 0x0058001B}, // not used {0x00580001, 0x00580004, 0x00580006, 0x00580008, 0x00580000, 0x0058001B}, {0x005A0003, 0x005A0006, 0x005A0009, 0x005A000B, 0x005A0000, 0x005A001A}, {0x00390002, 0x00390003, 0x00390004, 0x00390005, 0x00390000, 0x00390014}, }; -void* D_800F7C7C[] = { &D_800F7BE8, &D_800F7BE8, &D_800F7BBC, &D_800F7B94 }; +s32* D_800F7C7C[] = { &D_800F7BE8, &D_800F7BE8, &D_800F7BBC, &D_800F7B94 }; Action D_800F7C8C[39] = { { world_action_idle_update, world_action_idle_ROM_START, world_action_idle_ROM_END, TRUE }, diff --git a/src/world/actions.h b/src/world/actions.h index 580bdf85ef..57eb4f4b82 100644 --- a/src/world/actions.h +++ b/src/world/actions.h @@ -11,17 +11,18 @@ typedef struct Action { } Action; // size = 0x10 typedef struct DisguiseAnims { - /* 0x00 */ NpcAnimID idle; - /* 0x04 */ NpcAnimID unk_04; - /* 0x08 */ NpcAnimID unk_08; - /* 0x0C */ NpcAnimID unk_0C; - /* 0x10 */ NpcAnimID unk_10; - /* 0x10 */ NpcAnimID unk_14; + /* 0x00 */ s32 idle; + /* 0x04 */ s32 unk_04; + /* 0x08 */ s32 unk_08; + /* 0x0C */ s32 unk_0C; + /* 0x10 */ s32 unk_10; + /* 0x14 */ s32 unk_14; } DisguiseAnims; // size = 0x18 extern f32 D_800F7B90; extern Action D_800F7C8C[39]; -extern DisguiseAnims world_actions_peachDisguises[]; +extern DisguiseAnims world_actions_peachDisguises[4]; +extern s32* D_800F7C7C[4]; #endif diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index fccea5af9d..31b4a76b3a 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -106,22 +106,22 @@ StaticNpc N(npcGroup_802414CC) = { .maxCoinBonus = 3, .movement = { -196, 130, 104, 50, 30, -32767, 1, -196, 130, 104, 120 }, .animations = { - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, walk), - NPC_ANIM(cleft, hyper, run), - NPC_ANIM(cleft, hyper, run), - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, skid), - NPC_ANIM(cleft, hyper, skid), - NPC_ANIM(cleft, hyper, rock), - NPC_ANIM(cleft, hyper, rock_darken), - NPC_ANIM(cleft, hyper, from_rock), - NPC_ANIM(cleft, hyper, into_rock), - NPC_ANIM(cleft, hyper, charge_still), - NPC_ANIM(cleft, hyper, charge), - NPC_ANIM(cleft, hyper, rock_lighten), - NPC_ANIM(cleft, hyper, still), + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_walk, + NPC_ANIM_cleft_hyper_run, + NPC_ANIM_cleft_hyper_run, + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_skid, + NPC_ANIM_cleft_hyper_skid, + NPC_ANIM_cleft_hyper_rock, + NPC_ANIM_cleft_hyper_rock_darken, + NPC_ANIM_cleft_hyper_from_rock, + NPC_ANIM_cleft_hyper_into_rock, + NPC_ANIM_cleft_hyper_charge_still, + NPC_ANIM_cleft_hyper_charge, + NPC_ANIM_cleft_hyper_rock_lighten, + NPC_ANIM_cleft_hyper_still, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -139,22 +139,22 @@ StaticNpc N(npcGroup_802416BC) = { .maxCoinBonus = 3, .movement = { 641, 268, 202, 50, 30, -32767, 1, 641, 268, 202, 120 }, .animations = { - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, walk), - NPC_ANIM(cleft, hyper, run), - NPC_ANIM(cleft, hyper, run), - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, skid), - NPC_ANIM(cleft, hyper, skid), - NPC_ANIM(cleft, hyper, rock), - NPC_ANIM(cleft, hyper, rock_darken), - NPC_ANIM(cleft, hyper, from_rock), - NPC_ANIM(cleft, hyper, into_rock), - NPC_ANIM(cleft, hyper, charge_still), - NPC_ANIM(cleft, hyper, charge), - NPC_ANIM(cleft, hyper, rock_lighten), - NPC_ANIM(cleft, hyper, still), + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_walk, + NPC_ANIM_cleft_hyper_run, + NPC_ANIM_cleft_hyper_run, + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_skid, + NPC_ANIM_cleft_hyper_skid, + NPC_ANIM_cleft_hyper_rock, + NPC_ANIM_cleft_hyper_rock_darken, + NPC_ANIM_cleft_hyper_from_rock, + NPC_ANIM_cleft_hyper_into_rock, + NPC_ANIM_cleft_hyper_charge_still, + NPC_ANIM_cleft_hyper_charge, + NPC_ANIM_cleft_hyper_rock_lighten, + NPC_ANIM_cleft_hyper_still, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -173,22 +173,22 @@ StaticNpc N(npcGroup_802418AC) = { .maxCoinBonus = 2, .movement = { 333, 215, 85, 40, 30, -32767, 1, 360, 215, 150, 120, 137, 1 }, .animations = { - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, walk), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_walk, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index 4bd4db14da..d82ac62dad 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -354,26 +354,26 @@ EvtSource N(interact_80241EB0) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { if (SI_AREA_FLAG(2) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0073)); SI_AREA_FLAG(2) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0074)); SI_AREA_FLAG(2) = 0; } } < STORY_CH3_DEFEATED_TUBBA_BLUBBA { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0075)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0075)); } < STORY_CH3_BEGAN_PEACH_MISSION { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0076)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0076)); } < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0077)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0077)); } >= STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0078)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0078)); SetPlayerAnimation(ANIM_10002); sleep 10; SetPlayerAnimation(0x80007); @@ -418,13 +418,13 @@ EvtSource N(idle_80242064) = SCRIPT({ sleep 15; DisablePartnerAI(0); InterpNpcYaw(NPC_SELF, -4, 0); - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x006E)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x006E)); InterpNpcYaw(NPC_PARTNER, -1, 0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x006F)); - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x0070)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 5, MESSAGE_ID(0x0E, 0x006F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x0070)); InterpNpcYaw(NPC_PARTNER, -1, 0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x0071)); - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x0072)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 5, MESSAGE_ID(0x0E, 0x0071)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x0072)); EnablePartnerAI(); sleep 10; GetCurrentPartnerID(SI_VAR(6)); @@ -458,7 +458,7 @@ EvtSource N(init_802424E0) = SCRIPT({ EvtSource N(interact_8024254C) = SCRIPT({ if (SI_MAP_VAR(0) != 0) { if (SI_MAP_VAR(0) >= SI_MAP_VAR(1)) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0081)); SI_VAR(0) = 118; SI_VAR(1) = 1; @@ -469,7 +469,7 @@ EvtSource N(interact_8024254C) = SCRIPT({ SI_SAVE_FLAG(1020) = 0; return; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0080)); return; } @@ -477,32 +477,32 @@ EvtSource N(interact_8024254C) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { if (SI_AREA_FLAG(3) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0079)); SI_AREA_FLAG(3) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x007A)); SI_AREA_FLAG(3) = 0; } } < STORY_CH3_DEFEATED_TUBBA_BLUBBA { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x007B)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x007B)); } < STORY_CH3_BEGAN_PEACH_MISSION { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x007C)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x007C)); } < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x007D)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x007D)); } >= STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x007E)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x007E)); } } if (SI_SAVE_FLAG(1015) == 0) { if (SI_SAVE_VAR(348) == 18) { await N(80241E68); - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x007F)); EndSpeech(-1, 9765124, 9765121, 0); SI_MAP_VAR(0) = 0; @@ -591,7 +591,7 @@ EvtSource N(80242C60) = SCRIPT({ spawn { sleep 25; SetPlayerAnimation(0x80017); - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_9)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_9); loop { if (SI_MAP_VAR(2) == 1) { break loop; @@ -599,12 +599,12 @@ EvtSource N(80242C60) = SCRIPT({ sleep 1; } SetPlayerAnimation(ANIM_10002); - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_1); } - SetNpcAnimation(0x4, NPC_ANIM(boo, Palette_01, Anim_8)); + SetNpcAnimation(0x4, NPC_ANIM_boo_Palette_01_Anim_8); EndSpeech(4, 9765128, 9765128, 5); sleep 30; - SetNpcAnimation(0x4, NPC_ANIM(boo, Palette_01, Anim_1)); + SetNpcAnimation(0x4, NPC_ANIM_boo_Palette_01_Anim_1); sleep 10; await N(80242B0C); SI_MAP_VAR(2) = 1; @@ -615,20 +615,20 @@ EvtSource N(interact_80242DC4) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { if (SI_AREA_FLAG(4) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0082)); SI_AREA_FLAG(4) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0083)); SI_AREA_FLAG(4) = 0; } } < STORY_CH3_DEFEATED_TUBBA_BLUBBA { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0084)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0084)); } < STORY_CH3_BEGAN_PEACH_MISSION { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0085)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0085)); } < STORY_CH5_STAR_SPRIT_DEPARTED { DisablePartnerAI(0); @@ -640,13 +640,13 @@ EvtSource N(interact_80242DC4) = SCRIPT({ NpcMoveTo(NPC_PARTNER, SI_VAR(0), SI_VAR(2), 0); NpcFaceNpc(NPC_PARTNER, NPC_SELF, 1); } - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0086)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0086)); await N(802428CC); PlayerFaceNpc(4, 1); NpcFaceNpc(NPC_PARTNER, 0x4, 1); - SpeakToPlayer(0x4, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x0087)); + SpeakToPlayer(0x4, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x0087)); await N(80242C60); - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0088)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0088)); DisablePlayerPhysics(FALSE); EnablePartnerAI(); } @@ -660,13 +660,13 @@ EvtSource N(interact_80242DC4) = SCRIPT({ NpcMoveTo(NPC_PARTNER, SI_VAR(0), SI_VAR(2), 0); NpcFaceNpc(NPC_PARTNER, NPC_SELF, 1); } - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0089)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0089)); await N(802428CC); PlayerFaceNpc(4, 1); NpcFaceNpc(NPC_PARTNER, 0x4, 1); - SpeakToPlayer(0x4, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x008A)); + SpeakToPlayer(0x4, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x008A)); await N(80242C60); - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x008B)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x008B)); DisablePlayerPhysics(FALSE); EnablePartnerAI(); } @@ -681,26 +681,26 @@ EvtSource N(interact_802431C8) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { if (SI_AREA_FLAG(5) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x008C)); SI_AREA_FLAG(5) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x008D)); SI_AREA_FLAG(5) = 0; } } < STORY_CH3_DEFEATED_TUBBA_BLUBBA { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x008E)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x008E)); } < STORY_CH3_BEGAN_PEACH_MISSION { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x008F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x008F)); } < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0090)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0090)); } >= STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0091)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0091)); } } }); @@ -725,22 +725,22 @@ StaticNpc N(npcGroup_80243378) = { .flowerDrops = NO_DROPS, .movement = { 2, 36, 10, 185, 56, 10, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 479, 215, 198, 150 }, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00AA), }; @@ -756,22 +756,22 @@ StaticNpc N(npcGroup_80243568) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00AB), }; @@ -788,22 +788,22 @@ StaticNpc N(npcGroup_80243758) = { .flowerDrops = NO_DROPS, .movement = { 2, 379, 10, 186, 399, 10, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 479, 215, 198, 150 }, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00AC), }; @@ -819,22 +819,22 @@ StaticNpc N(npcGroup_80243948) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00AD), }; @@ -850,22 +850,22 @@ StaticNpc N(npcGroup_80243B38) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }; @@ -923,22 +923,22 @@ StaticNpc N(npcGroup_80243F80)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }, { @@ -952,22 +952,22 @@ StaticNpc N(npcGroup_80243F80)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }, { @@ -981,22 +981,22 @@ StaticNpc N(npcGroup_80243F80)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }, { @@ -1010,22 +1010,22 @@ StaticNpc N(npcGroup_80243F80)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }, }; diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index f36e20629d..9900c85a98 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -133,22 +133,22 @@ StaticNpc N(npcGroup_80243840) = { .maxCoinBonus = 2, .movement = { -350, 180, 150, 30, 0, -32767, 0, -350, 180, 150, 150 }, .animations = { - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, walk), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, pain), - NPC_ANIM(paragoomba, hyper, pain), - NPC_ANIM(paragoomba, hyper, attack), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_walk, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_pain, + NPC_ANIM_paragoomba_hyper_pain, + NPC_ANIM_paragoomba_hyper_attack, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -167,22 +167,22 @@ StaticNpc N(npcGroup_80243A30) = { .maxCoinBonus = 2, .movement = { 360, 208, 100, 30, 0, -32767, 0, 360, 208, 100, 150 }, .animations = { - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, walk), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_walk, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -200,22 +200,22 @@ StaticNpc N(npcGroup_80243C20) = { .maxCoinBonus = 3, .movement = { 150, 177, 160, 30, 0, -32767, 0, 150, 177, 160, 150 }, .animations = { - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, walk), - NPC_ANIM(cleft, hyper, run), - NPC_ANIM(cleft, hyper, run), - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, skid), - NPC_ANIM(cleft, hyper, skid), - NPC_ANIM(cleft, hyper, rock), - NPC_ANIM(cleft, hyper, rock_darken), - NPC_ANIM(cleft, hyper, from_rock), - NPC_ANIM(cleft, hyper, into_rock), - NPC_ANIM(cleft, hyper, charge_still), - NPC_ANIM(cleft, hyper, charge), - NPC_ANIM(cleft, hyper, rock_lighten), - NPC_ANIM(cleft, hyper, still), + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_walk, + NPC_ANIM_cleft_hyper_run, + NPC_ANIM_cleft_hyper_run, + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_skid, + NPC_ANIM_cleft_hyper_skid, + NPC_ANIM_cleft_hyper_rock, + NPC_ANIM_cleft_hyper_rock_darken, + NPC_ANIM_cleft_hyper_from_rock, + NPC_ANIM_cleft_hyper_into_rock, + NPC_ANIM_cleft_hyper_charge_still, + NPC_ANIM_cleft_hyper_charge, + NPC_ANIM_cleft_hyper_rock_lighten, + NPC_ANIM_cleft_hyper_still, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -233,22 +233,22 @@ StaticNpc N(npcGroup_80243E10) = { .maxCoinBonus = 3, .movement = { 550, 230, 125, 30, 0, -32767, 0, 550, 230, 125, 150 }, .animations = { - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, walk), - NPC_ANIM(cleft, hyper, run), - NPC_ANIM(cleft, hyper, run), - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, idle), - NPC_ANIM(cleft, hyper, skid), - NPC_ANIM(cleft, hyper, skid), - NPC_ANIM(cleft, hyper, rock), - NPC_ANIM(cleft, hyper, rock_darken), - NPC_ANIM(cleft, hyper, from_rock), - NPC_ANIM(cleft, hyper, into_rock), - NPC_ANIM(cleft, hyper, charge_still), - NPC_ANIM(cleft, hyper, charge), - NPC_ANIM(cleft, hyper, rock_lighten), - NPC_ANIM(cleft, hyper, still), + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_walk, + NPC_ANIM_cleft_hyper_run, + NPC_ANIM_cleft_hyper_run, + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_idle, + NPC_ANIM_cleft_hyper_skid, + NPC_ANIM_cleft_hyper_skid, + NPC_ANIM_cleft_hyper_rock, + NPC_ANIM_cleft_hyper_rock_darken, + NPC_ANIM_cleft_hyper_from_rock, + NPC_ANIM_cleft_hyper_into_rock, + NPC_ANIM_cleft_hyper_charge_still, + NPC_ANIM_cleft_hyper_charge, + NPC_ANIM_cleft_hyper_rock_lighten, + NPC_ANIM_cleft_hyper_still, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index a1b25b3a23..359711b1af 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -103,64 +103,64 @@ EvtSource N(interact_80241794) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { if (SI_AREA_FLAG(6) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0092)); SI_AREA_FLAG(6) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0093)); SI_AREA_FLAG(6) = 0; } } < STORY_CH3_DEFEATED_TUBBA_BLUBBA { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0095)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0095)); } < STORY_CH3_BEGAN_PEACH_MISSION { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0096)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0096)); } < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0097)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0097)); } >= STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0098)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0098)); } } }); EvtSource N(interact_802418F4) = SCRIPT({ - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x0094)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0094)); }); EvtSource N(interact_80241924) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { if (SI_AREA_FLAG(7) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0099)); SI_AREA_FLAG(7) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x009A)); SI_AREA_FLAG(7) = 0; } } < STORY_CH3_DEFEATED_TUBBA_BLUBBA { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x009C)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x009C)); } < STORY_CH3_BEGAN_PEACH_MISSION { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x009D)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x009D)); } < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x009E)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x009E)); } >= STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x009F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x009F)); } } }); EvtSource N(interact_80241A84) = SCRIPT({ - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x009B)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x009B)); }); EvtSource N(interact_80241AB4) = SCRIPT({ @@ -169,43 +169,43 @@ EvtSource N(interact_80241AB4) = SCRIPT({ < STORY_CH3_DEFEATED_TUBBA_BLUBBA {} < STORY_CH3_BEGAN_PEACH_MISSION {} < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00A9)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00A9)); } >= STORY_CH5_STAR_SPRIT_DEPARTED { if (SI_SAVE_FLAG(1014) == 1) { if (SI_AREA_FLAG(9) == 1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_5), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_5, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AE)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B0)); } } else { - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_7)); - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_7), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_7); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_7, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AA)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_9)); - ContinueSpeech(-1, NPC_ANIM(boo, Palette_01, Anim_9), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00AB)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_A)); - ContinueSpeech(-1, NPC_ANIM(boo, Palette_01, Anim_A), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00AC)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_9); + ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_9, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AB)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_A); + ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_A, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AC)); ShowChoice(1966110); match SI_VAR(0) { == 0 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_5)); - ContinueSpeech(-1, NPC_ANIM(boo, Palette_01, Anim_5), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00AD)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_5); + ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_5, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AD)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_1); SI_SAVE_FLAG(1014) = 1; SI_AREA_FLAG(9) = 1; } == 1 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_5)); - ContinueSpeech(-1, NPC_ANIM(boo, Palette_01, Anim_5), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00AD)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_5); + ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_5, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AD)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_1); SI_SAVE_FLAG(1014) = 1; SI_AREA_FLAG(9) = 1; } == 2 { - ContinueSpeech(-1, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00AF)); + ContinueSpeech(-1, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00AF)); } } } @@ -219,10 +219,10 @@ EvtSource N(interact_80241D88) = SCRIPT({ < STORY_CH3_DEFEATED_TUBBA_BLUBBA {} < STORY_CH3_BEGAN_PEACH_MISSION {} < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00B1)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B1)); } >= STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00B2)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B2)); } } }); @@ -231,32 +231,32 @@ EvtSource N(interact_80241E28) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { if (SI_AREA_FLAG(8) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B3)); SI_AREA_FLAG(8) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B4)); SI_AREA_FLAG(8) = 0; } } < STORY_CH3_DEFEATED_TUBBA_BLUBBA { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00B6)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B6)); } < STORY_CH3_BEGAN_PEACH_MISSION { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00B7)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B7)); } < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00B8)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B8)); } >= STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00B9)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B9)); } } }); EvtSource N(interact_80241F88) = SCRIPT({ - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00B5)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B5)); }); EvtSource N(init_80241FB8) = SCRIPT({ @@ -334,22 +334,22 @@ StaticNpc N(npcGroup_8024223C)[] = { .flowerDrops = NO_DROPS, .movement = { 2, 55, 10, 160, 75, 10, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 55, 195, 160, 50 }, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00AE), }, @@ -364,22 +364,22 @@ StaticNpc N(npcGroup_8024223C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00AF), }, @@ -394,22 +394,22 @@ StaticNpc N(npcGroup_8024223C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00B0), }, @@ -424,22 +424,22 @@ StaticNpc N(npcGroup_8024223C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00B1), }, @@ -455,22 +455,22 @@ StaticNpc N(npcGroup_8024223C)[] = { .flowerDrops = NO_DROPS, .movement = { 2, 350, 10, 197, 330, 10, 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 350, 185, 197, 50 }, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00B2), }, @@ -509,7 +509,7 @@ EvtSource N(80242C50) = SCRIPT({ SetCamDistance(0, 350); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00A0)); + SpeakToPlayer(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00A0)); PlaySoundAt(SOUND_UNKNOWN_20F6, 0, 450, 200, 160); ShakeCam(0, 0, 20, 0.80078125); PlaySoundAtNpc(NPC_BOO0, SOUND_UNKNOWN_262, 0); @@ -549,7 +549,7 @@ EvtSource N(80242C50) = SCRIPT({ func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0); sleep 1; } - SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 0, MESSAGE_ID(0x0E, 0x00A1)); + SpeakToPlayer(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_6, NPC_ANIM_boo_Palette_01_Anim_6, 0, MESSAGE_ID(0x0E, 0x00A1)); GetCurrentPartnerID(SI_VAR(0)); if (SI_VAR(0) != 9) { N(SwitchToPartner)(9); @@ -570,7 +570,7 @@ EvtSource N(80242C50) = SCRIPT({ } } DisablePartnerAI(0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00A3)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00A3)); EnablePartnerAI(); InterpPlayerYaw(90, 0); sleep 5; @@ -615,9 +615,9 @@ EvtSource N(80242C50) = SCRIPT({ } SI_VAR(0) = 4; spawn N(80242BEC); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_9); NpcMoveTo(NPC_WORLD_TUBBA, 550, 196, 0); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_6); SetCamSpeed(0, 4.0); SetCamPitch(0, 17.0, -11.5); SetCamDistance(0, 375); @@ -631,11 +631,11 @@ EvtSource N(80242C50) = SCRIPT({ spawn { SI_VAR(0) = 7; spawn N(80242BEC); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_9); NpcMoveTo(NPC_WORLD_TUBBA, 370, 220, 0); GetNpcPos(NPC_BOO2, SI_VAR(0), SI_VAR(1), SI_VAR(2)); NpcMoveTo(NPC_WORLD_TUBBA, 330, SI_VAR(2), 0); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_6); SI_MAP_VAR(1) = 1; } SetCamSpeed(0, 90.0); @@ -647,7 +647,7 @@ EvtSource N(80242C50) = SCRIPT({ SetPanTarget(0, 240, 169, 206); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 0, MESSAGE_ID(0x0E, 0x00A4)); + SpeakToPlayer(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_6, NPC_ANIM_boo_Palette_01_Anim_6, 0, MESSAGE_ID(0x0E, 0x00A4)); sleep 15; loop { sleep 1; @@ -657,17 +657,17 @@ EvtSource N(80242C50) = SCRIPT({ } NpcFaceNpc(NPC_BOO2, NPC_WORLD_TUBBA, 1); sleep 30; - SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00A5)); - SetNpcAnimation(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_9)); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1E)); + SpeakToPlayer(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x00A5)); + SetNpcAnimation(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_9); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_1E); SetNpcJumpscale(NPC_BOO2, 0.0); NpcJump1(NPC_BOO2, 265, 206, 212, 3); sleep 20; - SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1E), NPC_ANIM(world_tubba, Palette_00, Anim_1E), 5, MESSAGE_ID(0x0E, 0x00A6)); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_1E, NPC_ANIM_world_tubba_Palette_00_Anim_1E, 5, MESSAGE_ID(0x0E, 0x00A6)); SetNpcPos(NPC_BOO2, 303, 237, 228); - SetNpcAnimation(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_6); EnableNpcShadow(NPC_BOO2, FALSE); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1F)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_1F); SetCamSpeed(0, 5.0); SetCamPitch(0, 17.0, -17.0); SetCamDistance(0, 250); @@ -682,7 +682,7 @@ EvtSource N(80242C50) = SCRIPT({ } sleep 40; SetNpcPos(NPC_BOO2, 0, -1000, 0); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_20)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_20); sleep 80; SetCamSpeed(0, 90.0); SetCamPitch(0, 17.0, -11.5); @@ -693,25 +693,25 @@ EvtSource N(80242C50) = SCRIPT({ SetPanTarget(0, 240, 169, 206); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_6); sleep 15; - SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_21), NPC_ANIM(world_tubba, Palette_00, Anim_6), 5, MESSAGE_ID(0x0E, 0x00A7)); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_21)); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_21, NPC_ANIM_world_tubba_Palette_00_Anim_6, 5, MESSAGE_ID(0x0E, 0x00A7)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_21); GetNpcPos(NPC_WORLD_TUBBA, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += -50; SI_VAR(1) += 50; SI_VAR(2) += 10; PlayEffect(0x6, 1, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10, 0, 0, 0, 0, 0, 0, 0, 0); sleep 20; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_6); InterpNpcYaw(NPC_WORLD_TUBBA, 90, 1); sleep 30; SI_VAR(0) = 7; spawn N(80242BEC); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_9); NpcMoveTo(NPC_WORLD_TUBBA, 370, 220, 0); NpcMoveTo(NPC_WORLD_TUBBA, 550, 196, 0); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_6); SetNpcPos(NPC_WORLD_TUBBA, 0, -1000, 0); SetNpcFlagBits(NPC_WORLD_TUBBA, NPC_FLAG_GRAVITY, FALSE); NpcFacePlayer(NPC_BOO0, 3); @@ -742,7 +742,7 @@ EvtSource N(80242C50) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); PanToTarget(0, 0, 0); - SpeakToPlayer(NPC_BOO4, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00A8)); + SpeakToPlayer(NPC_BOO4, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x00A8)); DisablePlayerInput(FALSE); }); @@ -778,13 +778,13 @@ EvtSource N(init_80244358) = SCRIPT({ } }); -NpcAnimID N(extraAnimationList_80244390)[] = { - NPC_ANIM(world_tubba, Palette_00, Anim_6), - NPC_ANIM(world_tubba, Palette_00, Anim_9), - NPC_ANIM(world_tubba, Palette_00, Anim_1E), - NPC_ANIM(world_tubba, Palette_00, Anim_1F), - NPC_ANIM(world_tubba, Palette_00, Anim_20), - NPC_ANIM(world_tubba, Palette_00, Anim_21), +s32 N(extraAnimationList_80244390)[] = { + NPC_ANIM_world_tubba_Palette_00_Anim_6, + NPC_ANIM_world_tubba_Palette_00_Anim_9, + NPC_ANIM_world_tubba_Palette_00_Anim_1E, + NPC_ANIM_world_tubba_Palette_00_Anim_1F, + NPC_ANIM_world_tubba_Palette_00_Anim_20, + NPC_ANIM_world_tubba_Palette_00_Anim_21, ANIM_END, }; @@ -799,22 +799,22 @@ StaticNpc N(npcGroup_802443AC) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_tubba, Palette_00, Anim_6), - NPC_ANIM(world_tubba, Palette_00, Anim_9), - NPC_ANIM(world_tubba, Palette_00, Anim_C), - NPC_ANIM(world_tubba, Palette_00, Anim_C), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM_world_tubba_Palette_00_Anim_6, + NPC_ANIM_world_tubba_Palette_00_Anim_9, + NPC_ANIM_world_tubba_Palette_00_Anim_C, + NPC_ANIM_world_tubba_Palette_00_Anim_C, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, }, .extraAnimations = N(extraAnimationList_80244390), }; @@ -873,22 +873,22 @@ StaticNpc N(npcGroup_802447E4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }, { @@ -902,22 +902,22 @@ StaticNpc N(npcGroup_802447E4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }, { @@ -931,22 +931,22 @@ StaticNpc N(npcGroup_802447E4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }, { @@ -960,22 +960,22 @@ StaticNpc N(npcGroup_802447E4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }, }; diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c index 32e852de11..c76d8bd647 100644 --- a/src/world/area_arn/arn_07/BECDF0.c +++ b/src/world/area_arn/arn_07/BECDF0.c @@ -423,7 +423,7 @@ EvtSource N(80242A30) = SCRIPT({ PlaySoundAtCollider(10, 450, 0); } NpcFaceNpc(NPC_TUBBAS_HEART, NPC_WORLD_TUBBA, 0); - SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_A), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x00C7)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_A, NPC_ANIM_tubbas_heart_Palette_00_Anim_1, 5, MESSAGE_ID(0x0E, 0x00C7)); SetNpcVar(0, 0, 1); loop { GetNpcVar(0, 0, SI_VAR(0)); @@ -448,16 +448,16 @@ EvtSource N(80242A30) = SCRIPT({ SetCamPosC(0, 0, 0); SetPanTarget(0, 65, 0, -137); PanToTarget(0, 0, 1); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_22)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_22); } PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); NpcJump0(NPC_TUBBAS_HEART, 298, 56, 31, 18); SetNpcPos(NPC_TUBBAS_HEART, 0, -1000, 0); EnableNpcShadow(NPC_TUBBAS_HEART, FALSE); spawn { - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_23)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_23); sleep 20; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_6); } sleep 20; spawn { @@ -501,7 +501,7 @@ EvtSource N(80242A30) = SCRIPT({ } PlayerMoveTo(200, 0, 35); sleep 5; - SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 0, MESSAGE_ID(0x0E, 0x00C8)); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_10, NPC_ANIM_world_tubba_Palette_00_Anim_6, 0, MESSAGE_ID(0x0E, 0x00C8)); SetNpcVar(1, 0, 1); sleep 30; DisablePlayerInput(FALSE); diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index b55b8799ca..0df5f09dab 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -183,14 +183,14 @@ EvtSource N(80243E24) = SCRIPT({ SetPanTarget(0, 250, 0, -46); PanToTarget(0, 0, 1); SetPlayerAnimation(ANIM_10002); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_8)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_8); SetNpcYaw(NPC_SELF, 90); sleep 10; - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_12), NPC_ANIM(world_tubba, Palette_00, Anim_8), 5, MESSAGE_ID(0x0E, 0x00CA)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_12, NPC_ANIM_world_tubba_Palette_00_Anim_8, 5, MESSAGE_ID(0x0E, 0x00CA)); sleep 10; InterpNpcYaw(NPC_SELF, 270, 0); sleep 10; - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_12), NPC_ANIM(world_tubba, Palette_00, Anim_8), 5, MESSAGE_ID(0x0E, 0x00CB)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_12, NPC_ANIM_world_tubba_Palette_00_Anim_8, 5, MESSAGE_ID(0x0E, 0x00CB)); SetCamDistance(0, 300); SetCamSpeed(0, 2.0); SetCamPitch(0, 5.0, -16.0); @@ -201,7 +201,7 @@ EvtSource N(80243E24) = SCRIPT({ EvtSource N(80243FE8) = SCRIPT({ sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_22)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_22); sleep 15; loop 4 { PlaySoundAtNpc(NPC_SELF, 0xB0000010, 0); @@ -224,14 +224,14 @@ EvtSource N(80243FE8) = SCRIPT({ sleep 6; } sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_23)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_23); sleep 30; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_22)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_22); sleep 10; PlaySoundAtNpc(NPC_SELF, 0xB0000010, 0); SetNpcVar(3, 0, 1); sleep 15; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_21)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_21); sleep 45; UseSettingsFrom(0, 236, 0, -46); SetCamSpeed(0, 90.0); @@ -241,8 +241,8 @@ EvtSource N(80243FE8) = SCRIPT({ PanToTarget(0, 0, 1); sleep 5; SetPlayerAnimation(ANIM_STAND_STILL); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_F)); - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_12), NPC_ANIM(world_tubba, Palette_00, Anim_8), 0, MESSAGE_ID(0x0E, 0x00CC)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_F); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_12, NPC_ANIM_world_tubba_Palette_00_Anim_8, 0, MESSAGE_ID(0x0E, 0x00CC)); spawn { sleep 5; SetCamSpeed(0, 90.0); @@ -305,7 +305,7 @@ EvtSource N(80243FE8) = SCRIPT({ sleep 5; } } - SpeakToPlayer(SI_VAR(5), NPC_ANIM(world_bow, Palette_00, Anim_B), NPC_ANIM(world_bow, Palette_00, Anim_B), 0, MESSAGE_ID(0x0E, 0x00CD)); + SpeakToPlayer(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0, MESSAGE_ID(0x0E, 0x00CD)); InterpPlayerYaw(270, 0); sleep 10; GetNpcPos(SI_VAR(5), SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -313,16 +313,16 @@ EvtSource N(80243FE8) = SCRIPT({ SetCamProperties(0, 2.0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 300.0, 15.0, -7.0); PlayerFaceNpc(SI_VAR(5), 0); sleep 10; - SpeakToPlayer(SI_VAR(5), NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00CE)); + SpeakToPlayer(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00CE)); ShowChoice(1966093); if (SI_VAR(0) == 0) { - ContinueSpeech(SI_VAR(5), NPC_ANIM(world_bow, Palette_00, Anim_B), NPC_ANIM(world_bow, Palette_00, Anim_B), 0, + ContinueSpeech(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0, MESSAGE_ID(0x0E, 0x00CF)); } else { - ContinueSpeech(SI_VAR(5), NPC_ANIM(world_bow, Palette_00, Anim_B), NPC_ANIM(world_bow, Palette_00, Anim_B), 0, + ContinueSpeech(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_B, NPC_ANIM_world_bow_Palette_00_Anim_B, 0, MESSAGE_ID(0x0E, 0x00D0)); } - SpeakToPlayer(SI_VAR(5), NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00D1)); + SpeakToPlayer(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00D1)); UseSettingsFrom(0, 175, 0, 0); SetCamSpeed(0, 4.0); SetPanTarget(0, 175, 0, 0); @@ -353,7 +353,7 @@ EvtSource N(80243FE8) = SCRIPT({ InterpNpcYaw(NPC_PARTNER, 90, 0); } } - SpeakToPlayer(SI_VAR(5), NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00D2)); + SpeakToPlayer(SI_VAR(5), NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00D2)); spawn { if (SI_VAR(6) != 9) { sleep 12; @@ -500,30 +500,30 @@ EvtSource N(init_8024519C) = SCRIPT({ } }); -NpcAnimID N(extraAnimationList_802451D4)[] = { - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_22), - NPC_ANIM(world_tubba, Palette_00, Anim_23), - NPC_ANIM(world_tubba, Palette_00, Anim_6), - NPC_ANIM(world_tubba, Palette_00, Anim_10), - NPC_ANIM(world_tubba, Palette_00, Anim_8), - NPC_ANIM(world_tubba, Palette_00, Anim_F), - NPC_ANIM(world_tubba, Palette_00, Anim_12), +s32 N(extraAnimationList_802451D4)[] = { + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_22, + NPC_ANIM_world_tubba_Palette_00_Anim_23, + NPC_ANIM_world_tubba_Palette_00_Anim_6, + NPC_ANIM_world_tubba_Palette_00_Anim_10, + NPC_ANIM_world_tubba_Palette_00_Anim_8, + NPC_ANIM_world_tubba_Palette_00_Anim_F, + NPC_ANIM_world_tubba_Palette_00_Anim_12, ANIM_END, }; -NpcAnimID N(extraAnimationList_802451F8)[] = { - NPC_ANIM(boo, Palette_00, Anim_0), +s32 N(extraAnimationList_802451F8)[] = { + NPC_ANIM_boo_Palette_00_Anim_0, ANIM_END, }; -NpcAnimID N(extraAnimationList_80245200)[] = { - NPC_ANIM(boo, Palette_01, Anim_0), +s32 N(extraAnimationList_80245200)[] = { + NPC_ANIM_boo_Palette_01_Anim_0, ANIM_END, }; -NpcAnimID N(extraAnimationList_80245208)[] = { - NPC_ANIM(bootler, Palette_00, Anim_1), +s32 N(extraAnimationList_80245208)[] = { + NPC_ANIM_bootler_Palette_00_Anim_1, ANIM_END, }; @@ -566,7 +566,7 @@ EvtSource N(80245304) = SCRIPT({ WaitForPlayerInputEnabled(); DisablePlayerInput(TRUE); sleep 40; - SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D3)); + SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM_world_skolar_Palette_00_Anim_2, NPC_ANIM_world_skolar_Palette_00_Anim_1, 512, MESSAGE_ID(0x0E, 0x00D3)); SetCamDistance(0, 300.0); SetCamPitch(0, 18, -9); SetCamSpeed(0, 4.0); @@ -582,7 +582,7 @@ EvtSource N(80245304) = SCRIPT({ } } EnableNpcAI(13, 0); - SetNpcAnimation(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_3)); + SetNpcAnimation(NPC_WORLD_SKOLAR, NPC_ANIM_world_skolar_Palette_00_Anim_3); sleep 20; SetPlayerAnimation(ANIM_GOT_ITEM); PlaySoundAtPlayer(313, 0); @@ -604,7 +604,7 @@ EvtSource N(80245304) = SCRIPT({ PlayEffect(0x52, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 30, 0, 0, 0, 0, 0, 0, 0); sleep 30; SetPlayerAnimation(ANIM_10002); - SetNpcAnimation(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_1)); + SetNpcAnimation(NPC_WORLD_SKOLAR, NPC_ANIM_world_skolar_Palette_00_Anim_1); EnableNpcAI(13, 1); PostChapter3StatUpdate(); ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x0193), 160, 40); @@ -615,7 +615,7 @@ EvtSource N(80245304) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D4)); + SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM_world_skolar_Palette_00_Anim_2, NPC_ANIM_world_skolar_Palette_00_Anim_1, 512, MESSAGE_ID(0x0E, 0x00D4)); sleep 10; GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += -25; @@ -625,7 +625,7 @@ EvtSource N(80245304) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D5)); + SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM_world_skolar_Palette_00_Anim_2, NPC_ANIM_world_skolar_Palette_00_Anim_1, 512, MESSAGE_ID(0x0E, 0x00D5)); SetNpcFlagBits(NPC_WORLD_SKOLAR, NPC_FLAG_40000, TRUE); spawn { loop 25 { @@ -700,22 +700,22 @@ StaticNpc N(npcGroup_80245D0C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_tubba, Palette_00, Anim_6), - NPC_ANIM(world_tubba, Palette_00, Anim_9), - NPC_ANIM(world_tubba, Palette_00, Anim_C), - NPC_ANIM(world_tubba, Palette_00, Anim_C), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM_world_tubba_Palette_00_Anim_6, + NPC_ANIM_world_tubba_Palette_00_Anim_9, + NPC_ANIM_world_tubba_Palette_00_Anim_C, + NPC_ANIM_world_tubba_Palette_00_Anim_C, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, }, .extraAnimations = N(extraAnimationList_802451D4), }, @@ -730,22 +730,22 @@ StaticNpc N(npcGroup_80245D0C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, }, }, }; @@ -762,22 +762,22 @@ StaticNpc N(npcGroup_802460EC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .extraAnimations = N(extraAnimationList_80245200), }, @@ -792,22 +792,22 @@ StaticNpc N(npcGroup_802460EC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .extraAnimations = N(extraAnimationList_80245200), }, @@ -822,22 +822,22 @@ StaticNpc N(npcGroup_802460EC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .extraAnimations = N(extraAnimationList_80245200), }, @@ -852,22 +852,22 @@ StaticNpc N(npcGroup_802460EC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .extraAnimations = N(extraAnimationList_80245200), }, @@ -882,22 +882,22 @@ StaticNpc N(npcGroup_802460EC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_00, Anim_1), - NPC_ANIM(boo, Palette_00, Anim_2), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_1), - NPC_ANIM(boo, Palette_00, Anim_1), - NPC_ANIM(boo, Palette_00, Anim_0), - NPC_ANIM(boo, Palette_00, Anim_0), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), + NPC_ANIM_boo_Palette_00_Anim_1, + NPC_ANIM_boo_Palette_00_Anim_2, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_1, + NPC_ANIM_boo_Palette_00_Anim_1, + NPC_ANIM_boo_Palette_00_Anim_0, + NPC_ANIM_boo_Palette_00_Anim_0, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, }, .extraAnimations = N(extraAnimationList_802451F8), }, @@ -912,22 +912,22 @@ StaticNpc N(npcGroup_802460EC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_00, Anim_1), - NPC_ANIM(boo, Palette_00, Anim_2), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_1), - NPC_ANIM(boo, Palette_00, Anim_1), - NPC_ANIM(boo, Palette_00, Anim_0), - NPC_ANIM(boo, Palette_00, Anim_0), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), - NPC_ANIM(boo, Palette_00, Anim_3), + NPC_ANIM_boo_Palette_00_Anim_1, + NPC_ANIM_boo_Palette_00_Anim_2, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_1, + NPC_ANIM_boo_Palette_00_Anim_1, + NPC_ANIM_boo_Palette_00_Anim_0, + NPC_ANIM_boo_Palette_00_Anim_0, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, + NPC_ANIM_boo_Palette_00_Anim_3, }, .extraAnimations = N(extraAnimationList_802451F8), }, @@ -944,22 +944,22 @@ StaticNpc N(npcGroup_80246C8C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_bow, Palette_00, Anim_1), - NPC_ANIM(world_bow, Palette_00, Anim_2), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_1), - NPC_ANIM(world_bow, Palette_00, Anim_1), - NPC_ANIM(world_bow, Palette_00, Anim_0), - NPC_ANIM(world_bow, Palette_00, Anim_0), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_3), - NPC_ANIM(world_bow, Palette_00, Anim_3), + NPC_ANIM_world_bow_Palette_00_Anim_1, + NPC_ANIM_world_bow_Palette_00_Anim_2, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_1, + NPC_ANIM_world_bow_Palette_00_Anim_1, + NPC_ANIM_world_bow_Palette_00_Anim_0, + NPC_ANIM_world_bow_Palette_00_Anim_0, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_3, + NPC_ANIM_world_bow_Palette_00_Anim_3, }, }; @@ -974,22 +974,22 @@ StaticNpc N(npcGroup_80246E7C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(bootler, Palette_00, Anim_1), - NPC_ANIM(bootler, Palette_00, Anim_2), - NPC_ANIM(bootler, Palette_00, Anim_3), - NPC_ANIM(bootler, Palette_00, Anim_3), - NPC_ANIM(bootler, Palette_00, Anim_1), - NPC_ANIM(bootler, Palette_00, Anim_1), - NPC_ANIM(bootler, Palette_00, Anim_0), - NPC_ANIM(bootler, Palette_00, Anim_0), - NPC_ANIM(bootler, Palette_00, Anim_5), - NPC_ANIM(bootler, Palette_00, Anim_6), - NPC_ANIM(bootler, Palette_00, Anim_7), - NPC_ANIM(bootler, Palette_00, Anim_8), - NPC_ANIM(bootler, Palette_00, Anim_5), - NPC_ANIM(bootler, Palette_00, Anim_6), - NPC_ANIM(bootler, Palette_00, Anim_7), - NPC_ANIM(bootler, Palette_00, Anim_8), + NPC_ANIM_bootler_Palette_00_Anim_1, + NPC_ANIM_bootler_Palette_00_Anim_2, + NPC_ANIM_bootler_Palette_00_Anim_3, + NPC_ANIM_bootler_Palette_00_Anim_3, + NPC_ANIM_bootler_Palette_00_Anim_1, + NPC_ANIM_bootler_Palette_00_Anim_1, + NPC_ANIM_bootler_Palette_00_Anim_0, + NPC_ANIM_bootler_Palette_00_Anim_0, + NPC_ANIM_bootler_Palette_00_Anim_5, + NPC_ANIM_bootler_Palette_00_Anim_6, + NPC_ANIM_bootler_Palette_00_Anim_7, + NPC_ANIM_bootler_Palette_00_Anim_8, + NPC_ANIM_bootler_Palette_00_Anim_5, + NPC_ANIM_bootler_Palette_00_Anim_6, + NPC_ANIM_bootler_Palette_00_Anim_7, + NPC_ANIM_bootler_Palette_00_Anim_8, }, .extraAnimations = N(extraAnimationList_80245208), }; @@ -1019,22 +1019,22 @@ StaticNpc N(npcGroup_802470BC) = { .maxCoinBonus = 2, .movement = { -216, 60, -10, 30, 0, -32767, 0, -216, 60, -10, 250 }, .animations = { - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, walk), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, pain), - NPC_ANIM(paragoomba, hyper, pain), - NPC_ANIM(paragoomba, hyper, attack), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_walk, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_pain, + NPC_ANIM_paragoomba_hyper_pain, + NPC_ANIM_paragoomba_hyper_attack, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -1056,22 +1056,22 @@ StaticNpc N(npcGroup_802472AC) = { .maxCoinBonus = 2, .movement = { 0, 60, 150, 30, 0, -32767, 0, 0, 60, 150, 250 }, .animations = { - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, walk), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, pain), - NPC_ANIM(paragoomba, hyper, pain), - NPC_ANIM(paragoomba, hyper, attack), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_walk, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_pain, + NPC_ANIM_paragoomba_hyper_pain, + NPC_ANIM_paragoomba_hyper_attack, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -1093,22 +1093,22 @@ StaticNpc N(npcGroup_8024749C) = { .maxCoinBonus = 2, .movement = { 260, 60, 30, 30, 0, -32767, 0, 260, 60, 30, 250 }, .animations = { - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, walk), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, idle), - NPC_ANIM(paragoomba, hyper, pain), - NPC_ANIM(paragoomba, hyper, pain), - NPC_ANIM(paragoomba, hyper, attack), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), - NPC_ANIM(paragoomba, hyper, run), + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_walk, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_idle, + NPC_ANIM_paragoomba_hyper_pain, + NPC_ANIM_paragoomba_hyper_pain, + NPC_ANIM_paragoomba_hyper_attack, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, + NPC_ANIM_paragoomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -1124,22 +1124,22 @@ StaticNpc N(npcGroup_8024768C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_0), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), - NPC_ANIM(world_skolar, Palette_00, Anim_1), + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_0, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, + NPC_ANIM_world_skolar_Palette_00_Anim_1, }, }; diff --git a/src/world/area_arn/arn_08/events.c b/src/world/area_arn/arn_08/events.c index 4381418fd9..78027151e1 100644 --- a/src/world/area_arn/arn_08/events.c +++ b/src/world/area_arn/arn_08/events.c @@ -55,21 +55,21 @@ EvtSource N(8024049C) = SCRIPT({ SetNpcPos(NPC_PARTNER, 1000, 1000, 0); RotateModel(0, 80, 0, -1, 0); RotateModel(1, 80, 0, -1, 0); - SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_6); SetNpcJumpscale(NPC_TUBBAS_HEART, 2.5); PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); NpcJump0(NPC_TUBBAS_HEART, -50, 0, 50, 10); - SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_7); sleep 1; - SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_6); PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); NpcJump0(NPC_TUBBAS_HEART, -110, 0, 110, 10); - SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_7); sleep 1; - SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_6); PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); NpcJump0(NPC_TUBBAS_HEART, -180, 0, 180, 10); - SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_7); sleep 1; MakeLerp(80, 0, 10, 0); loop { @@ -315,19 +315,19 @@ EvtSource N(init_80241288) = SCRIPT({ EvtSource N(interact_802412E8) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH5_WHALE_MOUTH_OPEN { - SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BA)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00BA)); } < STORY_CH6_FLOWER_GATE_OPEN { - SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BB)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00BB)); } < STORY_CH7_INVITED_TO_STARBORN_VALLEY { - SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BC)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00BC)); } < STORY_CH8_OPENED_PATH_TO_STAR_WAY { - SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BD)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00BD)); } >= STORY_CH8_OPENED_PATH_TO_STAR_WAY { - SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BE)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00BE)); } } }); @@ -351,22 +351,22 @@ StaticNpc N(npcGroup_80241448) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, }, }; @@ -381,22 +381,22 @@ StaticNpc N(npcGroup_80241638) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00B4), }; diff --git a/src/world/area_arn/arn_09/events.c b/src/world/area_arn/arn_09/events.c index 5650026fbf..121894cd88 100644 --- a/src/world/area_arn/arn_09/events.c +++ b/src/world/area_arn/arn_09/events.c @@ -119,13 +119,13 @@ NpcSettings N(npcSettings_802405D0) = { EvtSource N(idle_802405FC) = SCRIPT({ EnableNpcShadow(NPC_SELF, FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SetNpcJumpscale(NPC_SELF, 2.5); PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); NpcJump0(NPC_SELF, 0, 25, -10, 6); PlaySoundAtNpc(NPC_SELF, 0x2086, 0); N(func_80240000_BF6060)(); - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SetNpcJumpscale(NPC_SELF, 2.5); PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); NpcJump0(NPC_SELF, 0, 200, 0, 15); @@ -152,22 +152,22 @@ StaticNpc N(npcGroup_80240784) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, }, }; diff --git a/src/world/area_arn/arn_10/events.c b/src/world/area_arn/arn_10/events.c index 214d74b4ea..fe57c3dcf9 100644 --- a/src/world/area_arn/arn_10/events.c +++ b/src/world/area_arn/arn_10/events.c @@ -112,22 +112,22 @@ NpcSettings N(npcSettings_802404CC) = { }; EvtSource N(idle_802404F8) = SCRIPT({ - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SetNpcJumpscale(NPC_SELF, 3.0); GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) -= 30; PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 8); - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_14)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14); sleep 1; - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SI_VAR(0) -= 80; SetNpcJumpscale(NPC_SELF, 2.5); PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12); - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_14)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14); sleep 1; - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SI_VAR(0) -= 80; SetNpcJumpscale(NPC_SELF, 2.5); PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); @@ -170,22 +170,22 @@ StaticNpc N(npcGroup_802407D8) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, }, }; @@ -203,22 +203,22 @@ StaticNpc N(npcGroup_802409C8) = { .maxCoinBonus = 2, .movement = { 0, 0, 0, 20, 0, -32767, 0, 0, 0, 0, 150, 0, 0, 1 }, .animations = { - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, walk), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_walk, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; diff --git a/src/world/area_arn/arn_11/events.c b/src/world/area_arn/arn_11/events.c index 14e058eb3a..86d5ebd3be 100644 --- a/src/world/area_arn/arn_11/events.c +++ b/src/world/area_arn/arn_11/events.c @@ -21,16 +21,16 @@ EvtSource N(802401BC) = SCRIPT({ sleep 30; SetPlayerSpeed(3.0); PlayerMoveTo(6, 0, 0); - SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BF)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_B, NPC_ANIM_tubbas_heart_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00BF)); sleep 10; SetPlayerAnimation(ANIM_80007); sleep 40; - SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C0)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_B, NPC_ANIM_tubbas_heart_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00C0)); SetPlayerAnimation(ANIM_10002); sleep 10; SetPlayerAnimation(0x90000); sleep 30; - SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C1)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_B, NPC_ANIM_tubbas_heart_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00C1)); SetPlayerAnimation(ANIM_10002); sleep 20; SetPlayerAnimation(0x90000); @@ -44,7 +44,7 @@ EvtSource N(802401BC) = SCRIPT({ NpcJump0(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); } sleep 40; - SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C2)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM_tubbas_heart_Palette_00_Anim_B, NPC_ANIM_tubbas_heart_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00C2)); SetPlayerAnimation(0x90000); sleep 10; SetNpcVar(0, 0, 1); @@ -258,22 +258,22 @@ StaticNpc N(npcGroup_80240EEC) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, }, }; diff --git a/src/world/area_arn/arn_12/events.c b/src/world/area_arn/arn_12/events.c index 49ca9791d5..4e2eabdcb6 100644 --- a/src/world/area_arn/arn_12/events.c +++ b/src/world/area_arn/arn_12/events.c @@ -111,22 +111,22 @@ NpcSettings N(npcSettings_802404BC) = { }; EvtSource N(idle_802404E8) = SCRIPT({ - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SetNpcJumpscale(NPC_SELF, 3.0); GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) -= 30; PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 8); - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_14)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14); sleep 1; - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SI_VAR(0) -= 80; SetNpcJumpscale(NPC_SELF, 2.5); PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12); - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_14)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14); sleep 1; - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SI_VAR(0) -= 80; SetNpcJumpscale(NPC_SELF, 2.5); PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); @@ -170,22 +170,22 @@ StaticNpc N(npcGroup_802407DC) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, }, }; @@ -203,22 +203,22 @@ StaticNpc N(npcGroup_802409CC) = { .maxCoinBonus = 2, .movement = { 0, 0, 0, 20, 0, -32767, 0, 0, 0, 0, 150, 0, 0, 1 }, .animations = { - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, walk), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_walk, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; diff --git a/src/world/area_arn/arn_13/events.c b/src/world/area_arn/arn_13/events.c index 4f016c7feb..802c657e0e 100644 --- a/src/world/area_arn/arn_13/events.c +++ b/src/world/area_arn/arn_13/events.c @@ -112,22 +112,22 @@ NpcSettings N(npcSettings_802404CC) = { }; EvtSource N(idle_802404F8) = SCRIPT({ - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SetNpcJumpscale(NPC_SELF, 3.0); GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) -= 30; PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 8); - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_14)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14); sleep 1; - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SI_VAR(0) -= 80; SetNpcJumpscale(NPC_SELF, 2.5); PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); NpcJump0(NPC_SELF, SI_VAR(0), 0, SI_VAR(2), 12); - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_14)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_14); sleep 1; - SetNpcAnimation(NPC_SELF, NPC_ANIM(tubbas_heart, Palette_00, Anim_13)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13); SI_VAR(0) -= 80; SetNpcJumpscale(NPC_SELF, 2.5); PlaySoundAtNpc(NPC_SELF, 0x20C8, 0); @@ -171,22 +171,22 @@ StaticNpc N(npcGroup_802407EC) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), - NPC_ANIM(tubbas_heart, Palette_00, Anim_1), + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, + NPC_ANIM_tubbas_heart_Palette_00_Anim_1, }, }; @@ -204,22 +204,22 @@ StaticNpc N(npcGroup_802409DC) = { .maxCoinBonus = 2, .movement = { 0, 0, 0, 20, 0, -32767, 0, 0, 0, 0, 150, 0, 0, 1 }, .animations = { - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, walk), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, idle), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, pain), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), - NPC_ANIM(goomba, hyper, run), + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_walk, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_idle, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_pain, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, + NPC_ANIM_goomba_hyper_run, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index 7bd6a410fd..f9ccbac6b4 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -110,42 +110,42 @@ EvtSource N(80240B08) = SCRIPT({ SetNpcJumpscale(NPC_BOO0, -0.19921875); NpcJump0(NPC_BOO0, 257, 30, -90, 5); EnableNpcShadow(NPC_BOO0, FALSE); - SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6); }); EvtSource N(80240B74) = SCRIPT({ SetNpcJumpscale(NPC_BOO1, -0.2998046875); NpcJump0(NPC_BOO1, 272, 112, -81, 12); EnableNpcShadow(NPC_BOO1, FALSE); - SetNpcAnimation(NPC_BOO1, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO1, NPC_ANIM_boo_Palette_01_Anim_6); }); EvtSource N(80240BE0) = SCRIPT({ SetNpcJumpscale(NPC_BOO2, -0.3994140625); NpcJump0(NPC_BOO2, 237, 120, -118, 10); EnableNpcShadow(NPC_BOO2, FALSE); - SetNpcAnimation(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_6); }); EvtSource N(80240C4C) = SCRIPT({ SetNpcJumpscale(NPC_BOO3, -0.2998046875); NpcJump0(NPC_BOO3, 280, 60, -79, 8); EnableNpcShadow(NPC_BOO3, FALSE); - SetNpcAnimation(NPC_BOO3, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO3, NPC_ANIM_boo_Palette_01_Anim_6); }); EvtSource N(80240CB8) = SCRIPT({ SetNpcJumpscale(NPC_BOO4, -0.3994140625); NpcJump0(NPC_BOO4, 250, 81, -97, 9); EnableNpcShadow(NPC_BOO4, FALSE); - SetNpcAnimation(NPC_BOO4, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO4, NPC_ANIM_boo_Palette_01_Anim_6); }); EvtSource N(80240D24) = SCRIPT({ SetNpcJumpscale(NPC_BOO5, -0.5); NpcJump0(NPC_BOO5, 227, 43, -123, 15); EnableNpcShadow(NPC_BOO5, FALSE); - SetNpcAnimation(NPC_BOO5, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO5, NPC_ANIM_boo_Palette_01_Anim_6); }); EvtSource N(80240D90) = SCRIPT({ @@ -224,9 +224,9 @@ EvtSource N(8024103C) = SCRIPT({ await N(80240AB0); sleep 60; InterpNpcYaw(NPC_BOO0, 270, 1); - SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00DB)); - SpeakToPlayer(NPC_BOO4, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00DC)); - SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00DD)); + SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x00DB)); + SpeakToPlayer(NPC_BOO4, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x00DC)); + SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 5, MESSAGE_ID(0x0E, 0x00DD)); PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); ShakeCam(0, 0, 20, 2.0); sleep 10; @@ -271,32 +271,32 @@ EvtSource N(802413F4) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); SI_VAR(10) = spawn N(80240DDC); - SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00DF)); + SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00DF)); kill SI_VAR(10); SetPlayerAnimation(ANIM_80007); sleep 20; - SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00E0)); + SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00E0)); sleep 20; SetPlayerAnimation(ANIM_NOD_YES); sleep 20; - SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00E1)); + SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00E1)); DisablePartnerAI(0); GetCurrentPartnerID(SI_VAR(0)); match SI_VAR(0) { == 1 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_goombario, normal, talk), NPC_ANIM(world_goombario, normal, idle), 0, MESSAGE_ID(0x0E, 0x00E2)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_goombario_normal_talk, NPC_ANIM_world_goombario_normal_idle, 0, MESSAGE_ID(0x0E, 0x00E2)); } == 2 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_kooper, normal, talk), NPC_ANIM(world_kooper, normal, idle), 0, MESSAGE_ID(0x0E, 0x00E3)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_kooper_normal_talk, NPC_ANIM_world_kooper_normal_idle, 0, MESSAGE_ID(0x0E, 0x00E3)); } == 3 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bombette, normal, idle_fast), NPC_ANIM(world_bombette, normal, idle), 0, MESSAGE_ID(0x0E, 0x00E4)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bombette_normal_idle_fast, NPC_ANIM_world_bombette_normal_idle, 0, MESSAGE_ID(0x0E, 0x00E4)); } == 4 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00E5)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_parakarry_Palette_00_Anim_6, NPC_ANIM_world_parakarry_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00E5)); } == 9 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00E6)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00E6)); } } EnablePartnerAI(); @@ -316,8 +316,8 @@ EvtSource N(802413F4) = SCRIPT({ ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00E7), 160, 40); await N(80240B08); sleep 10; - SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 5, MESSAGE_ID(0x0E, 0x00E8)); - SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6)); + SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6, NPC_ANIM_boo_Palette_01_Anim_6, 5, MESSAGE_ID(0x0E, 0x00E8)); + SetNpcAnimation(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6); spawn N(80240F50); SI_STORY_PROGRESS = STORY_CH3_ESCAPED_TUBBAS_MANOR; DisablePlayerInput(FALSE); @@ -336,12 +336,12 @@ EvtSource N(80241AA0) = SCRIPT({ InterpNpcYaw(NPC_BOO3, 74, 1); InterpNpcYaw(NPC_BOO4, 78, 1); InterpNpcYaw(NPC_BOO5, 81, 1); - SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6)); - SetNpcAnimation(NPC_BOO1, NPC_ANIM(boo, Palette_01, Anim_6)); - SetNpcAnimation(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6)); - SetNpcAnimation(NPC_BOO3, NPC_ANIM(boo, Palette_01, Anim_6)); - SetNpcAnimation(NPC_BOO4, NPC_ANIM(boo, Palette_01, Anim_6)); - SetNpcAnimation(NPC_BOO5, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6); + SetNpcAnimation(NPC_BOO1, NPC_ANIM_boo_Palette_01_Anim_6); + SetNpcAnimation(NPC_BOO2, NPC_ANIM_boo_Palette_01_Anim_6); + SetNpcAnimation(NPC_BOO3, NPC_ANIM_boo_Palette_01_Anim_6); + SetNpcAnimation(NPC_BOO4, NPC_ANIM_boo_Palette_01_Anim_6); + SetNpcAnimation(NPC_BOO5, NPC_ANIM_boo_Palette_01_Anim_6); EnableNpcShadow(NPC_BOO0, FALSE); EnableNpcShadow(NPC_BOO1, FALSE); EnableNpcShadow(NPC_BOO2, FALSE); @@ -352,34 +352,34 @@ EvtSource N(80241AA0) = SCRIPT({ EvtSource N(interact_80241CD8) = SCRIPT({ SI_MAP_VAR(0) = 1; - SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 5, MESSAGE_ID(0x0E, 0x00E9)); - SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6)); + SpeakToPlayer(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6, NPC_ANIM_boo_Palette_01_Anim_6, 5, MESSAGE_ID(0x0E, 0x00E9)); + SetNpcAnimation(NPC_BOO0, NPC_ANIM_boo_Palette_01_Anim_6); DisablePartnerAI(0); GetCurrentPartnerID(SI_VAR(0)); match SI_VAR(0) { == 1 { AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_goombario, normal, talk), NPC_ANIM(world_goombario, normal, idle), 0, MESSAGE_ID(0x0E, 0x00EA)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_goombario_normal_talk, NPC_ANIM_world_goombario_normal_idle, 0, MESSAGE_ID(0x0E, 0x00EA)); ResetCam(0, 6.0); } == 2 { AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_kooper, normal, talk), NPC_ANIM(world_kooper, normal, idle), 0, MESSAGE_ID(0x0E, 0x00EB)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_kooper_normal_talk, NPC_ANIM_world_kooper_normal_idle, 0, MESSAGE_ID(0x0E, 0x00EB)); ResetCam(0, 6.0); } == 3 { AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bombette, normal, idle_fast), NPC_ANIM(world_bombette, normal, idle), 0, MESSAGE_ID(0x0E, 0x00EC)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bombette_normal_idle_fast, NPC_ANIM_world_bombette_normal_idle, 0, MESSAGE_ID(0x0E, 0x00EC)); ResetCam(0, 6.0); } == 4 { AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00ED)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_parakarry_Palette_00_Anim_6, NPC_ANIM_world_parakarry_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00ED)); ResetCam(0, 6.0); } == 9 { AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00EE)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00EE)); ResetCam(0, 6.0); } } @@ -422,22 +422,22 @@ StaticNpc N(npcGroup_80241FE4) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00B5), }; @@ -453,22 +453,22 @@ StaticNpc N(npcGroup_802421D4) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }; @@ -483,22 +483,22 @@ StaticNpc N(npcGroup_802423C4) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }; @@ -513,22 +513,22 @@ StaticNpc N(npcGroup_802425B4) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }; @@ -543,22 +543,22 @@ StaticNpc N(npcGroup_802427A4) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }; @@ -573,22 +573,22 @@ StaticNpc N(npcGroup_80242994) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, }; @@ -610,7 +610,7 @@ EvtSource N(80242B84) = SCRIPT({ SetPlayerAnimation(ANIM_80017); SetNpcPos(NPC_SENTINEL, 320, 70, -158); InterpNpcYaw(NPC_SENTINEL, 270, 0); - SetNpcAnimation(NPC_SENTINEL, NPC_ANIM(sentinel, Palette_00, Anim_8)); + SetNpcAnimation(NPC_SENTINEL, NPC_ANIM_sentinel_Palette_00_Anim_8); UseSettingsFrom(0, 175, 0, -35); SetPanTarget(0, 175, 0, -35); SetCamDistance(0, 540.0); @@ -639,14 +639,14 @@ EvtSource N(80242B84) = SCRIPT({ NpcMoveTo(NPC_SENTINEL, 175, -33, 40); sleep 20; SetNpcPos(NPC_SENTINEL, 175, 85, -33); - SetNpcAnimation(NPC_SENTINEL, NPC_ANIM(sentinel, Palette_00, Anim_9)); + SetNpcAnimation(NPC_SENTINEL, NPC_ANIM_sentinel_Palette_00_Anim_9); sleep 20; PlaySoundAtNpc(NPC_SENTINEL, SOUND_UNKNOWN_2F7, 0); - SetNpcAnimation(NPC_SENTINEL, NPC_ANIM(sentinel, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SENTINEL, NPC_ANIM_sentinel_Palette_00_Anim_2); SetNpcPos(NPC_SENTINEL, 175, 70, -33); spawn { sleep 40; - SetNpcAnimation(NPC_SENTINEL, NPC_ANIM(sentinel, Palette_00, Anim_3)); + SetNpcAnimation(NPC_SENTINEL, NPC_ANIM_sentinel_Palette_00_Anim_3); NpcMoveTo(NPC_SENTINEL, 270, -120, 30); StopSound(814); SetNpcPos(NPC_SENTINEL, 0, -1000, 0); @@ -754,22 +754,22 @@ StaticNpc N(npcGroup_802434FC) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, }; diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index b45231f370..55457fe038 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -357,7 +357,7 @@ EvtSource N(80243EF0) = SCRIPT({ ShakeCam(0, 0, 300, 1.0); StopSound(0x8000005D); spawn { - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_D)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_D); SetNpcSpeed(NPC_WORLD_TUBBA, 3.0); NpcMoveTo(NPC_WORLD_TUBBA, 176, 0, 0); } @@ -381,7 +381,7 @@ EvtSource N(80243EF0) = SCRIPT({ DeleteAnimatedModel(0); spawn { sleep 30; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_D)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_D); SetNpcPos(NPC_WORLD_TUBBA, 137, 244, 35); SetNpcSpeed(NPC_WORLD_TUBBA, 3.0); NpcMoveTo(NPC_WORLD_TUBBA, 470, 0, 0); @@ -1060,7 +1060,7 @@ EvtSource N(npcAI_80244D54) = SCRIPT({ SI_VAR(2) += 2; SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); func_80045838(-1, 759, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_8)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_8); sleep 10; SetPlayerAnimation(ANIM_80017); sleep 10; @@ -1182,11 +1182,11 @@ EvtSource N(idle_8024536C) = SCRIPT({ break loop; } } - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_A)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_A); SetNpcPos(NPC_SELF, 520, 420, 0); SetNpcYaw(NPC_SELF, 270); NpcMoveTo(NPC_SELF, 390, 0, 30); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_7)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_7); spawn { sleep 20; MakeLerp(80, 0, 10, 0); @@ -1201,17 +1201,17 @@ EvtSource N(idle_8024536C) = SCRIPT({ } PlaySoundAtCollider(28, 456, 0); } - SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 0, MESSAGE_ID(0x0E, 0x0101)); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_10, NPC_ANIM_world_tubba_Palette_00_Anim_6, 0, MESSAGE_ID(0x0E, 0x0101)); spawn { - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_19)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_19); sleep 4; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1A)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_1A); sleep 17; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1B)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_1B); sleep 11; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1C)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_1C); sleep 30; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1D)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_1D); } sleep 4; SetNpcJumpscale(NPC_WORLD_TUBBA, 1.0); @@ -1391,7 +1391,7 @@ EvtSource N(idle_8024598C) = SCRIPT({ } SetNpcPos(NPC_SELF, 555, 0, 0); SetNpcYaw(NPC_SELF, 270); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_A)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_A); NpcMoveTo(NPC_SELF, 426, 0, 30); spawn { sleep 20; @@ -1443,7 +1443,7 @@ EvtSource N(init_80245D80) = SCRIPT({ if (SI_VAR(0) >= -29) { SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE); EnableNpcShadow(NPC_SELF, FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_1); SetNpcPos(NPC_SELF, -33, -3, 8); SetNpcRotation(NPC_SELF, -50, 30, 10); BindNpcIdle(NPC_SELF, 0); @@ -1455,7 +1455,7 @@ EvtSource N(init_80245E44) = SCRIPT({ if (SI_VAR(0) >= -29) { SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE); EnableNpcShadow(NPC_SELF, FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_1); SetNpcPos(NPC_SELF, -486, 182, 28); SetNpcRotation(NPC_SELF, -10, 50, 0); BindNpcIdle(NPC_SELF, 0); @@ -1467,7 +1467,7 @@ EvtSource N(init_80245F08) = SCRIPT({ if (SI_VAR(0) >= -29) { SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE); EnableNpcShadow(NPC_SELF, FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_1); SetNpcPos(NPC_SELF, -201, 0, -143); SetNpcRotation(NPC_SELF, -50, 0, 0); BindNpcIdle(NPC_SELF, 0); @@ -1479,7 +1479,7 @@ EvtSource N(init_80245FCC) = SCRIPT({ if (SI_VAR(0) >= -29) { SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE); EnableNpcShadow(NPC_SELF, FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_1); SetNpcPos(NPC_SELF, -305, -1, -80); SetNpcRotation(NPC_SELF, -65, -30, 0); BindNpcIdle(NPC_SELF, 0); @@ -1498,22 +1498,22 @@ StaticNpc N(npcGroup_80246090) = { .flowerDrops = NO_DROPS, .movement = { -180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, }; @@ -1529,22 +1529,22 @@ StaticNpc N(npcGroup_80246280) = { .flowerDrops = NO_DROPS, .movement = { 180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, }; @@ -1560,22 +1560,22 @@ StaticNpc N(npcGroup_80246470) = { .flowerDrops = NO_DROPS, .movement = { -180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, }; @@ -1591,37 +1591,37 @@ StaticNpc N(npcGroup_80246660) = { .flowerDrops = NO_DROPS, .movement = { 180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, }; -NpcAnimID N(extraAnimationList_80246850)[] = { - NPC_ANIM(world_tubba, Palette_00, Anim_6), - NPC_ANIM(world_tubba, Palette_00, Anim_10), - NPC_ANIM(world_tubba, Palette_00, Anim_9), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_A), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_19), - NPC_ANIM(world_tubba, Palette_00, Anim_1A), - NPC_ANIM(world_tubba, Palette_00, Anim_1B), - NPC_ANIM(world_tubba, Palette_00, Anim_1C), - NPC_ANIM(world_tubba, Palette_00, Anim_1D), +s32 N(extraAnimationList_80246850)[] = { + NPC_ANIM_world_tubba_Palette_00_Anim_6, + NPC_ANIM_world_tubba_Palette_00_Anim_10, + NPC_ANIM_world_tubba_Palette_00_Anim_9, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_A, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_19, + NPC_ANIM_world_tubba_Palette_00_Anim_1A, + NPC_ANIM_world_tubba_Palette_00_Anim_1B, + NPC_ANIM_world_tubba_Palette_00_Anim_1C, + NPC_ANIM_world_tubba_Palette_00_Anim_1D, ANIM_END, }; @@ -1636,22 +1636,22 @@ StaticNpc N(npcGroup_80246880) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_tubba, Palette_00, Anim_6), - NPC_ANIM(world_tubba, Palette_00, Anim_9), - NPC_ANIM(world_tubba, Palette_00, Anim_C), - NPC_ANIM(world_tubba, Palette_00, Anim_C), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM_world_tubba_Palette_00_Anim_6, + NPC_ANIM_world_tubba_Palette_00_Anim_9, + NPC_ANIM_world_tubba_Palette_00_Anim_C, + NPC_ANIM_world_tubba_Palette_00_Anim_C, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, }, .extraAnimations = N(extraAnimationList_80246850), }; @@ -1674,22 +1674,22 @@ StaticNpc N(npcGroup_80246A70) = { .maxCoinBonus = 3, .movement = { 2, 320, 210, 0, 370, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 350, 210, 0, 1000, 250, 1 }, .animations = { - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_A), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_19), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_A, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_19, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_80246850), @@ -1713,22 +1713,22 @@ StaticNpc N(npcGroup_80246C60) = { .maxCoinBonus = 3, .movement = { 8, 156, 0, 187, -36, 0, 290, -159, 0, 50, -80, 0, -218, 66, 0, -362, 196, 0, -268, 280, 0, -124, 250, 0, 100, 0, 0, 0, 0, 0, 0, -32767, 250, 0, 100, 1000, 250, 1 }, .animations = { - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_A), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_19), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_A, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_19, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_80246850), diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index babd39d77d..44e6dc25e2 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -167,21 +167,21 @@ EvtSource N(80241AB0) = SCRIPT({ } }); -NpcAnimID N(extraAnimationList_80241B6C)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), +s32 N(extraAnimationList_80241B6C)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, ANIM_END, }; -NpcAnimID N(extraAnimationList_80241B94)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), +s32 N(extraAnimationList_80241B94)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, ANIM_END, }; @@ -287,22 +287,22 @@ StaticNpc N(npcGroup_80241E08)[] = { .maxCoinBonus = 3, .movement = { -200, 0, 180, 40, 0, -32767, 0, -200, 0, 175, 250, 90, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_80241B6C), @@ -317,22 +317,22 @@ StaticNpc N(npcGroup_80241E08)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_80241B94), }, @@ -356,22 +356,22 @@ StaticNpc N(npcGroup_802421E8)[] = { .maxCoinBonus = 3, .movement = { 375, 0, 100, 40, 0, -32767, 0, 320, 0, 175, 250, 90, 0, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }, @@ -385,22 +385,22 @@ StaticNpc N(npcGroup_802421E8)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_80241B94), }, diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 80b6e87dea..eeb77b4b6e 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -393,8 +393,8 @@ s32 N(unk_missing_80243A2C)[] = { 0x00390012, 0xFFFFFFFF, }; -NpcAnimID N(extraAnimationList_80243A54)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), +s32 N(extraAnimationList_80243A54)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, ANIM_END, }; @@ -539,22 +539,22 @@ StaticNpc N(npcGroup_80243DE8)[] = { .maxCoinBonus = 3, .movement = { 180, 0, -122, 40, 0, -32767, 0, 0, 0, 75, 355, 255, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }, @@ -568,22 +568,22 @@ StaticNpc N(npcGroup_80243DE8)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_80243A54), }, @@ -607,22 +607,22 @@ StaticNpc N(npcGroup_802441C8)[] = { .maxCoinBonus = 3, .movement = { 2, -272, 0, -135, -171, 0, -135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 75, 355, 255, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }, @@ -636,22 +636,22 @@ StaticNpc N(npcGroup_802441C8)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_80243A54), }, @@ -676,22 +676,22 @@ StaticNpc N(npcGroup_802445A8)[] = { .maxCoinBonus = 3, .movement = { -326, 210, 80, 0, 0, -32767, 0, 0, 0, 75, 355, 255, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }, @@ -705,22 +705,22 @@ StaticNpc N(npcGroup_802445A8)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_80243A54), }, diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 76d02c8883..b8c53adf5a 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -158,7 +158,7 @@ EvtSource N(npcAI_802435E4) = SCRIPT({ SI_VAR(2) += 2; SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); func_80045838(-1, 759, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_8)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_8); sleep 10; SetPlayerAnimation(ANIM_80017); sleep 10; @@ -231,22 +231,22 @@ StaticNpc N(npcGroup_80243B28) = { .flowerDrops = NO_DROPS, .movement = { 70, -220, 186, 15, 40, -32767, 1, 80, -220, 170, 80, 150, 1 }, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index ffca978057..54daad121e 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -134,8 +134,8 @@ s32 N(unk_missing_8024197C)[] = { 0x00390012, 0xFFFFFFFF, }; -NpcAnimID N(extraAnimationList_802419A4)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), +s32 N(extraAnimationList_802419A4)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, ANIM_END, }; @@ -209,22 +209,22 @@ StaticNpc N(npcGroup_80241B4C)[] = { .maxCoinBonus = 3, .movement = { 132, -110, 238, 0, 0, -32767, 0, 325, 0, 185, 200 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }, @@ -238,22 +238,22 @@ StaticNpc N(npcGroup_80241B4C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802419A4), }, @@ -277,22 +277,22 @@ StaticNpc N(npcGroup_80241F2C)[] = { .maxCoinBonus = 3, .movement = { 503, -210, 225, 0, 0, -32767, 0, 503, -210, 290, 200, 150, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }, @@ -306,22 +306,22 @@ StaticNpc N(npcGroup_80241F2C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802419A4), }, diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 5258f1a2be..03d44e939b 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -138,11 +138,11 @@ NpcSettings N(npcSettings_80240840) = { EvtSource N(interact_8024086C) = SCRIPT({ if (SI_AREA_FLAG(4) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00F0)); SI_AREA_FLAG(4) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, + SpeakToPlayer(NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00F1)); SI_AREA_FLAG(4) = 0; } @@ -166,22 +166,22 @@ StaticNpc N(npcGroup_80240954) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_2), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_1), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_0), - NPC_ANIM(boo, Palette_01, Anim_A), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), - NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_2, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_1, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_0, + NPC_ANIM_boo_Palette_01_Anim_A, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, + NPC_ANIM_boo_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x00B3), }; diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index a2031379c0..731b743e9c 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -108,21 +108,21 @@ EvtSource N(802417F0) = SCRIPT({ } }); -NpcAnimID N(extraAnimationList_802418AC)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), +s32 N(extraAnimationList_802418AC)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, ANIM_END, }; -NpcAnimID N(extraAnimationList_802418D4)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), +s32 N(extraAnimationList_802418D4)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, ANIM_END, }; @@ -196,22 +196,22 @@ StaticNpc N(npcGroup_80241A7C)[] = { .maxCoinBonus = 3, .movement = { -500, 0, -240, 40, 0, -32767, 0, -500, 0, -240, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_802418AC), @@ -226,22 +226,22 @@ StaticNpc N(npcGroup_80241A7C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802418D4), }, diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index bbd07094ff..d1060d5180 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -183,21 +183,21 @@ EvtSource N(802441D4) = SCRIPT({ } }); -NpcAnimID N(extraAnimationList_80244290)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), +s32 N(extraAnimationList_80244290)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, ANIM_END, }; -NpcAnimID N(extraAnimationList_802442B8)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), +s32 N(extraAnimationList_802442B8)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, ANIM_END, }; @@ -305,7 +305,7 @@ EvtSource N(npcAI_802444E4) = SCRIPT({ SI_VAR(2) += 2; SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); func_80045838(-1, 759, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_8)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_8); sleep 10; SetPlayerAnimation(ANIM_80017); sleep 10; @@ -394,7 +394,7 @@ EvtSource N(idle_80244A54) = SCRIPT({ break loop; } } - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_A)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_A); SetNpcPos(NPC_SELF, -665, 210, 180); SetNpcYaw(NPC_SELF, 90); NpcMoveTo(NPC_SELF, -530, 180, 30); @@ -503,22 +503,22 @@ StaticNpc N(npcGroup_802450A0) = { .maxCoinBonus = 3, .movement = { 10, -400, 210, 80, -100, 210, 80, 100, 210, 80, 400, 210, 80, 820, 100, 80, 820, 100, 260, 400, 0, 260, 100, 0, 200, -100, 0, 175, -450, 0, 175, -32767, 150, 0, 175, 1450, 200, 1 }, .animations = { - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_A), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_19), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_A, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_19, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -541,22 +541,22 @@ StaticNpc N(npcGroup_80245290)[] = { .maxCoinBonus = 3, .movement = { -250, 0, 135, 30, 0, -32767, 0, -250, 0, 135, 250, 0, 0, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_80244290), @@ -571,22 +571,22 @@ StaticNpc N(npcGroup_80245290)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802442B8), }, @@ -610,22 +610,22 @@ StaticNpc N(npcGroup_80245670)[] = { .maxCoinBonus = 3, .movement = { 220, 0, 155, 30, 0, -32767, 0, 220, 0, 155, 250, 0, 0, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_80244290), @@ -640,22 +640,22 @@ StaticNpc N(npcGroup_80245670)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802442B8), }, @@ -679,22 +679,22 @@ StaticNpc N(npcGroup_80245A50)[] = { .maxCoinBonus = 3, .movement = { 825, 100, 200, 25, 0, -32767, 0, 825, 100, 200, 150, 0, 0, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_80244290), @@ -709,22 +709,22 @@ StaticNpc N(npcGroup_80245A50)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802442B8), }, @@ -741,22 +741,22 @@ StaticNpc N(npcGroup_80245E30) = { .flowerDrops = NO_DROPS, .movement = { 75, 310, 85, 30, 0, -32767, 0, 75, 0, 85, 250, 55, 1, 1 }, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, }; @@ -771,51 +771,51 @@ StaticNpc N(npcGroup_80246020) = { .flowerDrops = NO_DROPS, .movement = { -451, 310, 81, 30, 0, -32767, 0, -310, 0, 175, 250, 145, 1, 1 }, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, }; EvtSource N(idle_80246210) = SCRIPT({ 0: - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_7)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_7); sleep 30; loop 15 { N(func_80243C50_C43A00)(); sleep 60; } - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_C)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_C); sleep 20; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_7)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_7); sleep 30; loop 5 { N(func_80243C50_C43A00)(); sleep 60; } - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_C)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_C); sleep 15; goto 0; }); EvtSource N(interact_80246310) = SCRIPT({ - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_8)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_8); PlaySoundAtNpc(NPC_SELF, 0x2F1, 0); sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_2); sleep 20; GetNpcYaw(-1, SI_VAR(0)); SI_VAR(0) += 180; @@ -830,16 +830,16 @@ EvtSource N(interact_80246310) = SCRIPT({ InterpNpcYaw(NPC_SELF, SI_VAR(0), 0); sleep 15; NpcFacePlayer(NPC_SELF, 0); - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_5), NPC_ANIM(world_clubba, Palette_00, Anim_2), 0, MESSAGE_ID(0x0E, 0x00F2)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_5, NPC_ANIM_world_clubba_Palette_00_Anim_2, 0, MESSAGE_ID(0x0E, 0x00F2)); sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_6); sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_7)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_7); }); EvtSource N(init_802464C4) = SCRIPT({ SetNpcCollisionSize(-1, 36, 30); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_7)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_7); BindNpcInteract(NPC_SELF, N(interact_80246310)); BindNpcIdle(NPC_SELF, N(idle_80246210)); }); @@ -856,22 +856,22 @@ StaticNpc N(npcGroup_80246528) = { .flowerDrops = NO_DROPS, .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .tattle = MESSAGE_ID(0x1A, 0x00B6), @@ -904,22 +904,22 @@ StaticNpc N(npcGroup_80246768) = { .maxCoinBonus = 3, .movement = { -250, 0, 135, 30, 0, -32767, 0, -250, 0, 135, 250, 0, 0, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_80244290), diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 2854102d1b..edd29727ed 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -195,21 +195,21 @@ EvtSource N(80244000) = SCRIPT({ } }); -NpcAnimID N(extraAnimationList_802440BC)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), +s32 N(extraAnimationList_802440BC)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, ANIM_END, }; -NpcAnimID N(extraAnimationList_802440E4)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), +s32 N(extraAnimationList_802440E4)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, ANIM_END, }; @@ -349,7 +349,7 @@ EvtSource N(npcAI_802443DC) = SCRIPT({ SI_VAR(2) += 2; SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); func_80045838(-1, 759, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_8)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_sentinel_Palette_00_Anim_8); sleep 10; SetPlayerAnimation(ANIM_80017); sleep 10; @@ -429,22 +429,22 @@ StaticNpc N(npcGroup_80244920)[] = { .maxCoinBonus = 3, .movement = { -350, 0, 180, 40, 0, -32767, 0, 0, 0, 50, 600, 250, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_802440BC), @@ -459,22 +459,22 @@ StaticNpc N(npcGroup_80244920)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802440E4), }, @@ -507,22 +507,22 @@ StaticNpc N(npcGroup_80244D6C)[] = { .maxCoinBonus = 3, .movement = { 310, 0, 88, 40, 0, -32767, 0, 0, 0, 50, 600, 250, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_802440BC), @@ -537,22 +537,22 @@ StaticNpc N(npcGroup_80244D6C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802440E4), }, @@ -569,22 +569,22 @@ StaticNpc N(npcGroup_8024514C) = { .flowerDrops = NO_DROPS, .movement = { -20, 100, 180, 40, 0, -32767, 0, -20, 100, 180, 250, 0, 0, 1 }, .animations = { - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_2), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_3), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_5), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_8), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), - NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_2, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_3, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_5, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_8, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, + NPC_ANIM_sentinel_Palette_00_Anim_1, }, }; diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 4efceba0cf..312e59f7a2 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -248,13 +248,13 @@ EvtSource N(idle_80242238) = SCRIPT({ } SI_SAVE_VAR(203) = 15; SetNpcPos(NPC_SELF, 0, 0, 88); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_9); SetNpcYaw(NPC_SELF, 270); NpcMoveTo(NPC_SELF, -53, 180, 60); SetMusicTrack(0, SONG_TUBBA_BLUBBA_THEME, 0, 8); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_6); sleep 15; - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 0, MESSAGE_ID(0x0E, 0x00F3)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_10, NPC_ANIM_world_tubba_Palette_00_Anim_6, 0, MESSAGE_ID(0x0E, 0x00F3)); sleep 15; spawn { GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -325,7 +325,7 @@ NpcAISettings N(npcAISettings_8024271C) = { EvtSource N(npcAI_8024274C) = SCRIPT({ spawn N(80242184); SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_GRAVITY)), TRUE); - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_C)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_C); spawn N(802424E8); N(func_80241464_C50974)(N(npcAISettings_8024271C)); }); @@ -371,22 +371,22 @@ StaticNpc N(npcGroup_802428C0) = { .maxCoinBonus = 3, .movement = { 7, -500, 0, 200, -700, 0, 200, -900, 0, 200, -1000, 0, 200, -800, 0, 200, -600, 0, 200, -400, 0, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -500, 0, 200, 1000, 250, 1, 1 }, .animations = { - NPC_ANIM(world_tubba, Palette_00, Anim_6), - NPC_ANIM(world_tubba, Palette_00, Anim_9), - NPC_ANIM(world_tubba, Palette_00, Anim_C), - NPC_ANIM(world_tubba, Palette_00, Anim_C), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), - NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM_world_tubba_Palette_00_Anim_6, + NPC_ANIM_world_tubba_Palette_00_Anim_9, + NPC_ANIM_world_tubba_Palette_00_Anim_C, + NPC_ANIM_world_tubba_Palette_00_Anim_C, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, + NPC_ANIM_world_tubba_Palette_00_Anim_0, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }; diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 1f1f32d1f5..b3c7dd2697 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -124,21 +124,21 @@ EvtSource N(802417C0) = SCRIPT({ } }); -NpcAnimID N(extraAnimationList_8024187C)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), +s32 N(extraAnimationList_8024187C)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, ANIM_END, }; -NpcAnimID N(extraAnimationList_802418A4)[] = { - NPC_ANIM(world_clubba, Palette_00, Anim_0), +s32 N(extraAnimationList_802418A4)[] = { + NPC_ANIM_world_clubba_Palette_00_Anim_0, ANIM_END, }; @@ -212,22 +212,22 @@ StaticNpc N(npcGroup_80241A4C)[] = { .maxCoinBonus = 3, .movement = { -70, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, .extraAnimations = N(extraAnimationList_8024187C), @@ -242,22 +242,22 @@ StaticNpc N(npcGroup_80241A4C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802418A4), }, @@ -281,22 +281,22 @@ StaticNpc N(npcGroup_80241E2C)[] = { .maxCoinBonus = 3, .movement = { 0, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }, @@ -310,22 +310,22 @@ StaticNpc N(npcGroup_80241E2C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802418A4), }, @@ -349,22 +349,22 @@ StaticNpc N(npcGroup_8024220C)[] = { .maxCoinBonus = 3, .movement = { 70, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }, @@ -378,22 +378,22 @@ StaticNpc N(npcGroup_8024220C)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802418A4), }, @@ -417,22 +417,22 @@ StaticNpc N(npcGroup_802425EC)[] = { .maxCoinBonus = 3, .movement = { 140, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }, @@ -446,22 +446,22 @@ StaticNpc N(npcGroup_802425EC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802418A4), }, @@ -485,22 +485,22 @@ StaticNpc N(npcGroup_802429CC)[] = { .maxCoinBonus = 3, .movement = { 210, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }, @@ -514,22 +514,22 @@ StaticNpc N(npcGroup_802429CC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802418A4), }, @@ -553,22 +553,22 @@ StaticNpc N(npcGroup_80242DAC)[] = { .maxCoinBonus = 3, .movement = { 280, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }, @@ -582,22 +582,22 @@ StaticNpc N(npcGroup_80242DAC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_3), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_4), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_C), - NPC_ANIM(world_clubba, Palette_00, Anim_11), - NPC_ANIM(world_clubba, Palette_00, Anim_12), - NPC_ANIM(world_clubba, Palette_00, Anim_7), - NPC_ANIM(world_clubba, Palette_00, Anim_8), - NPC_ANIM(world_clubba, Palette_00, Anim_1), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), - NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_3, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_4, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_C, + NPC_ANIM_world_clubba_Palette_00_Anim_11, + NPC_ANIM_world_clubba_Palette_00_Anim_12, + NPC_ANIM_world_clubba_Palette_00_Anim_7, + NPC_ANIM_world_clubba_Palette_00_Anim_8, + NPC_ANIM_world_clubba_Palette_00_Anim_1, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, + NPC_ANIM_world_clubba_Palette_00_Anim_2, }, .extraAnimations = N(extraAnimationList_802418A4), }, diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 128ad5b51c..b2f613a1a1 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -185,10 +185,10 @@ EvtSource N(idle_80241654) = SCRIPT({ } } SetMusicTrack(0, SONG_TUBBA_BLUBBA_THEME, 0, 8); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_9); SetNpcPos(NPC_SELF, -210, 0, 180); NpcMoveTo(NPC_SELF, -60, 180, 30); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_6); spawn { MakeLerp(80, 0, 10, 0); loop { @@ -203,9 +203,9 @@ EvtSource N(idle_80241654) = SCRIPT({ PlaySoundAtCollider(17, 456, 0); } sleep 20; - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 5, MESSAGE_ID(0x0E, 0x00F4)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_10, NPC_ANIM_world_tubba_Palette_00_Anim_6, 5, MESSAGE_ID(0x0E, 0x00F4)); sleep 20; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_9); SetSelfVar(0, 0); spawn { loop { @@ -241,17 +241,17 @@ EvtSource N(idle_80241654) = SCRIPT({ NpcMoveTo(NPC_SELF, 140, 245, 0); NpcMoveTo(NPC_SELF, 615, 245, 0); SetSelfVar(0, 1); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_6); sleep 15; sleep 20; - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 5, MESSAGE_ID(0x0E, 0x00F5)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_10, NPC_ANIM_world_tubba_Palette_00_Anim_6, 5, MESSAGE_ID(0x0E, 0x00F5)); sleep 20; spawn { - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_14)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_14); sleep 5; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_15)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_15); sleep 5; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_16)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_16); sleep 5; } sleep 5; @@ -260,7 +260,7 @@ EvtSource N(idle_80241654) = SCRIPT({ spawn { ShakeCam(0, 0, 5, 0.30078125); } - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_5); SetNpcScale(NPC_SELF, 1.25, 1.2001953125, 1.25); sleep 1; SetNpcScale(NPC_SELF, 1.3505859375, 1.150390625, 1.25); @@ -306,9 +306,9 @@ EvtSource N(idle_80241654) = SCRIPT({ SetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); func_802CDE68(-1, 0); SetNpcRotation(NPC_SELF, 0, 0, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_2); sleep 15; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_24)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_24); sleep 30; PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); sleep 30; @@ -347,9 +347,9 @@ EvtSource N(idle_80242494) = SCRIPT({ SetNpcPos(NPC_SELF, 600, 50, 115); func_802CDE68(-1, 0); SetNpcRotation(NPC_SELF, 0, 0, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_2); sleep 15; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_24)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_24); sleep 30; PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); sleep 30; @@ -383,23 +383,23 @@ EvtSource N(npcAI_802426B0) = SCRIPT({ SetNpcVar(-1, 1, 2); sleep 20; PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2F1, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_19)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_19); sleep 30; spawn { NpcJump0(NPC_SELF, 650, 0, 250, 25); } - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_1A)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_1A); sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_1B)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_1B); sleep 12; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_1C)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_1C); sleep 5; BindNpcAI(NPC_WORLD_TUBBA, N(npcAI_80242834)); }); EvtSource N(npcAI_80242834) = SCRIPT({ group 11; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_D)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_D); spawn { loop { ShakeCam(0, 0, 5, 2.0); @@ -465,15 +465,15 @@ EvtSource N(idle_80242A24) = SCRIPT({ SetCamPosB(0, 800, 245); SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); PanToTarget(0, 0, 1); - SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x00F6)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 5, MESSAGE_ID(0x0E, 0x00F6)); sleep 15; - SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x00F7)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 5, MESSAGE_ID(0x0E, 0x00F7)); ShowChoice(1966093); if (SI_VAR(0) == 0) { - ContinueSpeech(-1, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, + ContinueSpeech(-1, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00F8)); } else { - ContinueSpeech(-1, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, + ContinueSpeech(-1, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00F9)); } GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -485,7 +485,7 @@ EvtSource N(idle_80242A24) = SCRIPT({ WaitForCam(0, 1.0); spawn { SI_MAP_FLAG(0) = 0; - SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 517, MESSAGE_ID(0x0E, 0x00FA)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 517, MESSAGE_ID(0x0E, 0x00FA)); SI_MAP_FLAG(0) = 1; } GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -506,7 +506,7 @@ EvtSource N(idle_80242A24) = SCRIPT({ SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); SetNpcVar(0, 1, 1); sleep 15; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_25)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_25); spawn { loop { GetNpcVar(0, 1, SI_VAR(0)); @@ -522,26 +522,26 @@ EvtSource N(idle_80242A24) = SCRIPT({ } } sleep 15; - SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_5)); - SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_13), NPC_ANIM(world_tubba, Palette_00, Anim_5), 5, MESSAGE_ID(0x0E, 0x00FB)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_5); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM_world_tubba_Palette_00_Anim_13, NPC_ANIM_world_tubba_Palette_00_Anim_5, 5, MESSAGE_ID(0x0E, 0x00FB)); sleep 15; DisablePartnerAI(0); GetCurrentPartnerID(SI_VAR(0)); match SI_VAR(0) { == 1 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_goombario, normal, talk), NPC_ANIM(world_goombario, normal, idle), 0, MESSAGE_ID(0x0E, 0x00FC)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_goombario_normal_talk, NPC_ANIM_world_goombario_normal_idle, 0, MESSAGE_ID(0x0E, 0x00FC)); } == 2 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_kooper, normal, talk), NPC_ANIM(world_kooper, normal, idle), 0, MESSAGE_ID(0x0E, 0x00FD)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_kooper_normal_talk, NPC_ANIM_world_kooper_normal_idle, 0, MESSAGE_ID(0x0E, 0x00FD)); } == 3 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bombette, normal, idle_fast), NPC_ANIM(world_bombette, normal, idle), 0, MESSAGE_ID(0x0E, 0x00FE)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bombette_normal_idle_fast, NPC_ANIM_world_bombette_normal_idle, 0, MESSAGE_ID(0x0E, 0x00FE)); } == 4 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00FF)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_parakarry_Palette_00_Anim_6, NPC_ANIM_world_parakarry_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00FF)); } == 9 { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x0100)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_bow_Palette_00_Anim_4, NPC_ANIM_world_bow_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x0100)); } } EnablePartnerAI(); @@ -580,22 +580,22 @@ StaticNpc N(npcGroup_802432D4) = { .flowerDrops = NO_DROPS, .movement = { 5, 0, 0, 240, 175, 0, 240, 350, 0, 240, 525, 0, 240, 700, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 300, 0, 240, 1000, 250, 1, 1 }, .animations = { - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_A), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_D), - NPC_ANIM(world_tubba, Palette_00, Anim_19), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), - NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_A, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_D, + NPC_ANIM_world_tubba_Palette_00_Anim_19, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, + NPC_ANIM_world_tubba_Palette_00_Anim_7, }, }; @@ -610,22 +610,22 @@ StaticNpc N(npcGroup_802434C4) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), - NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, + NPC_ANIM_yakkey_Palette_00_Anim_1, }, }; diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 8c57f2be3e..60b297aef1 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -586,7 +586,7 @@ EvtSource N(802452AC) = SCRIPT({ GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(1) += 300; SetNpcJumpscale(NPC_SELF, 1); - SetNpcAnimation(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_C)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_C); sleep 40; SetNpcPos(NPC_SELF, 0, -1000, 0); } @@ -706,7 +706,7 @@ EvtSource N(80245918) = SCRIPT({ } sleep 60; NpcFacePlayer(NPC_CHUCK_QUIZMO, 0); - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_1)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1); }); EvtSource N(80245A84) = SCRIPT({ @@ -956,18 +956,18 @@ EvtSource N(802468F8) = SCRIPT({ GetPlayerPos(SI_ARRAY(1), SI_ARRAY(2), SI_ARRAY(3)); NpcFacePlayer(NPC_SELF, 16); if (SI_SAVE_VAR(352) == 63) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x000A)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000A)); } else { if (SI_SAVE_FLAG(1767) == 1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x0009)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x0009)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x0008)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x0008)); SI_SAVE_FLAG(1767) = 1; } } ShowChoice(MESSAGE_ID(0x1E, 0x000D)); if (SI_VAR(0) == 1) { - ContinueSpeech(-1, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x000C)); + ContinueSpeech(-1, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000C)); await N(802452AC); SI_VAR(0) = 0; return; @@ -983,7 +983,7 @@ EvtSource N(802468F8) = SCRIPT({ SetNpcFlagBits(NPC_CHUCK_QUIZMO, ((NPC_FLAG_100)), TRUE); SetNpcAnimation(NPC_PARTNER, 0x106); SI_VAR(1) = spawn N(80245A84); - ContinueSpeech(-1, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x000B)); + ContinueSpeech(-1, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000B)); PlaySound(0x89); loop { SI_VAR(0) = does_script_exist SI_VAR(1); @@ -1001,7 +1001,7 @@ EvtSource N(802468F8) = SCRIPT({ } SI_VAR(0) = 2883584; SI_VAR(0) += SI_SAVE_VAR(352); - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_5), NPC_ANIM(chuck_quizmo, Palette_00, Anim_6), 0, SI_VAR(0)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_5, NPC_ANIM_chuck_quizmo_Palette_00_Anim_6, 0, SI_VAR(0)); SetPlayerAnimation(ANIM_QUESTION); SI_VAR(0) = 2949120; SI_VAR(0) += SI_SAVE_VAR(352); @@ -1023,7 +1023,7 @@ EvtSource N(802468F8) = SCRIPT({ SI_ARRAY(4) = 0; } if (SI_VAR(0) == 1) { - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_7)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_7); SI_ARRAY(4) = 1; spawn { N(func_80241EAC_95D0AC)(1); @@ -1067,7 +1067,7 @@ EvtSource N(802468F8) = SCRIPT({ SI_SAVE_VAR(352) += 1; if (SI_SAVE_VAR(352) > 63) { ContinueSpeech(-1, -1, -1, 0, MESSAGE_ID(0x08, 0x0010)); - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_6)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_6); loop { SI_VAR(0) = does_script_exist SI_VAR(1); if (SI_VAR(0) == 0) { @@ -1075,7 +1075,7 @@ EvtSource N(802468F8) = SCRIPT({ } sleep 1; } - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_5)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_5); SI_VAR(0) = 348; SI_VAR(1) = 3; await N(802451BC); @@ -1083,10 +1083,10 @@ EvtSource N(802468F8) = SCRIPT({ N(func_80241EAC_95D0AC)(15); N(func_80241F60_95D160)(); SetMessageValue(SI_SAVE_VAR(352), 0); - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x0011)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x0011)); } else { ContinueSpeech(-1, -1, -1, 0, MESSAGE_ID(0x08, 0x000E)); - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_6)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_6); loop { SI_VAR(0) = does_script_exist SI_VAR(1); if (SI_VAR(0) == 0) { @@ -1094,7 +1094,7 @@ EvtSource N(802468F8) = SCRIPT({ } sleep 1; } - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_5)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_5); SI_VAR(0) = 348; SI_VAR(1) = 1; await N(802451BC); @@ -1107,11 +1107,11 @@ EvtSource N(802468F8) = SCRIPT({ } else { SetMessageString(2148844176, 1); } - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x000F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000F)); } SI_VAR(0) = 1; } else { - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_9)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_9); SI_ARRAY(4) = 2; PlaySound(0x21D); PlaySound(0x8B); @@ -1119,7 +1119,7 @@ EvtSource N(802468F8) = SCRIPT({ GetPlayerPos(SI_VAR(2), SI_VAR(3), SI_VAR(4)); PlayEffect(0x2B, 0, SI_VAR(2), SI_VAR(3), SI_VAR(4), 0, 0, 0, 0, 0, 0, 0, 0, 0); ContinueSpeech(-1, -1, -1, 0, MESSAGE_ID(0x08, 0x000D)); - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_A)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_A); loop { SI_VAR(0) = does_script_exist SI_VAR(1); if (SI_VAR(0) == 0) { @@ -1270,7 +1270,7 @@ EvtSource N(802479FC) = SCRIPT({ SI_VAR(0) |= (const) 0x50000; MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0); SI_VAR(10) = spawn N(8024797C); - SetNpcAnimation(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_2)); + SetNpcAnimation(NPC_PARTNER, NPC_ANIM_world_parakarry_Palette_00_Anim_2); GetAngleBetweenNPCs(SI_VAR(9), -4, SI_VAR(11)); GetNpcPos(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5)); GetNpcPos(SI_VAR(9), SI_VAR(6), SI_VAR(7), SI_VAR(8)); @@ -1291,7 +1291,7 @@ EvtSource N(802479FC) = SCRIPT({ InterpNpcYaw(NPC_PARTNER, SI_VAR(10), 0); sleep 5; NpcJump1(NPC_PARTNER, SI_VAR(3), SI_VAR(4), SI_VAR(5), 20); - SetNpcAnimation(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_1)); + SetNpcAnimation(NPC_PARTNER, NPC_ANIM_world_parakarry_Palette_00_Anim_1); NpcFaceNpc(NPC_PARTNER, SI_VAR(9), 0); sleep 5; SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), FALSE); @@ -1337,13 +1337,13 @@ EvtSource N(80247D90) = SCRIPT({ == -1 { DisablePartnerAI(0); sleep 1; - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 5, SI_VAR(8)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_parakarry_Palette_00_Anim_6, NPC_ANIM_world_parakarry_Palette_00_Anim_1, 5, SI_VAR(8)); EnablePartnerAI(); SI_VAR(12) = 1; } else { DisablePartnerAI(0); sleep 1; - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_parakarry_Palette_00_Anim_6, NPC_ANIM_world_parakarry_Palette_00_Anim_1, 5, SI_VAR(9)); if (SI_VAR(10) != 0) { SpeakToPlayer(SI_VAR(2), SI_VAR(3), SI_VAR(4), 0, SI_VAR(10)); @@ -1374,21 +1374,21 @@ EvtSource N(80248090) = SCRIPT({ EvtSource N(interact_802480E0) = SCRIPT({ if (SI_STORY_PROGRESS >= STORY_CH2_STAR_SPRIT_DEPARTED) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, + SpeakToPlayer(NPC_SELF, NPC_ANIM_mouser_Palette_00_Anim_5, NPC_ANIM_mouser_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0062)); return; } match SI_AREA_VAR(0) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x005F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_mouser_Palette_00_Anim_5, NPC_ANIM_mouser_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x005F)); SI_AREA_VAR(0) += 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0060)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_mouser_Palette_00_Anim_5, NPC_ANIM_mouser_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0060)); SI_AREA_VAR(0) += 1; } == 2 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_00, Anim_5), NPC_ANIM(mouser, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0061)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_mouser_Palette_00_Anim_5, NPC_ANIM_mouser_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0061)); SI_AREA_VAR(0) -= 1; } } @@ -1408,23 +1408,23 @@ EvtSource N(interact_8024821C) = SCRIPT({ } match SI_AREA_VAR(1) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0063)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_03_Anim_4, NPC_ANIM_dryite_Palette_03_Anim_1, 0, MESSAGE_ID(0x0D, 0x0063)); SI_AREA_VAR(1) += 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0064)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_03_Anim_4, NPC_ANIM_dryite_Palette_03_Anim_1, 0, MESSAGE_ID(0x0D, 0x0064)); SI_AREA_VAR(1) += 1; } == 2 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0065)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_03_Anim_4, NPC_ANIM_dryite_Palette_03_Anim_1, 0, MESSAGE_ID(0x0D, 0x0065)); SI_AREA_VAR(1) = 0; } } } < 39 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, 0x0066)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_03_Anim_4, NPC_ANIM_dryite_Palette_03_Anim_1, 0, MESSAGE_ID(0x0D, 0x0066)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_03, Anim_4), NPC_ANIM(dryite, Palette_03, Anim_1), 0, MESSAGE_ID(0x0D, + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_03_Anim_4, NPC_ANIM_dryite_Palette_03_Anim_1, 0, MESSAGE_ID(0x0D, 0x0067)); } } @@ -1437,19 +1437,19 @@ EvtSource N(init_802483A8) = SCRIPT({ EvtSource N(interact_802483CC) = SCRIPT({ match SI_AREA_VAR(2) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_02, Anim_4), NPC_ANIM(dryite, Palette_02, Anim_1), 0, MESSAGE_ID(0x0D, 0x0068)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_02_Anim_4, NPC_ANIM_dryite_Palette_02_Anim_1, 0, MESSAGE_ID(0x0D, 0x0068)); SI_AREA_VAR(2) += 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_02, Anim_4), NPC_ANIM(dryite, Palette_02, Anim_1), 0, MESSAGE_ID(0x0D, 0x0069)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_02_Anim_4, NPC_ANIM_dryite_Palette_02_Anim_1, 0, MESSAGE_ID(0x0D, 0x0069)); SI_AREA_VAR(2) += 1; } == 2 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_02, Anim_4), NPC_ANIM(dryite, Palette_02, Anim_1), 0, MESSAGE_ID(0x0D, 0x006A)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_02_Anim_4, NPC_ANIM_dryite_Palette_02_Anim_1, 0, MESSAGE_ID(0x0D, 0x006A)); SI_AREA_VAR(2) += 1; } == 3 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_02, Anim_4), NPC_ANIM(dryite, Palette_02, Anim_1), 0, MESSAGE_ID(0x0D, 0x006B)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_02_Anim_4, NPC_ANIM_dryite_Palette_02_Anim_1, 0, MESSAGE_ID(0x0D, 0x006B)); SI_AREA_VAR(2) = 0; } } @@ -1475,7 +1475,7 @@ EvtSource N(80248504) = SCRIPT({ NpcFacePlayer(NPC_PARTNER, 0); } PlayerFaceNpc(3, 0); - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0078)); + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0078)); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); GetNpcPos(NPC_DRYITE2, SI_VAR(3), SI_VAR(4), SI_VAR(5)); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -1491,11 +1491,11 @@ EvtSource N(80248504) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); SetPlayerAnimation(ANIM_10002); - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0079)); + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0079)); SetPlayerAnimation(ANIM_80007); sleep 30; SetPlayerAnimation(ANIM_10002); - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x007A)); + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x007A)); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetCamSpeed(0, 4.0); @@ -1516,7 +1516,7 @@ EvtSource N(interact_80248864) = SCRIPT({ if (SI_SAVE_FLAG(761) == 1) { N(func_802431B4_95E3B4)(); if (SI_VAR(0) == 1) { - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x007B)); return; } @@ -1525,33 +1525,33 @@ EvtSource N(interact_80248864) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH2_STAR_SPRIT_DEPARTED { if (SI_AREA_FLAG(1) == 0) { - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x006C)); - SpeakToPlayer(NPC_DRYITE3, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE3, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x006D)); - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x006E)); SI_AREA_FLAG(1) = 1; } else { - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x006F)); - SpeakToPlayer(NPC_DRYITE3, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE3, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0070)); - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0071)); SI_AREA_FLAG(1) = 0; } } < STORY_CH5_STAR_SPRIT_DEPARTED { - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0072)); - SpeakToPlayer(NPC_DRYITE3, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0073)); - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, MESSAGE_ID(0x0D, 0x0074)); + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0072)); + SpeakToPlayer(NPC_DRYITE3, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0073)); + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0074)); } else { - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0075)); - SpeakToPlayer(NPC_DRYITE3, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE3, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0076)); - SpeakToPlayer(NPC_DRYITE2, NPC_ANIM(dryite, Palette_00, Anim_4), NPC_ANIM(dryite, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_DRYITE2, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0077)); } } @@ -1561,7 +1561,7 @@ EvtSource N(init_80248AE4) = SCRIPT({ GetEntryID(SI_VAR(0)); match SI_VAR(0) { 3, 4 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(dryite, Palette_00, Anim_4)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_dryite_Palette_00_Anim_4); return; } } @@ -1581,10 +1581,10 @@ EvtSource N(interact_80248BA0) = SCRIPT({ } N(func_802431FC_95E3FC)(); SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(dryite, Palette_00, Anim_3)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_dryite_Palette_00_Anim_3); SetNpcSpeed(NPC_SELF, 3.5); NpcMoveTo(NPC_SELF, SI_VAR(0), SI_VAR(1), 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(dryite, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_dryite_Palette_00_Anim_1); SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), FALSE); sleep 5; GetNpcYaw(-1, SI_VAR(0)); @@ -1596,7 +1596,7 @@ EvtSource N(init_80248CC8) = SCRIPT({ GetEntryID(SI_VAR(0)); match SI_VAR(0) { 3, 4 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(dryite, Palette_00, Anim_4)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_dryite_Palette_00_Anim_4); return; } } @@ -1611,18 +1611,18 @@ EvtSource N(interact_80248D54) = SCRIPT({ if (SI_SAVE_FLAG(754) == 1) { FindKeyItem(ITEM_MELODY, SI_VAR(0)); if (SI_VAR(0) != -1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0084)); return; } else { if (SI_SAVE_FLAG(755) == 0) { if (SI_STORY_PROGRESS < STORY_CH7_BEGAN_PEACH_MISSION) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0085)); SetPlayerAnimation(ANIM_NOD_YES); sleep 30; SetPlayerAnimation(ANIM_10002); - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0086)); SI_SAVE_FLAG(755) = 1; return; @@ -1633,32 +1633,32 @@ EvtSource N(interact_80248D54) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH2_STAR_SPRIT_DEPARTED { if (SI_AREA_FLAG(2) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x007C)); SI_AREA_FLAG(2) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x007D)); SI_AREA_FLAG(2) = 0; } } < STORY_CH5_STAR_SPRIT_DEPARTED { if (SI_AREA_FLAG(2) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x007E)); SI_AREA_FLAG(2) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x007F)); SI_AREA_FLAG(2) = 0; } } else { if (SI_AREA_FLAG(2) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0080)); SI_AREA_FLAG(2) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0081)); SI_AREA_FLAG(2) = 0; } @@ -1671,12 +1671,12 @@ EvtSource N(interact_80248D54) = SCRIPT({ == 0 {} == -1 {} else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0082)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_3)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_3); sleep 60; - SetNpcAnimation(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_1)); - SpeakToPlayer(NPC_SELF, NPC_ANIM(artist_toad, Palette_01, Anim_2), NPC_ANIM(artist_toad, Palette_01, Anim_1), 0, + SetNpcAnimation(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_1); + SpeakToPlayer(NPC_SELF, NPC_ANIM_artist_toad_Palette_01_Anim_2, NPC_ANIM_artist_toad_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0083)); SI_VAR(0) = 104; SI_VAR(1) = 1; @@ -1713,13 +1713,13 @@ EvtSource N(idle_8024918C) = SCRIPT({ SetCamDistance(0, -350); SetCamSpeed(0, 0.80078125); PanToTarget(0, 0, 1); - SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_4)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_4); NpcMoveTo(NPC_SELF, -23, -105, 20); sleep 10; InterpNpcYaw(NPC_SELF, 65, 0); sleep 10; await N(8024C4C8); - SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_4)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_4); NpcMoveTo(NPC_SELF, 37, -27, 20); UseSettingsFrom(0, SI_VAR(10), SI_VAR(11), SI_VAR(12)); SetPanTarget(0, 142, 0, -67); @@ -1745,22 +1745,22 @@ EvtSource N(idle_8024918C) = SCRIPT({ < STORY_CH2_SPOKE_WITH_SHEEK {} < STORY_CH2_SHADY_MOUSE_ENTERED_SHOP { EnableNpcBlur(-1, 1); - SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_4)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_4); PlaySoundAtNpc(NPC_SELF, 0x174, 0); SetNpcPos(NPC_SELF, 470, 0, 18); NpcMoveTo(NPC_SELF, 287, 9, 20); NpcMoveTo(NPC_SELF, 102, -14, 20); NpcMoveTo(NPC_SELF, -32, -96, 20); - SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_1); await N(8024C41C); - SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_4)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_4); NpcMoveTo(NPC_SELF, 20, -375, 30); - SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_1); await N(8024C4C8); EnableNpcBlur(-1, 0); SI_STORY_PROGRESS = STORY_CH2_SHADY_MOUSE_ENTERED_SHOP; } else { - SetNpcAnimation(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_1); SetNpcPos(NPC_SELF, 20, 0, -375); } } @@ -1769,7 +1769,7 @@ EvtSource N(idle_8024918C) = SCRIPT({ EvtSource N(interact_80249750) = SCRIPT({ if (SI_AREA_VAR(4) == 4) { if (SI_AREA_VAR(5) == 1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, + SpeakToPlayer(NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_5, NPC_ANIM_mouser_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0088)); await N(80248090); if (SI_VAR(12) != 0) { @@ -1791,9 +1791,9 @@ EvtSource N(init_8024981C) = SCRIPT({ }); EvtSource N(interact_80249854) = SCRIPT({ - SpeakToPlayer(NPC_THREE_SISTERS0, NPC_ANIM(three_sisters, Palette_01, Anim_4), NPC_ANIM(three_sisters, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x008E)); - SpeakToPlayer(NPC_THREE_SISTERS1, NPC_ANIM(three_sisters, Palette_01, Anim_4), NPC_ANIM(three_sisters, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x008F)); - SpeakToPlayer(NPC_THREE_SISTERS2, NPC_ANIM(three_sisters, Palette_01, Anim_4), NPC_ANIM(three_sisters, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0090)); + SpeakToPlayer(NPC_THREE_SISTERS0, NPC_ANIM_three_sisters_Palette_01_Anim_4, NPC_ANIM_three_sisters_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x008E)); + SpeakToPlayer(NPC_THREE_SISTERS1, NPC_ANIM_three_sisters_Palette_01_Anim_4, NPC_ANIM_three_sisters_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x008F)); + SpeakToPlayer(NPC_THREE_SISTERS2, NPC_ANIM_three_sisters_Palette_01_Anim_4, NPC_ANIM_three_sisters_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0090)); }); EvtSource N(init_802498C4) = SCRIPT({ @@ -1807,31 +1807,31 @@ EvtSource N(interact_802498E8) = SCRIPT({ FindKeyItem(ITEM_FOURTH_DEGREE_CARD, SI_VAR(4)); FindKeyItem(ITEM_DIPLOMA, SI_VAR(5)); if (SI_VAR(1) != -1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_01_Anim_4, NPC_ANIM_dryite_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x009A)); return; } if (SI_VAR(2) != -1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_01_Anim_4, NPC_ANIM_dryite_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x009B)); return; } if (SI_VAR(3) != -1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_01_Anim_4, NPC_ANIM_dryite_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x009C)); return; } if (SI_VAR(4) != -1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_01_Anim_4, NPC_ANIM_dryite_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x009D)); return; } if (SI_VAR(5) != -1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_01_Anim_4, NPC_ANIM_dryite_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x009E)); return; } - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0099)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_01_Anim_4, NPC_ANIM_dryite_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0099)); }); EvtSource N(init_80249ABC) = SCRIPT({ @@ -1839,7 +1839,7 @@ EvtSource N(init_80249ABC) = SCRIPT({ }); EvtSource N(interact_80249AE0) = SCRIPT({ - SpeakToPlayer(NPC_SELF, NPC_ANIM(dryite, Palette_01, Anim_4), NPC_ANIM(dryite, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x009F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_dryite_Palette_01_Anim_4, NPC_ANIM_dryite_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x009F)); }); EvtSource N(init_80249B10) = SCRIPT({ @@ -1858,22 +1858,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0090), }, @@ -1889,22 +1889,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .flowerDrops = NO_DROPS, .movement = { -235, 0, 160, 30, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_2), - NPC_ANIM(dryite, Palette_03, Anim_3), - NPC_ANIM(dryite, Palette_03, Anim_3), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_0), - NPC_ANIM(dryite, Palette_03, Anim_0), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_1), - NPC_ANIM(dryite, Palette_03, Anim_1), + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_2, + NPC_ANIM_dryite_Palette_03_Anim_3, + NPC_ANIM_dryite_Palette_03_Anim_3, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_0, + NPC_ANIM_dryite_Palette_03_Anim_0, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_1, + NPC_ANIM_dryite_Palette_03_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0091), }, @@ -1919,22 +1919,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_2), - NPC_ANIM(dryite, Palette_02, Anim_3), - NPC_ANIM(dryite, Palette_02, Anim_3), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_0), - NPC_ANIM(dryite, Palette_02, Anim_0), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_2, + NPC_ANIM_dryite_Palette_02_Anim_3, + NPC_ANIM_dryite_Palette_02_Anim_3, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_0, + NPC_ANIM_dryite_Palette_02_Anim_0, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0094), }, @@ -1949,22 +1949,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_2), - NPC_ANIM(dryite, Palette_00, Anim_3), - NPC_ANIM(dryite, Palette_00, Anim_3), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_0), - NPC_ANIM(dryite, Palette_00, Anim_0), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_2, + NPC_ANIM_dryite_Palette_00_Anim_3, + NPC_ANIM_dryite_Palette_00_Anim_3, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_0, + NPC_ANIM_dryite_Palette_00_Anim_0, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0092), }, @@ -1979,22 +1979,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_2), - NPC_ANIM(dryite, Palette_00, Anim_3), - NPC_ANIM(dryite, Palette_00, Anim_3), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_0), - NPC_ANIM(dryite, Palette_00, Anim_0), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_2, + NPC_ANIM_dryite_Palette_00_Anim_3, + NPC_ANIM_dryite_Palette_00_Anim_3, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_0, + NPC_ANIM_dryite_Palette_00_Anim_0, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0093), }, @@ -2009,22 +2009,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(artist_toad, Palette_01, Anim_1), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), - NPC_ANIM(artist_toad, Palette_01, Anim_0), + NPC_ANIM_artist_toad_Palette_01_Anim_1, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, + NPC_ANIM_artist_toad_Palette_01_Anim_0, }, .tattle = MESSAGE_ID(0x1A, 0x0095), }, @@ -2039,22 +2039,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_4), - NPC_ANIM(mouser, Palette_01, Anim_4), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_4, + NPC_ANIM_mouser_Palette_01_Anim_4, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x008F), }, @@ -2069,22 +2069,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_2), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_0), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_0), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), + NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_2, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_0, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_0, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x0002), }, @@ -2100,22 +2100,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .flowerDrops = NO_DROPS, .movement = { -120, 0, 134, 40, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_2), - NPC_ANIM(dryite, Palette_01, Anim_3), - NPC_ANIM(dryite, Palette_01, Anim_3), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_0), - NPC_ANIM(dryite, Palette_01, Anim_0), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_2, + NPC_ANIM_dryite_Palette_01_Anim_3, + NPC_ANIM_dryite_Palette_01_Anim_3, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_0, + NPC_ANIM_dryite_Palette_01_Anim_0, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0096), }, @@ -2131,22 +2131,22 @@ StaticNpc N(npcGroup_80249B34)[] = { .flowerDrops = NO_DROPS, .movement = { 2, 40, 0, 105, -30, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_2), - NPC_ANIM(dryite, Palette_01, Anim_3), - NPC_ANIM(dryite, Palette_01, Anim_3), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_0), - NPC_ANIM(dryite, Palette_01, Anim_0), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), - NPC_ANIM(dryite, Palette_01, Anim_1), + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_2, + NPC_ANIM_dryite_Palette_01_Anim_3, + NPC_ANIM_dryite_Palette_01_Anim_3, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_0, + NPC_ANIM_dryite_Palette_01_Anim_0, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, + NPC_ANIM_dryite_Palette_01_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0097), }, @@ -2164,22 +2164,22 @@ StaticNpc N(npcGroup_8024AE94)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_2), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_6), - NPC_ANIM(three_sisters, Palette_01, Anim_6), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_2, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_6, + NPC_ANIM_three_sisters_Palette_01_Anim_6, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x0003), }, @@ -2194,22 +2194,22 @@ StaticNpc N(npcGroup_8024AE94)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_2), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_6), - NPC_ANIM(three_sisters, Palette_01, Anim_6), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_2, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_6, + NPC_ANIM_three_sisters_Palette_01_Anim_6, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x0004), }, @@ -2224,22 +2224,22 @@ StaticNpc N(npcGroup_8024AE94)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_2), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_1), - NPC_ANIM(three_sisters, Palette_01, Anim_6), - NPC_ANIM(three_sisters, Palette_01, Anim_6), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), - NPC_ANIM(three_sisters, Palette_01, Anim_3), + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_2, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_1, + NPC_ANIM_three_sisters_Palette_01_Anim_6, + NPC_ANIM_three_sisters_Palette_01_Anim_6, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, + NPC_ANIM_three_sisters_Palette_01_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x0005), }, @@ -2315,13 +2315,13 @@ EvtSource N(8024B6B4) = SCRIPT({ func_802D2C14(1); await N(8024B614); if (SI_STORY_PROGRESS < STORY_CH2_BOUGHT_SECRET_ITEMS) { - SpeakToPlayer(NPC_MOUSER1, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0087)); + SpeakToPlayer(NPC_MOUSER1, NPC_ANIM_mouser_Palette_01_Anim_5, NPC_ANIM_mouser_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0087)); SetPlayerAnimation(ANIM_10002); sleep 10; SetPlayerAnimation(ANIM_80007); sleep 30; } - SpeakToPlayer(NPC_MOUSER1, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, MESSAGE_ID(0x0D, 0x0088)); + SpeakToPlayer(NPC_MOUSER1, NPC_ANIM_mouser_Palette_01_Anim_5, NPC_ANIM_mouser_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0088)); SI_STORY_PROGRESS = STORY_CH2_BOUGHT_SECRET_ITEMS; func_802D2C14(0); await N(8024B664); @@ -2353,7 +2353,7 @@ EvtSource N(8024B7B0) = SCRIPT({ N(func_80243578_95E778)(); func_802D2C14(1); await N(8024B614); - SpeakToPlayer(NPC_MOUSER1, NPC_ANIM(mouser, Palette_01, Anim_5), NPC_ANIM(mouser, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_MOUSER1, NPC_ANIM_mouser_Palette_01_Anim_5, NPC_ANIM_mouser_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x008D)); SI_VAR(0) = 119; SI_VAR(1) = 1; diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 17e9533ee0..0fda0a70ae 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -854,18 +854,18 @@ EvtSource N(80246520) = SCRIPT({ GetPlayerPos(SI_ARRAY(1), SI_ARRAY(2), SI_ARRAY(3)); NpcFacePlayer(NPC_SELF, 16); if (SI_SAVE_VAR(352) == 63) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x000A)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000A)); } else { if (SI_SAVE_FLAG(1767) == 1) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x0009)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x0009)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x0008)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x0008)); SI_SAVE_FLAG(1767) = 1; } } ShowChoice(MESSAGE_ID(0x1E, 0x000D)); if (SI_VAR(0) == 1) { - ContinueSpeech(-1, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x000C)); + ContinueSpeech(-1, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000C)); await N(80244ED4); SI_VAR(0) = 0; return; @@ -881,7 +881,7 @@ EvtSource N(80246520) = SCRIPT({ SetNpcFlagBits(NPC_CHUCK_QUIZMO, ((NPC_FLAG_100)), TRUE); SetNpcAnimation(NPC_PARTNER, 0x106); SI_VAR(1) = spawn N(802456AC); - ContinueSpeech(-1, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x000B)); + ContinueSpeech(-1, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000B)); PlaySound(0x89); loop { SI_VAR(0) = does_script_exist SI_VAR(1); @@ -899,7 +899,7 @@ EvtSource N(80246520) = SCRIPT({ } SI_VAR(0) = 2883584; SI_VAR(0) += SI_SAVE_VAR(352); - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_5), NPC_ANIM(chuck_quizmo, Palette_00, Anim_6), 0, SI_VAR(0)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_5, NPC_ANIM_chuck_quizmo_Palette_00_Anim_6, 0, SI_VAR(0)); SetPlayerAnimation(ANIM_QUESTION); SI_VAR(0) = 2949120; SI_VAR(0) += SI_SAVE_VAR(352); @@ -921,7 +921,7 @@ EvtSource N(80246520) = SCRIPT({ SI_ARRAY(4) = 0; } if (SI_VAR(0) == 1) { - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_7)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_7); SI_ARRAY(4) = 1; spawn { N(func_80240D3C_969EFC)(1); @@ -965,7 +965,7 @@ EvtSource N(80246520) = SCRIPT({ SI_SAVE_VAR(352) += 1; if (SI_SAVE_VAR(352) > 63) { ContinueSpeech(-1, -1, -1, 0, MESSAGE_ID(0x08, 0x0010)); - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_6)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_6); loop { SI_VAR(0) = does_script_exist SI_VAR(1); if (SI_VAR(0) == 0) { @@ -973,7 +973,7 @@ EvtSource N(80246520) = SCRIPT({ } sleep 1; } - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_5)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_5); SI_VAR(0) = 348; SI_VAR(1) = 3; await N(80244DE4); @@ -981,10 +981,10 @@ EvtSource N(80246520) = SCRIPT({ N(func_80240D3C_969EFC)(15); N(func_80240DF0_969FB0)(); SetMessageValue(SI_SAVE_VAR(352), 0); - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x0011)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x0011)); } else { ContinueSpeech(-1, -1, -1, 0, MESSAGE_ID(0x08, 0x000E)); - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_6)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_6); loop { SI_VAR(0) = does_script_exist SI_VAR(1); if (SI_VAR(0) == 0) { @@ -992,7 +992,7 @@ EvtSource N(80246520) = SCRIPT({ } sleep 1; } - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_5)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_5); SI_VAR(0) = 348; SI_VAR(1) = 1; await N(80244DE4); @@ -1005,11 +1005,11 @@ EvtSource N(80246520) = SCRIPT({ } else { SetMessageString(2148844176, 1); } - SpeakToPlayer(NPC_SELF, NPC_ANIM(chuck_quizmo, Palette_00, Anim_4), NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), 0, MESSAGE_ID(0x08, 0x000F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000F)); } SI_VAR(0) = 1; } else { - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_9)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_9); SI_ARRAY(4) = 2; PlaySound(0x21D); PlaySound(0x8B); @@ -1017,7 +1017,7 @@ EvtSource N(80246520) = SCRIPT({ GetPlayerPos(SI_VAR(2), SI_VAR(3), SI_VAR(4)); PlayEffect(0x2B, 0, SI_VAR(2), SI_VAR(3), SI_VAR(4), 0, 0, 0, 0, 0, 0, 0, 0, 0); ContinueSpeech(-1, -1, -1, 0, MESSAGE_ID(0x08, 0x000D)); - SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM(chuck_quizmo, Palette_00, Anim_A)); + SetNpcAnimation(NPC_CHUCK_QUIZMO, NPC_ANIM_chuck_quizmo_Palette_00_Anim_A); loop { SI_VAR(0) = does_script_exist SI_VAR(1); if (SI_VAR(0) == 0) { @@ -1322,13 +1322,13 @@ EvtSource N(80247AA0) = SCRIPT({ } } SetNpcRotation(NPC_WORLD_MERLEE, 0, 0, 0); - SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM(world_merlee, Palette_00, Anim_A)); + SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM_world_merlee_Palette_00_Anim_A); sleep 200; - SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM(world_merlee, Palette_00, Anim_9)); + SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM_world_merlee_Palette_00_Anim_9); sleep 40; - SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM(world_merlee, Palette_00, Anim_A)); + SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM_world_merlee_Palette_00_Anim_A); sleep 75; - SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM(world_merlee, Palette_00, Anim_B)); + SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM_world_merlee_Palette_00_Anim_B); } sleep 60; PlaySoundAtNpc(NPC_WORLD_MERLEE, 514, 0); @@ -1460,7 +1460,7 @@ EvtSource N(802482F8) = SCRIPT({ SI_VAR(0) += 1; } if (SI_VAR(0) == 3) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_merlee, Palette_00, Anim_7), NPC_ANIM(world_merlee, Palette_00, Anim_4), 0, MESSAGE_ID(0x0D, 0x00DC)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_merlee_Palette_00_Anim_7, NPC_ANIM_world_merlee_Palette_00_Anim_4, 0, MESSAGE_ID(0x0D, 0x00DC)); SI_VAR(0) = 39; SI_VAR(1) = 1; await N(80244DE4); @@ -1471,32 +1471,32 @@ EvtSource N(802482F8) = SCRIPT({ await N(802482A8); return; } - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_merlee, Palette_00, Anim_7), NPC_ANIM(world_merlee, Palette_00, Anim_4), 0, MESSAGE_ID(0x0D, 0x00D6)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_merlee_Palette_00_Anim_7, NPC_ANIM_world_merlee_Palette_00_Anim_4, 0, MESSAGE_ID(0x0D, 0x00D6)); ShowChoice(MESSAGE_ID(0x1E, 0x0011)); if (SI_VAR(0) != 0) { - ContinueSpeech(-1, NPC_ANIM(world_merlee, Palette_00, Anim_7), NPC_ANIM(world_merlee, Palette_00, Anim_4), 0, MESSAGE_ID(0x0D, 0x00D7)); + ContinueSpeech(-1, NPC_ANIM_world_merlee_Palette_00_Anim_7, NPC_ANIM_world_merlee_Palette_00_Anim_4, 0, MESSAGE_ID(0x0D, 0x00D7)); func_802D2C14(0); await N(802482A8); return; } - ContinueSpeech(-1, NPC_ANIM(world_merlee, Palette_00, Anim_7), NPC_ANIM(world_merlee, Palette_00, Anim_4), 0, MESSAGE_ID(0x0D, 0x00D8)); + ContinueSpeech(-1, NPC_ANIM_world_merlee_Palette_00_Anim_7, NPC_ANIM_world_merlee_Palette_00_Anim_4, 0, MESSAGE_ID(0x0D, 0x00D8)); ShowCoinCounter(1); ShowChoice(MESSAGE_ID(0x1E, 0x0018)); ShowCoinCounter(0); if (SI_VAR(0) == 3) { - ContinueSpeech(-1, NPC_ANIM(world_merlee, Palette_00, Anim_7), NPC_ANIM(world_merlee, Palette_00, Anim_4), 0, MESSAGE_ID(0x0D, 0x00D7)); + ContinueSpeech(-1, NPC_ANIM_world_merlee_Palette_00_Anim_7, NPC_ANIM_world_merlee_Palette_00_Anim_4, 0, MESSAGE_ID(0x0D, 0x00D7)); func_802D2C14(0); await N(802482A8); return; } N(func_80241394_96A554)(SI_VAR(0), SI_VAR(1)); if (SI_VAR(1) != 0) { - ContinueSpeech(-1, NPC_ANIM(world_merlee, Palette_00, Anim_7), NPC_ANIM(world_merlee, Palette_00, Anim_4), 0, MESSAGE_ID(0x0D, 0x00D9)); + ContinueSpeech(-1, NPC_ANIM_world_merlee_Palette_00_Anim_7, NPC_ANIM_world_merlee_Palette_00_Anim_4, 0, MESSAGE_ID(0x0D, 0x00D9)); func_802D2C14(0); await N(802482A8); return; } - ContinueSpeech(-1, NPC_ANIM(world_merlee, Palette_00, Anim_7), NPC_ANIM(world_merlee, Palette_00, Anim_4), 0, MESSAGE_ID(0x0D, 0x00DA)); + ContinueSpeech(-1, NPC_ANIM_world_merlee_Palette_00_Anim_7, NPC_ANIM_world_merlee_Palette_00_Anim_4, 0, MESSAGE_ID(0x0D, 0x00DA)); SetMusicTrack(0, SONG_MERLEE_SPELL, 0, 8); DisablePartnerAI(0); SetNpcAnimation(NPC_PARTNER, 0x106); @@ -1509,9 +1509,9 @@ EvtSource N(802482F8) = SCRIPT({ sleep 1; } sleep 60; - SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM(world_merlee, Palette_00, Anim_4)); + SetNpcAnimation(NPC_WORLD_MERLEE, NPC_ANIM_world_merlee_Palette_00_Anim_4); PlayerMoveTo(-100, -370, 8); - SpeakToPlayer(NPC_SELF, NPC_ANIM(world_merlee, Palette_00, Anim_7), NPC_ANIM(world_merlee, Palette_00, Anim_4), 0, MESSAGE_ID(0x0D, 0x00DB)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_world_merlee_Palette_00_Anim_7, NPC_ANIM_world_merlee_Palette_00_Anim_4, 0, MESSAGE_ID(0x0D, 0x00DB)); spawn N(80243AF0); EnablePartnerAI(); func_802D2C14(0); @@ -2732,22 +2732,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flowerDrops = NO_DROPS, .movement = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_2), - NPC_ANIM(archeologist, Palette_00, Anim_3), - NPC_ANIM(archeologist, Palette_00, Anim_3), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), - NPC_ANIM(archeologist, Palette_00, Anim_1), + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_2, + NPC_ANIM_archeologist_Palette_00_Anim_3, + NPC_ANIM_archeologist_Palette_00_Anim_3, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, + NPC_ANIM_archeologist_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0001), }, @@ -2763,22 +2763,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .flowerDrops = NO_DROPS, .movement = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_2), - NPC_ANIM(dryite, Palette_02, Anim_3), - NPC_ANIM(dryite, Palette_02, Anim_3), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_0), - NPC_ANIM(dryite, Palette_02, Anim_0), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), - NPC_ANIM(dryite, Palette_02, Anim_1), + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_2, + NPC_ANIM_dryite_Palette_02_Anim_3, + NPC_ANIM_dryite_Palette_02_Anim_3, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_0, + NPC_ANIM_dryite_Palette_02_Anim_0, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, + NPC_ANIM_dryite_Palette_02_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x009C), }, @@ -2793,22 +2793,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), - NPC_ANIM(disguised_moustafa, Palette_00, Anim_1), + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, + NPC_ANIM_disguised_moustafa_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0098), }, @@ -2823,22 +2823,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(toad, Palette_00, Anim_1), - NPC_ANIM(toad, Palette_00, Anim_2), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_1), - NPC_ANIM(toad, Palette_00, Anim_1), - NPC_ANIM(toad, Palette_00, Anim_6), - NPC_ANIM(toad, Palette_00, Anim_6), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_3), - NPC_ANIM(toad, Palette_00, Anim_3), + NPC_ANIM_toad_Palette_00_Anim_1, + NPC_ANIM_toad_Palette_00_Anim_2, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_1, + NPC_ANIM_toad_Palette_00_Anim_1, + NPC_ANIM_toad_Palette_00_Anim_6, + NPC_ANIM_toad_Palette_00_Anim_6, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_3, + NPC_ANIM_toad_Palette_00_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x009A), }, @@ -2853,22 +2853,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_5), - NPC_ANIM(world_merlee, Palette_00, Anim_6), - NPC_ANIM(world_merlee, Palette_00, Anim_6), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), - NPC_ANIM(world_merlee, Palette_00, Anim_4), + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_5, + NPC_ANIM_world_merlee_Palette_00_Anim_6, + NPC_ANIM_world_merlee_Palette_00_Anim_6, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, + NPC_ANIM_world_merlee_Palette_00_Anim_4, }, .tattle = MESSAGE_ID(0x1A, 0x009B), }, @@ -2883,22 +2883,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_4), - NPC_ANIM(moustafa, Palette_00, Anim_4), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), - NPC_ANIM(moustafa, Palette_00, Anim_1), + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_4, + NPC_ANIM_moustafa_Palette_00_Anim_4, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, + NPC_ANIM_moustafa_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x0099), }, @@ -2913,22 +2913,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_2), - NPC_ANIM(dryite, Palette_00, Anim_3), - NPC_ANIM(dryite, Palette_00, Anim_3), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_0), - NPC_ANIM(dryite, Palette_00, Anim_0), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_2, + NPC_ANIM_dryite_Palette_00_Anim_3, + NPC_ANIM_dryite_Palette_00_Anim_3, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_0, + NPC_ANIM_dryite_Palette_00_Anim_0, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x009D), }, @@ -2943,22 +2943,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_2), - NPC_ANIM(dryite, Palette_00, Anim_3), - NPC_ANIM(dryite, Palette_00, Anim_3), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_0), - NPC_ANIM(dryite, Palette_00, Anim_0), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), - NPC_ANIM(dryite, Palette_00, Anim_1), + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_2, + NPC_ANIM_dryite_Palette_00_Anim_3, + NPC_ANIM_dryite_Palette_00_Anim_3, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_0, + NPC_ANIM_dryite_Palette_00_Anim_0, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, + NPC_ANIM_dryite_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00A0), }, @@ -2973,22 +2973,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x009E), }, @@ -3003,22 +3003,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_4), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), - NPC_ANIM(mouser, Palette_00, Anim_1), + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_4, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, + NPC_ANIM_mouser_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x009F), }, @@ -3033,22 +3033,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_4), - NPC_ANIM(mouser, Palette_01, Anim_4), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), - NPC_ANIM(mouser, Palette_01, Anim_1), + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_4, + NPC_ANIM_mouser_Palette_01_Anim_4, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, + NPC_ANIM_mouser_Palette_01_Anim_1, }, }, { @@ -3062,22 +3062,22 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_2), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_1), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_0), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_0), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), - NPC_ANIM(chuck_quizmo, Palette_00, Anim_3), + NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_2, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_0, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_0, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, + NPC_ANIM_chuck_quizmo_Palette_00_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x0002), }, diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 429fa67533..75fc678e38 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -602,30 +602,30 @@ EvtSource N(init_80243474) = SCRIPT({ EvtSource N(interact_8024352C) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0016)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_00_Anim_3, NPC_ANIM_bubulb_Palette_00_Anim_2, 0, MESSAGE_ID(0x11, 0x0016)); } < STORY_CH6_GOT_FERTILE_SOIL { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0017)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_00_Anim_3, NPC_ANIM_bubulb_Palette_00_Anim_2, 0, MESSAGE_ID(0x11, 0x0017)); } < STORY_CH6_FILLED_SPRING_WITH_WATER { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0018)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_00_Anim_3, NPC_ANIM_bubulb_Palette_00_Anim_2, 0, MESSAGE_ID(0x11, 0x0018)); } < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_3), NPC_ANIM(bubulb, Palette_00, Anim_2), 0, MESSAGE_ID(0x11, 0x0019)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_00_Anim_3, NPC_ANIM_bubulb_Palette_00_Anim_2, 0, MESSAGE_ID(0x11, 0x0019)); } < STORY_CH6_STAR_SPIRIT_RESCUED { match SI_AREA_FLAG(18) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_9), NPC_ANIM(bubulb, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x001A)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_00_Anim_9, NPC_ANIM_bubulb_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x001A)); SI_AREA_FLAG(18) = 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_9), NPC_ANIM(bubulb, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x001B)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_00_Anim_9, NPC_ANIM_bubulb_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x001B)); SI_AREA_FLAG(18) = 0; } } } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_00, Anim_9), NPC_ANIM(bubulb, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_00_Anim_9, NPC_ANIM_bubulb_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x001C)); } } @@ -634,30 +634,30 @@ EvtSource N(interact_8024352C) = SCRIPT({ EvtSource N(interact_802436C0) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x001D)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_01_Anim_3, NPC_ANIM_bubulb_Palette_01_Anim_2, 0, MESSAGE_ID(0x11, 0x001D)); } < STORY_CH6_GOT_FERTILE_SOIL { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x001E)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_01_Anim_3, NPC_ANIM_bubulb_Palette_01_Anim_2, 0, MESSAGE_ID(0x11, 0x001E)); } < STORY_CH6_FILLED_SPRING_WITH_WATER { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x001F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_01_Anim_3, NPC_ANIM_bubulb_Palette_01_Anim_2, 0, MESSAGE_ID(0x11, 0x001F)); } < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x0020)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_01_Anim_3, NPC_ANIM_bubulb_Palette_01_Anim_2, 0, MESSAGE_ID(0x11, 0x0020)); } < STORY_CH6_STAR_SPIRIT_RESCUED { match SI_AREA_FLAG(19) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x0021)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_01_Anim_3, NPC_ANIM_bubulb_Palette_01_Anim_2, 0, MESSAGE_ID(0x11, 0x0021)); SI_AREA_FLAG(19) = 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, 0x0022)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_01_Anim_3, NPC_ANIM_bubulb_Palette_01_Anim_2, 0, MESSAGE_ID(0x11, 0x0022)); SI_AREA_FLAG(19) = 0; } } } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_01, Anim_3), NPC_ANIM(bubulb, Palette_01, Anim_2), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_01_Anim_3, NPC_ANIM_bubulb_Palette_01_Anim_2, 0, MESSAGE_ID(0x11, 0x0023)); } } @@ -666,30 +666,30 @@ EvtSource N(interact_802436C0) = SCRIPT({ EvtSource N(interact_80243854) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0024)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_02_Anim_3, NPC_ANIM_bubulb_Palette_02_Anim_2, 0, MESSAGE_ID(0x11, 0x0024)); } < STORY_CH6_GOT_FERTILE_SOIL { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0025)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_02_Anim_3, NPC_ANIM_bubulb_Palette_02_Anim_2, 0, MESSAGE_ID(0x11, 0x0025)); } < STORY_CH6_FILLED_SPRING_WITH_WATER { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0026)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_02_Anim_3, NPC_ANIM_bubulb_Palette_02_Anim_2, 0, MESSAGE_ID(0x11, 0x0026)); } < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_3), NPC_ANIM(bubulb, Palette_02, Anim_2), 0, MESSAGE_ID(0x11, 0x0027)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_02_Anim_3, NPC_ANIM_bubulb_Palette_02_Anim_2, 0, MESSAGE_ID(0x11, 0x0027)); } < STORY_CH6_STAR_SPIRIT_RESCUED { match SI_AREA_FLAG(20) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_9), NPC_ANIM(bubulb, Palette_02, Anim_8), 0, MESSAGE_ID(0x11, 0x0028)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_02_Anim_9, NPC_ANIM_bubulb_Palette_02_Anim_8, 0, MESSAGE_ID(0x11, 0x0028)); SI_AREA_FLAG(20) = 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_9), NPC_ANIM(bubulb, Palette_02, Anim_8), 0, MESSAGE_ID(0x11, 0x0029)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_02_Anim_9, NPC_ANIM_bubulb_Palette_02_Anim_8, 0, MESSAGE_ID(0x11, 0x0029)); SI_AREA_FLAG(20) = 0; } } } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_02, Anim_9), NPC_ANIM(bubulb, Palette_02, Anim_8), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_02_Anim_9, NPC_ANIM_bubulb_Palette_02_Anim_8, 0, MESSAGE_ID(0x11, 0x002A)); } } @@ -698,30 +698,30 @@ EvtSource N(interact_80243854) = SCRIPT({ EvtSource N(interact_802439E8) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002B)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_03_Anim_3, NPC_ANIM_bubulb_Palette_03_Anim_2, 0, MESSAGE_ID(0x11, 0x002B)); } < STORY_CH6_GOT_FERTILE_SOIL { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002C)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_03_Anim_3, NPC_ANIM_bubulb_Palette_03_Anim_2, 0, MESSAGE_ID(0x11, 0x002C)); } < STORY_CH6_FILLED_SPRING_WITH_WATER { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002D)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_03_Anim_3, NPC_ANIM_bubulb_Palette_03_Anim_2, 0, MESSAGE_ID(0x11, 0x002D)); } < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_3), NPC_ANIM(bubulb, Palette_03, Anim_2), 0, MESSAGE_ID(0x11, 0x002E)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_03_Anim_3, NPC_ANIM_bubulb_Palette_03_Anim_2, 0, MESSAGE_ID(0x11, 0x002E)); } < STORY_CH6_STAR_SPIRIT_RESCUED { match SI_AREA_FLAG(21) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_9), NPC_ANIM(bubulb, Palette_03, Anim_8), 0, MESSAGE_ID(0x11, 0x002F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_03_Anim_9, NPC_ANIM_bubulb_Palette_03_Anim_8, 0, MESSAGE_ID(0x11, 0x002F)); SI_AREA_FLAG(21) = 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_9), NPC_ANIM(bubulb, Palette_03, Anim_8), 0, MESSAGE_ID(0x11, 0x0030)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_03_Anim_9, NPC_ANIM_bubulb_Palette_03_Anim_8, 0, MESSAGE_ID(0x11, 0x0030)); SI_AREA_FLAG(21) = 0; } } } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(bubulb, Palette_03, Anim_9), NPC_ANIM(bubulb, Palette_03, Anim_8), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_03_Anim_9, NPC_ANIM_bubulb_Palette_03_Anim_8, 0, MESSAGE_ID(0x11, 0x0031)); } } @@ -756,18 +756,18 @@ EvtSource N(interact_80243C4C) = SCRIPT({ < STORY_CH6_GOT_MAGICAL_BEAN { match SI_AREA_VAR(0) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0035)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0035)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0038)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0038)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 2; } == 2 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0039)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0039)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 0; } } @@ -775,18 +775,18 @@ EvtSource N(interact_80243C4C) = SCRIPT({ < 47 { match SI_AREA_VAR(0) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0036)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0036)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0038)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0038)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 2; } == 2 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0039)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0039)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 0; } } @@ -794,18 +794,18 @@ EvtSource N(interact_80243C4C) = SCRIPT({ < 53 { match SI_AREA_VAR(0) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0037)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0037)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0038)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0038)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 2; } == 2 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0039)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0039)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 0; } } @@ -813,19 +813,19 @@ EvtSource N(interact_80243C4C) = SCRIPT({ < 57 { match SI_AREA_VAR(0) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0039)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0039)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); SI_AREA_VAR(0) = 1; } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0038)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0038)); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); } } } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(tolielup, Palette_00, Anim_2), NPC_ANIM(tolielup, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_tolielup_Palette_00_Anim_2, NPC_ANIM_tolielup_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x003A)); - EndSpeech(-1, NPC_ANIM(tolielup, Palette_00, Anim_3), NPC_ANIM(tolielup, Palette_00, Anim_3), 0); + EndSpeech(-1, NPC_ANIM_tolielup_Palette_00_Anim_3, NPC_ANIM_tolielup_Palette_00_Anim_3, 0); } } ResetCam(0, 4.0); @@ -875,7 +875,7 @@ EvtSource N(8024427C) = SCRIPT({ WaitForPlayerInputEnabled(); DisablePlayerInput(TRUE); sleep 40; - SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_3), NPC_ANIM(world_klevar, Palette_00, Anim_1), 512, MESSAGE_ID(0x11, 0x00D8)); + SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM_world_klevar_Palette_00_Anim_3, NPC_ANIM_world_klevar_Palette_00_Anim_1, 512, MESSAGE_ID(0x11, 0x00D8)); SetCamDistance(0, 300.0); SetCamPitch(0, 18, -9); SetCamSpeed(0, 4.0); @@ -891,7 +891,7 @@ EvtSource N(8024427C) = SCRIPT({ } } EnableNpcAI(6, 0); - SetNpcAnimation(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_4)); + SetNpcAnimation(NPC_WORLD_KLEVAR, NPC_ANIM_world_klevar_Palette_00_Anim_4); sleep 20; SetPlayerAnimation(ANIM_GOT_ITEM); PlaySoundAtPlayer(313, 0); @@ -913,7 +913,7 @@ EvtSource N(8024427C) = SCRIPT({ PlayEffect(0x52, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 30, 0, 0, 0, 0, 0, 0, 0); sleep 30; SetPlayerAnimation(ANIM_10002); - SetNpcAnimation(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_1)); + SetNpcAnimation(NPC_WORLD_KLEVAR, NPC_ANIM_world_klevar_Palette_00_Anim_1); EnableNpcAI(6, 1); N(PostChapter6StatUpdate)(); ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x0196), 160, 40); @@ -924,7 +924,7 @@ EvtSource N(8024427C) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_3), NPC_ANIM(world_klevar, Palette_00, Anim_1), 512, MESSAGE_ID(0x11, 0x00D9)); + SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM_world_klevar_Palette_00_Anim_3, NPC_ANIM_world_klevar_Palette_00_Anim_1, 512, MESSAGE_ID(0x11, 0x00D9)); sleep 10; GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += -25; @@ -934,7 +934,7 @@ EvtSource N(8024427C) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM(world_klevar, Palette_00, Anim_3), NPC_ANIM(world_klevar, Palette_00, Anim_1), 512, MESSAGE_ID(0x11, 0x00DA)); + SpeakToPlayer(NPC_WORLD_KLEVAR, NPC_ANIM_world_klevar_Palette_00_Anim_3, NPC_ANIM_world_klevar_Palette_00_Anim_1, 512, MESSAGE_ID(0x11, 0x00DA)); SetNpcFlagBits(NPC_WORLD_KLEVAR, ((NPC_FLAG_40000)), TRUE); spawn { loop 25 { @@ -1000,22 +1000,21 @@ EvtSource N(init_80244BF4) = SCRIPT({ EvtSource N(interact_80244C98) = SCRIPT({ if (SI_STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) { - SpeakToPlayer(NPC_LAKILULU, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_LAKILULU, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0032)); } else { GetCurrentPartnerID(SI_VAR(0)); if (SI_VAR(0) == 8) { - SpeakToPlayer(NPC_LAKILULU, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_LAKILULU, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0032)); sleep 10; DisablePartnerAI(0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_B), NPC_ANIM(world_lakilester, Palette_00, - Anim_3), 5, MESSAGE_ID(0x11, 0x0033)); - SetNpcAnimation(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_1)); - EndSpeech(-4, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_lakilester_Palette_00_Anim_B, NPC_ANIM_world_lakilester_Palette_00_Anim_3, 5, MESSAGE_ID(0x11, 0x0033)); + SetNpcAnimation(NPC_PARTNER, NPC_ANIM_world_lakilester_Palette_00_Anim_1); + EndSpeech(-4, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 5); EnablePartnerAI(); } else { - SpeakToPlayer(NPC_LAKILULU, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_LAKILULU, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0034)); } } @@ -1042,22 +1041,22 @@ StaticNpc N(npcGroup_80244E64) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_E), - NPC_ANIM(bubulb, Palette_00, Anim_E), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_E, + NPC_ANIM_bubulb_Palette_00_Anim_E, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, }, }; @@ -1074,22 +1073,22 @@ StaticNpc N(npcGroup_80245054)[] = { .flowerDrops = NO_DROPS, .movement = { 2, -59, 0, -40, -80, 0, -40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 }, .animations = { - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_E), - NPC_ANIM(bubulb, Palette_00, Anim_E), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_E, + NPC_ANIM_bubulb_Palette_00_Anim_E, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, }, .tattle = MESSAGE_ID(0x1A, 0x00D5), }, @@ -1105,22 +1104,22 @@ StaticNpc N(npcGroup_80245054)[] = { .flowerDrops = NO_DROPS, .movement = { 2, 67, 0, 85, 97, 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 }, .animations = { - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_E), - NPC_ANIM(bubulb, Palette_01, Anim_E), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), - NPC_ANIM(bubulb, Palette_01, Anim_2), + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_E, + NPC_ANIM_bubulb_Palette_01_Anim_E, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, + NPC_ANIM_bubulb_Palette_01_Anim_2, }, .tattle = MESSAGE_ID(0x1A, 0x00D6), }, @@ -1136,22 +1135,22 @@ StaticNpc N(npcGroup_80245054)[] = { .flowerDrops = NO_DROPS, .movement = { 2, 90, 0, 410, 120, 0, 410, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 }, .animations = { - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_E), - NPC_ANIM(bubulb, Palette_02, Anim_E), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), - NPC_ANIM(bubulb, Palette_02, Anim_2), + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_E, + NPC_ANIM_bubulb_Palette_02_Anim_E, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, + NPC_ANIM_bubulb_Palette_02_Anim_2, }, .tattle = MESSAGE_ID(0x1A, 0x00D7), }, @@ -1167,22 +1166,22 @@ StaticNpc N(npcGroup_80245054)[] = { .flowerDrops = NO_DROPS, .movement = { 2, 200, 0, 430, 240, 0, 430, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 }, .animations = { - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_E), - NPC_ANIM(bubulb, Palette_03, Anim_E), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), - NPC_ANIM(bubulb, Palette_03, Anim_2), + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_E, + NPC_ANIM_bubulb_Palette_03_Anim_E, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, + NPC_ANIM_bubulb_Palette_03_Anim_2, }, .tattle = MESSAGE_ID(0x1A, 0x00D8), }, @@ -1199,22 +1198,22 @@ StaticNpc N(npcGroup_80245814) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), - NPC_ANIM(tolielup, Palette_00, Anim_1), + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, + NPC_ANIM_tolielup_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00D9), }; @@ -1230,22 +1229,22 @@ StaticNpc N(npcGroup_80245A04) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_0), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), - NPC_ANIM(world_klevar, Palette_00, Anim_1), + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_0, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, + NPC_ANIM_world_klevar_Palette_00_Anim_1, }, }; @@ -1260,22 +1259,22 @@ StaticNpc N(npcGroup_80245BF4) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E2), }; @@ -1336,12 +1335,12 @@ EvtSource N(80245EB8) = SCRIPT({ sleep 70; InterpNpcYaw(NPC_BUBULB0, 90, 0); sleep 10; - SetNpcAnimation(NPC_BUBULB0, NPC_ANIM(world_lakilester, Palette_00, Anim_9)); + SetNpcAnimation(NPC_BUBULB0, NPC_ANIM_world_lakilester_Palette_00_Anim_9); sleep 40; - SetNpcAnimation(NPC_BUBULB0, NPC_ANIM(world_lakilester, Palette_00, Anim_1)); - SetNpcAnimation(NPC_BUBULB2, NPC_ANIM(world_parakarry, Palette_00, Anim_6)); + SetNpcAnimation(NPC_BUBULB0, NPC_ANIM_world_lakilester_Palette_00_Anim_1); + SetNpcAnimation(NPC_BUBULB2, NPC_ANIM_world_parakarry_Palette_00_Anim_6); sleep 40; - SetNpcAnimation(NPC_BUBULB2, NPC_ANIM(world_parakarry, Palette_00, Anim_1)); + SetNpcAnimation(NPC_BUBULB2, NPC_ANIM_world_parakarry_Palette_00_Anim_1); InterpNpcYaw(NPC_BUBULB2, 90, 0); NpcFlyTo(2, 400, 200, 287, 80, -5, 0); InterpNpcYaw(NPC_BUBULB0, 270, 0); @@ -1380,22 +1379,22 @@ StaticNpc N(npcGroup_80246264)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, }, }, { @@ -1409,22 +1408,22 @@ StaticNpc N(npcGroup_80246264)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, }, }, { @@ -1438,22 +1437,22 @@ StaticNpc N(npcGroup_80246264)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_2), - NPC_ANIM(world_parakarry, Palette_00, Anim_3), - NPC_ANIM(world_parakarry, Palette_00, Anim_3), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_0), - NPC_ANIM(world_parakarry, Palette_00, Anim_0), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), - NPC_ANIM(world_parakarry, Palette_00, Anim_1), + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_2, + NPC_ANIM_world_parakarry_Palette_00_Anim_3, + NPC_ANIM_world_parakarry_Palette_00_Anim_3, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_0, + NPC_ANIM_world_parakarry_Palette_00_Anim_0, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, + NPC_ANIM_world_parakarry_Palette_00_Anim_1, }, }, }; diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index 1402d685b1..c988496cbf 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -220,8 +220,8 @@ EvtSource N(80240FFC) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 20; - SpeakToPlayer(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00C8)); - SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_3)); + SpeakToPlayer(NPC_PETUNIA, NPC_ANIM_petunia_Palette_00_Anim_2, NPC_ANIM_petunia_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00C8)); + SetNpcAnimation(NPC_PETUNIA, NPC_ANIM_petunia_Palette_00_Anim_3); sleep 10; GotoMap("flo_18", 1); sleep 100; @@ -259,12 +259,12 @@ EvtSource N(interact_802412BC) = SCRIPT({ SI_MAP_VAR(14) = 1; SI_VAR(4) = (int) 3.5; await N(8024122C); - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0050)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_6)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0050)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_6); SetPlayerAnimation(ANIM_NOD_YES); sleep 20; - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0051)); - SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_12)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0051)); + SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM_monty_mole_Palette_01_Anim_12); SetNpcYaw(NPC_MONTY_MOLE0, 270); GetNpcPos(NPC_MONTY_MOLE0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -276,12 +276,12 @@ EvtSource N(interact_802412BC) = SCRIPT({ WaitForCam(0, 1.0); sleep 20; PlaySoundAtNpc(NPC_MONTY_MOLE0, SOUND_MOLE_SURFACE, 0); - SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_16)); + SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM_monty_mole_Palette_01_Anim_16); sleep 10; PlaySoundAtNpc(NPC_MONTY_MOLE0, 0x263, 0); ShowEmote(2, EMOTE_QUESTION, -45, 30, 1, 0, 0, 0, 0); GetNpcPos(NPC_MONTY_MOLE1, SI_VAR(0), SI_VAR(1), SI_VAR(2)); - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0052)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0052)); SetNpcYaw(NPC_MONTY_MOLE1, 90); SetNpcPos(NPC_MONTY_MOLE1, 0, -1000, 0); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -290,13 +290,13 @@ EvtSource N(interact_802412BC) = SCRIPT({ SetCamPitch(0, 17.0, -8.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_0)); + SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM_monty_mole_Palette_01_Anim_0); sleep 20; PlaySoundAtNpc(NPC_MONTY_MOLE1, SOUND_MOLE_SURFACE, 0); SetNpcPos(NPC_MONTY_MOLE1, SI_VAR(0), SI_VAR(1), SI_VAR(2)); - SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM_monty_mole_Palette_01_Anim_10); sleep 20; - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0053)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0053)); SetNpcYaw(NPC_MONTY_MOLE2, 270); GetNpcPos(NPC_MONTY_MOLE2, SI_VAR(0), SI_VAR(1), SI_VAR(2)); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -306,8 +306,8 @@ EvtSource N(interact_802412BC) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 20; - SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_14)); - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0054)); + SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM_monty_mole_Palette_01_Anim_14); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0054)); SetNpcYaw(NPC_MONTY_MOLE3, 270); GetNpcPos(NPC_MONTY_MOLE3, SI_VAR(0), SI_VAR(1), SI_VAR(2)); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -316,14 +316,14 @@ EvtSource N(interact_802412BC) = SCRIPT({ SetCamPitch(0, 17.0, -9.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_6)); + SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM_monty_mole_Palette_01_Anim_6); sleep 20; - SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_7)); + SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM_monty_mole_Palette_01_Anim_7); sleep 20; - SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_8)); + SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM_monty_mole_Palette_01_Anim_8); sleep 20; - SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_16)); - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0055)); + SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM_monty_mole_Palette_01_Anim_16); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0055)); SetNpcPos(NPC_DAYZEE, -233, 0, -217); GetNpcPos(NPC_DAYZEE, SI_VAR(0), SI_VAR(1), SI_VAR(2)); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -332,14 +332,14 @@ EvtSource N(interact_802412BC) = SCRIPT({ SetCamPitch(0, 17.0, -9.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SetNpcAnimation(NPC_DAYZEE, NPC_ANIM(dayzee, Palette_00, Anim_D)); + SetNpcAnimation(NPC_DAYZEE, NPC_ANIM_dayzee_Palette_00_Anim_D); PlaySoundAtNpc(NPC_DAYZEE, SOUND_UNKNOWN_262, 0); ShowEmote(1, EMOTE_EXCLAMATION, 45, 30, 1, 0, 0, 0, 0); sleep 15; - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0056)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0056)); SI_VAR(4) = (int) 90.0; await N(8024122C); - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0057)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0057)); SetEnemyFlagBits(1, 1, 0); SetEnemyFlagBits(2, 1, 0); SetEnemyFlagBits(3, 1, 0); @@ -352,41 +352,41 @@ EvtSource N(interact_802412BC) = SCRIPT({ } == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { if (SI_SAVE_FLAG(1411) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0058)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_6)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_6); } else { SI_VAR(4) = (int) 3.5; await N(8024122C); - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_8), NPC_ANIM(petunia, Palette_00, Anim_3), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_8, NPC_ANIM_petunia_Palette_00_Anim_3, 0, MESSAGE_ID(0x11, 0x0059)); - EndSpeech(-1, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_4)); + EndSpeech(-1, NPC_ANIM_petunia_Palette_00_Anim_2, NPC_ANIM_petunia_Palette_00_Anim_1, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_4); sleep 20; - SetNpcAnimation(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_1); SI_VAR(0) = 88; SI_VAR(1) = 1; await N(80240F0C); AddKeyItem(ITEM_MAGICAL_BEAN); sleep 20; - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_2, NPC_ANIM_petunia_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x005A)); - EndSpeech(-1, NPC_ANIM(petunia, Palette_00, Anim_7), NPC_ANIM(petunia, Palette_00, Anim_6), 0); + EndSpeech(-1, NPC_ANIM_petunia_Palette_00_Anim_7, NPC_ANIM_petunia_Palette_00_Anim_6, 0); SI_STORY_PROGRESS = STORY_CH6_GOT_MAGICAL_BEAN; } } < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE { - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x005B)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_2, NPC_ANIM_petunia_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x005B)); } < STORY_CH6_RETURNED_TO_TOAD_TOWN { - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x005C)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_2, NPC_ANIM_petunia_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x005C)); } else { if (SI_AREA_VAR(1) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_2, NPC_ANIM_petunia_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x005D)); SI_AREA_VAR(1) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(petunia, Palette_00, Anim_2), NPC_ANIM(petunia, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_petunia_Palette_00_Anim_2, NPC_ANIM_petunia_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x005E)); } } @@ -398,9 +398,9 @@ EvtSource N(interact_802412BC) = SCRIPT({ EvtSource N(init_80241DA4) = SCRIPT({ BindNpcInteract(NPC_SELF, N(interact_802412BC)); if (SI_SAVE_FLAG(1411) == 0) { - SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_6)); + SetNpcAnimation(NPC_PETUNIA, NPC_ANIM_petunia_Palette_00_Anim_6); } else { - SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_1)); + SetNpcAnimation(NPC_PETUNIA, NPC_ANIM_petunia_Palette_00_Anim_1); } }); @@ -455,19 +455,19 @@ EvtSource N(defeat_80241F64) = SCRIPT({ SI_VAR(0) += SI_SAVE_FLAG(1369); SI_VAR(0) += SI_SAVE_FLAG(1370); if (SI_VAR(0) != 4) { - SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_6)); + SetNpcAnimation(NPC_PETUNIA, NPC_ANIM_petunia_Palette_00_Anim_6); } else { - SetNpcAnimation(NPC_PETUNIA, NPC_ANIM(petunia, Palette_00, Anim_1)); + SetNpcAnimation(NPC_PETUNIA, NPC_ANIM_petunia_Palette_00_Anim_1); SI_SAVE_FLAG(1411) = 1; await N(802406A0); } DoNpcDefeat(); } == 1 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(monty_mole, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_monty_mole_Palette_01_Anim_1); } == 2 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(monty_mole, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_monty_mole_Palette_01_Anim_1); } } }); @@ -476,7 +476,7 @@ EvtSource N(hit_80242138) = SCRIPT({ if (SI_STORY_PROGRESS == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES) { GetOwnerEncounterTrigger(SI_VAR(0)); if (SI_VAR(0) != 1) { - SetNpcAnimation(NPC_SELF, NPC_ANIM(monty_mole, Palette_01, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_monty_mole_Palette_01_Anim_5); } } }); @@ -518,7 +518,7 @@ EvtSource N(idle_8024219C) = SCRIPT({ SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), TRUE); } PlaySoundAtNpc(NPC_MONTY_MOLE0, SOUND_MOLE_DIG, 0); - SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_11)); + SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM_monty_mole_Palette_01_Anim_11); sleep 20; if (SI_SAVE_FLAG(1367) == 0) { SetNpcPos(NPC_MONTY_MOLE0, 0, -50, 0); @@ -541,7 +541,7 @@ EvtSource N(idle_8024219C) = SCRIPT({ NpcFacePlayer(NPC_MONTY_MOLE0, 1); sleep 1; PlaySoundAtNpc(NPC_MONTY_MOLE0, SOUND_MOLE_SURFACE, 0); - SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM_monty_mole_Palette_01_Anim_10); sleep 10; SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), FALSE); RandInt(30, SI_VAR(0)); @@ -594,7 +594,7 @@ EvtSource N(idle_80242618) = SCRIPT({ SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), TRUE); } PlaySoundAtNpc(NPC_MONTY_MOLE1, SOUND_MOLE_DIG, 0); - SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_11)); + SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM_monty_mole_Palette_01_Anim_11); sleep 20; if (SI_SAVE_FLAG(1368) == 0) { SetNpcPos(NPC_MONTY_MOLE1, 0, -50, 0); @@ -617,7 +617,7 @@ EvtSource N(idle_80242618) = SCRIPT({ NpcFacePlayer(NPC_MONTY_MOLE1, 1); sleep 1; PlaySoundAtNpc(NPC_MONTY_MOLE1, SOUND_MOLE_SURFACE, 0); - SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM_monty_mole_Palette_01_Anim_10); sleep 10; SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), FALSE); RandInt(35, SI_VAR(0)); @@ -670,7 +670,7 @@ EvtSource N(idle_80242A94) = SCRIPT({ SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), TRUE); } PlaySoundAtNpc(NPC_MONTY_MOLE2, SOUND_MOLE_DIG, 0); - SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_11)); + SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM_monty_mole_Palette_01_Anim_11); sleep 20; if (SI_SAVE_FLAG(1369) == 0) { SetNpcPos(NPC_MONTY_MOLE2, 0, -50, 0); @@ -693,7 +693,7 @@ EvtSource N(idle_80242A94) = SCRIPT({ NpcFacePlayer(NPC_MONTY_MOLE2, 1); sleep 1; PlaySoundAtNpc(NPC_MONTY_MOLE2, SOUND_MOLE_SURFACE, 0); - SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM_monty_mole_Palette_01_Anim_10); sleep 10; SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), FALSE); RandInt(40, SI_VAR(0)); @@ -746,7 +746,7 @@ EvtSource N(idle_80242F10) = SCRIPT({ SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), TRUE); } PlaySoundAtNpc(NPC_MONTY_MOLE3, SOUND_MOLE_DIG, 0); - SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_11)); + SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM_monty_mole_Palette_01_Anim_11); sleep 20; if (SI_SAVE_FLAG(1370) == 0) { SetNpcPos(NPC_MONTY_MOLE3, 0, -50, 0); @@ -769,7 +769,7 @@ EvtSource N(idle_80242F10) = SCRIPT({ NpcFacePlayer(NPC_MONTY_MOLE3, 1); sleep 1; PlaySoundAtNpc(NPC_MONTY_MOLE3, SOUND_MOLE_SURFACE, 0); - SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM_monty_mole_Palette_01_Anim_10); sleep 10; SetSelfEnemyFlagBits(((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | 0x02000000 | NPC_FLAG_PARTICLE | 0x10000000)), FALSE); RandInt(45, SI_VAR(0)); @@ -792,12 +792,12 @@ EvtSource N(init_8024338C) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { BindNpcIdle(NPC_SELF, N(idle_8024219C)); - SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM_monty_mole_Palette_01_Anim_10); } == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { if (SI_SAVE_FLAG(1367) == 0) { BindNpcIdle(NPC_SELF, N(idle_8024219C)); - SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE0, NPC_ANIM_monty_mole_Palette_01_Anim_10); SetEnemyFlagBits(2, 1, 0); } else { SetNpcPos(NPC_MONTY_MOLE0, 0, -1000, 0); @@ -815,12 +815,12 @@ EvtSource N(init_802434CC) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { BindNpcIdle(NPC_SELF, N(idle_80242618)); - SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM_monty_mole_Palette_01_Anim_10); } == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { if (SI_SAVE_FLAG(1368) == 0) { BindNpcIdle(NPC_SELF, N(idle_80242618)); - SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE1, NPC_ANIM_monty_mole_Palette_01_Anim_10); SetEnemyFlagBits(3, 1, 0); } else { SetNpcPos(NPC_MONTY_MOLE1, 0, -1000, 0); @@ -838,12 +838,12 @@ EvtSource N(init_8024360C) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { BindNpcIdle(NPC_SELF, N(idle_80242A94)); - SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM_monty_mole_Palette_01_Anim_10); } == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { if (SI_SAVE_FLAG(1369) == 0) { BindNpcIdle(NPC_SELF, N(idle_80242A94)); - SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE2, NPC_ANIM_monty_mole_Palette_01_Anim_10); SetEnemyFlagBits(4, 1, 0); } else { SetNpcPos(NPC_MONTY_MOLE2, 0, -1000, 0); @@ -861,12 +861,12 @@ EvtSource N(init_8024374C) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { BindNpcIdle(NPC_SELF, N(idle_80242F10)); - SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM_monty_mole_Palette_01_Anim_10); } == STORY_CH6_ASKED_TO_DEFEAT_MONTY_MOLES { if (SI_SAVE_FLAG(1370) == 0) { BindNpcIdle(NPC_SELF, N(idle_80242F10)); - SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM(monty_mole, Palette_01, Anim_10)); + SetNpcAnimation(NPC_MONTY_MOLE3, NPC_ANIM_monty_mole_Palette_01_Anim_10); SetEnemyFlagBits(5, 1, 0); } else { SetNpcPos(NPC_MONTY_MOLE3, 0, -1000, 0); @@ -888,22 +888,22 @@ StaticNpc N(npcGroup_8024388C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), - NPC_ANIM(petunia, Palette_00, Anim_1), + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, + NPC_ANIM_petunia_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00DD), }; @@ -919,22 +919,22 @@ StaticNpc N(npcGroup_80243A7C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, }; @@ -949,22 +949,22 @@ StaticNpc N(npcGroup_80243C6C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_2), - NPC_ANIM(monty_mole, Palette_01, Anim_3), - NPC_ANIM(monty_mole, Palette_01, Anim_3), - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_5), - NPC_ANIM(monty_mole, Palette_01, Anim_5), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_2, + NPC_ANIM_monty_mole_Palette_01_Anim_3, + NPC_ANIM_monty_mole_Palette_01_Anim_3, + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_5, + NPC_ANIM_monty_mole_Palette_01_Anim_5, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, }, }; @@ -979,22 +979,22 @@ StaticNpc N(npcGroup_80243E5C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_2), - NPC_ANIM(monty_mole, Palette_01, Anim_3), - NPC_ANIM(monty_mole, Palette_01, Anim_3), - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_5), - NPC_ANIM(monty_mole, Palette_01, Anim_5), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_2, + NPC_ANIM_monty_mole_Palette_01_Anim_3, + NPC_ANIM_monty_mole_Palette_01_Anim_3, + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_5, + NPC_ANIM_monty_mole_Palette_01_Anim_5, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, }, }; @@ -1009,22 +1009,22 @@ StaticNpc N(npcGroup_8024404C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_2), - NPC_ANIM(monty_mole, Palette_01, Anim_3), - NPC_ANIM(monty_mole, Palette_01, Anim_3), - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_5), - NPC_ANIM(monty_mole, Palette_01, Anim_5), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_2, + NPC_ANIM_monty_mole_Palette_01_Anim_3, + NPC_ANIM_monty_mole_Palette_01_Anim_3, + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_5, + NPC_ANIM_monty_mole_Palette_01_Anim_5, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, }, }; @@ -1039,22 +1039,22 @@ StaticNpc N(npcGroup_8024423C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_2), - NPC_ANIM(monty_mole, Palette_01, Anim_3), - NPC_ANIM(monty_mole, Palette_01, Anim_3), - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_1), - NPC_ANIM(monty_mole, Palette_01, Anim_5), - NPC_ANIM(monty_mole, Palette_01, Anim_5), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), - NPC_ANIM(monty_mole, Palette_01, Anim_0), + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_2, + NPC_ANIM_monty_mole_Palette_01_Anim_3, + NPC_ANIM_monty_mole_Palette_01_Anim_3, + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_1, + NPC_ANIM_monty_mole_Palette_01_Anim_5, + NPC_ANIM_monty_mole_Palette_01_Anim_5, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, + NPC_ANIM_monty_mole_Palette_01_Anim_0, }, }; diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index 0ed3d111c2..c429678057 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -238,7 +238,7 @@ EvtSource N(80241C14) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 20; - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00C5)); + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00C5)); sleep 10; GotoMap("flo_10", 1); sleep 100; @@ -255,7 +255,7 @@ EvtSource N(80241DBC) = SCRIPT({ if (SI_AREA_FLAG(6) == 1) { return; } - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0068)); + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0068)); spawn { SetCamDistance(0, 300); SetCamPitch(0, 18.0, -7.5); @@ -264,7 +264,7 @@ EvtSource N(80241DBC) = SCRIPT({ } PlaySound(0x8000006B); SI_MAP_VAR(0) = spawn N(80241D6C); - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_6), NPC_ANIM(posie, Palette_00, Anim_6), 0, MESSAGE_ID(0x11, 0x0069)); + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_6, NPC_ANIM_posie_Palette_00_Anim_6, 0, MESSAGE_ID(0x11, 0x0069)); kill SI_MAP_VAR(0); SetCamDistance(0, 350); SetCamPitch(0, 18.0, -7.5); @@ -284,7 +284,7 @@ EvtSource N(80241DBC) = SCRIPT({ func_802D62E4(956); SI_AREA_FLAG(6) = 1; sleep 20; - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006A)); + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x006A)); SI_STORY_PROGRESS = STORY_CH6_GOT_CRYSTAL_BERRY; }); @@ -294,26 +294,26 @@ EvtSource N(interact_80242044) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { if (SI_AREA_FLAG(5) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0070)); SI_AREA_FLAG(5) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0071)); } } < STORY_CH6_GOT_FERTILE_SOIL { AdjustCam(0, 4.0, 0, 350.0, 18.0, -7.5); - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0065)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_5)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0065)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_5); sleep 20; - SetNpcAnimation(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_0)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_0); SI_VAR(0) = 89; SI_VAR(1) = 1; await N(80241BB4); AddKeyItem(ITEM_FERTILE_SOIL); SI_STORY_PROGRESS = STORY_CH6_GOT_FERTILE_SOIL; - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0066)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0066)); if (SI_SAVE_FLAG(1379) == 1) { await N(80241DBC); } @@ -326,34 +326,34 @@ EvtSource N(interact_80242044) = SCRIPT({ await N(80241DBC); ResetCam(0, 4.0); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0072)); } } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0072)); } } < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE { if (SI_SAVE_FLAG(1374) == 0) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0072)); } else { if (SI_STORY_PROGRESS < STORY_CH6_GOT_WATER_STONE) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0073)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0074)); } - ContinueSpeech(-1, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + ContinueSpeech(-1, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0075)); } } < STORY_CH6_RETURNED_TO_TOAD_TOWN { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0076)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0076)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0077)); } } @@ -379,13 +379,13 @@ EvtSource N(802424F4) = SCRIPT({ DisablePlayerInput(TRUE); sleep 10; if (SI_AREA_VAR(3) < 5) { - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x006E)); GetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3)); PlayerMoveTo(410, SI_VAR(3), 10); SI_AREA_VAR(3) += 1; } else { - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_2), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_2, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x006F)); SI_AREA_VAR(3) = 0; } @@ -400,7 +400,7 @@ EvtSource N(tree1_Callback) = SCRIPT({ if (SI_STORY_PROGRESS < STORY_CH6_GOT_CRYSTAL_BERRY) { NpcFacePlayer(NPC_POSIE, 1); sleep 10; - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_4), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_4, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0067)); if (SI_STORY_PROGRESS == STORY_CH6_GOT_FERTILE_SOIL) { if (SI_SAVE_FLAG(1379) == 1) { @@ -416,19 +416,19 @@ EvtSource N(tree1_Callback) = SCRIPT({ if (SI_SAVE_FLAG(1374) == 0) { NpcFacePlayer(NPC_POSIE, 1); sleep 10; - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_4), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_4, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0067)); } else { SI_AREA_VAR(2) += 1; match SI_AREA_VAR(2) { < 2 { - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_3), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006B)); + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_3, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x006B)); } < 5 { - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_3), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006C)); + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_3, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x006C)); } >= 5 { - SpeakToPlayer(NPC_POSIE, NPC_ANIM(posie, Palette_00, Anim_3), NPC_ANIM(posie, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x006D)); + SpeakToPlayer(NPC_POSIE, NPC_ANIM_posie_Palette_00_Anim_3, NPC_ANIM_posie_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x006D)); SI_AREA_VAR(3) = 1; GotoMap(N(flo_25_name_hack), 1); sleep 100; @@ -475,22 +475,22 @@ StaticNpc N(npcGroup_8024291C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), - NPC_ANIM(posie, Palette_00, Anim_1), + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, + NPC_ANIM_posie_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00DE), }; diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index d6d42af491..7b971879e1 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -428,7 +428,7 @@ EvtSource N(interact_80243214) = SCRIPT({ SetCamSpeed(0, 4.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_2), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_2, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x0042)); SetPlayerAnimation(ANIM_THINKING); N(func_80241BCC_CB090C)(); @@ -438,22 +438,22 @@ EvtSource N(interact_80243214) = SCRIPT({ match SI_VAR(0) { <= 0 { SetPlayerAnimation(ANIM_STAND_STILL); - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_2), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0043)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_2, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x0043)); } else { SI_VAR(8) = SI_VAR(0); N(func_80241B5C_CB089C)(SI_VAR(0)); MakeItemEntity(SI_VAR(8), -695, 20, -29, 1, 0); SI_VAR(7) = SI_VAR(0); PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_3)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_3); sleep 20; RemoveItemEntity(SI_VAR(7)); match SI_VAR(8) { == 160 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_4), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0046)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_4, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x0046)); PlaySoundAtNpc(NPC_SELF, 0x21C, 0); - EndSpeech(-1, NPC_ANIM(gate_flower, Palette_02, Anim_9), NPC_ANIM(gate_flower, Palette_02, Anim_8), 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_7)); + EndSpeech(-1, NPC_ANIM_gate_flower_Palette_02_Anim_9, NPC_ANIM_gate_flower_Palette_02_Anim_8, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_7); PlaySoundAtCollider(17, 457, 0); ModifyColliderFlags(0, 17, 0x7FFFFE00); MakeLerp(0, 100, 30, 1); @@ -474,20 +474,20 @@ EvtSource N(interact_80243214) = SCRIPT({ break loop; } } - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_5); SI_SAVE_FLAG(1364) = 1; } == 159 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_4), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0045)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_1)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_4, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x0045)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_1); } == 158 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_4), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x0045)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_1)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_4, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x0045)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_1); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_4), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_4, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x0044)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_6)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_6); PlaySoundAtNpc(NPC_SELF, 0x2096, 0); MakeItemEntity(SI_VAR(8), 125, 20, 0, 1, 0); SI_VAR(7) = SI_VAR(0); @@ -532,10 +532,10 @@ EvtSource N(interact_80243214) = SCRIPT({ } } } - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_1); RemoveItemEntity(SI_VAR(7)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_1)); - EndSpeech(-1, NPC_ANIM(gate_flower, Palette_02, Anim_2), NPC_ANIM(gate_flower, Palette_02, Anim_1), 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_1); + EndSpeech(-1, NPC_ANIM_gate_flower_Palette_02_Anim_2, NPC_ANIM_gate_flower_Palette_02_Anim_1, 0); } } } @@ -546,10 +546,10 @@ EvtSource N(interact_80243214) = SCRIPT({ sleep 10; } else { if (SI_STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_9), NPC_ANIM(gate_flower, Palette_02, Anim_8), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_9, NPC_ANIM_gate_flower_Palette_02_Anim_8, 0, MESSAGE_ID(0x11, 0x0047)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_9), NPC_ANIM(gate_flower, Palette_02, Anim_8), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_9, NPC_ANIM_gate_flower_Palette_02_Anim_8, 0, MESSAGE_ID(0x11, 0x0048)); } } @@ -560,7 +560,7 @@ EvtSource N(interact_80243214) = SCRIPT({ EvtSource N(init_80243B20) = SCRIPT({ BindNpcInteract(NPC_SELF, N(interact_80243214)); if (SI_SAVE_FLAG(1364) == 1) { - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_02, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_5); ModifyColliderFlags(0, 17, 0x7FFFFE00); RotateModel(103, 50, 0, 1, 0); RotateModel(104, 50, 0, 1, 0); @@ -582,22 +582,22 @@ StaticNpc N(npcGroup_80243C48) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), - NPC_ANIM(gate_flower, Palette_02, Anim_1), + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, + NPC_ANIM_gate_flower_Palette_02_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00DB), }; @@ -619,22 +619,22 @@ StaticNpc N(npcGroup_80243E38) = { .maxCoinBonus = 3, .movement = { 205, 0, -80, 30, 0, -32767, 0, 205, 0, -80, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -656,22 +656,22 @@ StaticNpc N(npcGroup_80244028) = { .maxCoinBonus = 3, .movement = { 275, 0, -115, 30, 0, -32767, 0, 275, 0, -115, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -693,22 +693,22 @@ StaticNpc N(npcGroup_80244218) = { .maxCoinBonus = 3, .movement = { -230, 60, -110, 30, 0, -32767, 0, -230, 60, -110, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -730,22 +730,22 @@ StaticNpc N(npcGroup_80244408) = { .maxCoinBonus = 3, .movement = { -330, 60, -110, 30, 0, -32767, 0, -330, 60, -110, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -767,22 +767,22 @@ StaticNpc N(npcGroup_802445F8) = { .maxCoinBonus = 3, .movement = { -430, 60, -110, 30, 0, -32767, 0, -430, 60, -110, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -804,22 +804,22 @@ StaticNpc N(npcGroup_802447E8) = { .maxCoinBonus = 3, .movement = { -530, 60, -110, 30, 0, -32767, 0, -530, 60, -110, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -841,22 +841,22 @@ StaticNpc N(npcGroup_802449D8) = { .maxCoinBonus = 3, .movement = { -630, 60, -110, 30, 0, -32767, 0, -630, 60, -110, 150, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -900,22 +900,22 @@ StaticNpc N(npcGroup_80244CD4) = { .maxCoinBonus = 8, .movement = { 240, 0, -90, 30, 0, -32767, 0, 240, 0, -90, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_01, Anim_1), - NPC_ANIM(dayzee, Palette_01, Anim_2), - NPC_ANIM(dayzee, Palette_01, Anim_3), - NPC_ANIM(dayzee, Palette_01, Anim_3), - NPC_ANIM(dayzee, Palette_01, Anim_1), - NPC_ANIM(dayzee, Palette_01, Anim_1), - NPC_ANIM(dayzee, Palette_01, Anim_8), - NPC_ANIM(dayzee, Palette_01, Anim_8), - NPC_ANIM(dayzee, Palette_01, Anim_6), - NPC_ANIM(dayzee, Palette_01, Anim_7), - NPC_ANIM(dayzee, Palette_01, Anim_1), - NPC_ANIM(dayzee, Palette_01, Anim_1), - NPC_ANIM(dayzee, Palette_01, Anim_1), - NPC_ANIM(dayzee, Palette_01, Anim_1), - NPC_ANIM(dayzee, Palette_01, Anim_1), - NPC_ANIM(dayzee, Palette_01, Anim_1), + NPC_ANIM_dayzee_Palette_01_Anim_1, + NPC_ANIM_dayzee_Palette_01_Anim_2, + NPC_ANIM_dayzee_Palette_01_Anim_3, + NPC_ANIM_dayzee_Palette_01_Anim_3, + NPC_ANIM_dayzee_Palette_01_Anim_1, + NPC_ANIM_dayzee_Palette_01_Anim_1, + NPC_ANIM_dayzee_Palette_01_Anim_8, + NPC_ANIM_dayzee_Palette_01_Anim_8, + NPC_ANIM_dayzee_Palette_01_Anim_6, + NPC_ANIM_dayzee_Palette_01_Anim_7, + NPC_ANIM_dayzee_Palette_01_Anim_1, + NPC_ANIM_dayzee_Palette_01_Anim_1, + NPC_ANIM_dayzee_Palette_01_Anim_1, + NPC_ANIM_dayzee_Palette_01_Anim_1, + NPC_ANIM_dayzee_Palette_01_Anim_1, + NPC_ANIM_dayzee_Palette_01_Anim_1, }, .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, }; diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index b8689b1396..5223e7204a 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -527,22 +527,22 @@ StaticNpc N(npcGroup_8024398C) = { .maxCoinBonus = 3, .movement = { -350, 0, 40, 30, 0, -32767, 0, -350, 0, 40, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -564,22 +564,22 @@ StaticNpc N(npcGroup_80243B7C) = { .maxCoinBonus = 3, .movement = { 260, 0, 75, 30, 0, -32767, 0, 260, 0, 75, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -602,22 +602,22 @@ StaticNpc N(npcGroup_80243D6C) = { .maxCoinBonus = 4, .movement = { -50, 55, 90, 30, 0, -32767, 0, -50, 50, 90, 250, 0, 0, 1 }, .animations = { - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_4), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_4, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -641,22 +641,22 @@ StaticNpc N(npcGroup_80243F5C) = { .maxCoinBonus = 4, .movement = { -50, 55, 90, 100, 0, -32767, 0, -50, 50, 90, 250, 0, 0, 1 }, .animations = { - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_4), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_4, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index b53cb53784..a5c937f165 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -399,19 +399,19 @@ EvtSource N(802427EC) = SCRIPT({ sleep 10; await N(802415C4); sleep 10; - SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x0082)); + SpeakToPlayer(NPC_LILY, NPC_ANIM_lily_Palette_00_Anim_2, NPC_ANIM_lily_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x0082)); NpcFacePlayer(NPC_LILY, 1); - SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_3), NPC_ANIM(lily, Palette_00, Anim_7), 0, MESSAGE_ID(0x11, 0x0083)); - SetNpcAnimation(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_6)); + SpeakToPlayer(NPC_LILY, NPC_ANIM_lily_Palette_00_Anim_3, NPC_ANIM_lily_Palette_00_Anim_7, 0, MESSAGE_ID(0x11, 0x0083)); + SetNpcAnimation(NPC_LILY, NPC_ANIM_lily_Palette_00_Anim_6); sleep 20; - SetNpcAnimation(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_1)); + SetNpcAnimation(NPC_LILY, NPC_ANIM_lily_Palette_00_Anim_1); SI_VAR(0) = 90; SI_VAR(1) = 1; await N(80241CB4); AddKeyItem(ITEM_MIRACLE_WATER); - SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_3), NPC_ANIM(lily, Palette_00, Anim_7), 0, MESSAGE_ID(0x11, 0x0084)); - EndSpeech(0, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0); - SetNpcAnimation(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_1)); + SpeakToPlayer(NPC_LILY, NPC_ANIM_lily_Palette_00_Anim_3, NPC_ANIM_lily_Palette_00_Anim_7, 0, MESSAGE_ID(0x11, 0x0084)); + EndSpeech(0, NPC_ANIM_lily_Palette_00_Anim_2, NPC_ANIM_lily_Palette_00_Anim_1, 0); + SetNpcAnimation(NPC_LILY, NPC_ANIM_lily_Palette_00_Anim_1); ResetCam(0, 4.0); await N(802415E8); DisablePlayerPhysics(FALSE); @@ -563,7 +563,7 @@ EvtSource N(8024324C) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 20; - SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00C6)); + SpeakToPlayer(NPC_LILY, NPC_ANIM_lily_Palette_00_Anim_2, NPC_ANIM_lily_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00C6)); sleep 10; GotoMap("flo_12", 1); sleep 100; @@ -591,7 +591,7 @@ EvtSource N(8024339C) = SCRIPT({ CloseChoicePopup(); SetTimeFreezeMode(0); sleep 10; - SpeakToPlayer(NPC_LILY, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x0081)); + SpeakToPlayer(NPC_LILY, NPC_ANIM_lily_Palette_00_Anim_4, NPC_ANIM_lily_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x0081)); } else { GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5)); PlayerMoveTo(-17, -17, 20); @@ -662,8 +662,8 @@ EvtSource N(interact_802437C8) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 5, MESSAGE_ID(0x11, 0x0078)); - EndSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_9), NPC_ANIM(lily, Palette_00, Anim_5), 5); + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_4, NPC_ANIM_lily_Palette_00_Anim_8, 5, MESSAGE_ID(0x11, 0x0078)); + EndSpeech(-1, NPC_ANIM_lily_Palette_00_Anim_9, NPC_ANIM_lily_Palette_00_Anim_5, 5); } < STORY_CH6_GOT_WATER_STONE { if (SI_SAVE_FLAG(1375) == 0) { @@ -677,56 +677,56 @@ EvtSource N(interact_802437C8) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_4, NPC_ANIM_lily_Palette_00_Anim_8, 5, MESSAGE_ID(0x11, 0x0079)); NpcFacePlayer(NPC_SELF, 1); - SetNpcAnimation(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_1); PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_262, 0); ShowEmote(-1, EMOTE_EXCLAMATION, 0, 15, 1, 0, 0, 0, 0); sleep 15; - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_1), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_1, NPC_ANIM_lily_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x007A)); - EndSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_5), NPC_ANIM(lily, Palette_00, Anim_1), 0); + EndSpeech(-1, NPC_ANIM_lily_Palette_00_Anim_5, NPC_ANIM_lily_Palette_00_Anim_1, 0); GetPlayerTargetYaw(SI_VAR(0)); InterpNpcYaw(NPC_SELF, SI_VAR(0), 1); sleep 20; - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_2, NPC_ANIM_lily_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x007B)); NpcFacePlayer(NPC_SELF, 1); sleep 20; - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_2, NPC_ANIM_lily_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x007C)); ShowChoice(MESSAGE_ID(0x1E, 0x0011)); sleep 10; match SI_VAR(0) { == 0 { - ContinueSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_3), NPC_ANIM(lily, Palette_00, Anim_7), 0, MESSAGE_ID(0x11, 0x007D)); + ContinueSpeech(-1, NPC_ANIM_lily_Palette_00_Anim_3, NPC_ANIM_lily_Palette_00_Anim_7, 0, MESSAGE_ID(0x11, 0x007D)); } == 1 { - ContinueSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x007E)); + ContinueSpeech(-1, NPC_ANIM_lily_Palette_00_Anim_4, NPC_ANIM_lily_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x007E)); } } sleep 10; SI_SAVE_FLAG(1375) = 1; SetEnemyFlagBits(-1, 4194304, 0); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_4, NPC_ANIM_lily_Palette_00_Anim_8, 5, MESSAGE_ID(0x11, 0x007F)); } } < 49 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0080)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_2, NPC_ANIM_lily_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0080)); SI_SAVE_FLAG(1376) = 1; } < 53 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x0085)); - EndSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0); - EndSpeech(-1, NPC_ANIM(lily, Palette_00, Anim_4), NPC_ANIM(lily, Palette_00, Anim_8), 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_4, NPC_ANIM_lily_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x0085)); + EndSpeech(-1, NPC_ANIM_lily_Palette_00_Anim_2, NPC_ANIM_lily_Palette_00_Anim_1, 0); + EndSpeech(-1, NPC_ANIM_lily_Palette_00_Anim_4, NPC_ANIM_lily_Palette_00_Anim_8, 0); } < 60 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_3), NPC_ANIM(lily, Palette_00, Anim_7), 0, MESSAGE_ID(0x11, 0x0086)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_3, NPC_ANIM_lily_Palette_00_Anim_7, 0, MESSAGE_ID(0x11, 0x0086)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_2), NPC_ANIM(lily, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_2, NPC_ANIM_lily_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0087)); } } @@ -739,7 +739,7 @@ EvtSource N(init_80243D78) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_GOT_WATER_STONE { if (SI_SAVE_FLAG(1375) == 0) { - SetNpcAnimation(NPC_SELF, NPC_ANIM(lily, Palette_00, Anim_8)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_lily_Palette_00_Anim_8); InterpNpcYaw(NPC_SELF, 90, 1); SetEnemyFlagBits(-1, 4194304, 1); } @@ -764,22 +764,22 @@ StaticNpc N(npcGroup_80243E64) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), - NPC_ANIM(lily, Palette_00, Anim_1), + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, + NPC_ANIM_lily_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00DF), }; diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 4c2b53e564..52c497a66d 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -632,13 +632,13 @@ EvtSource N(80242240) = SCRIPT({ NpcFaceNpc(NPC_LAKITU1, NPC_LAKITU0, 1); spawn N(80241E4C); sleep 30; - SpeakToPlayer(NPC_LAKITU0, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0088)); + SpeakToPlayer(NPC_LAKITU0, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0088)); NpcFaceNpc(NPC_LAKITU1, NPC_LAKITU0, 1); - SpeakToPlayer(NPC_LAKITU1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x0089)); + SpeakToPlayer(NPC_LAKITU1, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0089)); InterpNpcYaw(NPC_LAKITU0, 0, 1); sleep 20; - SpeakToPlayer(NPC_LAKITU0, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x008A)); - SpeakToPlayer(NPC_LAKITU1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x008B)); + SpeakToPlayer(NPC_LAKITU0, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x008A)); + SpeakToPlayer(NPC_LAKITU1, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x008B)); SetCamType(0, 1, 0); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -763,22 +763,22 @@ StaticNpc N(npcGroup_80242CF4)[] = { .flowerDrops = STANDARD_FLOWER_DROPS(3), .maxCoinBonus = 2, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, }, { @@ -800,22 +800,22 @@ StaticNpc N(npcGroup_80242CF4)[] = { .flowerDrops = STANDARD_FLOWER_DROPS(3), .maxCoinBonus = 2, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, }, }; diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 9702fa1a7b..8e81ae8ca2 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -224,7 +224,7 @@ EvtSource N(802419F4) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 20; - SpeakToPlayer(NPC_ROSIE0, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x00C7)); + SpeakToPlayer(NPC_ROSIE0, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x00C7)); sleep 10; GotoMap("flo_03", 2); sleep 100; @@ -258,36 +258,36 @@ EvtSource N(interact_80241C8C) = SCRIPT({ GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 30; SetCamProperties(0, 4.0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 325, 19.0, -9.5); - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_3), NPC_ANIM(rosie, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x008C)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_3, NPC_ANIM_rosie_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x008C)); ShowChoice(MESSAGE_ID(0x1E, 0x0011)); sleep 10; match SI_VAR(0) { == 0 { - ContinueSpeech(-1, NPC_ANIM(rosie, Palette_00, Anim_3), NPC_ANIM(rosie, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x008D)); + ContinueSpeech(-1, NPC_ANIM_rosie_Palette_00_Anim_3, NPC_ANIM_rosie_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x008D)); } == 1 { - ContinueSpeech(-1, NPC_ANIM(rosie, Palette_00, Anim_3), NPC_ANIM(rosie, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x008E)); + ContinueSpeech(-1, NPC_ANIM_rosie_Palette_00_Anim_3, NPC_ANIM_rosie_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x008E)); } } SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_5); sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_2); MakeItemEntity(ITEM_WATER_STONE, -33, 14, 19, 1, 1380); sleep 10; match SI_SAVE_FLAG(1375) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_4), 5, MESSAGE_ID(0x11, 0x008F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_4, 5, MESSAGE_ID(0x11, 0x008F)); } == 1 { SetPlayerAnimation(0x60002); - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_4), 5, MESSAGE_ID(0x11, 0x008F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_4, 5, MESSAGE_ID(0x11, 0x008F)); SetPlayerAnimation(0x60005); - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0091)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0091)); SetPlayerAnimation(ANIM_PRAY); sleep 40; SetPlayerAnimation(ANIM_10002); - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0092)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0092)); SI_SAVE_FLAG(1379) = 1; } } @@ -298,24 +298,24 @@ EvtSource N(interact_80241C8C) = SCRIPT({ == 0 { if (SI_SAVE_FLAG(1375) == 1) { spawn N(80241BE4); - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_4), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_4, 5, MESSAGE_ID(0x11, 0x0090)); SetPlayerAnimation(0x60005); - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0091)); SetPlayerAnimation(ANIM_PRAY); sleep 40; SetPlayerAnimation(ANIM_10002); - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0092)); SI_SAVE_FLAG(1379) = 1; } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_4), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_4, 5, MESSAGE_ID(0x11, 0x0090)); } } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0093)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0093)); } } } @@ -329,15 +329,15 @@ EvtSource N(interact_80241C8C) = SCRIPT({ SI_VAR(0) += 30; SetCamProperties(0, 4.0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 325, 19.0, -9.5); } - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0094)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0094)); SI_VAR(0) = N(D_802419EC_CC281C); SI_VAR(1) = 0; await N(8024199C); match SI_VAR(0) { <= 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0093)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0093)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0095)); RemoveItemEntity(SI_VAR(7)); MakeItemEntity(ITEM_CRYSTAL_BERRY, -33, 14, 19, 1, 1380); @@ -346,7 +346,7 @@ EvtSource N(interact_80241C8C) = SCRIPT({ await N(802417F0); AddKeyItem(ITEM_WATER_STONE); sleep 10; - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0096)); SI_AREA_FLAG(22) = 1; SI_STORY_PROGRESS = STORY_CH6_GOT_WATER_STONE; @@ -356,17 +356,17 @@ EvtSource N(interact_80241C8C) = SCRIPT({ < 53 { match SI_AREA_FLAG(22) { == 0 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0097)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0097)); } == 1 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0096)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0096)); } } } < 60 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, 0x0098)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0098)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_4), NPC_ANIM(rosie, Palette_00, Anim_2), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_4, NPC_ANIM_rosie_Palette_00_Anim_2, 5, MESSAGE_ID(0x11, 0x0099)); } } @@ -385,19 +385,19 @@ EvtSource N(init_802423D0) = SCRIPT({ < STORY_CH6_GOT_CRYSTAL_BERRY { if (SI_SAVE_FLAG(1378) == 1) { SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_2); MakeItemEntity(ITEM_WATER_STONE, -33, 14, 19, 1, 1380); SI_VAR(10) = SI_VAR(0); } } < STORY_CH6_GOT_WATER_STONE { SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_2); MakeItemEntity(ITEM_WATER_STONE, -33, 14, 19, 1, 1380); SI_VAR(10) = SI_VAR(0); } else { SetNpcFlagBits(NPC_ROSIE1, ((NPC_FLAG_100)), FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(rosie, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_rosie_Palette_00_Anim_2); MakeItemEntity(ITEM_CRYSTAL_BERRY, -33, 14, 19, 1, 1380); SI_VAR(10) = SI_VAR(0); } @@ -416,22 +416,22 @@ StaticNpc N(npcGroup_802425D8)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E0), }, @@ -445,22 +445,22 @@ StaticNpc N(npcGroup_802425D8)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), - NPC_ANIM(rosie, Palette_00, Anim_1), + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, + NPC_ANIM_rosie_Palette_00_Anim_1, }, }, }; diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 7a5031857d..199338e17f 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -384,7 +384,7 @@ EvtSource N(802446AC) = SCRIPT({ EvtSource N(80244888) = SCRIPT({ spawn N(802446AC); - SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_C)); + SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_C); GetNpcPos(NPC_LAKILULU0, SI_VAR(1), SI_VAR(2), SI_VAR(3)); SI_VAR(1) += -5; SI_VAR(2) += 30; @@ -407,7 +407,7 @@ EvtSource N(80244888) = SCRIPT({ break loop; } } - SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_D)); + SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_D); GetPlayerPos(SI_VAR(1), SI_VAR(2), SI_VAR(3)); SI_VAR(1) += 5; SI_VAR(2) += 20; @@ -435,7 +435,7 @@ EvtSource N(80244888) = SCRIPT({ sleep 1; } SetPlayerAnimation(ANIM_STAND_STILL); - SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_1)); + SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_1); }); EvtSource N(idle_80244BF8) = SCRIPT({ @@ -456,7 +456,7 @@ EvtSource N(idle_80244BF8) = SCRIPT({ sleep 20; SetPlayerAnimation(ANIM_STAND_STILL); func_802CF56C(2); - SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_7)); + SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_7); spawn { N(func_802434D4_CC6CE4)(); } @@ -470,7 +470,7 @@ EvtSource N(idle_80244BF8) = SCRIPT({ goto 0; } kill SI_VAR(9); - SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_1)); + SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_1); PlayerFaceNpc(0, 0); sleep 15; GetNpcPos(NPC_WORLD_LAKILESTER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -485,10 +485,10 @@ EvtSource N(idle_80244BF8) = SCRIPT({ PlayerMoveTo(-75, 65, 10); PlayerFaceNpc(0, 0); } - SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00A1)); - SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_7)); + SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00A1)); + SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_7); sleep 10; - SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_1)); + SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_1); spawn { SetCamDistance(0, 1000); SetCamPitch(0, 17.0, -6.0); @@ -513,7 +513,7 @@ EvtSource N(80245014) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); NpcFaceNpc(NPC_LAKILULU0, NPC_WORLD_LAKILESTER, 1); - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00B4)); + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00B4)); NpcFaceNpc(NPC_PARTNER, NPC_LAKILULU0, 1); SetCamDistance(0, 600); SetCamPitch(0, 10.0, -8.0); @@ -550,7 +550,7 @@ EvtSource N(80245014) = SCRIPT({ DisablePartnerAI(0); InterpNpcYaw(NPC_PARTNER, 270, 0); sleep 5; - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00B5)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x00B5)); EnablePartnerAI(); PutPartnerAway(); ResetCam(0, 90.0); @@ -560,17 +560,17 @@ EvtSource N(80245014) = SCRIPT({ EvtSource N(80245444) = SCRIPT({ DisablePlayerInput(TRUE); sleep 30; - SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_A), NPC_ANIM(world_lakilester, Palette_00, Anim_4), 0, MESSAGE_ID(0x11, 0x00A2)); + SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_A, NPC_ANIM_world_lakilester_Palette_00_Anim_4, 0, MESSAGE_ID(0x11, 0x00A2)); SetNpcPos(NPC_LAKILULU0, -290, 120, 45); spawn { sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_lakilester, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_lakilester_Palette_00_Anim_1); SetPlayerAnimation(0x1002A); sleep 20; InterpPlayerYaw(270, 1); } - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00A3)); - SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_7)); + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x00A3)); + SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_7); UseSettingsFrom(0, 0, 0, 0); SetPanTarget(0, 0, 0, 0); SetCamDistance(0, 500); @@ -601,7 +601,7 @@ EvtSource N(80245444) = SCRIPT({ goto 0; } kill SI_VAR(9); - SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_9)); + SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_9); SetPlayerAnimation(ANIM_STAND_STILL); sleep 20; GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -613,7 +613,7 @@ EvtSource N(80245444) = SCRIPT({ SetCamSpeed(0, 90.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00A4)); + SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00A4)); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 40; SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -621,7 +621,7 @@ EvtSource N(80245444) = SCRIPT({ SetCamSpeed(0, 4.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_8), NPC_ANIM(lakilulu, Palette_00, Anim_8), 0, MESSAGE_ID(0x11, 0x00A5)); + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_8, NPC_ANIM_lakilulu_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x00A5)); GetNpcPos(NPC_LAKILULU0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 20; SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -629,9 +629,9 @@ EvtSource N(80245444) = SCRIPT({ SetCamSpeed(0, 4.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_B), NPC_ANIM(world_lakilester, Palette_00, Anim_3), 0, MESSAGE_ID(0x11, 0x00A6)); - SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_1)); - EndSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0); + SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_B, NPC_ANIM_world_lakilester_Palette_00_Anim_3, 0, MESSAGE_ID(0x11, 0x00A6)); + SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_1); + EndSpeech(0, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 40; SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -640,16 +640,16 @@ EvtSource N(80245444) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); 10: - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_A), NPC_ANIM(lakilulu, Palette_00, Anim_9), 0, MESSAGE_ID(0x11, 0x00A7)); + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_A, NPC_ANIM_lakilulu_Palette_00_Anim_9, 0, MESSAGE_ID(0x11, 0x00A7)); ShowChoice(MESSAGE_ID(0x1E, 0x0020)); if (SI_VAR(0) != 0) { await N(80244888); sleep 10; goto 10; } else { - ContinueSpeech(1, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, + ContinueSpeech(1, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00A9)); - SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_1)); + SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_1); SetPlayerAnimation(ANIM_NOD_YES); sleep 10; SetPlayerAnimation(ANIM_STAND_STILL); @@ -661,10 +661,9 @@ EvtSource N(80245444) = SCRIPT({ SetCamSpeed(0, 90.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_B), NPC_ANIM(world_lakilester, - Palette_00, Anim_3), 0, MESSAGE_ID(0x11, 0x00AA)); - SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_1)); - EndSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0); + SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_B, NPC_ANIM_world_lakilester_Palette_00_Anim_3, 0, MESSAGE_ID(0x11, 0x00AA)); + SetNpcAnimation(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_1); + EndSpeech(0, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += 40; SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -673,33 +672,32 @@ EvtSource N(80245444) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_B), NPC_ANIM(world_lakilester, - Palette_00, Anim_3), 0, MESSAGE_ID(0x11, 0x00AB)); + SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_B, NPC_ANIM_world_lakilester_Palette_00_Anim_3, 0, MESSAGE_ID(0x11, 0x00AB)); sleep 10; ShowChoice(MESSAGE_ID(0x1E, 0x0021)); match SI_VAR(0) { == -1 {} == 0 { - ContinueSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00AC)); + ContinueSpeech(0, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00AC)); } == 1 { - ContinueSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00AD)); + ContinueSpeech(0, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00AD)); } == 2 { - ContinueSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00AE)); + ContinueSpeech(0, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00AE)); } == 3 { - ContinueSpeech(0, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00AF)); + ContinueSpeech(0, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00AF)); } } } InterpNpcYaw(NPC_LAKILULU0, 90, 1); - SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_9)); - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_A), NPC_ANIM(lakilulu, Palette_00, Anim_9), 5, MESSAGE_ID(0x11, 0x00B0)); - SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00B1)); + SetNpcAnimation(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_9); + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_A, NPC_ANIM_lakilulu_Palette_00_Anim_9, 5, MESSAGE_ID(0x11, 0x00B0)); + SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00B1)); sleep 15; - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_A), NPC_ANIM(lakilulu, Palette_00, Anim_9), 5, MESSAGE_ID(0x11, 0x00B2)); - SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x00B3)); + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_A, NPC_ANIM_lakilulu_Palette_00_Anim_9, 5, MESSAGE_ID(0x11, 0x00B2)); + SpeakToPlayer(NPC_WORLD_LAKILESTER, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x00B3)); sleep 10; spawn { ResetCam(0, 90.0); @@ -726,7 +724,7 @@ EvtSource N(defeat_80246038) = SCRIPT({ GetBattleOutcome(SI_VAR(0)); match SI_VAR(0) { == 0 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(world_lakilester, Palette_00, Anim_4)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_world_lakilester_Palette_00_Anim_4); SetCamType(0, 6, 1); GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(1), SI_VAR(2)); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -749,15 +747,15 @@ EvtSource N(defeat_80246038) = SCRIPT({ EvtSource N(interact_802461C0) = SCRIPT({ if (SI_STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) { - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0032)); } else { GetCurrentPartnerID(SI_VAR(0)); if (SI_VAR(0) != 8) { - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0034)); } else { - SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM(lakilulu, Palette_00, Anim_4), NPC_ANIM(lakilulu, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_LAKILULU0, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0032)); } } @@ -784,7 +782,7 @@ EvtSource N(init_802462D0) = SCRIPT({ EvtSource N(init_80246370) = SCRIPT({ SetNpcPos(NPC_LAKILULU1, 0, -1000, 0); - SetNpcAnimation(NPC_LAKILULU1, NPC_ANIM(lakilulu, Palette_00, Anim_B)); + SetNpcAnimation(NPC_LAKILULU1, NPC_ANIM_lakilulu_Palette_00_Anim_B); }); EvtSource N(init_802463B0) = SCRIPT({ @@ -811,22 +809,22 @@ StaticNpc N(npcGroup_80246434) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), - NPC_ANIM(world_lakilester, Palette_00, Anim_1), + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, + NPC_ANIM_world_lakilester_Palette_00_Anim_1, }, }; @@ -841,22 +839,22 @@ StaticNpc N(npcGroup_80246624) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E2), }; @@ -872,22 +870,22 @@ StaticNpc N(npcGroup_80246814) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), - NPC_ANIM(lakilulu, Palette_00, Anim_1), + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, + NPC_ANIM_lakilulu_Palette_00_Anim_1, }, }; @@ -911,22 +909,22 @@ StaticNpc N(npcGroup_80246A04) = { .maxCoinBonus = 2, .movement = { 335, 90, 45, 30, 0, -32767, 0, 335, 90, 45, 250, 0, 0, 1 }, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -951,22 +949,22 @@ StaticNpc N(npcGroup_80246BF4) = { .maxCoinBonus = 2, .movement = { -320, 90, 0, 30, 0, -32767, 0, -320, 90, 0, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -984,22 +982,22 @@ StaticNpc N(npcGroup_80246DE4) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -1017,22 +1015,22 @@ StaticNpc N(npcGroup_80246FD4) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -1050,22 +1048,22 @@ StaticNpc N(npcGroup_802471C4) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -1083,22 +1081,22 @@ StaticNpc N(npcGroup_802473B4) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -1116,22 +1114,22 @@ StaticNpc N(npcGroup_802475A4) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -1149,22 +1147,22 @@ StaticNpc N(npcGroup_80247794) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index fca87b5332..579a160ad3 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -167,22 +167,22 @@ StaticNpc N(npcGroup_80244B20) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_E), - NPC_ANIM(bubulb, Palette_00, Anim_E), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), - NPC_ANIM(bubulb, Palette_00, Anim_2), + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_E, + NPC_ANIM_bubulb_Palette_00_Anim_E, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, + NPC_ANIM_bubulb_Palette_00_Anim_2, }, .tattle = MESSAGE_ID(0x1A, 0x00E3), }; @@ -205,22 +205,22 @@ StaticNpc N(npcGroup_80244D10) = { .maxCoinBonus = 4, .movement = { -175, 55, 15, 30, 0, -32767, 0, -175, 55, 15, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_4), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_4, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; diff --git a/src/world/area_flo/flo_15/CD06C0.c b/src/world/area_flo/flo_15/CD06C0.c index c495605336..f01f3cc4ba 100644 --- a/src/world/area_flo/flo_15/CD06C0.c +++ b/src/world/area_flo/flo_15/CD06C0.c @@ -124,8 +124,8 @@ EvtSource N(802404D8) = SCRIPT({ SetCamSpeed(0, 6.5); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_9), NPC_ANIM(sun, Palette_00, Anim_9), 517, MESSAGE_ID(0x11, 0x00C3)); - SetNpcAnimation(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_9)); + SpeakToPlayer(NPC_SUN0, NPC_ANIM_sun_Palette_00_Anim_9, NPC_ANIM_sun_Palette_00_Anim_9, 517, MESSAGE_ID(0x11, 0x00C3)); + SetNpcAnimation(NPC_SUN0, NPC_ANIM_sun_Palette_00_Anim_9); spawn { SetCamDistance(0, 1000); SetCamSpeed(0, 5.0); @@ -205,29 +205,29 @@ EvtSource N(8024094C) = SCRIPT({ EvtSource N(interact_80240B28) = SCRIPT({ match SI_STORY_PROGRESS { < STORY_CH6_SPOKE_WITH_THE_SUN { - SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009A)); + SpeakToPlayer(NPC_SUN0, NPC_ANIM_sun_Palette_00_Anim_7, NPC_ANIM_sun_Palette_00_Anim_1, 517, MESSAGE_ID(0x11, 0x009A)); SetPlayerAnimation(ANIM_THINKING); sleep 20; SetPlayerAnimation(ANIM_80007); sleep 20; SetPlayerAnimation(ANIM_10002); - SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009B)); + SpeakToPlayer(NPC_SUN0, NPC_ANIM_sun_Palette_00_Anim_7, NPC_ANIM_sun_Palette_00_Anim_1, 517, MESSAGE_ID(0x11, 0x009B)); SI_STORY_PROGRESS = STORY_CH6_SPOKE_WITH_THE_SUN; } < STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE { - SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, 0x009C)); + SpeakToPlayer(NPC_SUN0, NPC_ANIM_sun_Palette_00_Anim_7, NPC_ANIM_sun_Palette_00_Anim_1, 517, MESSAGE_ID(0x11, 0x009C)); } < STORY_CH6_STAR_SPIRIT_RESCUED { if (SI_SAVE_FLAG(1410) == 0) { - SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SUN0, NPC_ANIM_sun_Palette_00_Anim_7, NPC_ANIM_sun_Palette_00_Anim_1, 517, MESSAGE_ID(0x11, 0x009D)); SI_SAVE_FLAG(1410) = 1; } else { - SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SUN0, NPC_ANIM_sun_Palette_00_Anim_7, NPC_ANIM_sun_Palette_00_Anim_1, 517, MESSAGE_ID(0x11, 0x009E)); } } else { - SpeakToPlayer(NPC_SUN0, NPC_ANIM(sun, Palette_00, Anim_7), NPC_ANIM(sun, Palette_00, Anim_1), 517, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SUN0, NPC_ANIM_sun_Palette_00_Anim_7, NPC_ANIM_sun_Palette_00_Anim_1, 517, MESSAGE_ID(0x11, 0x009F)); } } @@ -251,7 +251,7 @@ EvtSource N(init_80240CD0) = SCRIPT({ EvtSource N(init_80240DB4) = SCRIPT({ EnableNpcShadow(NPC_SUN1, FALSE); - SetNpcAnimation(NPC_SUN1, NPC_ANIM(sun, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SUN1, NPC_ANIM_sun_Palette_00_Anim_2); SetNpcPaletteSwapMode(10, 3); SetNpcPaletteSwapMode(11, 3); SetNpcPaletteSwapping(10, 0, 1, 5, 5, 13, 5, 0, 0); @@ -276,22 +276,22 @@ StaticNpc N(npcGroup_80240EE0)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E1), }, @@ -306,22 +306,22 @@ StaticNpc N(npcGroup_80240EE0)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), - NPC_ANIM(sun, Palette_00, Anim_1), + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, + NPC_ANIM_sun_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E1), }, diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index e5cce127f5..fb5d4c7639 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -57,22 +57,22 @@ StaticNpc N(npcGroup_802440F4) = { .maxCoinBonus = 2, .movement = { 440, 145, 15, 30, 0, -32767, 0, 485, 145, 55, 225, 95, 1 }, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -93,22 +93,22 @@ StaticNpc N(npcGroup_802442E4) = { .maxCoinBonus = 2, .movement = { 600, 145, 15, 30, 0, -32767, 0, 485, 145, 55, 225, 95, 1 }, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index c059e4b040..c0fc594468 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -402,22 +402,22 @@ StaticNpc N(npcGroup_80244688) = { .maxCoinBonus = 2, .movement = { -185, 90, 10, 30, 0, -32767, 0, -185, 90, 0, 85, 120, 1, 1 }, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -441,22 +441,22 @@ StaticNpc N(npcGroup_80244878) = { .maxCoinBonus = 2, .movement = { 200, 90, -25, 30, 0, -32767, 0, 200, 90, 0, 85, 120, 1, 1 }, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -473,22 +473,22 @@ StaticNpc N(npcGroup_80244A68) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -505,22 +505,22 @@ StaticNpc N(npcGroup_80244C58) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -537,22 +537,22 @@ StaticNpc N(npcGroup_80244E48) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -569,22 +569,22 @@ StaticNpc N(npcGroup_80245038) = { .maxCoinBonus = 1, .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index 65e0eb5a79..45441b0d94 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -989,7 +989,7 @@ EvtSource N(80244058) = SCRIPT({ } PlayerFaceNpc(-4, 0); NpcFacePlayer(NPC_PARTNER, 0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00C9)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x00C9)); SetPlayerAnimation(ANIM_NOD_YES); sleep 10; SetPlayerAnimation(ANIM_STAND_STILL); @@ -1092,7 +1092,7 @@ EvtSource N(80244774) = SCRIPT({ SetNpcPos(NPC_PARTNER, 65, SI_VAR(1), 80); SetNpcYaw(NPC_PARTNER, 270); AdjustCam(0, 8.0, 0, 450, 17.0, -6.0); - SpeakToPlayer(NPC_FLYING_MAGIKOOPA, NPC_ANIM(flying_magikoopa, Palette_02, Anim_9), NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), 0, MESSAGE_ID(0x11, 0x00BB)); + SpeakToPlayer(NPC_FLYING_MAGIKOOPA, NPC_ANIM_flying_magikoopa_Palette_02_Anim_9, NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, 0, MESSAGE_ID(0x11, 0x00BB)); sleep 20; spawn N(80244270); sleep 80; @@ -1109,7 +1109,7 @@ EvtSource N(80244774) = SCRIPT({ } NpcFacePlayer(NPC_PARTNER, 0); DisablePartnerAI(0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00C1)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x00C1)); EnablePartnerAI(); sleep 20; PutPartnerAway(); @@ -1131,7 +1131,7 @@ EvtSource N(80244774) = SCRIPT({ PlayerFaceNpc(-4, 0); NpcFacePlayer(NPC_PARTNER, 0); DisablePartnerAI(0); - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_lakilester, Palette_00, Anim_9), NPC_ANIM(world_lakilester, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, 0x00C2)); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_lakilester_Palette_00_Anim_9, NPC_ANIM_world_lakilester_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x00C2)); EnablePartnerAI(); PutPartnerAway(); ResetCam(0, 4.0); @@ -1206,19 +1206,19 @@ EvtSource N(80244E2C) = SCRIPT({ EvtSource N(80244ED0) = SCRIPT({ match SI_MAP_VAR(10) { == 0 { - SpeakToPlayer(NPC_MAGIKOOPA, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 16, MESSAGE_ID(0x11, 0x00B9)); + SpeakToPlayer(NPC_MAGIKOOPA, NPC_ANIM_magikoopa_Palette_02_Anim_2, NPC_ANIM_magikoopa_Palette_02_Anim_1, 16, MESSAGE_ID(0x11, 0x00B9)); InterpNpcYaw(NPC_MAGIKOOPA, 90, 0); } == 1 { - SpeakToPlayer(NPC_LAKITU0, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00BF)); + SpeakToPlayer(NPC_LAKITU0, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 16, MESSAGE_ID(0x11, 0x00BF)); InterpNpcYaw(NPC_LAKITU0, 90, 0); } == 2 { - SpeakToPlayer(NPC_LAKITU1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00BF)); + SpeakToPlayer(NPC_LAKITU1, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 16, MESSAGE_ID(0x11, 0x00BF)); InterpNpcYaw(NPC_LAKITU1, 270, 0); } == 3 { - SpeakToPlayer(NPC_LAKITU2, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00BF)); + SpeakToPlayer(NPC_LAKITU2, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 16, MESSAGE_ID(0x11, 0x00BF)); InterpNpcYaw(NPC_LAKITU2, 270, 0); } } @@ -1227,16 +1227,16 @@ EvtSource N(80244ED0) = SCRIPT({ EvtSource N(80245004) = SCRIPT({ match SI_MAP_VAR(10) { == 0 { - SpeakToPlayer(NPC_MAGIKOOPA, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 16, MESSAGE_ID(0x11, 0x00BA)); + SpeakToPlayer(NPC_MAGIKOOPA, NPC_ANIM_magikoopa_Palette_02_Anim_2, NPC_ANIM_magikoopa_Palette_02_Anim_1, 16, MESSAGE_ID(0x11, 0x00BA)); } == 1 { - SpeakToPlayer(NPC_LAKITU0, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00C0)); + SpeakToPlayer(NPC_LAKITU0, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 16, MESSAGE_ID(0x11, 0x00C0)); } == 2 { - SpeakToPlayer(NPC_LAKITU1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00C0)); + SpeakToPlayer(NPC_LAKITU1, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 16, MESSAGE_ID(0x11, 0x00C0)); } == 3 { - SpeakToPlayer(NPC_LAKITU2, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 16, MESSAGE_ID(0x11, 0x00C0)); + SpeakToPlayer(NPC_LAKITU2, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 16, MESSAGE_ID(0x11, 0x00C0)); } } SetNpcVar(3, 0, 1); @@ -1383,10 +1383,10 @@ EvtSource N(interact_802457D4) = SCRIPT({ == 0 { GetSelfNpcID(SI_VAR(0)); if (SI_VAR(0) == 3) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 5, + SpeakToPlayer(NPC_SELF, NPC_ANIM_magikoopa_Palette_02_Anim_2, NPC_ANIM_magikoopa_Palette_02_Anim_1, 5, MESSAGE_ID(0x11, 0x00B6)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x00BC)); } SI_AREA_VAR(6) += 1; @@ -1394,10 +1394,10 @@ EvtSource N(interact_802457D4) = SCRIPT({ == 1 { GetSelfNpcID(SI_VAR(0)); if (SI_VAR(0) == 3) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 5, + SpeakToPlayer(NPC_SELF, NPC_ANIM_magikoopa_Palette_02_Anim_2, NPC_ANIM_magikoopa_Palette_02_Anim_1, 5, MESSAGE_ID(0x11, 0x00B7)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x00BD)); } SI_AREA_VAR(6) += 1; @@ -1406,17 +1406,17 @@ EvtSource N(interact_802457D4) = SCRIPT({ AdjustCam(0, 8.0, 0, 300, 19.0, -9.0); GetSelfNpcID(SI_VAR(0)); if (SI_VAR(0) == 3) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 5, + SpeakToPlayer(NPC_SELF, NPC_ANIM_magikoopa_Palette_02_Anim_2, NPC_ANIM_magikoopa_Palette_02_Anim_1, 5, MESSAGE_ID(0x11, 0x00B8)); NpcFacePlayer(NPC_SELF, 0); sleep 15; - EndSpeech(-1, NPC_ANIM(magikoopa, Palette_02, Anim_2), NPC_ANIM(magikoopa, Palette_02, Anim_1), 0); + EndSpeech(-1, NPC_ANIM_magikoopa_Palette_02_Anim_2, NPC_ANIM_magikoopa_Palette_02_Anim_1, 0); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 5, MESSAGE_ID(0x11, + SpeakToPlayer(NPC_SELF, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 5, MESSAGE_ID(0x11, 0x00BE)); NpcFacePlayer(NPC_SELF, 0); sleep 15; - EndSpeech(-1, NPC_ANIM(lakitu, Palette_00, Anim_16), NPC_ANIM(lakitu, Palette_00, Anim_1), 0); + EndSpeech(-1, NPC_ANIM_lakitu_Palette_00_Anim_16, NPC_ANIM_lakitu_Palette_00_Anim_1, 0); } SetNpcVar(3, 0, 1); sleep 5; @@ -1494,22 +1494,22 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flowerDrops = STANDARD_FLOWER_DROPS(3), .maxCoinBonus = 2, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E4), }, @@ -1532,22 +1532,22 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flowerDrops = STANDARD_FLOWER_DROPS(3), .maxCoinBonus = 2, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E4), }, @@ -1570,22 +1570,22 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flowerDrops = STANDARD_FLOWER_DROPS(3), .maxCoinBonus = 2, .animations = { - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_2), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_4), - NPC_ANIM(lakitu, Palette_00, Anim_3), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), - NPC_ANIM(lakitu, Palette_00, Anim_1), + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_2, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_4, + NPC_ANIM_lakitu_Palette_00_Anim_3, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, + NPC_ANIM_lakitu_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E4), }, @@ -1608,22 +1608,22 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flowerDrops = STANDARD_FLOWER_DROPS(3), .maxCoinBonus = 2, .animations = { - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_4), - NPC_ANIM(magikoopa, Palette_02, Anim_4), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), - NPC_ANIM(magikoopa, Palette_02, Anim_1), + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_4, + NPC_ANIM_magikoopa_Palette_02_Anim_4, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, + NPC_ANIM_magikoopa_Palette_02_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E4), }, @@ -1646,22 +1646,22 @@ StaticNpc N(npcGroup_80245CEC)[] = { .flowerDrops = STANDARD_FLOWER_DROPS(3), .maxCoinBonus = 2, .animations = { - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_4), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_4), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), - NPC_ANIM(flying_magikoopa, Palette_02, Anim_1), + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_4, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_4, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, + NPC_ANIM_flying_magikoopa_Palette_02_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00E4), }, diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 2479f5cfe8..64a9e4f6d8 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -880,9 +880,9 @@ EvtSource N(80242D34) = SCRIPT({ }); EvtSource N(80243010) = SCRIPT({ - SetNpcAnimation(NPC_HUFF_N_PUFF1, NPC_ANIM(huff_n_puff, Palette_00, Anim_4)); - SetNpcAnimation(NPC_HUFF_N_PUFF0, NPC_ANIM(huff_n_puff, Palette_00, Anim_5)); - SetNpcAnimation(NPC_HUFF_N_PUFF2, NPC_ANIM(huff_n_puff, Palette_00, Anim_6)); + SetNpcAnimation(NPC_HUFF_N_PUFF1, NPC_ANIM_huff_n_puff_Palette_00_Anim_4); + SetNpcAnimation(NPC_HUFF_N_PUFF0, NPC_ANIM_huff_n_puff_Palette_00_Anim_5); + SetNpcAnimation(NPC_HUFF_N_PUFF2, NPC_ANIM_huff_n_puff_Palette_00_Anim_6); GetNpcPos(NPC_HUFF_N_PUFF0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += -15; @@ -893,7 +893,7 @@ EvtSource N(80243010) = SCRIPT({ SetCamSpeed(0, 90.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_HUFF_N_PUFF0, NPC_ANIM(huff_n_puff, Palette_00, Anim_30), NPC_ANIM(huff_n_puff, Palette_00, Anim_5), 256, -30, 30, MESSAGE_ID(0x11, 0x00CE)); + SpeakToPlayer(NPC_HUFF_N_PUFF0, NPC_ANIM_huff_n_puff_Palette_00_Anim_30, NPC_ANIM_huff_n_puff_Palette_00_Anim_5, 256, -30, 30, MESSAGE_ID(0x11, 0x00CE)); FadeOutMusic(0, 1500); SI_MAP_VAR(13) = 2; GetNpcPos(NPC_HUFF_N_PUFF0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -970,7 +970,7 @@ EvtSource N(init_802435E4) = SCRIPT({ SetEnemyFlagBits(-1, 4194304, 1); BindNpcIdle(NPC_SELF, N(idle_80243428)); BindNpcDefeat(NPC_SELF, N(defeat_802434D8)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(huff_n_puff, Palette_00, Anim_2)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_huff_n_puff_Palette_00_Anim_2); } else { SetNpcPos(NPC_SELF, 0, -1000, 0); } @@ -980,7 +980,7 @@ EvtSource N(init_80243684) = SCRIPT({ if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) { SetEnemyFlagBits(-1, 4194304, 1); BindNpcDefeat(NPC_SELF, N(defeat_802435D4)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(huff_n_puff, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_huff_n_puff_Palette_00_Anim_1); spawn N(80242290); } else { SetNpcPos(NPC_SELF, 0, -1000, 0); @@ -991,26 +991,26 @@ EvtSource N(init_8024371C) = SCRIPT({ if (SI_STORY_PROGRESS < STORY_CH6_DEFEATED_HUFF_N_PUFF) { SetEnemyFlagBits(-1, 4194304, 1); BindNpcDefeat(NPC_SELF, N(defeat_802435D4)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(huff_n_puff, Palette_00, Anim_19)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_huff_n_puff_Palette_00_Anim_19); } else { SetNpcPos(NPC_SELF, 0, -1000, 0); } }); EvtSource N(init_802437A8) = SCRIPT({ - SetNpcAnimation(NPC_SELF, NPC_ANIM(tuff_puff, Palette_00, Anim_B)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_tuff_puff_Palette_00_Anim_B); SetNpcJumpscale(NPC_SELF, 0); }); -NpcAnimID N(extraAnimationList_802437E0)[] = { - NPC_ANIM(huff_n_puff, Palette_00, Anim_0), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_2), - NPC_ANIM(huff_n_puff, Palette_00, Anim_4), - NPC_ANIM(huff_n_puff, Palette_00, Anim_5), - NPC_ANIM(huff_n_puff, Palette_00, Anim_31), - NPC_ANIM(huff_n_puff, Palette_00, Anim_19), - NPC_ANIM(huff_n_puff, Palette_00, Anim_2D), +s32 N(extraAnimationList_802437E0)[] = { + NPC_ANIM_huff_n_puff_Palette_00_Anim_0, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_2, + NPC_ANIM_huff_n_puff_Palette_00_Anim_4, + NPC_ANIM_huff_n_puff_Palette_00_Anim_5, + NPC_ANIM_huff_n_puff_Palette_00_Anim_31, + NPC_ANIM_huff_n_puff_Palette_00_Anim_19, + NPC_ANIM_huff_n_puff_Palette_00_Anim_2D, ANIM_END, }; @@ -1026,22 +1026,22 @@ StaticNpc N(npcGroup_80243804)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_802437E0), }, @@ -1056,22 +1056,22 @@ StaticNpc N(npcGroup_80243804)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_802437E0), }, @@ -1086,29 +1086,29 @@ StaticNpc N(npcGroup_80243804)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), - NPC_ANIM(huff_n_puff, Palette_00, Anim_1), + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, + NPC_ANIM_huff_n_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_802437E0), }, }; -NpcAnimID N(extraAnimationList_80243DD4)[] = { - NPC_ANIM(tuff_puff, Palette_00, Anim_B), +s32 N(extraAnimationList_80243DD4)[] = { + NPC_ANIM_tuff_puff_Palette_00_Anim_B, ANIM_END, }; @@ -1124,22 +1124,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1154,22 +1154,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1184,22 +1184,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1214,22 +1214,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1244,22 +1244,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1274,22 +1274,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1304,22 +1304,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1334,22 +1334,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1364,22 +1364,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1394,22 +1394,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1424,22 +1424,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1454,22 +1454,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1484,22 +1484,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1514,22 +1514,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, @@ -1544,22 +1544,22 @@ StaticNpc N(npcGroup_80243DDC)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .extraAnimations = N(extraAnimationList_80243DD4), }, diff --git a/src/world/area_flo/flo_22/CEC240.c b/src/world/area_flo/flo_22/CEC240.c index d013dbf50f..e5e3d02453 100644 --- a/src/world/area_flo/flo_22/CEC240.c +++ b/src/world/area_flo/flo_22/CEC240.c @@ -97,7 +97,7 @@ EvtSource N(defeat_802405E4) = SCRIPT({ SetNpcPos(NPC_SELF, 0, -1000, 0); } == 2 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(bzzap, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_bzzap_Palette_00_Anim_1); SetNpcPos(NPC_SELF, 30, 60, 0); sleep 10; SetNpcJumpscale(NPC_SELF, 0); @@ -142,14 +142,14 @@ EvtSource N(defeat_80240810) = SCRIPT({ SetNpcPos(NPC_SELF, 0, -1000, 0); } == 3 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(dayzee, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_dayzee_Palette_00_Anim_1); sleep 10; SetNpcJumpscale(NPC_SELF, 2.0); NpcJump0(NPC_SELF, 30, 0, 0, 15); SetNpcPos(NPC_SELF, 0, -1000, 0); } == 2 { - SetNpcAnimation(NPC_SELF, NPC_ANIM(dayzee, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_dayzee_Palette_00_Anim_1); sleep 10; SetNpcJumpscale(NPC_SELF, 2.0); NpcJump0(NPC_SELF, 30, 0, 0, 15); @@ -174,22 +174,22 @@ StaticNpc N(npcGroup_80240A04) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_4), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_4, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, }, }; @@ -210,22 +210,22 @@ StaticNpc N(npcGroup_80240BF4) = { .flowerDrops = STANDARD_FLOWER_DROPS(4), .maxCoinBonus = 3, .animations = { - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_2), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_3), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_8), - NPC_ANIM(dayzee, Palette_00, Anim_6), - NPC_ANIM(dayzee, Palette_00, Anim_7), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), - NPC_ANIM(dayzee, Palette_00, Anim_1), + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_2, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_3, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_8, + NPC_ANIM_dayzee_Palette_00_Anim_6, + NPC_ANIM_dayzee_Palette_00_Anim_7, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, + NPC_ANIM_dayzee_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -334,17 +334,17 @@ EvtSource N(80241028) = SCRIPT({ NpcFacePlayer(NPC_BZZAP, 0); sleep 1; SetNpcPos(NPC_BZZAP, 30, 0, 0); - SetNpcAnimation(NPC_BZZAP, NPC_ANIM(bzzap, Palette_00, Anim_1)); + SetNpcAnimation(NPC_BZZAP, NPC_ANIM_bzzap_Palette_00_Anim_1); NpcJump0(NPC_BZZAP, 30, 60, 0, 20); sleep 10; - SetNpcAnimation(NPC_BZZAP, NPC_ANIM(bzzap, Palette_00, Anim_4)); + SetNpcAnimation(NPC_BZZAP, NPC_ANIM_bzzap_Palette_00_Anim_4); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(1) += 20; NpcJump0(NPC_BZZAP, SI_VAR(0), SI_VAR(1), SI_VAR(2), 5); SI_MAP_VAR(10) = 1; } else { SetNpcPos(NPC_DAYZEE, 30, 0, 0); - SetNpcAnimation(NPC_DAYZEE, NPC_ANIM(dayzee, Palette_00, Anim_E)); + SetNpcAnimation(NPC_DAYZEE, NPC_ANIM_dayzee_Palette_00_Anim_E); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(1) += 20; SetNpcJumpscale(NPC_DAYZEE, 2.0); diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index 3cdb2c1052..96b9b5d7ef 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -198,7 +198,7 @@ EvtSource N(interact_80241564) = SCRIPT({ SetCamSpeed(0, 4.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_2), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_2, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0049)); SetPlayerAnimation(ANIM_THINKING); N(func_80240C9C_CEEEFC)(); @@ -208,22 +208,22 @@ EvtSource N(interact_80241564) = SCRIPT({ match SI_VAR(0) { <= 0 { SetPlayerAnimation(ANIM_STAND_STILL); - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_2), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004A)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_2, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x004A)); } else { SI_VAR(8) = SI_VAR(0); N(func_80240C2C_CEEE8C)(SI_VAR(0)); MakeItemEntity(SI_VAR(8), 385, 20, -34, 1, 0); SI_VAR(7) = SI_VAR(0); PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_3)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_3); sleep 20; RemoveItemEntity(SI_VAR(7)); match SI_VAR(8) { == 158 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_4), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004D)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_4, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x004D)); PlaySoundAtNpc(NPC_SELF, 0x21C, 0); - EndSpeech(-1, NPC_ANIM(gate_flower, Palette_00, Anim_9), NPC_ANIM(gate_flower, Palette_00, Anim_8), 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_7)); + EndSpeech(-1, NPC_ANIM_gate_flower_Palette_00_Anim_9, NPC_ANIM_gate_flower_Palette_00_Anim_8, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_7); PlaySoundAtCollider(13, 457, 0); ModifyColliderFlags(0, 13, 0x7FFFFE00); MakeLerp(0, 100, 30, 1); @@ -244,20 +244,20 @@ EvtSource N(interact_80241564) = SCRIPT({ break loop; } } - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_5); SI_SAVE_FLAG(1365) = 1; } == 159 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_4), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004C)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_1)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_4, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x004C)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_1); } == 160 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_4), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, MESSAGE_ID(0x11, 0x004C)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_1)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_4, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x004C)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_1); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_4), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_4, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x004B)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_6)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_6); PlaySoundAtNpc(NPC_SELF, 0x2096, 0); MakeItemEntity(SI_VAR(8), 375, 20, 0, 1, 0); SI_VAR(7) = SI_VAR(0); @@ -302,10 +302,10 @@ EvtSource N(interact_80241564) = SCRIPT({ } } } - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_1); RemoveItemEntity(SI_VAR(7)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_1)); - EndSpeech(-1, NPC_ANIM(gate_flower, Palette_00, Anim_2), NPC_ANIM(gate_flower, Palette_00, Anim_1), 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_1); + EndSpeech(-1, NPC_ANIM_gate_flower_Palette_00_Anim_2, NPC_ANIM_gate_flower_Palette_00_Anim_1, 0); } } } @@ -316,10 +316,10 @@ EvtSource N(interact_80241564) = SCRIPT({ sleep 10; } else { if (SI_STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_9), NPC_ANIM(gate_flower, Palette_00, Anim_8), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_9, NPC_ANIM_gate_flower_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x004E)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_9), NPC_ANIM(gate_flower, Palette_00, Anim_8), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_9, NPC_ANIM_gate_flower_Palette_00_Anim_8, 0, MESSAGE_ID(0x11, 0x004F)); } } @@ -330,7 +330,7 @@ EvtSource N(interact_80241564) = SCRIPT({ EvtSource N(init_80241E70) = SCRIPT({ BindNpcInteract(NPC_SELF, N(interact_80241564)); if (SI_SAVE_FLAG(1365) == 1) { - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_00, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_5); ModifyColliderFlags(0, 13, 0x7FFFFE00); RotateModel(59, 50, 0, -1, 0); RotateModel(60, 50, 0, -1, 0); @@ -352,22 +352,22 @@ StaticNpc N(npcGroup_80241F98) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), - NPC_ANIM(gate_flower, Palette_00, Anim_1), + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, + NPC_ANIM_gate_flower_Palette_00_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00DC), }; @@ -384,22 +384,22 @@ StaticNpc N(npcGroup_80242188) = { .maxCoinBonus = 1, .movement = { 80, 0, 0, 30, 0, -32767, 0, 80, 0, 0, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, }; @@ -415,22 +415,22 @@ StaticNpc N(npcGroup_80242378) = { .maxCoinBonus = 1, .movement = { -320, 0, 0, 30, 0, -32767, 0, -320, 0, 0, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_3), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_4), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_9), - NPC_ANIM(spiny, Palette_00, Anim_6), - NPC_ANIM(spiny, Palette_00, Anim_8), - NPC_ANIM(spiny, Palette_00, Anim_7), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), - NPC_ANIM(spiny, Palette_00, Anim_1), + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_3, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_4, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_9, + NPC_ANIM_spiny_Palette_00_Anim_6, + NPC_ANIM_spiny_Palette_00_Anim_8, + NPC_ANIM_spiny_Palette_00_Anim_7, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, + NPC_ANIM_spiny_Palette_00_Anim_1, }, }; diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index ba8a826e01..5c523e531e 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -234,7 +234,7 @@ EvtSource N(interact_80242C58) = SCRIPT({ SetCamSpeed(0, 4.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_2), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_2, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0, MESSAGE_ID(0x11, 0x003B)); SetPlayerAnimation(ANIM_THINKING); N(func_80241FB4_CF4B84)(); @@ -244,22 +244,22 @@ EvtSource N(interact_80242C58) = SCRIPT({ match SI_VAR(0) { <= 0 { SetPlayerAnimation(ANIM_STAND_STILL); - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_2), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003C)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_2, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0, MESSAGE_ID(0x11, 0x003C)); } else { SI_VAR(8) = SI_VAR(0); N(func_80241F44_CF4B14)(SI_VAR(0)); MakeItemEntity(SI_VAR(8), 505, 20, -24, 1, 0); SI_VAR(7) = SI_VAR(0); PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2095, 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_3)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_3); sleep 20; RemoveItemEntity(SI_VAR(7)); match SI_VAR(8) { == 159 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_4), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003F)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_4, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0, MESSAGE_ID(0x11, 0x003F)); PlaySoundAtNpc(NPC_SELF, 0x21C, 0); - EndSpeech(-1, NPC_ANIM(gate_flower, Palette_01, Anim_9), NPC_ANIM(gate_flower, Palette_01, Anim_8), 0); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_7)); + EndSpeech(-1, NPC_ANIM_gate_flower_Palette_01_Anim_9, NPC_ANIM_gate_flower_Palette_01_Anim_8, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_7); PlaySoundAtCollider(14, 457, 0); ModifyColliderFlags(0, 14, 0x7FFFFE00); MakeLerp(0, 100, 30, 1); @@ -280,20 +280,20 @@ EvtSource N(interact_80242C58) = SCRIPT({ break loop; } } - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_5); SI_SAVE_FLAG(1363) = 1; } == 160 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_4), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003E)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_1)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_4, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0, MESSAGE_ID(0x11, 0x003E)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_1); } == 158 { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_4), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, MESSAGE_ID(0x11, 0x003E)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_1)); + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_4, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0, MESSAGE_ID(0x11, 0x003E)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_1); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_4), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_4, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0, MESSAGE_ID(0x11, 0x003D)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_6)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_6); PlaySoundAtNpc(NPC_SELF, 0x2096, 0); MakeItemEntity(SI_VAR(8), -125, 20, 0, 1, 0); SI_VAR(7) = SI_VAR(0); @@ -338,10 +338,10 @@ EvtSource N(interact_80242C58) = SCRIPT({ } } } - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_1); RemoveItemEntity(SI_VAR(7)); - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_1)); - EndSpeech(-1, NPC_ANIM(gate_flower, Palette_01, Anim_2), NPC_ANIM(gate_flower, Palette_01, Anim_1), 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_1); + EndSpeech(-1, NPC_ANIM_gate_flower_Palette_01_Anim_2, NPC_ANIM_gate_flower_Palette_01_Anim_1, 0); } } } @@ -352,10 +352,10 @@ EvtSource N(interact_80242C58) = SCRIPT({ sleep 10; } else { if (SI_STORY_PROGRESS < STORY_CH6_STAR_SPIRIT_RESCUED) { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_9), NPC_ANIM(gate_flower, Palette_01, Anim_8), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_9, NPC_ANIM_gate_flower_Palette_01_Anim_8, 0, MESSAGE_ID(0x11, 0x0040)); } else { - SpeakToPlayer(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_9), NPC_ANIM(gate_flower, Palette_01, Anim_8), 0, + SpeakToPlayer(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_9, NPC_ANIM_gate_flower_Palette_01_Anim_8, 0, MESSAGE_ID(0x11, 0x0041)); } } @@ -366,7 +366,7 @@ EvtSource N(interact_80242C58) = SCRIPT({ EvtSource N(init_80243564) = SCRIPT({ BindNpcInteract(NPC_SELF, N(interact_80242C58)); if (SI_SAVE_FLAG(1363) == 1) { - SetNpcAnimation(NPC_SELF, NPC_ANIM(gate_flower, Palette_01, Anim_5)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_5); ModifyColliderFlags(0, 14, 0x7FFFFE00); RotateModel(86, 50, 0, -1, 0); RotateModel(87, 50, 0, -1, 0); @@ -388,22 +388,22 @@ StaticNpc N(npcGroup_8024368C) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), - NPC_ANIM(gate_flower, Palette_01, Anim_1), + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, + NPC_ANIM_gate_flower_Palette_01_Anim_1, }, .tattle = MESSAGE_ID(0x1A, 0x00DA), }; @@ -424,22 +424,22 @@ StaticNpc N(npcGroup_8024387C) = { .maxCoinBonus = 2, .movement = { -200, 45, 0, 30, 0, -32767, 0, -200, 45, 0, 200 }, .animations = { - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_0), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_6), - NPC_ANIM(tuff_puff, Palette_00, Anim_5), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), - NPC_ANIM(tuff_puff, Palette_00, Anim_1), + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_0, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_6, + NPC_ANIM_tuff_puff_Palette_00_Anim_5, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, + NPC_ANIM_tuff_puff_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; @@ -462,22 +462,22 @@ StaticNpc N(npcGroup_80243A6C) = { .maxCoinBonus = 4, .movement = { 150, 50, 0, 30, 0, -32767, 0, 150, 50, 0, 200, 0, 0, 1 }, .animations = { - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_3), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_6), - NPC_ANIM(bzzap, Palette_00, Anim_4), - NPC_ANIM(bzzap, Palette_00, Anim_2), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), - NPC_ANIM(bzzap, Palette_00, Anim_1), + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_3, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_6, + NPC_ANIM_bzzap_Palette_00_Anim_4, + NPC_ANIM_bzzap_Palette_00_Anim_2, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, + NPC_ANIM_bzzap_Palette_00_Anim_1, }, .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index e77d42b544..8960f7811f 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -66,7 +66,7 @@ EvtSource N(8024097C) = SCRIPT({ EnableNpcAI(0, 0); DisablePlayerInput(TRUE); SetNpcSpeed(NPC_GOOMPA, 4.0); - SetNpcAnimation(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_3)); + SetNpcAnimation(NPC_GOOMPA, NPC_ANIM_goompa_Palette_00_Anim_3); N(func_802401B0_8C8140)(); GetAngleToPlayer(0, SI_VAR(2)); loop SI_VAR(1) { @@ -104,7 +104,7 @@ EvtSource N(npcAI_80240B50) = SCRIPT({ sleep 15; NpcFacePlayer(NPC_SELF, 5); sleep 10; - SpeakToPlayer(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A6)); + SpeakToPlayer(NPC_GOOMPA, NPC_ANIM_goompa_Palette_00_Anim_8, NPC_ANIM_goompa_Palette_00_Anim_1, 0, MESSAGE_ID(0x0B, 0x00A6)); UseSettingsFrom(0, -220, 20, -72); SetPanTarget(0, -20, 0, 68); SetCamPitch(0, 15.0, -8.5); @@ -118,16 +118,16 @@ EvtSource N(npcAI_80240B50) = SCRIPT({ } GetNpcPos(NPC_GOOMPA, SI_VAR(7), SI_VAR(8), SI_VAR(9)); SetNpcSpeed(NPC_GOOMPA, 4.0); - SetNpcAnimation(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_3)); + SetNpcAnimation(NPC_GOOMPA, NPC_ANIM_goompa_Palette_00_Anim_3); NpcMoveTo(NPC_GOOMPA, 0, 70, 0); - SetNpcAnimation(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_1)); + SetNpcAnimation(NPC_GOOMPA, NPC_ANIM_goompa_Palette_00_Anim_1); InterpNpcYaw(NPC_GOOMPA, 276, 20); sleep 30; - SpeakToPlayer(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A7)); + SpeakToPlayer(NPC_GOOMPA, NPC_ANIM_goompa_Palette_00_Anim_8, NPC_ANIM_goompa_Palette_00_Anim_1, 0, MESSAGE_ID(0x0B, 0x00A7)); sleep 5; SetPlayerAnimation(ANIM_80007); sleep 30; - SpeakToPlayer(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A8)); + SpeakToPlayer(NPC_GOOMPA, NPC_ANIM_goompa_Palette_00_Anim_8, NPC_ANIM_goompa_Palette_00_Anim_1, 0, MESSAGE_ID(0x0B, 0x00A8)); N(UnkFunc41)(0, 5); SI_STORY_PROGRESS = STORY_CH0_GOOMPA_JOINED_PARTY; UseSettingsFrom(0, -220, 20, -72); @@ -145,9 +145,9 @@ EvtSource N(npcAI_80240B50) = SCRIPT({ }); EvtSource N(hit_80240F64) = SCRIPT({ - SetNpcAnimation(NPC_SELF, NPC_ANIM(goompa, Palette_00, Anim_7)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_goompa_Palette_00_Anim_7); sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(goompa, Palette_00, Anim_1)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_goompa_Palette_00_Anim_1); SI_MAP_VAR(0) += 1; if (SI_MAP_VAR(0) < 3) { GetOwnerEncounterTrigger(SI_VAR(0)); @@ -170,7 +170,7 @@ EvtSource N(hit_80240F64) = SCRIPT({ } } sleep 10; - SetNpcAnimation(NPC_SELF, NPC_ANIM(goompa, Palette_00, Anim_3)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_goompa_Palette_00_Anim_3); } else { sleep 10; GetNpcPos(NPC_GOOMPA, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -208,22 +208,22 @@ StaticNpc N(npcGroup_80241260) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, .animations = { - NPC_ANIM(goompa, Palette_00, Anim_1), - NPC_ANIM(goompa, Palette_00, Anim_2), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_1), - NPC_ANIM(goompa, Palette_00, Anim_1), - NPC_ANIM(goompa, Palette_00, Anim_0), - NPC_ANIM(goompa, Palette_00, Anim_0), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_3), - NPC_ANIM(goompa, Palette_00, Anim_3), + NPC_ANIM_goompa_Palette_00_Anim_1, + NPC_ANIM_goompa_Palette_00_Anim_2, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_1, + NPC_ANIM_goompa_Palette_00_Anim_1, + NPC_ANIM_goompa_Palette_00_Anim_0, + NPC_ANIM_goompa_Palette_00_Anim_0, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_3, + NPC_ANIM_goompa_Palette_00_Anim_3, }, .tattle = MESSAGE_ID(0x1A, 0x0063), }; diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index dc05b46df3..be8cc6852d 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -87,7 +87,7 @@ EvtSource N(GoombaIdle) = SCRIPT({ sleep 1; SetSelfVar(0, FALSE); - SetNpcAnimation(NPC_SELF, NPC_ANIM(goomba, normal, fake_mushroom)); // TODO: work out why palette 0 is used here + SetNpcAnimation(NPC_SELF, NPC_ANIM_goomba_normal_fake_mushroom); // TODO: work out why palette 0 is used here EnableNpcShadow(NPC_SELF, FALSE); SetSelfEnemyFlagBits(NPC_FLAG_NO_AI, TRUE); @@ -108,15 +108,15 @@ EvtSource N(GoombaIdle) = SCRIPT({ SetNpcRotation(NPC_SELF, 0, SI_VAR(0), 0); sleep 1; } - SetNpcAnimation(NPC_SELF, NPC_ANIM(goomba, normal, still)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_goomba_normal_still); loop 9 { SI_VAR(0) += 10.0; SetNpcRotation(NPC_SELF, 0, SI_VAR(0), 0); sleep 1; } - SetNpcAnimation(NPC_SELF, NPC_ANIM(goomba, normal, dizzy)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_goomba_normal_dizzy); sleep 20; - SetNpcAnimation(NPC_SELF, NPC_ANIM(goomba, normal, idle)); + SetNpcAnimation(NPC_SELF, NPC_ANIM_goomba_normal_idle); PlaySoundAtNpc(NPC_SELF, 248, 0); func_802CFE2C(NPC_SELF, 8192); func_802CFD30(NPC_SELF, 5, 6, 1, 1, 0); @@ -170,22 +170,22 @@ StaticNpc N(goombaNpc) = { /* flying? */ TRUE, }, .animations = { - NPC_ANIM(goomba, normal, idle), - NPC_ANIM(goomba, normal, walk), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, idle), - NPC_ANIM(goomba, normal, idle), - NPC_ANIM(goomba, normal, pain), - NPC_ANIM(goomba, normal, pain), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, run), - NPC_ANIM(goomba, normal, run), + NPC_ANIM_goomba_normal_idle, + NPC_ANIM_goomba_normal_walk, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_idle, + NPC_ANIM_goomba_normal_idle, + NPC_ANIM_goomba_normal_pain, + NPC_ANIM_goomba_normal_pain, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_run, + NPC_ANIM_goomba_normal_run, }, }; diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c index 66d7bfe407..07ee3a5220 100644 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ b/src/world/area_sbk/sbk_00/9292B0.c @@ -47,22 +47,22 @@ StaticNpc N(npcGroup_80240388) = { .maxCoinBonus = 1, .movement = { -40, 0, 160, 100, 0, -32767, 0, 0, 0, 0, 1000, 0, 0, 1 }, .animations = { - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_C), - NPC_ANIM(pokey, Palette_00, Anim_C), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_C, + NPC_ANIM_pokey_Palette_00_Anim_C, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -84,22 +84,22 @@ StaticNpc N(npcGroup_80240578) = { .maxCoinBonus = 1, .movement = { 245, 0, 75, 100, 0, -32767, 0, 0, 0, 0, 1000, 0, 0, 1 }, .animations = { - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_C), - NPC_ANIM(pokey, Palette_00, Anim_C), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_C, + NPC_ANIM_pokey_Palette_00_Anim_C, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; diff --git a/src/world/area_sbk/sbk_01/929AD0.c b/src/world/area_sbk/sbk_01/929AD0.c index eafef586cd..d21c066d3a 100644 --- a/src/world/area_sbk/sbk_01/929AD0.c +++ b/src/world/area_sbk/sbk_01/929AD0.c @@ -47,22 +47,22 @@ StaticNpc N(npcGroup_802403F8) = { .maxCoinBonus = 1, .movement = { 205, 0, -60, 100, 0, -32767, 0, 0, 0, 0, 1000, 0, 0, 1 }, .animations = { - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_C), - NPC_ANIM(pokey, Palette_00, Anim_C), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_C, + NPC_ANIM_pokey_Palette_00_Anim_C, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; @@ -84,22 +84,22 @@ StaticNpc N(npcGroup_802405E8) = { .maxCoinBonus = 1, .movement = { -200, 0, 180, 100, 0, -32767, 0, 0, 0, 0, 1000, 0, 0, 1 }, .animations = { - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_4), - NPC_ANIM(pokey, Palette_00, Anim_C), - NPC_ANIM(pokey, Palette_00, Anim_C), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), - NPC_ANIM(pokey, Palette_00, Anim_8), + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_4, + NPC_ANIM_pokey_Palette_00_Anim_C, + NPC_ANIM_pokey_Palette_00_Anim_C, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, + NPC_ANIM_pokey_Palette_00_Anim_8, }, .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, }; diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 2f57742095..80bd76f91e 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -108,7 +108,7 @@ EvtSource world_goombario_use_ability = SCRIPT({ } if (SI_VAR(1) == 0) { - SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_goombario, normal, talk), NPC_ANIM(world_goombario, normal, idle), 0, + SpeakToPlayer(NPC_PARTNER, NPC_ANIM_world_goombario_normal_talk, NPC_ANIM_world_goombario_normal_idle, 0, SI_VAR(0)); } diff --git a/src/world/partners.c b/src/world/partners.c index 29462a207e..0a51ef8ad4 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -84,7 +84,7 @@ WorldPartner wPartners[12] = { .update = world_goombario_update, .useAbility = world_goombario_use_ability, .putAway = world_goombario_put_away, - .idle = NPC_ANIM(world_goombario, normal, idle), + .idle = NPC_ANIM_world_goombario_normal_idle, .canUseAbility = world_goombario_can_pause, .canPlayerPause = world_goombario_can_pause, .preBattle = world_goombario_pre_battle, @@ -100,7 +100,7 @@ WorldPartner wPartners[12] = { .update = 0x802BEB64, .useAbility = 0x802BEB80, .putAway = 0x802BEB9C, - .idle = NPC_ANIM(world_kooper, normal, idle), + .idle = NPC_ANIM_world_kooper_normal_idle, .testFirstStrike = 0x802BE818, .canUseAbility = partner_is_idle, .canPlayerPause = partner_is_idle, @@ -118,7 +118,7 @@ WorldPartner wPartners[12] = { .update = 0x802BE8A0, .useAbility = 0x802BE8BC, .putAway = 0x802BE8D8, - .idle = NPC_ANIM(world_bombette, normal, idle), + .idle = NPC_ANIM_world_bombette_normal_idle, .testFirstStrike = 0x802BE520, .canUseAbility = 0x802BD720, .canPlayerPause = 0x802BD748, @@ -135,7 +135,7 @@ WorldPartner wPartners[12] = { .update = 0x802BEAB0, .useAbility = 0x802BEACC, .putAway = 0x802BEAE8, - .idle = NPC_ANIM(world_parakarry, Palette_00, Anim_1), + .idle = NPC_ANIM_world_parakarry_Palette_00_Anim_1, .canPlayerPause = partner_is_idle, .preBattle = 0x802BE90C, .postBattle = 0x802BE9D0, @@ -151,7 +151,7 @@ WorldPartner wPartners[12] = { .update = world_goompa_update, .useAbility = world_goompa_use_ability, .putAway = world_goompa_put_away, - .idle = NPC_ANIM(goompa, Palette_00, Anim_1), + .idle = NPC_ANIM_goompa_Palette_00_Anim_1, }, { // Watt @@ -164,7 +164,7 @@ WorldPartner wPartners[12] = { .update = 0x802BE27C, .useAbility = 0x802BE298, .putAway = 0x802BE2B4, - .idle = NPC_ANIM(world_watt, Palette_00, Anim_1), + .idle = NPC_ANIM_world_watt_Palette_00_Anim_1, .canPlayerPause = world_partner_can_player_pause_default, .preBattle = 0x802BDD9C, .postBattle = 0x802BDE10, @@ -181,7 +181,7 @@ WorldPartner wPartners[12] = { .update = 0x802BFDFC, .useAbility = 0x802BFDC0, .putAway = 0x802BFE18, - .idle = NPC_ANIM(world_sushie, Palette_00, Anim_1), + .idle = NPC_ANIM_world_sushie_Palette_00_Anim_1, .canPlayerPause = world_partner_can_player_pause_default, .preBattle = 0x802BF9B8, .postBattle = 0x802BFA58, @@ -198,7 +198,7 @@ WorldPartner wPartners[12] = { .update = 0x802BFE80, .useAbility = 0x802BFE9C, .putAway = 0x802BFEB8, - .idle = NPC_ANIM(world_lakilester, Palette_00, Anim_1), + .idle = NPC_ANIM_world_lakilester_Palette_00_Anim_1, .canPlayerPause = world_partner_can_player_pause_default, .preBattle = 0x802BFA00, .postBattle = 0x802BFAA8, @@ -215,7 +215,7 @@ WorldPartner wPartners[12] = { .update = 0x802BE000, .useAbility = 0x802BE01C, .putAway = 0x802BE038, - .idle = NPC_ANIM(world_bow, Palette_00, Anim_1), + .idle = NPC_ANIM_world_bow_Palette_00_Anim_1, .canUseAbility = partner_is_idle, .canPlayerPause = world_partner_can_player_pause_default, .preBattle = 0x802BDF64, @@ -231,7 +231,7 @@ WorldPartner wPartners[12] = { .update = world_goombaria_update, .useAbility = world_goombaria_use_ability, .putAway = world_goombaria_put_away, - .idle = NPC_ANIM(goombaria, Palette_00, Anim_1), + .idle = NPC_ANIM_goombaria_Palette_00_Anim_1, .canUseAbility = partner_is_idle, .canPlayerPause = partner_is_idle, }, @@ -246,7 +246,7 @@ WorldPartner wPartners[12] = { .update = world_twink_update, .useAbility = world_twink_use_ability, .putAway = world_twink_put_away, - .idle = NPC_ANIM(twink, Palette_00, Anim_1), + .idle = NPC_ANIM_twink_Palette_00_Anim_1, .canUseAbility = partner_is_idle, .canPlayerPause = partner_is_idle, }, diff --git a/src/world/partners.h b/src/world/partners.h index 1cac415802..fbfc141075 100644 --- a/src/world/partners.h +++ b/src/world/partners.h @@ -17,7 +17,7 @@ typedef struct WorldPartner { /* 0x18 */ Bytecode* update; /* 0x1C */ Bytecode* useAbility; /* 0x20 */ Bytecode* putAway; - /* 0x24 */ NpcAnimID idle; + /* 0x24 */ s32 idle; /* 0x28 */ PartnerUnkFunc testFirstStrike; /* 0x2C */ PartnerBoolFunc canUseAbility; /* 0x30 */ PartnerBoolFunc canPlayerPause; diff --git a/tools/build/sprites/header.py b/tools/build/sprites/header.py index 6442a8da6b..732a4a31d9 100755 --- a/tools/build/sprites/header.py +++ b/tools/build/sprites/header.py @@ -23,22 +23,19 @@ if __name__ == "__main__": sprite = Sprite.from_dir(sprite_dir, read_images=False) sprite_name = sprite_dir.stem - f.write(f"#ifndef _SPRITE_{sprite_name.upper()}_H_\n") - f.write(f"#define _SPRITE_{sprite_name.upper()}_H_\n") + f.write(f"#ifndef _NPC_SPRITE_{sprite_name.upper()}_H_\n") + f.write(f"#define _NPC_SPRITE_{sprite_name.upper()}_H_\n") f.write("\n") f.write('#include "types.h"\n') f.write("\n") - f.write(f"#define _NPC_SPRITE_{sprite_name} 0x{s:02X}\n") - seen_palette_names = set() for p, palette_name in enumerate(sprite.palette_names): if palette_name not in seen_palette_names: seen_palette_names.add(palette_name) - f.write(f"#define _NPC_PALETTE_{sprite_name}_{palette_name} 0x{p:02X}\n") - for a, name in enumerate(sprite.animation_names): - f.write(f"#define _NPC_ANIM_{sprite_name}_{name} 0x{a:02X}\n") + for a, name in enumerate(sprite.animation_names): + f.write(f"#define NPC_ANIM_{sprite_name}_{palette_name}_{name} 0x{s:02X}{p:02X}{a:02X}\n") f.write("\n") f.write("#endif\n") diff --git a/tools/make_npc_structs.py b/tools/make_npc_structs.py index 6ee19f2b26..d630d88c6d 100644 --- a/tools/make_npc_structs.py +++ b/tools/make_npc_structs.py @@ -219,7 +219,7 @@ def get_vals(fd, offset, var): data = unpack_from('>H', fd, offset)[0] fmt = "d" offset += 2 - elif var["type"] == "s32" or var["type"] in ("NpcID", "NpcAnimID", "MessageID", "BattleID"): + elif var["type"] == "s32" or var["type"] in ("NpcID", "s32", "MessageID", "s32"): poff = offset offset += offset % 4 data = unpack_from('>i', fd, offset)[0] @@ -545,7 +545,7 @@ def MacroReplaceStaticNPC(fd): sprite = CONSTANTS["NPC_SPRITE"][sprite_id]["name"] palette = CONSTANTS["NPC_SPRITE"][sprite_id]["palettes"][palette_id] anim = CONSTANTS["NPC_SPRITE"][sprite_id]["anims"][anim_id] - new_line += " " * (indent+1) + f"NPC_ANIM({sprite}, {palette}, {anim}),\n" + new_line += " " * (indent+1) + f"NPC_ANIM_{sprite}_{palette}_{anim},\n" new_line += " " * indent + "}," out.append(new_line) i = x diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index 022f4cfe94..182d067093 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -422,9 +422,9 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): palette = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["palettes"][palette_id] anim = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["anims"][anim_id] if numNpcs > 1: - tmp_out += INDENT + " " + f"NPC_ANIM({sprite}, {palette}, {anim}),\n" + tmp_out += INDENT + " " + f"NPC_ANIM_{sprite}_{palette}_{anim},\n" else: - tmp_out += INDENT*2 + f"NPC_ANIM({sprite}, {palette}, {anim}),\n" + tmp_out += INDENT*2 + f"NPC_ANIM_{sprite}_{palette}_{anim},\n" INCLUDES_NEEDED["sprites"].add(sprite) i += 4 tmp_out += INDENT + f"}},\n" @@ -445,7 +445,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): curr_base += 0x1F0 out += tmp_out elif struct["type"] == "ExtraAnimationList": - tmp_out = f"NpcAnimID {name}[] = {{\n" + tmp_out = f"s32 {name}[] = {{\n" extraAnimations = bytes.read(struct["length"]) i = 0 @@ -460,7 +460,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): sprite = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["name"] palette = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["palettes"][palette_id] anim = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["anims"][anim_id] - tmp_out += INDENT + f"NPC_ANIM({sprite}, {palette}, {anim}),\n" + tmp_out += INDENT + f"NPC_ANIM_{sprite}_{palette}_{anim},\n" INCLUDES_NEEDED["sprites"].add(sprite) i += 4 tmp_out += f"}};\n" @@ -825,7 +825,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): sprite = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["name"] palette = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["palettes"][palette_id] anim = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["anims"][anim_id] - anim = f"NPC_ANIM({sprite}, {palette}, {anim})" + anim = f"NPC_ANIM_{sprite}_{palette}_{anim}" INCLUDES_NEEDED["sprites"].add(sprite) out += f" {element}, "