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

peach anims (#953)

Browse Source 
* checkpoint

* peach anims

* print message

* oh

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
HailSanta 2023-02-22 03:03:47 -05:00 committed by GitHub
parent a07575cc00
commit 44fd49ea0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
92 changed files with 858 additions and 846 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -46,8 +46,9 @@ pipeline {
def message = "${us_progress}\n${jp_progress}\n${cn_progress}\n${warnings}"
if (message != "\n\n") {
if (message != "\n\n\n") {
if (comment_id == -1) {
echo message
pullRequest.comment(message)
} else {
pullRequest.editComment(comment_id, message)

288
include/enums.h
View File

@ -2415,148 +2415,148 @@ enum PlayerAnims {
ANIM_MarioW3_8bit_Run = 0x00090003,
ANIM_MarioW3_8bit_TurnAround = 0x00090004,
ANIM_MarioW3_8bit_Jump = 0x00090005,
ANIM_Peach_A0000 = 0x000A0000,
ANIM_Peach_A0001 = 0x000A0001,
ANIM_Peach_A0002 = 0x000A0002,
ANIM_Peach_A0003 = 0x000A0003,
ANIM_Peach_A0004 = 0x000A0004,
ANIM_Peach_A0005 = 0x000A0005,
ANIM_Peach_A0006 = 0x000A0006,
ANIM_Peach_A0007 = 0x000A0007,
ANIM_Peach_A0008 = 0x000A0008,
ANIM_Peach_A0009 = 0x000A0009,
ANIM_Peach_A000A = 0x000A000A,
ANIM_Peach_A000B = 0x000A000B,
ANIM_Peach_A000C = 0x000A000C,
ANIM_Peach_A000D = 0x000A000D,
ANIM_Peach_A000E = 0x000A000E,
ANIM_Peach_A000F = 0x000A000F,
ANIM_Peach_A0010 = 0x000A0010,
ANIM_Peach_A0011 = 0x000A0011,
ANIM_Peach_A0012 = 0x000A0012,
ANIM_Peach_A0013 = 0x000A0013,
ANIM_Peach_A0014 = 0x000A0014,
ANIM_Peach_A0015 = 0x000A0015,
ANIM_Peach_A0016 = 0x000A0016,
ANIM_Peach_A0017 = 0x000A0017,
ANIM_Peach_A0018 = 0x000A0018,
ANIM_Peach_A0019 = 0x000A0019,
ANIM_Peach_A001A = 0x000A001A,
ANIM_Peach_A001B = 0x000A001B,
ANIM_Peach_A001C = 0x000A001C,
ANIM_Peach_A001D = 0x000A001D,
ANIM_Peach_A001E = 0x000A001E,
ANIM_Peach_A001F = 0x000A001F,
ANIM_Peach_A0020 = 0x000A0020,
ANIM_Peach_A0021 = 0x000A0021,
ANIM_Peach_A0022 = 0x000A0022,
ANIM_Peach_A0023 = 0x000A0023,
ANIM_Peach_A0024 = 0x000A0024,
ANIM_Peach_A0025 = 0x000A0025,
ANIM_Peach_A0026 = 0x000A0026,
ANIM_Peach_A0027 = 0x000A0027,
ANIM_Peach_A0028 = 0x000A0028,
ANIM_Peach_A0029 = 0x000A0029,
ANIM_Peach_A002A = 0x000A002A,
ANIM_Peach_A002B = 0x000A002B,
ANIM_Peach_A002C = 0x000A002C,
ANIM_Peach_A002D = 0x000A002D,
ANIM_Peach_A002E = 0x000A002E,
ANIM_Peach_A002F = 0x000A002F,
ANIM_Peach_A0030 = 0x000A0030,
ANIM_Peach_A0031 = 0x000A0031,
ANIM_Peach_A0032 = 0x000A0032,
ANIM_Peach_A0033 = 0x000A0033,
ANIM_Peach_A0034 = 0x000A0034,
ANIM_Peach_A0035 = 0x000A0035,
ANIM_Peach_A0036 = 0x000A0036,
ANIM_Peach_A0037 = 0x000A0037,
ANIM_Peach_A0038 = 0x000A0038,
ANIM_Peach_A0039 = 0x000A0039,
ANIM_Peach_A003A = 0x000A003A,
ANIM_Peach_A003B = 0x000A003B,
ANIM_Peach_A003C = 0x000A003C,
ANIM_Peach_A003D = 0x000A003D,
ANIM_Peach_A003E = 0x000A003E,
ANIM_Peach_A003F = 0x000A003F,
ANIM_Peach_A0040 = 0x000A0040,
ANIM_Peach_A0041 = 0x000A0041,
ANIM_Peach_A0042 = 0x000A0042,
ANIM_Peach_A0043 = 0x000A0043,
ANIM_Peach_A0044 = 0x000A0044,
ANIM_Peach_A0045 = 0x000A0045,
ANIM_Peach_A0046 = 0x000A0046,
ANIM_Peach_A0047 = 0x000A0047,
ANIM_Peach_A0048 = 0x000A0048,
ANIM_Peach_A0049 = 0x000A0049,
ANIM_Peach_A004A = 0x000A004A,
ANIM_Peach_A004B = 0x000A004B,
ANIM_Peach_A004C = 0x000A004C,
ANIM_Peach_A004D = 0x000A004D,
ANIM_Peach_A004E = 0x000A004E,
ANIM_Peach_C0000 = 0x000C0000,
ANIM_Peach_C0001 = 0x000C0001,
ANIM_Peach_C0002 = 0x000C0002,
ANIM_Peach_C0003 = 0x000C0003,
ANIM_Peach_C0004 = 0x000C0004,
ANIM_Peach_C0005 = 0x000C0005,
ANIM_Peach_C0006 = 0x000C0006,
ANIM_Peach_C0007 = 0x000C0007,
ANIM_Peach_C0008 = 0x000C0008,
ANIM_Peach_C0009 = 0x000C0009,
ANIM_Peach_C000A = 0x000C000A,
ANIM_Peach_C000B = 0x000C000B,
ANIM_Peach_C000C = 0x000C000C,
ANIM_Peach_C000D = 0x000C000D,
ANIM_Peach_C000E = 0x000C000E,
ANIM_Peach_C000F = 0x000C000F,
ANIM_Peach_C0010 = 0x000C0010,
ANIM_Peach_C0011 = 0x000C0011,
ANIM_Peach_C0012 = 0x000C0012,
ANIM_Peach_C0013 = 0x000C0013,
ANIM_Peach_C0014 = 0x000C0014,
ANIM_Peach_C0015 = 0x000C0015,
ANIM_Peach_C0016 = 0x000C0016,
ANIM_Peach_C0017 = 0x000C0017,
ANIM_Peach_C0018 = 0x000C0018,
ANIM_Peach_C0019 = 0x000C0019,
ANIM_Peach_C001A = 0x000C001A,
ANIM_Peach_C001B = 0x000C001B,
ANIM_Peach_C001C = 0x000C001C,
ANIM_Peach_C001D = 0x000C001D,
ANIM_Peach_C001E = 0x000C001E,
ANIM_Peach_C001F = 0x000C001F,
ANIM_Peach_C0020 = 0x000C0020,
ANIM_Peach_C0021 = 0x000C0021,
ANIM_Peach_C0022 = 0x000C0022,
ANIM_Peach_C0023 = 0x000C0023,
ANIM_Peach_C0024 = 0x000C0024,
ANIM_Peach_C0025 = 0x000C0025,
ANIM_Peach_C0026 = 0x000C0026,
ANIM_Peach_C0027 = 0x000C0027,
ANIM_Peach_C0028 = 0x000C0028,
ANIM_Peach_D0000 = 0x000D0000,
ANIM_Peach_D0001 = 0x000D0001,
ANIM_Peach_D0002 = 0x000D0002,
ANIM_Peach_D0003 = 0x000D0003,
ANIM_Peach_D0004 = 0x000D0004,
ANIM_Peach_D0005 = 0x000D0005,
ANIM_Peach_D0006 = 0x000D0006,
ANIM_Peach_D0007 = 0x000D0007,
ANIM_Peach_D0008 = 0x000D0008,
ANIM_Peach_D0009 = 0x000D0009,
ANIM_Peach_D000A = 0x000D000A,
ANIM_Peach_D000B = 0x000D000B,
ANIM_Peach_D000C = 0x000D000C,
ANIM_Peach_D000D = 0x000D000D,
ANIM_Peach_D000E = 0x000D000E,
ANIM_Peach_D000F = 0x000D000F,
ANIM_Peach_D0010 = 0x000D0010,
ANIM_Peach_D0011 = 0x000D0011,
ANIM_Peach_D0012 = 0x000D0012,
ANIM_Peach_D0013 = 0x000D0013,
ANIM_Peach_D0014 = 0x000D0014,
ANIM_Peach_D0015 = 0x000D0015,
ANIM_Peach1_Still = 0x000A0000,
ANIM_Peach1_Idle = 0x000A0001,
ANIM_Peach1_Walk = 0x000A0002,
ANIM_Peach1_Run = 0x000A0003,
ANIM_Peach1_RunLiftDress = 0x000A0004,
ANIM_Peach1_StepUp = 0x000A0005,
ANIM_Peach1_StepDown = 0x000A0006,
ANIM_Peach1_HoldCream = 0x000A0007,
ANIM_Peach1_HoldCream_Back = 0x000A0008,
ANIM_Peach1_HoldStrawberry = 0x000A0009,
ANIM_Peach1_HoldStrawberry_Back = 0x000A000A,
ANIM_Peach1_HoldButter = 0x000A000B,
ANIM_Peach1_HoldButter_Back = 0x000A000C,
ANIM_Peach1_HoldCleanser = 0x000A000D,
ANIM_Peach1_HoldCleanser_Back = 0x000A000E,
ANIM_Peach1_HoldWater = 0x000A000F,
ANIM_Peach1_HoldWater_Back = 0x000A0010,
ANIM_Peach1_HoldMilk = 0x000A0011,
ANIM_Peach1_HoldMilk_Back = 0x000A0012,
ANIM_Peach1_HoldFlour = 0x000A0013,
ANIM_Peach1_HoldFlour_Back = 0x000A0014,
ANIM_Peach1_HoldEgg = 0x000A0015,
ANIM_Peach1_HoldEgg_Back = 0x000A0016,
ANIM_Peach1_HoldCompleteCake = 0x000A0017,
ANIM_Peach1_HoldCompleteCake_Back = 0x000A0018,
ANIM_Peach1_HoldCakeBowl = 0x000A0019,
ANIM_Peach1_HoldCakeBowl_Back = 0x000A001A,
ANIM_Peach1_HoldCakeMixed = 0x000A001B,
ANIM_Peach1_HoldCakeMixed_Back = 0x000A001C,
ANIM_Peach1_HoldCakePan = 0x000A001D,
ANIM_Peach1_HoldCakePan_Back = 0x000A001E,
ANIM_Peach1_HoldCakeBatter = 0x000A001F,
ANIM_Peach1_HoldCakeBatter_Back = 0x000A0020,
ANIM_Peach1_HoldBareCake = 0x000A0021,
ANIM_Peach1_HoldBareCake_Back = 0x000A0022,
ANIM_Peach1_HoldSalt = 0x000A0023,
ANIM_Peach1_HoldSalt_Back = 0x000A0024,
ANIM_Peach1_HoldSugar = 0x000A0025,
ANIM_Peach1_HoldSugar_Back = 0x000A0026,
ANIM_Peach1_HoldIcingCake = 0x000A0027,
ANIM_Peach1_HoldIcingCake_Back = 0x000A0028,
ANIM_Peach1_HoldBerryCake = 0x000A0029,
ANIM_Peach1_HoldBerryCake_Back = 0x000A002A,
ANIM_Peach1_CarryCream = 0x000A002B,
ANIM_Peach1_CarryCream_Back = 0x000A002C,
ANIM_Peach1_CarryStrawberry = 0x000A002D,
ANIM_Peach1_CarryStrawberry_Back = 0x000A002E,
ANIM_Peach1_CarryButter = 0x000A002F,
ANIM_Peach1_CarryButter_Back = 0x000A0030,
ANIM_Peach1_CarryCleanser = 0x000A0031,
ANIM_Peach1_CarryCleanser_Back = 0x000A0032,
ANIM_Peach1_CarryWater = 0x000A0033,
ANIM_Peach1_CarryWater_Back = 0x000A0034,
ANIM_Peach1_CarryMilk = 0x000A0035,
ANIM_Peach1_CarryMilk_Back = 0x000A0036,
ANIM_Peach1_CarryFlour = 0x000A0037,
ANIM_Peach1_CarryFlour_Back = 0x000A0038,
ANIM_Peach1_CarryEgg = 0x000A0039,
ANIM_Peach1_CarryEgg_Back = 0x000A003A,
ANIM_Peach1_CarryCompleteCake = 0x000A003B,
ANIM_Peach1_CarryCompleteCake_Back = 0x000A003C,
ANIM_Peach1_CarryCakeBowl = 0x000A003D,
ANIM_Peach1_CarryCakeBowl_Back = 0x000A003E,
ANIM_Peach1_CarryCakeMixed = 0x000A003F,
ANIM_Peach1_CarryCakeMixed_Back = 0x000A0040,
ANIM_Peach1_CarryCakePan = 0x000A0041,
ANIM_Peach1_CarryCakePan_Back = 0x000A0042,
ANIM_Peach1_CarryCakeBatter = 0x000A0043,
ANIM_Peach1_CarryCakeBatter_Back = 0x000A0044,
ANIM_Peach1_CarryBareCake = 0x000A0045,
ANIM_Peach1_CarryBareCake_Back = 0x000A0046,
ANIM_Peach1_CarrySalt = 0x000A0047,
ANIM_Peach1_CarrySalt_Back = 0x000A0048,
ANIM_Peach1_CarrySugar = 0x000A0049,
ANIM_Peach1_CarrySugar_Back = 0x000A004A,
ANIM_Peach1_CarryIcingCake = 0x000A004B,
ANIM_Peach1_CarryIcingCake_Back = 0x000A004C,
ANIM_Peach1_CarryBerryCake = 0x000A004D,
ANIM_Peach1_CarryBerryCake_Back = 0x000A004E,
ANIM_Peach2_RaiseArms = 0x000C0000,
ANIM_Peach2_Talk = 0x000C0001,
ANIM_Peach2_LowerArms = 0x000C0002,
ANIM_Peach2_Yawn = 0x000C0003,
ANIM_Peach2_Sleep = 0x000C0004,
ANIM_Peach2_Gasp = 0x000C0005,
ANIM_Peach2_GaspStill = 0x000C0006,
ANIM_Peach2_Shout = 0x000C0007,
ANIM_Peach2_EndShout = 0x000C0008,
ANIM_Peach2_Delighted = 0x000C0009,
ANIM_Peach2_GiveItem = 0x000C000A,
ANIM_Peach2_OpenDoors = 0x000C000B,
ANIM_Peach2_Curious = 0x000C000C,
ANIM_Peach2_Startle = 0x000C000D,
ANIM_Peach2_SadStill = 0x000C000E,
ANIM_Peach2_SadTalk = 0x000C000F,
ANIM_Peach2_SpreadArms = 0x000C0010,
ANIM_Peach2_LookAround = 0x000C0011,
ANIM_Peach2_ArmsCrossedIdle = 0x000C0012,
ANIM_Peach2_ArmsCrossedTalk = 0x000C0013,
ANIM_Peach2_ForwardIdle = 0x000C0014,
ANIM_Peach2_ForwardShout = 0x000C0015,
ANIM_Peach2_ForwardHappy = 0x000C0016,
ANIM_Peach2_ForwardSad = 0x000C0017,
ANIM_Peach2_Carried = 0x000C0018,
ANIM_Peach2_Thrown = 0x000C0019,
ANIM_Peach2_Land = 0x000C001A,
ANIM_Peach2_TiedHangIdle = 0x000C001B,
ANIM_Peach2_TiedHangStruggle = 0x000C001C,
ANIM_Peach2_TiedStill = 0x000C001D,
ANIM_Peach2_TiedIdle = 0x000C001E,
ANIM_Peach2_MixingFull = 0x000C001F,
ANIM_Peach2_Mixing1 = 0x000C0020,
ANIM_Peach2_Mixing2 = 0x000C0021,
ANIM_Peach2_Mixing3 = 0x000C0022,
ANIM_Peach2_Mixing4 = 0x000C0023,
ANIM_Peach2_UseParasol = 0x000C0024,
ANIM_Peach2_PutAwayParasol = 0x000C0025,
ANIM_Peach2_TalkIdle = 0x000C0026,
ANIM_Peach2_CantFitParasol = 0x000C0027,
ANIM_Peach2_Inert = 0x000C0028,
ANIM_Peach3_PresentCompleteCake = 0x000D0000,
ANIM_Peach3_PresentBareCake = 0x000D0001,
ANIM_Peach3_PresentBerryCake = 0x000D0002,
ANIM_Peach3_PresentIcingCake = 0x000D0003,
ANIM_Peach3_InformalTalk = 0x000D0004,
ANIM_Peach3_ForwardHoldItem = 0x000D0005,
ANIM_Peach3_ForwardPlaceItem = 0x000D0006,
ANIM_Peach3_ReachIntoOven = 0x000D0007,
ANIM_Peach3_TiedSideways = 0x000D0008,
ANIM_Peach3_TiedTalk = 0x000D0009,
ANIM_Peach3_TiedShout = 0x000D000A,
ANIM_Peach3_TiedLaugh = 0x000D000B,
ANIM_Peach3_PourBatter = 0x000D000C,
ANIM_Peach3_WalkSad = 0x000D000D,
ANIM_Peach3_TiedUpsideDown = 0x000D000E,
ANIM_Peach3_Pray = 0x000D000F,
ANIM_Peach3_ReachForButtonHigh = 0x000D0010,
ANIM_Peach3_PressButtonHigh = 0x000D0011,
ANIM_Peach3_AfterPressButtonHigh = 0x000D0012,
ANIM_Peach3_ReachForButton = 0x000D0013,
ANIM_Peach3_PressButton = 0x000D0014,
ANIM_Peach3_AfterPressButton = 0x000D0015,
};
enum AmbientSounds {
@ -3364,7 +3364,7 @@ enum DamageTypes {
DAMAGE_TYPE_POW = 0x00000400,
DAMAGE_TYPE_QUAKE = 0x00000800,
DAMAGE_TYPE_FEAR = 0x00001000,
DAMAGE_TYPE_2000 = 0x00002000,
DAMAGE_TYPE_DEATH = 0x00002000,
DAMAGE_TYPE_4000 = 0x00004000,
DAMAGE_TYPE_AIR_LIFT = 0x00008000,
DAMAGE_TYPE_SPINY_SURGE = 0x00010000,
@ -3704,7 +3704,7 @@ enum ActorFlags {
ACTOR_FLAG_100 = 0x00000100,
ACTOR_FLAG_FLYING = 0x00000200, ///< Quake Hammer can't hit.
ACTOR_FLAG_FLIPPED = 0x00000400, ///< Actor has been flipped over.
ACTOR_FLAG_HP_OFFSET_BELOW = 0x00000800, ///< HP bar offset below actor (e.g. Swooper when upside-down). Is this just UPSIDE_DOWN? FLIPPED? TOPPLED?
ACTOR_FLAG_UPSIDE_DOWN = 0x00000800, ///< HP bar offset below actor (e.g. Swooper when upside-down).
ACTOR_FLAG_TYPE_CHANGED = 0x00001000, ///< Indicates actors type has changed, triggers recheck for if HP bar should be shown based on tattle status.
ACTOR_FLAG_2000 = 0x00002000,
ACTOR_FLAG_TARGET_ONLY = 0x00004000, ///< Battle ends even if undefeated. No turn.

4
src/17D6A0.c
View File

@ -2280,8 +2280,8 @@ s32 bMarioHideAnims[] = {
};
s32 bPeachIdleAnims[] = {
STATUS_NORMAL, ANIM_Peach_A0002,
STATUS_TURN_DONE, ANIM_Peach_C0028,
STATUS_NORMAL, ANIM_Peach1_Walk,
STATUS_TURN_DONE, ANIM_Peach2_Inert,
STATUS_END
};

3
src/17FEB0.c
View File

@ -199,7 +199,8 @@ HitResult calc_item_damage_enemy(void) {
sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
return HIT_RESULT_NO_DAMAGE;
}
if (battleStatus->currentAttackElement & DAMAGE_TYPE_2000) {
if (battleStatus->currentAttackElement & DAMAGE_TYPE_DEATH) {
battleStatus->lastAttackDamage = 0;
dispatchEvent = EVENT_DEATH;
hitResult = HIT_RESULT_HIT;

28
src/182B30.c
View File

@ -529,7 +529,7 @@ void func_802552EC(s32 arg0, Actor* actor) {
phi_s6 = 15;
}
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
guTranslateF(mtxPivotOn, -pivotX, -pivotY, 0.0f);
guTranslateF(mtxPivotOff, pivotX, pivotY, 0.0f);
} else {
@ -612,7 +612,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) {
actor->renderMode = RENDER_MODE_ALPHATEST;
x1 = actor->currentPos.x + actor->headOffset.x;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
y1 = actor->currentPos.y + actor->headOffset.y;
} else {
y1 = actor->currentPos.y - actor->headOffset.y;
@ -631,7 +631,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) {
if (!(actorPart->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) {
x2 = x1 + actorPart->partOffset.x + actorPart->visualOffset.x;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
y2 = y1 + actorPart->partOffset.y + actorPart->visualOffset.y;
} else {
y2 = y1 - actorPart->partOffset.y - actorPart->visualOffset.y;
@ -652,7 +652,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) {
shadow = get_shadow_by_index(actorPart->shadowIndex);
shadow->flags &= ~ENTITY_FLAG_HIDDEN;
x1 = actorPart->currentPos.x;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
y1 = actorPart->currentPos.y + 12.0;
} else {
y1 = actorPart->currentPos.y - 12.0;
@ -685,7 +685,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) {
}
x1 = actor->currentPos.x + actor->headOffset.x;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
y1 = actor->currentPos.y + actor->headOffset.y + 12.0;
} else {
y1 = actor->currentPos.y - actor->headOffset.y + 12.0;
@ -749,7 +749,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
actor = battleStatus->partnerActor;
}
actorPosX = actor->currentPos.x + actor->headOffset.x;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
actorPosY = actor->currentPos.y + actor->headOffset.y + actor->verticalRenderOffset;
} else {
actorPosY = actor->currentPos.y - actor->headOffset.y + actor->verticalRenderOffset;
@ -798,7 +798,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
(actor->actorBlueprint->statusMessageOffset.x + actor->unk_196) * actor->scalingFactor,
(actor->actorBlueprint->statusMessageOffset.y + actor->unk_197) * actor->scalingFactor);
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
set_status_icons_offset(actor->hudElementDataIndex,
actor->size.y * actor->scalingFactor,
actor->size.x * actor->scalingFactor);
@ -816,7 +816,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
}
} while (0); // required to match
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
guTranslateF(mtxPivotOn,
-actor->rotationPivotOffset.x * actor->scalingFactor,
-actor->rotationPivotOffset.y * actor->scalingFactor,
@ -855,7 +855,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
for (i = 0; i < numParts; i++) {
if (!(part->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) {
partPosX = actorPosX + part->partOffset.x + part->visualOffset.x;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
partPosY = actorPosY + part->partOffset.y + part->visualOffset.y;
} else {
partPosY = (actorPosY - part->partOffset.y) - part->visualOffset.y;
@ -1068,7 +1068,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
}
}
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
guTranslateF(mtxPivotOn,
-part->rotationPivotOffset.x * actor->scalingFactor,
-part->rotationPivotOffset.y * actor->scalingFactor,
@ -1143,14 +1143,14 @@ void func_802571F0(s32 flipYaw, Actor* actor) {
s32 i;
actorPosX = actor->currentPos.x + actor->headOffset.x;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
actorPosY = actor->currentPos.y + actor->headOffset.y;
} else {
actorPosY = actor->currentPos.y - actor->headOffset.y;
}
actorPosZ = actor->currentPos.z + actor->headOffset.z - 5.0f;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
guTranslateF(mtxPivotOn,
-actor->rotationPivotOffset.x * actor->scalingFactor,
-actor->rotationPivotOffset.y * actor->scalingFactor,
@ -1191,7 +1191,7 @@ void func_802571F0(s32 flipYaw, Actor* actor) {
// determine part position
if (!(part->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) {
partPosX = actorPosX + part->partOffset.x + part->visualOffset.x;
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
partPosY = actorPosY + part->partOffset.y + part->visualOffset.y;
} else {
partPosY = actorPosY - part->partOffset.y - part->visualOffset.y;
@ -1218,7 +1218,7 @@ void func_802571F0(s32 flipYaw, Actor* actor) {
continue;
}
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
guTranslateF(mtxPivotOn,
-part->rotationPivotOffset.x * actor->scalingFactor,
-part->rotationPivotOffset.y * actor->scalingFactor,

6
src/18F340.c
View File

@ -36,7 +36,7 @@ void func_80260A60(void) {
if (battleStatus->flags2 & BS_FLAGS2_PEACH_BATTLE) {
actorPart->idleAnimations = bPeachIdleAnims;
set_animation(0, 0, ANIM_Peach_A0002);
set_animation(0, 0, ANIM_Peach1_Walk);
} else if (!battleStatus->outtaSightActive) {
actorPart->idleAnimations = bMarioIdleAnims;
}
@ -717,9 +717,9 @@ EvtScript EVS_PeachEnterStage = {
EVT_SUB(LVar0, 100)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Peach_A0003)
EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Peach1_Run)
EVT_CALL(PlayerRunToGoal, 40)
EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Peach_A0002)
EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Peach1_Walk)
EVT_WAIT(15)
EVT_CALL(func_8026BF48, 0)
EVT_RETURN

10
src/190B20.c
View File

@ -470,7 +470,7 @@ s32 func_80263064(Actor* actor0, Actor* actor1, s32 unused) {
z = actor1->currentPos.z;
x += part->partOffset.x;
if (!(actor1->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor1->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
y += part->partOffset.y;
} else {
y -= part->partOffset.y;
@ -478,7 +478,7 @@ s32 func_80263064(Actor* actor0, Actor* actor1, s32 unused) {
z += part->partOffset.z;
x += part->targetOffset.x;
if (!(actor1->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor1->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
y += part->targetOffset.y;
} else {
y -= part->targetOffset.y;
@ -489,7 +489,7 @@ s32 func_80263064(Actor* actor0, Actor* actor1, s32 unused) {
z = part->absolutePosition.z;
x += part->targetOffset.x;
if (!(actor1->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(actor1->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
y += part->targetOffset.y;
} else {
y -= part->targetOffset.y;
@ -1727,7 +1727,7 @@ Actor* create_actor(Formation formation) {
actor->healthBarPosition.x = actor->currentPos.x + formationActor->hpBarOffset.x;
actor->healthBarPosition.y = actor->currentPos.y + formationActor->hpBarOffset.y;
actor->healthBarPosition.z = actor->currentPos.z;
if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
actor->healthBarPosition.y = actor->currentPos.y - actor->size.y - formationActor->hpBarOffset.y;
}
@ -2309,7 +2309,7 @@ void func_802666E4(Actor* actor, f32 x, f32 y, f32 z, s32 damage) {
do {
if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) {
fx_ring_blast(0, x, y, z, 1.0f, 0x18);
fx_ring_blast(0, x, y, z, 1.0f, 24);
} else if (battleStatus->currentAttackElement & DAMAGE_TYPE_SHOCK) {
apply_shock_effect(actor);
} else if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) {

3
src/1A5830.c
View File

@ -564,7 +564,6 @@ HitResult calc_enemy_damage_target(Actor* attacker) {
isFire = TRUE;
}
if (gBattleStatus.flags1 & BS_FLAGS1_ATK_BLOCKED) {
if (event == EVENT_HIT_COMBO) {
event = EVENT_18;
@ -2673,7 +2672,7 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) {
s32 spawnMode;
s32 i;
if (dropper->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (dropper->flags & ACTOR_FLAG_UPSIDE_DOWN) {
spawnMode = ITEM_SPAWN_MODE_TOSS_FADE3;
} else {
spawnMode = ITEM_SPAWN_MODE_TOSS_FADE1;

16
src/1AC760.c
View File

@ -78,7 +78,7 @@ HitResult calc_partner_test_enemy(void) {
// check partner jumping on top-spiky enemy (cannot be suppressed)
if ((battleStatus->currentAttackElement & DAMAGE_TYPE_JUMP)
&& (part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)
&& !(target->flags2 & ACTOR_FLAG_HP_OFFSET_BELOW)
&& !(target->flags2 & ACTOR_FLAG_UPSIDE_DOWN)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
return HIT_RESULT_LANDED_ON_SPIKE;
@ -112,7 +112,7 @@ HitResult calc_partner_test_enemy(void) {
// check partner airlifting top-spiky enemy
if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT)) {
if ((part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)
&& !(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW)
&& !(target->flags & ACTOR_FLAG_UPSIDE_DOWN)
&& !(battleStatus->currentAttackEventSuppression & SUPPRESS_EVENT_SPIKY_TOP)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
@ -123,7 +123,7 @@ HitResult calc_partner_test_enemy(void) {
if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT)
&& (part->eventFlags & ACTOR_EVENT_FLAG_200000)
&& !(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW)
&& !(target->flags & ACTOR_FLAG_UPSIDE_DOWN)
&& !(battleStatus->currentAttackEventSuppression & SUPPRESS_EVENT_FLAG_80)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
@ -292,7 +292,7 @@ HitResult calc_partner_damage_enemy(void) {
// unknown alternate spiky #1
if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT)
&& targetPart->eventFlags & ACTOR_EVENT_FLAG_200000
&& !(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW)
&& !(target->flags & ACTOR_FLAG_UPSIDE_DOWN)
&& !(battleStatus->currentAttackEventSuppression & SUPPRESS_EVENT_FLAG_80)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
@ -304,7 +304,7 @@ HitResult calc_partner_damage_enemy(void) {
// unknown alternate spiky top
if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT)
&& targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP
&& !(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW)
&& !(target->flags & ACTOR_FLAG_UPSIDE_DOWN)
&& !(battleStatus->currentAttackEventSuppression & SUPPRESS_EVENT_SPIKY_TOP)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
@ -454,7 +454,11 @@ HitResult calc_partner_damage_enemy(void) {
dispatchEvent = EVENT_HIT_COMBO;
retVal = 0;
if (!(targetPart->flags & ACTOR_PART_FLAG_2000) && !(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE) && !partImmuneToElement && !(targetPart->targetFlags & ACTOR_PART_FLAG_4)) {
if (!(targetPart->flags & ACTOR_PART_FLAG_2000)
&& !(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE)
&& !partImmuneToElement
&& !(targetPart->targetFlags & ACTOR_PART_FLAG_4)
) {
target->currentHP -= damageDealt;
if (target->currentHP < 1) {

4
src/1AF120.c
View File

@ -1133,7 +1133,7 @@ EvtScript D_80298E20 = {
EVT_MULF(LVar3, EVT_FLOAT(0.4))
EVT_END_IF
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar6)
EVT_IF_FLAG(LVar6, ACTOR_FLAG_HP_OFFSET_BELOW)
EVT_IF_FLAG(LVar6, ACTOR_FLAG_UPSIDE_DOWN)
EVT_CALL(GetActorSize, ACTOR_SELF, LVar7, LVar8)
EVT_SUB(LVar1, LVar7)
EVT_END_IF
@ -1497,7 +1497,7 @@ EvtScript DoBurnHit = {
EVT_END_IF
EVT_DIVF(LVar3, EVT_FLOAT(2.0))
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar5)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_HP_OFFSET_BELOW)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_UPSIDE_DOWN)
EVT_SUBF(LVar1, LVar3)
EVT_ELSE
EVT_ADDF(LVar1, LVar3)

10
src/415D90.c
View File

@ -4550,14 +4550,14 @@ void btl_state_update_peach_menu(void) {
gBattleSubState = BTL_SUBSTATE_PEACH_MENU_CHOOSE_CATEGORY;
break;
case BTL_SUBSTATE_PEACH_MENU_CHOOSE_CATEGORY:
set_animation(ACTOR_PLAYER, 0, ANIM_Peach_C0009);
set_animation(ACTOR_PLAYER, 0, ANIM_Peach2_Delighted);
selectedOption = btl_main_menu_update();
if (D_802ACC60 != 0) {
D_802ACC60--;
break;
}
if (selectedOption != 0) {
set_animation(ACTOR_PLAYER, 0, ANIM_Peach_A0002);
set_animation(ACTOR_PLAYER, 0, ANIM_Peach1_Walk);
battleStatus->currentSubmenu = battle_menu_submenuIDs[selectedOption - 1];
func_802A1030();
D_802ACC60 = 8;
@ -4979,7 +4979,7 @@ void btl_state_update_select_target(void) {
actorFlags = get_actor(target->actorID)->flags;
id = D_802ACC70[0];
if (actorFlags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actorFlags & ACTOR_FLAG_UPSIDE_DOWN) {
hud_element_set_script(id, &HES_HandPointLeftLoop);
} else {
hud_element_set_script(id, &HES_HandPointDownLoop);
@ -5095,7 +5095,7 @@ void btl_state_draw_select_target(void) {
targetY = target->pos.y;
targetZ = target->pos.z;
if (anotherActor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (anotherActor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
xOffset = 16;
yOffset = 2;
if (hud_element_get_script(id) != &HES_HandPointLeftLoop) {
@ -5122,7 +5122,7 @@ void btl_state_draw_select_target(void) {
targetX = target->pos.x;
targetY = target->pos.y;
targetZ = target->pos.z;
if (anotherActor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (anotherActor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
xOffset = 16;
yOffset = 2;
if (hud_element_get_script(id) != &HES_HandPointLeftLoop) {

10
src/77480.c
View File

@ -822,21 +822,21 @@ s32 get_overriding_player_anim(s32 anim) {
return -1;
}
if (anim == ANIM_MarioW1_Lift || anim == ANIM_Peach_C0010 || anim == ANIM_Mario1_Idle) {
if (anim == ANIM_MarioW1_Lift || anim == ANIM_Peach2_SpreadArms || anim == ANIM_Mario1_Idle) {
if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) {
if (!func_800DFCF4()) {
return -1;
}
} else if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) {
anim = ANIM_Peach_C0010;
anim = ANIM_Peach2_SpreadArms;
} else {
peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].hold);
return -1;
}
} else if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) {
if ((playerStatus->peachItemHeld != 0)
&& (anim == ANIM_Peach_C0000 || anim == ANIM_Peach_C0001 || anim == ANIM_Peach_C0002)) {
anim = ANIM_Peach_D0000;
&& (anim == ANIM_Peach2_RaiseArms || anim == ANIM_Peach2_Talk || anim == ANIM_Peach2_LowerArms)) {
anim = ANIM_Peach3_PresentCompleteCake;
}
}
@ -1434,7 +1434,7 @@ s32 get_player_back_anim(s32 anim) {
outAnim = ANIM_MarioW1_Smash3_Hit_Back;
}
} else if (sprIndex == SPR_Peach1) {
if (anim > ANIM_Peach_A0006) {
if (anim > ANIM_Peach1_StepDown) {
outAnim = anim + 1;
}
}

2
src/7fd10_len_b40.c
View File

@ -161,7 +161,7 @@ s32 setup_item_popup(PopupMenu* menu) {
ItemData* item = &gItemTable[itemIdx];
IconHudScriptPair* itemScripts = &gItemHudScripts[item->hudElemID];
if (item->typeFlags & 1) {
if (item->typeFlags & ITEM_TYPE_FLAG_WORLD_USABLE) {
menu->ptrIcon[optionCount] = itemScripts->enabled;
menu->userIndex[optionCount] = i;
menu->enabled[optionCount] = 1;

4
src/80850_len_3060.c
View File

@ -170,7 +170,7 @@ s32 find_item(s32 itemID) {
ItemData* item = &gItemTable[itemID];
s32 i;
if ((item->typeFlags & 8) != 0) {
if ((item->typeFlags & ITEM_TYPE_FLAG_KEY) != 0) {
for (i = 0; i < ARRAY_COUNT(playerData->keyItems); i++) {
if (playerData->keyItems[i] == itemID) {
break;
@ -221,7 +221,7 @@ s32 add_badge(s32 itemID) {
ItemData* item = &gItemTable[itemID];
s32 i;
if ((item->typeFlags & 0x40) == 0) {
if ((item->typeFlags & ITEM_TYPE_FLAG_BADGE) == 0) {
return add_item(itemID);
}

30
src/actor_api.c
View File

@ -1936,7 +1936,7 @@ ApiStatus HPBarToHome(Evt* script, s32 isInitialCall) {
actor->healthBarPosition.y = actor->homePos.y + actor->actorBlueprint->hpBarOffset.y;
actor->healthBarPosition.z = actor->homePos.z;
if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
actor->healthBarPosition.y = actor->homePos.y - actor->size.y - actor->actorBlueprint->hpBarOffset.y;
}
@ -1959,7 +1959,7 @@ ApiStatus HPBarToCurrent(Evt* script, s32 isInitialCall) {
actor->healthBarPosition.y = actor->currentPos.y + actor->actorBlueprint->hpBarOffset.y;
actor->healthBarPosition.z = actor->currentPos.z;
if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
actor->healthBarPosition.y = actor->currentPos.y - actor->size.y - actor->actorBlueprint->hpBarOffset.y;
}
@ -2002,7 +2002,7 @@ ApiStatus func_8026D940(Evt* script, s32 isInitialCall) {
actor->healthBarPosition.y = actor->homePos.y + actor->actorBlueprint->hpBarOffset.y + actor->unk_198.y;
actor->healthBarPosition.z = actor->homePos.z;
if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
actor->healthBarPosition.y = actor->homePos.y - actor->size.y;
}
@ -3186,7 +3186,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
btl_cam_set_zoom(250);
btl_cam_move(10);
func_8024E60C();
if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
btl_cam_set_zoffset(0);
}
D_8029FBD4 = 1;
@ -3199,7 +3199,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
flags = actor->flags;
x1 = actor->currentPos.x + actor->headOffset.x;
if (flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (flags & ACTOR_FLAG_UPSIDE_DOWN) {
y1 = actor->currentPos.y + actor->headOffset.y - actor->size.y / 2;
} else if (!(flags & ACTOR_FLAG_8000)) {
y1 = actor->currentPos.y + actor->headOffset.y + actor->size.y / 2;
@ -3210,7 +3210,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
flags2 = actor->flags;
x2 = actor->currentPos.x + actor->headOffset.x + actor->size.x / 2;
if (flags2 & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (flags2 & ACTOR_FLAG_UPSIDE_DOWN) {
y2 = actor->currentPos.y + actor->headOffset.y - actor->size.y;
} else if (!(flags2 & ACTOR_FLAG_8000)) {
y2 = actor->currentPos.y + actor->headOffset.y + actor->size.y;
@ -3309,7 +3309,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
btl_cam_set_zoom(250);
btl_cam_move(10);
func_8024E60C();
if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
btl_cam_set_zoffset(0);
}
@ -3323,7 +3323,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
flags = actor->flags;
x1 = actor->currentPos.x + actor->headOffset.x;
if (flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (flags & ACTOR_FLAG_UPSIDE_DOWN) {
y1 = actor->currentPos.y + actor->headOffset.y - actor->size.y / 2;
} else if (!(flags & ACTOR_FLAG_8000)) {
y1 = actor->currentPos.y + actor->headOffset.y + actor->size.y / 2;
@ -3334,7 +3334,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
flags2 = actor->flags;
x2 = actor->currentPos.x + actor->headOffset.x + actor->size.x / 2;
if (flags2 & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (flags2 & ACTOR_FLAG_UPSIDE_DOWN) {
y2 = actor->currentPos.y + actor->headOffset.y - actor->size.y;
} else if (!(flags2 & ACTOR_FLAG_8000)) {
y2 = actor->currentPos.y + actor->headOffset.y + actor->size.y;
@ -3431,7 +3431,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
btl_cam_set_zoom(250);
btl_cam_move(10);
func_8024E60C();
if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
btl_cam_set_zoffset(0);
}
@ -3445,7 +3445,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
flags = actor->flags;
x = actor->currentPos.x + actor->headOffset.x;
if (flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (flags & ACTOR_FLAG_UPSIDE_DOWN) {
y = actor->currentPos.y + actor->headOffset.y - actor->size.y / 2;
} else if (!(flags & ACTOR_FLAG_8000)) {
y = actor->currentPos.y + actor->headOffset.y + actor->size.y / 2;
@ -3537,7 +3537,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
btl_cam_set_zoom(250);
btl_cam_move(10);
func_8024E60C();
if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (actor->flags & ACTOR_FLAG_UPSIDE_DOWN) {
btl_cam_set_zoffset(0);
}
@ -3551,7 +3551,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
flags = actor->flags;
x = actor->currentPos.x + actor->headOffset.x;
if (flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (flags & ACTOR_FLAG_UPSIDE_DOWN) {
y = actor->currentPos.y + actor->headOffset.y - actor->size.y / 2;
} else if (!(flags & ACTOR_FLAG_8000)) {
y = actor->currentPos.y + actor->headOffset.y + actor->size.y / 2;
@ -3657,7 +3657,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
flags = actor->flags;
x1 = actor->currentPos.x + actor->headOffset.x;
if (flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (flags & ACTOR_FLAG_UPSIDE_DOWN) {
y1 = actor->currentPos.y + actor->headOffset.y - actor->size.y / 2;
} else if (!(flags & ACTOR_FLAG_8000)) {
y1 = actor->currentPos.y + actor->headOffset.y + actor->size.y / 2;
@ -3668,7 +3668,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
flags2 = actor->flags;
x2 = actor->currentPos.x + actor->headOffset.x + actor->size.x / 2;
if (flags2 & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (flags2 & ACTOR_FLAG_UPSIDE_DOWN) {
y2 = actor->currentPos.y + actor->headOffset.y - actor->size.y;
} else if (!(flags2 & ACTOR_FLAG_8000)) {
y2 = actor->currentPos.y + actor->headOffset.y + actor->size.y;

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

@ -179,7 +179,7 @@ EvtScript N(80218D68) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24)
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -2, -10)
EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20)
@ -204,7 +204,7 @@ EvtScript N(80218FC8) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24)
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -2, -10)
EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20)
@ -262,7 +262,7 @@ EvtScript N(802191AC) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189FC)))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim06)
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80219ED4)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, TRUE)
EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24)
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 2, 8)
EVT_CALL(N(UnkBattleFunc1), -10, -25, 10, -30)
@ -409,7 +409,7 @@ EvtScript N(80219D68) = {
EVT_EXEC_WAIT(N(8021A2E8))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24)
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -2, -10)
EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20)
@ -513,7 +513,7 @@ EvtScript N(8021A2E8) = {
EVT_CASE_OR_EQ(1)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(4)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim04)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 180)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)

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

@ -190,7 +190,7 @@ EvtScript N(init) = {
EVT_END_IF
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8)
EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent)))
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn)))
@ -864,7 +864,7 @@ EvtScript N(8021B7C8) = {
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1)
EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8)
EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21)
EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20)

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

@ -1631,7 +1631,7 @@ EvtScript N(onBurnHit) = {
EVT_END_IF
EVT_DIVF(LVar3, EVT_FLOAT(2.0))
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar5)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_HP_OFFSET_BELOW)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_UPSIDE_DOWN)
EVT_SUBF(LVar1, LVar3)
EVT_ELSE
EVT_ADDF(LVar1, LVar3)

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

@ -1484,7 +1484,7 @@ EvtScript N(onBurnHit) = {
EVT_END_IF
EVT_DIVF(LVar3, EVT_FLOAT(2.0))
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar5)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_HP_OFFSET_BELOW)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_UPSIDE_DOWN)
EVT_SUBF(LVar1, LVar3)
EVT_ELSE
EVT_ADDF(LVar1, LVar3)

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

@ -1717,7 +1717,7 @@ EvtScript N(onBurnHit) = {
EVT_END_IF
EVT_DIVF(LVar3, EVT_FLOAT(2.0))
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar5)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_HP_OFFSET_BELOW)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_UPSIDE_DOWN)
EVT_SUBF(LVar1, LVar3)
EVT_ELSE
EVT_ADDF(LVar1, LVar3)

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

@ -61,7 +61,7 @@ ActorPartBlueprint N(partsTable_80219E24)[] = {
};
ActorBlueprint NAMESPACE = {
.flags = ACTOR_FLAG_HP_OFFSET_BELOW,
.flags = ACTOR_FLAG_UPSIDE_DOWN,
.type = ACTOR_TYPE_CHAN,
.level = 0,
.maxHP = 15,
@ -137,7 +137,7 @@ EvtScript N(80219F4C) = {
EVT_CALL(N(UnkBattleFunc1), -10, 0, 10, 0)
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021B81C)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021A560)))
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00001000, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, FALSE)
EVT_ELSE
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1)
EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16)
@ -145,8 +145,8 @@ EvtScript N(80219F4C) = {
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_Chan)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219E70)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00001000, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_END_IF
EVT_CALL(HPBarToHome, ACTOR_SELF)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
@ -171,9 +171,9 @@ EvtScript N(8021A12C) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1)
EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80219D6C)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219F08)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 16, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00001000, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_ToppledHurt)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
@ -556,8 +556,8 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_Chan)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219E70)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00001000, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0)
EVT_MOD(LVar0, 4)
EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0)

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

@ -629,7 +629,7 @@ EvtScript N(OnBurn) = {
EVT_END_IF
EVT_DIVF(LVar3, EVT_FLOAT(2.0))
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar5)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_HP_OFFSET_BELOW)
EVT_IF_FLAG(LVar5, ACTOR_FLAG_UPSIDE_DOWN)
EVT_SUBF(LVar1, LVar3)
EVT_ELSE
EVT_ADDF(LVar1, LVar3)

8
src/battle/common/actor/buzzy_beetle.inc.c
View File

@ -65,7 +65,7 @@ ActorPartBlueprint N(parts)[] = {
};
ActorBlueprint NAMESPACE = {
.flags = ACTOR_FLAG_HP_OFFSET_BELOW,
.flags = ACTOR_FLAG_UPSIDE_DOWN,
.type = ACTOR_TYPE_BUZZY_BEETLE,
.level = 10,
.maxHP = 3,
@ -143,7 +143,7 @@ EvtScript N(init) = {
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_END_IF
EVT_CALL(HPBarToHome, ACTOR_SELF)
@ -169,7 +169,7 @@ EvtScript N(fallOff) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1)
EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE)
@ -553,7 +553,7 @@ EvtScript N(takeTurn_ceiling) = {
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0)
EVT_MOD(LVar0, 4)

8
src/battle/common/actor/spike_top.inc.c
View File

@ -65,7 +65,7 @@ ActorPartBlueprint N(parts)[] = {
};
ActorBlueprint NAMESPACE = {
.flags = ACTOR_FLAG_HP_OFFSET_BELOW,
.flags = ACTOR_FLAG_UPSIDE_DOWN,
.type = ACTOR_TYPE_SPIKE_TOP,
.level = 17,
.maxHP = 4,
@ -143,7 +143,7 @@ EvtScript N(init) = {
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Floor)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Floor)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021C9D0)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_END_IF
EVT_CALL(HPBarToHome, ACTOR_SELF)
@ -169,7 +169,7 @@ EvtScript N(spikeTop_FallDown) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1)
EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021C8CC)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CA68)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE)
@ -556,7 +556,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = {
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Floor)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Floor)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021C9D0)))
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE)
EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0)
EVT_MOD(LVar0, 4)

12
src/battle/common/actor/swooper.inc.c
View File

@ -55,7 +55,7 @@ ActorPartBlueprint N(parts)[] = {
};
ActorBlueprint NAMESPACE = {
.flags = ACTOR_FLAG_HP_OFFSET_BELOW,
.flags = ACTOR_FLAG_UPSIDE_DOWN,
.type = ACTOR_TYPE_SWOOPER,
.level = 10,
.maxHP = 4,
@ -128,7 +128,7 @@ EvtScript N(returnHome) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, -24, 0)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, TRUE)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations)))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim0C)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -239,7 +239,7 @@ EvtScript N(knockDown) = {
EVT_IF_LE(LVar0, 0)
EVT_RETURN
EVT_END_IF
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -391,7 +391,7 @@ EvtScript N(handleEvent) = {
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying)))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -402,7 +402,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_CASE_EQ(EVENT_SCARE_AWAY)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -24, 0)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Swooper_Anim02)
@ -523,7 +523,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar1, 24)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)

12
src/battle/common/actor/swoopula.inc.c
View File

@ -58,7 +58,7 @@ ActorPartBlueprint N(parts)[] = {
};
ActorBlueprint NAMESPACE = {
.flags = ACTOR_FLAG_HP_OFFSET_BELOW,
.flags = ACTOR_FLAG_UPSIDE_DOWN,
.type = ACTOR_TYPE_SWOOPULA,
.level = 22,
.maxHP = 8,
@ -129,7 +129,7 @@ EvtScript N(returnHome) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, -24, 0)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, TRUE)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations)))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim0C)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -242,7 +242,7 @@ EvtScript N(knockDown) = {
EVT_IF_LE(LVar0, 0)
EVT_RETURN
EVT_END_IF
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -394,7 +394,7 @@ EvtScript N(handleEvent) = {
EVT_END_IF
EVT_RETURN
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying)))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
@ -405,7 +405,7 @@ EvtScript N(handleEvent) = {
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_CASE_EQ(EVENT_SCARE_AWAY)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -24, 0)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim02)
@ -895,7 +895,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, -1, 1, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar1, 24)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)

2
src/battle/common/move/StarBeamSupport.inc.c
View File

@ -323,7 +323,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) {
}
get_actor_part(target, player->targetPartIndex);
targetPosX = target->currentPos.x + target->headOffset.x;
if (target->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (target->flags & ACTOR_FLAG_UPSIDE_DOWN) {
targetPosY = target->currentPos.y + target->headOffset.y - target->size.y;
} else if (!(target->flags & ACTOR_FLAG_8000)) {
targetPosY = target->currentPos.y + target->headOffset.y + target->size.y;

10
src/battle/move/star_power/chill_out.c
View File

@ -42,8 +42,12 @@ API_CALLABLE(func_802A163C_79070C) {
script->varTable[0] = 0;
if ((target->flags & ACTOR_FLAG_TARGET_ONLY) || (target->flags & flag1) || (target->flags & ACTOR_FLAG_2000) ||
(part->eventFlags & ACTOR_EVENT_FLAG_ENCHANTED) || (part->eventFlags & flag2)) {
if ((target->flags & ACTOR_FLAG_TARGET_ONLY)
|| (target->flags & flag1)
|| (target->flags & ACTOR_FLAG_2000)
|| (part->eventFlags & ACTOR_EVENT_FLAG_ENCHANTED)
|| (part->eventFlags & flag2)
) {
return ApiStatus_DONE2;
}
@ -83,7 +87,7 @@ API_CALLABLE(func_802A16F4_7907C4) {
dispatch_damage_event_actor_0(target, 0, 10);
x = target->currentPos.x + target->headOffset.x + (target->size.x / 2);
if (target->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
if (target->flags & ACTOR_FLAG_UPSIDE_DOWN) {
y = target->currentPos.y + target->headOffset.y - target->size.y;
} else if (!(target->flags & ACTOR_FLAG_8000)) {
y = target->currentPos.y + target->headOffset.y + target->size.y;

14
src/battle/move/star_power/peach_focus.c
View File

@ -254,13 +254,13 @@ EvtScript N(802A22BC) = {
EvtScript N(EVS_UsePower) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0003)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Run)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 16)
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0))
EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(PlayerRunToGoal, 0)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_C000D)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_Startle)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30)
EVT_WAIT(1)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60)
@ -277,7 +277,7 @@ EvtScript N(EVS_UsePower) = {
EVT_CALL(SetBattleCamZoom, 213)
EVT_CALL(MoveBattleCamOver, 60)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_D000F)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach3_Pray)
EVT_CALL(PlaySound, SOUND_241)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 20)
@ -285,10 +285,10 @@ EvtScript N(EVS_UsePower) = {
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(GetActorVar, ACTOR_PARTNER, 0, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_CALL(ActorSpeak, MSG_CH8_0096, ACTOR_PLAYER, 0, ANIM_Peach_D000F, ANIM_Peach_D000F)
EVT_CALL(ActorSpeak, MSG_CH8_0096, ACTOR_PLAYER, 0, ANIM_Peach3_Pray, ANIM_Peach3_Pray)
EVT_END_IF
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0001)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Idle)
EVT_WAIT(10)
EVT_CALL(PlaySound, SOUND_2051)
EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
@ -320,9 +320,9 @@ EvtScript N(EVS_UsePower) = {
EVT_WAIT(15)
EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0))
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0003)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Run)
EVT_CALL(PlayerRunToGoal, 0)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0002)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Walk)
EVT_RETURN
EVT_END
};

10
src/battle/move/star_power/twink_dash.c
View File

@ -266,7 +266,7 @@ EvtScript N(802A233C) = {
EvtScript N(EVS_UsePower) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_C0010)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_SpreadArms)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 16)
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0))
@ -278,22 +278,22 @@ EvtScript N(EVS_UsePower) = {
EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_D000F)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach3_Pray)
EVT_WAIT(10)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 20)
EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2)
EVT_WAIT(30)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_C000C)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_Curious)
EVT_CALL(func_802A1518_79DDB8)
EVT_WAIT(10)
EVT_CALL(N(UnkBackgroundFunc))
EVT_WAIT(15)
EVT_CALL(SetGoalToHome, ACTOR_PLAYER)
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0))
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0003)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Run)
EVT_CALL(PlayerRunToGoal, 0)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0001)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Idle)
EVT_RETURN
EVT_END
};

5
src/battle/move/star_power/up_and_away.c
View File

@ -56,7 +56,10 @@ API_CALLABLE(func_802A1628_795908) {
if (!(flags & ACTOR_FLAG_TARGET_ONLY)) {
if (!(flags & ACTOR_FLAG_NO_DMG_APPLY)) {
if (!(flags & ACTOR_FLAG_2000) && targetActor->actorBlueprint->upAndAwayChance != 0 && rand_int(100) <= targetActor->actorBlueprint->upAndAwayChance) {
if (!(flags & ACTOR_FLAG_2000)
&& targetActor->actorBlueprint->upAndAwayChance != 0
&& rand_int(100) <= targetActor->actorBlueprint->upAndAwayChance
) {
script->varTable[0] = 1;
}
} else {

2
src/battle/partner/goombario.c
View File

@ -310,7 +310,7 @@ API_CALLABLE(N(GetTattleCamPos)) {
Actor* target = get_actor(gBattleStatus.partnerActor->targetActorID);
s32 xSize;
if (!(target->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(target->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
script->varTable[1] = script->varTable[1] + (((target->size.y / 3) & 0xFF) * target->scalingFactor);
script->varTable[1] += ((target->size.y / 4) * target->scalingFactor);
} else {

2
src/battle/partner/sushie.c
View File

@ -354,7 +354,7 @@ API_CALLABLE(N(ProcessTidalWave)) {
sEffect->data.waterFountain->unk_40 = partner->scale.x;
if (state->moveTime == 0) {
partner->rotation.z = 0.0f;
sEffect->flags |= ACTOR_FLAG_10;
sEffect->flags |= EFFECT_INSTANCE_FLAG_10;
return ApiStatus_DONE2;
}
state->moveTime--;

8
src/battle/partner/twink.c
View File

@ -146,19 +146,19 @@ EvtScript N(handleEvent) = {
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(EVENT_HIT_COMBO)
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_C0005)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_Gasp)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Twink_Hurt)
EVT_EXEC_WAIT(DoNormalHit)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0002)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Walk)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_C0005)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach2_Gasp)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Twink_Angry)
EVT_EXEC_WAIT(DoImmune)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0002)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach1_Walk)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE)

2
src/battle/partner/watt.c
View File

@ -966,7 +966,7 @@ EvtScript N(powerShock) = {
EVT_SET(LocalFlag(15), 0)
EVT_CALL(GetOwnerTarget, LVarA, LVarB)
EVT_CALL(GetActorFlags, LVarA, LVar0)
EVT_IF_FLAG(LVar0, ACTOR_FLAG_HP_OFFSET_BELOW)
EVT_IF_FLAG(LVar0, ACTOR_FLAG_UPSIDE_DOWN)
EVT_SET(LocalFlag(15), 1)
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_47)

2
src/common/UnkActorSizeFunc.inc.c
View File

@ -7,7 +7,7 @@ API_CALLABLE(N(UnkActorSizeFunc)) {
u8 targetActorSizeY;
u8 targetActorLargerDimension;
if (!(targetActor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
if (!(targetActor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
script->varTable[1] += targetActor->size.y / 2;
script->varTable[1] += targetActor->size.y / 4;
} else {

50
src/world/action/idle.c
View File

@ -2,25 +2,25 @@
#include "../actions.h"
AnimID IdlePeachAnims[] = {
ANIM_Peach_A0001, // none
ANIM_Peach_A0007, // cream
ANIM_Peach_A0009, // strawberry
ANIM_Peach_A000B, // butter
ANIM_Peach_A000D, // cleanser
ANIM_Peach_A000F, // water
ANIM_Peach_A0011, // milk
ANIM_Peach_A0013, // flour
ANIM_Peach_A0015, // egg
ANIM_Peach_A0017, // complete cake
ANIM_Peach_A0019, // cake bowl
ANIM_Peach_A001B, // cake mixed
ANIM_Peach_A001D, // cake pan
ANIM_Peach_A001F, // cake batter
ANIM_Peach_A0021, // cake bare
ANIM_Peach_A0023, // salt
ANIM_Peach_A0025, // sugar
ANIM_Peach_A0027, // cake with icing
ANIM_Peach_A0029, // cake with berries
ANIM_Peach1_Idle, // none
ANIM_Peach1_HoldCream, // cream
ANIM_Peach1_HoldStrawberry, // strawberry
ANIM_Peach1_HoldButter, // butter
ANIM_Peach1_HoldCleanser, // cleanser
ANIM_Peach1_HoldWater, // water
ANIM_Peach1_HoldMilk, // milk
ANIM_Peach1_HoldFlour, // flour
ANIM_Peach1_HoldEgg, // egg
ANIM_Peach1_HoldCompleteCake, // complete cake
ANIM_Peach1_HoldCakeBowl, // cake bowl
ANIM_Peach1_HoldCakeMixed, // cake mixed
ANIM_Peach1_HoldCakePan, // cake pan
ANIM_Peach1_HoldCakeBatter, // cake batter
ANIM_Peach1_HoldBareCake, // cake bare
ANIM_Peach1_HoldSalt, // salt
ANIM_Peach1_HoldSugar, // sugar
ANIM_Peach1_HoldIcingCake, // cake with icing
ANIM_Peach1_HoldBerryCake, // cake with berries
0x00000000,
};
@ -114,7 +114,7 @@ void action_update_idle_peach(void) {
if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) {
suggest_player_anim_allow_backward(IdlePeachAnims[gGameStatusPtr->peachBakingIngredient]);
} else {
suggest_player_anim_allow_backward(ANIM_Peach_C000E);
suggest_player_anim_allow_backward(ANIM_Peach2_SadStill);
}
} else {
peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].idle);
@ -129,7 +129,7 @@ void action_update_idle_peach(void) {
if (playerStatus->currentStateTime > 1800) {
// begin first yawm
playerStatus->actionSubstate++;
suggest_player_anim_allow_backward(ANIM_Peach_C0003);
suggest_player_anim_allow_backward(ANIM_Peach2_Yawn);
return;
}
playerStatus->currentStateTime++;
@ -140,7 +140,7 @@ void action_update_idle_peach(void) {
if (playerStatus->animNotifyValue != 0) {
playerStatus->actionSubstate++;
playerStatus->currentStateTime = 0;
suggest_player_anim_allow_backward(ANIM_Peach_A0001);
suggest_player_anim_allow_backward(ANIM_Peach1_Idle);
}
break;
case SUBSTATE_DELAY_SLEEP:
@ -148,16 +148,16 @@ void action_update_idle_peach(void) {
playerStatus->currentStateTime++;
if (playerStatus->currentStateTime > 200) {
playerStatus->actionSubstate++;
suggest_player_anim_allow_backward(ANIM_Peach_C0003);
suggest_player_anim_allow_backward(ANIM_Peach2_Yawn);
}
break;
case SUBSTATE_IDLE_SLEEP:
// peach is asleep
if (playerStatus->flags & (PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_INPUT_DISABLED)) {
suggest_player_anim_allow_backward(ANIM_Peach_A0001);
suggest_player_anim_allow_backward(ANIM_Peach1_Idle);
playerStatus->actionSubstate = SUBSTATE_IDLE_DEFAULT;
} else if (playerStatus->animNotifyValue != 0) {
suggest_player_anim_allow_backward(ANIM_Peach_C0004);
suggest_player_anim_allow_backward(ANIM_Peach2_Sleep);
}
break;
}

4
src/world/action/jump.c
View File

@ -186,7 +186,7 @@ void action_update_peach_falling(void) {
if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) {
anim = ANIM_Mario1_Fall;
} else {
anim = ANIM_Peach_A0006;
anim = ANIM_Peach1_StepDown;
}
suggest_player_anim_allow_backward(anim);
@ -205,7 +205,7 @@ void action_update_peach_step_down(void) {
gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y;
if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) {
suggest_player_anim_allow_backward(ANIM_Peach_A0006);
suggest_player_anim_allow_backward(ANIM_Peach1_StepDown);
}
}
playerStatus->timeInAir++;

4
src/world/action/misc.c
View File

@ -230,7 +230,7 @@ void action_update_talk(void) {
suggest_player_anim_always_forward(ANIM_MarioW2_SpeakUp);
} else if (playerStatus->peachItemHeld == 0) {
if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) {
suggest_player_anim_always_forward(ANIM_Peach_C0000);
suggest_player_anim_always_forward(ANIM_Peach2_RaiseArms);
} else {
peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].talk);
}
@ -243,7 +243,7 @@ void action_update_talk(void) {
playerStatus->currentStateTime--;
} else if (playerStatus->peachItemHeld == 0) {
if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) {
suggest_player_anim_always_forward(ANIM_Peach_A0001);
suggest_player_anim_always_forward(ANIM_Peach1_Idle);
} else {
peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].idle);
}

6
src/world/action/sneaky_parasol.c
View File

@ -119,11 +119,11 @@ void action_update_parasol(void) {
case SUBSTATE_DISGUISE_INIT:
if (playerStatus->flipYaw[CAM_DEFAULT] == 0) {
if (peach_disguise_check_overlaps() < 0) {
suggest_player_anim_allow_backward(ANIM_Peach_C0024);
suggest_player_anim_allow_backward(ANIM_Peach2_UseParasol);
sfx_play_sound_at_player(SOUND_92, SOUND_SPACE_MODE_0);
playerStatus->actionSubstate++; // SUBSTATE_USE_PARASOL
} else {
suggest_player_anim_allow_backward(ANIM_Peach_C0027);
suggest_player_anim_allow_backward(ANIM_Peach2_CantFitParasol);
playerStatus->actionSubstate = SUBSTATE_BLOCKED;
playerStatus->currentStateTime = 10;
transformation->disguiseTime = 0;
@ -131,7 +131,7 @@ void action_update_parasol(void) {
}
case SUBSTATE_USE_PARASOL:
if (--playerStatus->currentStateTime == 0) {
suggest_player_anim_allow_backward(ANIM_Peach_C0025);
suggest_player_anim_allow_backward(ANIM_Peach2_PutAwayParasol);
playerStatus->actionSubstate = SUBSTATE_PUT_AWAY;
if (transformation->npc == NULL) {
playerStatus->actionSubstate = SUBSTATE_FAILED;

42
src/world/action/step_up.c
View File

@ -2,25 +2,25 @@
#include "world/actions.h"
AnimID StepUpPeachAnims[] = {
ANIM_Peach_A0002, // none
ANIM_Peach_A002B, // cream
ANIM_Peach_A002D, // strawberry
ANIM_Peach_A002F, // butter
ANIM_Peach_A0031, // cleanser
ANIM_Peach_A0033, // water
ANIM_Peach_A0035, // milk
ANIM_Peach_A0037, // flour
ANIM_Peach_A0039, // egg
ANIM_Peach_A003B, // complete cake
ANIM_Peach_A003D, // cake bowl
ANIM_Peach_A003F, // cake mixed
ANIM_Peach_A0041, // cake pan
ANIM_Peach_A0043, // cake batter
ANIM_Peach_A0045, // cake bare
ANIM_Peach_A0047, // salt
ANIM_Peach_A0049, // sugar
ANIM_Peach_A004B, // cake with icing
ANIM_Peach_A004D, // cake with berries
ANIM_Peach1_Walk, // none
ANIM_Peach1_CarryCream, // cream
ANIM_Peach1_CarryStrawberry, // strawberry
ANIM_Peach1_CarryButter, // butter
ANIM_Peach1_CarryCleanser, // cleanser
ANIM_Peach1_CarryWater, // water
ANIM_Peach1_CarryMilk, // milk
ANIM_Peach1_CarryFlour, // flour
ANIM_Peach1_CarryEgg, // egg
ANIM_Peach1_CarryCompleteCake, // complete cake
ANIM_Peach1_CarryCakeBowl, // cake bowl
ANIM_Peach1_CarryCakeMixed, // cake mixed
ANIM_Peach1_CarryCakePan, // cake pan
ANIM_Peach1_CarryCakeBatter, // cake batter
ANIM_Peach1_CarryBareCake, // cake bare
ANIM_Peach1_CarrySalt, // salt
ANIM_Peach1_CarrySugar, // sugar
ANIM_Peach1_CarryIcingCake, // cake with icing
ANIM_Peach1_CarryBerryCake, // cake with berries
0x00000000
};
@ -81,7 +81,7 @@ void func_802B6198_E24768(void) {
if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) {
suggest_player_anim_allow_backward(StepUpPeachAnims[gGameStatusPtr->peachBakingIngredient]);
} else {
suggest_player_anim_allow_backward(ANIM_Peach_D000D);
suggest_player_anim_allow_backward(ANIM_Peach3_WalkSad);
}
} else {
peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].walk);
@ -93,7 +93,7 @@ void action_update_step_up_peach(void) {
if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) {
playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED;
suggest_player_anim_allow_backward(ANIM_Peach_A0005);
suggest_player_anim_allow_backward(ANIM_Peach1_StepUp);
playerStatus->currentStateTime = 8;
}

44
src/world/action/walk.c
View File

@ -2,25 +2,25 @@
#include "world/actions.h"
AnimID WalkPeachAnims[] = {
ANIM_Peach_A0002, // none
ANIM_Peach_A002B, // cream
ANIM_Peach_A002D, // strawberry
ANIM_Peach_A002F, // butter
ANIM_Peach_A0031, // cleanser
ANIM_Peach_A0033, // water
ANIM_Peach_A0035, // milk
ANIM_Peach_A0037, // flour
ANIM_Peach_A0039, // egg
ANIM_Peach_A003B, // complete cake
ANIM_Peach_A003D, // cake bowl
ANIM_Peach_A003F, // cake mixed
ANIM_Peach_A0041, // cake pan
ANIM_Peach_A0043, // cake batter
ANIM_Peach_A0045, // cake bare
ANIM_Peach_A0047, // salt
ANIM_Peach_A0049, // sugar
ANIM_Peach_A004B, // cake with icing
ANIM_Peach_A004D, // cake with berries
ANIM_Peach1_Walk, // none
ANIM_Peach1_CarryCream, // cream
ANIM_Peach1_CarryStrawberry, // strawberry
ANIM_Peach1_CarryButter, // butter
ANIM_Peach1_CarryCleanser, // cleanser
ANIM_Peach1_CarryWater, // water
ANIM_Peach1_CarryMilk, // milk
ANIM_Peach1_CarryFlour, // flour
ANIM_Peach1_CarryEgg, // egg
ANIM_Peach1_CarryCompleteCake, // complete cake
ANIM_Peach1_CarryCakeBowl, // cake bowl
ANIM_Peach1_CarryCakeMixed, // cake mixed
ANIM_Peach1_CarryCakePan, // cake pan
ANIM_Peach1_CarryCakeBatter, // cake batter
ANIM_Peach1_CarryBareCake, // cake bare
ANIM_Peach1_CarrySalt, // salt
ANIM_Peach1_CarrySugar, // sugar
ANIM_Peach1_CarryIcingCake, // cake with icing
ANIM_Peach1_CarryBerryCake, // cake with berries
0x00000000
};
@ -210,7 +210,7 @@ void func_802B6550_E23C30(void) {
suggest_player_anim_allow_backward(WalkPeachAnims[gGameStatusPtr->peachBakingIngredient]);
return;
}
suggest_player_anim_allow_backward(ANIM_Peach_D000D);
suggest_player_anim_allow_backward(ANIM_Peach3_WalkSad);
return;
}
peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].walk);
@ -269,12 +269,12 @@ static void action_update_run_peach(void) {
gameStatus = gGameStatusPtr;
if (!(gameStatus->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) {
if (!gameStatus->peachBakingIngredient) {
suggest_player_anim_allow_backward(ANIM_Peach_A0003);
suggest_player_anim_allow_backward(ANIM_Peach1_Run);
} else {
suggest_player_anim_allow_backward(WalkPeachAnims[gameStatus->peachBakingIngredient]);
}
} else {
suggest_player_anim_allow_backward(ANIM_Peach_D000D);
suggest_player_anim_allow_backward(ANIM_Peach3_WalkSad);
}
} else {
peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].run);

44
src/world/area_hos/hos_10/hos_10_2_npc1.c
View File

@ -66,12 +66,12 @@ EvtScript N(EVS_NpcInit_Kalmar) = {
};
AnimID N(ExtraAnims_Peach)[] = {
ANIM_Peach_A0001,
ANIM_Peach_A0002,
ANIM_Peach_C0000,
ANIM_Peach_C0006,
ANIM_Peach_C001E,
ANIM_Peach_C0026,
ANIM_Peach1_Idle,
ANIM_Peach1_Walk,
ANIM_Peach2_RaiseArms,
ANIM_Peach2_GaspStill,
ANIM_Peach2_TiedIdle,
ANIM_Peach2_TalkIdle,
ANIM_LIST_END
};
@ -133,22 +133,22 @@ NpcData N(NpcData_Spirits)[] = {
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_800 | ENEMY_FLAG_USE_PLAYER_SPRITE,
.drops = NO_DROPS,
.animations = {
.idle = ANIM_Peach_A0000,
.walk = ANIM_Peach_A0000,
.run = ANIM_Peach_A0000,
.chase = ANIM_Peach_A0000,
.anim_4 = ANIM_Peach_A0000,
.anim_5 = ANIM_Peach_A0000,
.death = ANIM_Peach_A0000,
.hit = ANIM_Peach_A0000,
.anim_8 = ANIM_Peach_A0000,
.anim_9 = ANIM_Peach_A0000,
.anim_A = ANIM_Peach_A0000,
.anim_B = ANIM_Peach_A0000,
.anim_C = ANIM_Peach_A0000,
.anim_D = ANIM_Peach_A0000,
.anim_E = ANIM_Peach_A0000,
.anim_F = ANIM_Peach_A0000,
.idle = ANIM_Peach1_Still,
.walk = ANIM_Peach1_Still,
.run = ANIM_Peach1_Still,
.chase = ANIM_Peach1_Still,
.anim_4 = ANIM_Peach1_Still,
.anim_5 = ANIM_Peach1_Still,
.death = ANIM_Peach1_Still,
.hit = ANIM_Peach1_Still,
.anim_8 = ANIM_Peach1_Still,
.anim_9 = ANIM_Peach1_Still,
.anim_A = ANIM_Peach1_Still,
.anim_B = ANIM_Peach1_Still,
.anim_C = ANIM_Peach1_Still,
.anim_D = ANIM_Peach1_Still,
.anim_E = ANIM_Peach1_Still,
.anim_F = ANIM_Peach1_Still,
},
.extraAnimations = N(ExtraAnims_Peach),
},

18
src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c
View File

@ -47,15 +47,15 @@ EvtScript N(EVS_NpcInit_ToadGuard_03) = {
};
AnimID N(ExtraAnims_Peach)[] = {
ANIM_Peach_A0000,
ANIM_Peach_A0001,
ANIM_Peach_C0026,
ANIM_Peach_C0000,
ANIM_Peach_C0001,
ANIM_Peach_C0002,
ANIM_Peach_A0002,
ANIM_Peach_C0010,
ANIM_Peach_D000F,
ANIM_Peach1_Still,
ANIM_Peach1_Idle,
ANIM_Peach2_TalkIdle,
ANIM_Peach2_RaiseArms,
ANIM_Peach2_Talk,
ANIM_Peach2_LowerArms,
ANIM_Peach1_Walk,
ANIM_Peach2_SpreadArms,
ANIM_Peach3_Pray,
ANIM_LIST_END
};

34
src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c
View File

@ -102,10 +102,10 @@ EvtScript N(EVS_Scene_Ending) = {
EVT_CALL(SetMusicTrack, 0, SONG_PEACH_APPEARS, 0, 8)
EVT_EXEC(N(EVS_OpenAndClosePeachDoor))
EVT_THREAD
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk)
EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(2.0))
EVT_CALL(NpcMoveTo, NPC_Peach, 0, -200, 0)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_END_THREAD
EVT_LOOP(0)
EVT_CALL(GetNpcPos, NPC_Peach, LVar0, LVar1, LVar2)
@ -129,17 +129,17 @@ EvtScript N(EVS_Scene_Ending) = {
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_WAIT(20)
EVT_CALL(SetMusicTrack, 0, SONG_PEACH_APPEARS, 1, 8)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Outro_0066)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Outro_0066)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 50, 0, 250)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 0, 250)
EVT_CALL(SetCamDistance, CAM_DEFAULT, 500)
EVT_CALL(SetCamPitch, CAM_DEFAULT, 3, -10)
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_WAIT(1)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Outro_0067)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Outro_0067)
EVT_WAIT(10)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 100, -200)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 100, -200)
@ -148,10 +148,10 @@ EvtScript N(EVS_Scene_Ending) = {
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CALL(InterpPlayerYaw, 90, 0)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Outro_0068)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Outro_0068)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 300)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 300)
EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(252.7))
@ -191,17 +191,17 @@ EvtScript N(EVS_Scene_Ending) = {
EVT_CALL(SetCamPosA, CAM_DEFAULT, -500, -1400)
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_WAIT(1)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Outro_006D)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_Outro_006D)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms)
EVT_WAIT(30)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_D000F)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach3_Pray)
EVT_WAIT(60)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Outro_006E)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0010)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_Outro_006E)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_SpreadArms)
EVT_CALL(EnableGroup, MODEL_chandelier, FALSE)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 120)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 120)

34
src/world/area_kkj/kkj_03/kkj_03_4_scenes.c
View File

@ -13,35 +13,35 @@ EvtScript N(EVS_Scene_MeetingPeach) = {
EVT_WAIT(20)
EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8)
EVT_CALL(PlayerFaceNpc, NPC_Peach, FALSE)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk)
EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(2.0))
EVT_CALL(NpcMoveTo, NPC_Peach, 625, 0, 0)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Intro_004B)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_Intro_004B)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_THREAD
EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(5.0), 600, 0, -12, EVT_FLOAT(325.0), EVT_FLOAT(17.0), EVT_FLOAT(-9.0))
EVT_END_THREAD
EVT_CALL(PlayerMoveTo, 575, 0, 20)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Intro_004C)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_Intro_004C)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes)
EVT_WAIT(20)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Intro_004D)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_Intro_004D)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_WAIT(10)
EVT_CALL(FadeOutMusic, 0, 1000)
EVT_THREAD
@ -53,13 +53,13 @@ EvtScript N(EVS_Scene_MeetingPeach) = {
EVT_END_THREAD
EVT_THREAD
EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 7)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk)
EVT_CALL(NpcMoveTo, NPC_Peach, 640, 0, 10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_CALL(PlaySoundAtNpc, NPC_Peach, SOUND_262, 0)
EVT_CALL(ShowEmote, NPC_Peach, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0)
EVT_WAIT(20)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0011)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LookAround)
EVT_WAIT(60)
EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7)
EVT_END_THREAD
@ -127,7 +127,7 @@ EvtScript N(EVS_Scene_Ascending) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_THREAD
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0004)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_RunLiftDress)
EVT_LOOP(0)
EVT_CALL(NpcMoveTo, NPC_Peach, 600, 0, 20)
EVT_CALL(NpcMoveTo, NPC_Peach, 680, 0, 20)

4
src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c
View File

@ -15,7 +15,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 5)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0174)
EVT_CALL(N(ApproachPlayer100Units), -1, LVar3, LVar0, LVar2)
@ -26,7 +26,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02)
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)

4
src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c
View File

@ -34,7 +34,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 5)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0174)
EVT_CALL(N(ApproachPlayer100Units), -1, LVar3, LVar0, LVar2)
@ -45,7 +45,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02)
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)

8
src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c
View File

@ -16,7 +16,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 5)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0174)
EVT_CALL(N(ApproachPlayer100Units), -1, LVar3, LVar0, LVar2)
@ -27,7 +27,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02)
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)
@ -166,10 +166,10 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 5)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0174)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)

4
src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c
View File

@ -33,7 +33,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 5)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0174)
EVT_CALL(N(ApproachPlayer100Units), -1, LVar3, LVar0, LVar2)
@ -44,7 +44,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01)
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)

4
src/world/area_kkj/kkj_12/kkj_12_2_npc.c
View File

@ -121,7 +121,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 5)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0174)
EVT_CALL(N(ApproachPlayer100Units), NPC_SELF, LVar3, LVar0, LVar2)
@ -132,7 +132,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim02)
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim09, ANIM_WorldKoopatrol_Anim02, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)

10
src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c
View File

@ -77,7 +77,7 @@ EvtScript N(EVS_Scene_MarioConfrontsBowser) = {
EVT_CALL(SetNpcPos, NPC_Bowser_Body, 725, 210, -25)
EVT_CALL(SetNpcPos, NPC_Bowser_Prop, 725, 210, -25)
EVT_EXEC(N(EVS_UpdatePropellerSounds))
EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach_C001C, ANIM_Peach_C001B, 0, MSG_CH8_006F)
EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach2_TiedHangStruggle, ANIM_Peach2_TiedHangIdle, 0, MSG_CH8_006F)
EVT_CALL(EnableNpcShadow, NPC_Bowser_Body, FALSE)
EVT_CALL(SetCamType, CAM_DEFAULT, 1, FALSE)
EVT_SET(LVar0, 725)
@ -123,7 +123,7 @@ EvtScript N(EVS_Scene_MarioConfrontsBowser) = {
EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(170.0), EVT_FLOAT(240.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_WAIT(20)
EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach_C001C, ANIM_Peach_C001B, 0, MSG_CH8_0071)
EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach2_TiedHangStruggle, ANIM_Peach2_TiedHangIdle, 0, MSG_CH8_0071)
EVT_WAIT(20)
EVT_CALL(SetPlayerPos, 400, 0, -15)
EVT_CALL(PartnerIsFlying, LVar0)
@ -264,8 +264,8 @@ EvtScript N(EVS_Scene_BowserDefeated) = {
EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Walk)
EVT_CALL(NpcMoveTo, NPC_Bowser_Body, 800, 0, 20)
EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle)
EVT_CALL(SetNpcAnimation, NPC_CaptivePeach, ANIM_Peach_C001E)
EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach_C001C, ANIM_Peach_C001B, 0, MSG_CH8_0079)
EVT_CALL(SetNpcAnimation, NPC_CaptivePeach, ANIM_Peach2_TiedIdle)
EVT_CALL(SpeakToPlayer, NPC_CaptivePeach, ANIM_Peach2_TiedHangStruggle, ANIM_Peach2_TiedHangIdle, 0, MSG_CH8_0079)
EVT_CALL(EnablePartnerAI)
EVT_CALL(PlayerMoveTo, 580, 0, 10)
EVT_EXEC_WAIT(N(EVS_BowserFliesAway))
@ -320,7 +320,7 @@ EvtScript N(EVS_NpcInit_CaptivePeach) = {
EVT_RETURN
EVT_END_IF
EVT_CALL(SetNpcPos, NPC_CaptivePeach, 775, 90, 0)
EVT_CALL(SetNpcAnimation, NPC_CaptivePeach, ANIM_Peach_C001C)
EVT_CALL(SetNpcAnimation, NPC_CaptivePeach, ANIM_Peach2_TiedHangStruggle)
EVT_RETURN
EVT_END
};

34
src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c
View File

@ -227,27 +227,27 @@ EvtScript N(EVS_Scene_BowserAttacks) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_THREAD
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0004)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_RunLiftDress)
EVT_LOOP(2)
EVT_CALL(NpcMoveTo, NPC_Peach, 600, -2, 20)
EVT_CALL(NpcMoveTo, NPC_Peach, 680, -2, 20)
EVT_END_LOOP
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk)
EVT_CALL(NpcMoveTo, NPC_Peach, 600, -2, 30)
EVT_CALL(NpcMoveTo, NPC_Peach, 625, -2, 30)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7)
EVT_END_THREAD
EVT_WAIT(160)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001,ANIM_Peach_C0026, 0, MSG_Intro_004E)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk,ANIM_Peach2_TalkIdle, 0, MSG_Intro_004E)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle)
EVT_WAIT(20)
EVT_CALL(GetNpcPos, NPC_Peach, LVar0, LVar1, LVar2)
EVT_CALL(NpcJump0, NPC_Peach, LVar0, LVar1, LVar2, 10)
@ -258,7 +258,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = {
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001, 5, MSG_Intro_004F)
EVT_CALL(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, 5, MSG_Intro_004F)
EVT_WAIT(30)
EVT_THREAD
EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_ClownCarIdle)
@ -319,7 +319,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = {
EVT_CALL(PlayerFaceNpc, NPC_Bowser_Body, FALSE)
EVT_CALL(NpcFaceNpc, NPC_Peach, NPC_Bowser_Body, 0)
EVT_END_LOOP
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_WAIT(30)
EVT_CALL(SetNpcPos, NPC_Bowser_Prop, NPC_DISPOSE_LOCATION)
EVT_CALL(SetMusicTrack, 0, SONG_BOWSER_THEME, 0, 8)
@ -347,7 +347,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = {
EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-11.0))
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CALL(SpeakToNpc, NPC_Peach, ANIM_Peach_C0007, ANIM_Peach_C0008, 0, NPC_Bowser_Body, MSG_Intro_0051)
EVT_CALL(SpeakToNpc, NPC_Peach, ANIM_Peach2_Shout, ANIM_Peach2_EndShout, 0, NPC_Bowser_Body, MSG_Intro_0051)
EVT_SET(LVar0, EVT_FLOAT(1.0))
EVT_EXEC_WAIT(N(EVS_FocusCam_OnBowser))
EVT_CALL(SpeakToNpc, NPC_Bowser_Body, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_Idle, 0, NPC_Peach, MSG_Intro_0052)
@ -369,7 +369,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = {
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump)
EVT_WAIT(15)
EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Intro_0053)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Intro_0054)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Intro_0054)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh)
EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh, ANIM_WorldBowser_RearUpLaugh, 0, MSG_Intro_0055)
@ -395,11 +395,11 @@ EvtScript N(EVS_Scene_BowserAttacks) = {
EVT_CALL(SetPlayerPos, 660, 0, 15)
EVT_WAIT(1)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_FallDown)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0006)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_GaspStill)
EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh)
EVT_EXEC_WAIT(N(EVS_FocusCam_OnPeach))
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0006, ANIM_Peach_C0006, 5, MSG_Intro_005D)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_GaspStill, ANIM_Peach2_GaspStill, 5, MSG_Intro_005D)
EVT_WAIT(10)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 790, 0, 0)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 790, 0, 0)
@ -466,7 +466,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = {
EvtScript N(EVS_Scene_PeachCaptured) = {
EVT_CALL(FadeOutMusic, 0, 500)
EVT_CALL(DisablePlayerInput, TRUE)
EVT_CALL(SetNpcAnimation, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle)
EVT_CALL(SetNpcYaw, NPC_Peach, 315)
EVT_CALL(SetNpcPos, NPC_Peach, 613, 0, -90)
EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh)
@ -477,7 +477,7 @@ EvtScript N(EVS_Scene_PeachCaptured) = {
EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone))
EVT_CALL(SetNpcSpeed, NPC_Peach, EVT_FLOAT(3.0))
EVT_CALL(NpcMoveTo, NPC_Peach, 570, -130, 0)
EVT_CALL(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001, SPRITE_ID_BACK_FACING | ANIM_Peach_A0001, 5, MSG_Intro_0062)
EVT_CALL(SpeakToPlayer, NPC_Peach, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, SPRITE_ID_BACK_FACING | ANIM_Peach1_Idle, 5, MSG_Intro_0062)
EVT_WAIT(10)
EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0)
EVT_WAIT(10)

20
src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c
View File

@ -111,15 +111,15 @@ EvtScript N(EVS_Scene_Chapter2) = {
EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle)
EVT_WAIT(1)
EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0012)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ArmsCrossedIdle)
EVT_CALL(InterpPlayerYaw, 90, 3)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_005D)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_005D)
EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 5, MSG_Peach_005E)
EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle)
EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(InterpPlayerYaw, 270, 0)
EVT_CALL(InterpNpcYaw, NPC_Bowser, 270, 0)
EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch2))
@ -218,17 +218,17 @@ EvtScript N(EVS_Scene_Chapter2) = {
EVT_END_IF
EVT_END_LOOP
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0066)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0066)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0067)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0068)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0068)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0069)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_006A)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_006A)
EVT_EXEC(N(EVS_SetupMusic))
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
EVT_CALL(EnablePartnerAI)

4
src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c
View File

@ -59,9 +59,9 @@ EvtScript N(EVS_Scene_Chapter3) = {
EVT_CALL(NpcFacePlayer, NPC_PARTNER, 5)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_007E)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_007F)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_007F)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0080)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0081)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0081)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0))
EVT_CALL(EnablePartnerAI)
EVT_CALL(DisablePlayerInput, FALSE)

4
src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c
View File

@ -8,9 +8,9 @@ EvtScript N(EVS_Scene_Chapter4) = {
EVT_CALL(SetNpcYaw, NPC_PARTNER, 90)
EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), -20, 250, EVT_FLOAT(17.0), EVT_FLOAT(-11.0))
EVT_WAIT(30)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0097)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0097)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0098)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0099)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0099)
EVT_THREAD
EVT_CALL(NpcFlyTo, NPC_PARTNER, -30, 55, 30, 30, -5, EASING_LINEAR)
EVT_CALL(EnablePartnerAI)

12
src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c
View File

@ -26,15 +26,15 @@ EvtScript N(EVS_Scene_Chapter5) = {
EVT_END_LOOP
EVT_CALL(PlayerMoveTo, -110, 0, 25)
EVT_CALL(InterpPlayerYaw, 270, 5)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_00EB)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_00EB)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00EC)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00ED)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00ED)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00EE)
EVT_THREAD
EVT_CALL(NpcFlyTo, NPC_PARTNER, -140, 55, 0, 30, -5, EASING_LINEAR)

10
src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c
View File

@ -15,13 +15,13 @@ EvtScript N(EVS_Scene_Chapter6) = {
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0))
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_012F)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_012F)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0130)
EVT_THREAD
EVT_CALL(NpcFlyTo, NPC_PARTNER, -90, 55, 0, 30, -5, EASING_LINEAR)

22
src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c
View File

@ -102,10 +102,10 @@ EvtScript N(EVS_TiePeachUp) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(10)
EVT_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0006)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_GaspStill)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(ShowMessageAtWorldPos, MSG_Peach_016D, LVar0, LVar1, LVar2)
EVT_END_THREAD
@ -117,7 +117,7 @@ EvtScript N(EVS_TiePeachUp) = {
EVT_ADD(LVar1, 2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C001E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TiedIdle)
EVT_LOOP(20)
EVT_CALL(InterpPlayerYaw, LVar0, 0)
EVT_ADD(LVar0, LVar1)
@ -149,7 +149,7 @@ EvtScript N(EVS_PickUpPeach) = {
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0008)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_TiedSideways)
EVT_LOOP(5)
EVT_ADD(LVar1, 4)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
@ -299,18 +299,18 @@ EvtScript N(EVS_Scene_Chapter7) = {
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_0162)
EVT_CALL(InterpPlayerYaw, 90, 5)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0012)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_0163)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ArmsCrossedIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_0163)
EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0164)
EVT_CALL(InterpPlayerYaw, 270, 5)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_0165)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_0165)
EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_TalkEyesClosed, ANIM_WorldBowser_TalkEyesClosed, 5, MSG_Peach_0166)
EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle)
EVT_CALL(EndSpeech, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_0167)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_0167)
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_EXEC_WAIT(N(EVS_FocusCam_Door_Ch7))
EVT_EXEC(N(EVS_OpenDoor_Ch7))
EVT_CALL(SetNpcAnimation, NPC_Ch7_Kammy, ANIM_WorldKammy_Anim03)
@ -413,7 +413,7 @@ EvtScript N(EVS_Scene_Chapter7) = {
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(7.5))
EVT_CALL(NpcFlyTo, NPC_PARTNER, 500, 130, 10, 0, 0, EASING_LINEAR)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C001E, ANIM_Peach_C001E, 5, MSG_Peach_0171)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_TiedIdle, ANIM_Peach2_TiedIdle, 5, MSG_Peach_0171)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Ch7_Bowser, ANIM_WorldBowser_Idle)
EVT_CALL(SpeakToPlayer, NPC_Ch7_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0172)
@ -425,7 +425,7 @@ EvtScript N(EVS_Scene_Chapter7) = {
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_EXEC_WAIT(N(EVS_PickUpPeach))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0008, ANIM_Peach_D0008, 5, MSG_Peach_0173)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_TiedSideways, ANIM_Peach3_TiedSideways, 5, MSG_Peach_0173)
EVT_EXEC_WAIT(N(EVS_CarryPeachAway))
EVT_WAIT(30)
EVT_EXEC_WAIT(N(EVS_EndPeachChapter7))

72
src/world/area_kkj/kkj_14/kkj_14_3_interactables.c
View File

@ -10,15 +10,15 @@ EvtScript N(EVS_Inspect_Fireplace) = {
EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE)
EVT_IF_EQ(AF_KKJ_14, FALSE)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0039)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0039)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_003A)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_003B)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_003B)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_SET(AF_KKJ_14, TRUE)
EVT_CALL(EnablePartnerAI)
EVT_ELSE
@ -45,13 +45,13 @@ EvtScript N(EVS_Inspect_Dresses) = {
EVT_IF_EQ(AF_KKJ_15, FALSE)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_003C)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_003D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_003D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_SET(AF_KKJ_15, TRUE)
EVT_CALL(EnablePartnerAI)
EVT_ELSE
@ -88,7 +88,7 @@ EvtScript N(EVS_Inspect_Vanity) = {
EVT_END_LOOP
EVT_ELSE
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0044)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0044)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0045)
EVT_CALL(EnablePartnerAI)
EVT_END_IF
@ -108,13 +108,13 @@ EvtScript N(EVS_Inspect_Photo) = {
EVT_IF_EQ(AF_KKJ_17, FALSE)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_003E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_003F)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_003F)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_SET(AF_KKJ_17, TRUE)
EVT_CALL(EnablePartnerAI)
EVT_ELSE
@ -140,14 +140,14 @@ EvtScript N(EVS_Inspect_Bed) = {
EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE)
EVT_IF_EQ(AF_KKJ_18, FALSE)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0040)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0040)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0041)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_SET(AF_KKJ_18, TRUE)
EVT_CALL(EnablePartnerAI)
EVT_ELSE
@ -173,14 +173,14 @@ EvtScript N(EVS_Inspect_Flowers) = {
EVT_IF_EQ(GF_KKJ14_RevealedButton, FALSE)
EVT_IF_EQ(AF_KKJ_19, FALSE)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0042)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0042)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0043)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_SET(AF_KKJ_19, TRUE)
EVT_CALL(EnablePartnerAI)
EVT_ELSE
@ -310,9 +310,9 @@ EvtScript N(EVS_Inspect_HiddenButton) = {
EVT_ELSE
EVT_CALL(FacePlayerTowardPoint, -29, -148, 5)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0010)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_ReachForButtonHigh)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButtonHigh)
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_FA, 0)
@ -320,9 +320,9 @@ EvtScript N(EVS_Inspect_HiddenButton) = {
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0))
EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0012)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_AfterPressButtonHigh)
EVT_WAIT(20)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(InterpPlayerYaw, 225, 0)
EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0)
EVT_EXEC_WAIT(N(EVS_OpenHiddenPassage))
@ -349,9 +349,9 @@ EvtScript N(EVS_Inspect_HiddenButton_FirstTime) = {
EVT_ELSE
EVT_CALL(FacePlayerTowardPoint, -29, -148, 5)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0010)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_ReachForButtonHigh)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButtonHigh)
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtCollider, COLLIDER_o128, SOUND_FA, 0)
@ -359,9 +359,9 @@ EvtScript N(EVS_Inspect_HiddenButton_FirstTime) = {
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0))
EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0012)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_AfterPressButtonHigh)
EVT_WAIT(20)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(InterpPlayerYaw, 225, 0)
EVT_CALL(InterpNpcYaw, NPC_PARTNER, 225, 0)
EVT_IF_EQ(AF_KKJ_05, FALSE)
@ -376,7 +376,7 @@ EvtScript N(EVS_Inspect_HiddenButton_FirstTime) = {
EVT_EXEC_WAIT(N(EVS_OpenHiddenPassage))
EVT_IF_EQ(AF_KKJ_05, FALSE)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ShoutJoy, ANIM_Twink_ShoutJoy, 5, MSG_Peach_0047)
EVT_SET(AF_KKJ_05, TRUE)
EVT_END_IF

12
src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c
View File

@ -27,7 +27,7 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = {
EVT_CALL(DisablePlayerPhysics, TRUE)
EVT_CALL(SetMusicTrack, 0, SONG_PEACH_CAUGHT, 0, 8)
EVT_CALL(SetPlayerPos, -480, 30, -30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Carried)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetNpcPos, NPC_PARTNER, -480, 30, -30)
EVT_CALL(SetNpcPos, NPC_Koopatrol_Guard_01, -492, 0, -30)
@ -91,7 +91,7 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = {
EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim12)
EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim12)
EVT_WAIT(20)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0019)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Thrown)
EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_01, ANIM_WorldKoopatrol_Anim15)
EVT_CALL(SetNpcAnimation, NPC_Koopatrol_Guard_02, ANIM_WorldKoopatrol_Anim15)
EVT_CALL(LoadPath, 15, EVT_PTR(N(PeachTossPath)), ARRAY_COUNT(N(PeachTossPath)), EASING_LINEAR)
@ -104,7 +104,7 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = {
EVT_END_IF
EVT_END_LOOP
EVT_CALL(PlaySoundAtPlayer, SOUND_162, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C001A)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Land)
EVT_THREAD
EVT_ADD(LVar1, 10)
EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, LVar2, LVar3, 0)
@ -154,10 +154,10 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = {
EVT_END_IF
EVT_END_LOOP
EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_IF_EQ(GB_StoryProgress, STORY_CH6_BEGAN_PEACH_MISSION)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0159)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_015A)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_015A)
EVT_IF_LT(GB_KKJ_CaughtCount, 3)
EVT_IF_EQ(AF_KKJ_13, FALSE)
EVT_SET(LVar0, MSG_Peach_015B)
@ -170,7 +170,7 @@ EvtScript N(EVS_Scene_TossedBackInRoom) = {
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, LVar0)
EVT_ELSE
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0176)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_0177)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_0177)
EVT_IF_LT(GB_KKJ_CaughtCount, 3)
EVT_IF_EQ(AF_KKJ_13, FALSE)
EVT_SET(LVar0, MSG_Peach_0178)

100
src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c
View File

@ -71,7 +71,7 @@ EvtScript N(EVS_TwinkTappingOnGlassDoor) = {
EvtScript N(EVS_Scene_Chapter0) = {
EVT_CALL(DisablePlayerInput, TRUE)
EVT_CALL(N(SetPeachDepressed))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_SadStill)
EVT_CALL(InterpPlayerYaw, 270, 0)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetNpcPos, NPC_PARTNER, 520, 60, -35)
@ -81,22 +81,22 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_CALL(SetNpcYaw, NPC_Kammy, 90)
EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 20, 250, EVT_FLOAT(17.0), EVT_FLOAT(-11.0))
EVT_WAIT(30)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C000F, ANIM_Peach_C000E, 5, MSG_Peach_0016)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_SadTalk, ANIM_Peach2_SadStill, 5, MSG_Peach_0016)
EVT_WAIT(5)
EVT_CALL(InterpPlayerYaw, 90, 5)
EVT_CALL(PlayerMoveTo, 20, 30, 30)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C000F, ANIM_Peach_C000E, 5, MSG_Peach_0017)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_SadTalk, ANIM_Peach2_SadStill, 5, MSG_Peach_0017)
EVT_WAIT(5)
EVT_CALL(InterpPlayerYaw, 270, 5)
EVT_CALL(PlayerMoveTo, -20, 30, 30)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C000F, ANIM_Peach_C000E, 5, MSG_Peach_0018)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_SadTalk, ANIM_Peach2_SadStill, 5, MSG_Peach_0018)
EVT_WAIT(5)
EVT_CALL(InterpPlayerYaw, 90, 5)
EVT_CALL(PlayerMoveTo, 20, 30, 30)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C000F, ANIM_Peach_C000E, 5, MSG_Peach_0019)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_SadTalk, ANIM_Peach2_SadStill, 5, MSG_Peach_0019)
EVT_WAIT(30)
EVT_CALL(N(ClearPeachDepressed))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0)
EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0)
EVT_WAIT(10)
@ -157,10 +157,10 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Brandish)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0, MSG_Peach_001C)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle)
EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle)
EVT_CALL(EndSpeech, NPC_Bowser, ANIM_WorldBowser_BrandishTalk, ANIM_WorldBowser_BrandishIdle, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_001D)
EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Peach_001E)
EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, MSG_Peach_001F)
@ -183,13 +183,13 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(FadeOutMusic, 0, 2000)
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0020)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0020)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_WAIT(20)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 150)
@ -202,10 +202,10 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_WAIT(20)
EVT_CALL(InterpPlayerYaw, 135, 5)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0021)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0021)
EVT_SET(AF_KKJ_03, FALSE)
EVT_EXEC_GET_TID(N(EVS_TwinkTappingOnGlassDoor), LVarA)
EVT_THREAD
@ -225,7 +225,7 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_KILL_THREAD(LVarA)
EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0)
EVT_WAIT(15)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000B)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_OpenDoors)
EVT_CALL(PlaySoundAtCollider, COLLIDER_tte, SOUND_1CB, 0)
EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT)
EVT_LOOP(0)
@ -270,7 +270,7 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_END_IF
EVT_END_LOOP
EVT_CALL(InterpPlayerYaw, 220, 5)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_THREAD
EVT_WAIT(40)
EVT_CALL(func_802D1270, 420, 0, EVT_FLOAT(2.0))
@ -302,25 +302,25 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.0))
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0023)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0023)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0024)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4))
EVT_CALL(SetPanTarget, CAM_DEFAULT, 350, 30, 17)
EVT_CALL(PlayerMoveTo, 380, 0, 30)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0025)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0025)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0026)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
EVT_CALL(SetCamDistance, CAM_DEFAULT, 200)
EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -14)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 380, 30, 17)
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0027)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0027)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -16)
@ -331,36 +331,36 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_CALL(SetCamDistance, CAM_DEFAULT, 300)
EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, -10)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 350, 30, 17)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0029)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0029)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_TalkSad, ANIM_Twink_TalkSad, 0, MSG_Peach_002A)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_002B)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_002B)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle)
EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0)
EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0)
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_002C)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_002C)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle)
EVT_CALL(EndSpeech, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(EndSpeech, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000A)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_GiveItem)
EVT_WAIT(12)
EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4)
EVT_SUB(LVar2, 10)
@ -418,10 +418,10 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_END_IF
EVT_END_LOOP
EVT_CALL(InterpPlayerYaw, 90, 5)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_002E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_002E)
EVT_SET(AF_KKJ_03, TRUE)
EVT_END_THREAD
EVT_THREAD
@ -456,14 +456,14 @@ EvtScript N(EVS_Scene_Chapter0) = {
EVT_CALL(SetPanTarget, CAM_DEFAULT, 405, 30, 17)
EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(400.0), EVT_FLOAT(32.0))
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_002F)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_002F)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly)
EVT_CALL(NpcFlyTo, NPC_PARTNER, 420, 60, 0, 20, 0, EASING_LINEAR)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0030)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0030)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_THREAD
EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR)
EVT_LOOP(0)

18
src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c
View File

@ -22,22 +22,22 @@ EvtScript N(EVS_Scene_Chapter1) = {
EVT_WAIT(5)
EVT_CALL(InterpPlayerYaw, 90, 5)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0033)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0033)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0034)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0035)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0035)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0036)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle)
EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0)
EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0)
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0037)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0037)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0038)
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
EVT_CALL(EnablePartnerAI)

2
src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c
View File

@ -29,7 +29,7 @@ EvtScript N(EVS_AnimateRotatingWall_AlmostCaught) = {
EVT_CALL(GetNpcPos, NPC_PARTNER, LVar9, LVar0, LVarA)
EVT_THREAD
EVT_WAIT(180)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround)
EVT_END_THREAD
EVT_CALL(PlaySoundAt, SOUND_93, 0, 50, 5, -200)
EVT_CALL(MakeLerp, 0, -1800, 360, EASING_LINEAR)

28
src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c
View File

@ -77,14 +77,14 @@ EvtScript N(EVS_PickUpPeach_Ch1) = {
EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5)
EVT_END_THREAD
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(1)
EVT_LOOP(4)
EVT_ADD(LVar1, 2)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Carried)
EVT_SUB(LVar0, 10)
EVT_LOOP(5)
EVT_ADD(LVar1, 4)
@ -163,35 +163,35 @@ EvtScript N(EVS_Inspect_BowsersDiary) = {
EVT_CALL(NpcJump0, NPC_PARTNER, -225, 50, -80, 20)
EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_004B)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000C)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Curious)
EVT_CALL(ShowChoice, MSG_Choice_0022)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_004C)
EVT_CALL(NpcFlyTo, NPC_PARTNER, -210, 40, -70, 20, 0, EASING_LINEAR)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_004D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000C)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Curious)
EVT_CALL(ShowChoice, MSG_Choice_0023)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_004E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe)
EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_004F)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(ShowChoice, MSG_Choice_0024)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0050)
EVT_CALL(ShowChoice, MSG_Choice_0025)
EVT_END_IF
EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0051)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe)
EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10)
EVT_CALL(NpcJump0, NPC_PARTNER, -210, 40, -70, 10)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_0052)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0007, ANIM_Peach_C0008, 5, MSG_Peach_0053)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Shout, ANIM_Peach2_EndShout, 5, MSG_Peach_0053)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Shout, ANIM_Twink_Shout, 0, MSG_Peach_0054)
EVT_CALL(InterpPlayerYaw, 90, 0)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Fly)
@ -223,7 +223,7 @@ EvtScript N(EVS_Inspect_BowsersDiary) = {
EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle)
EVT_CALL(SpeakToPlayer, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 5, MSG_Peach_0055)
EVT_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround)
EVT_WAIT(10)
EVT_CALL(SetPanTarget, CAM_DEFAULT, -110, 0, -40)
EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0))
@ -232,7 +232,7 @@ EvtScript N(EVS_Inspect_BowsersDiary) = {
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe)
EVT_CALL(NpcJump0, NPC_PARTNER, -168, 38, -112, 10)
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_SadStill)
EVT_END_THREAD
EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Walk)
EVT_CALL(NpcMoveTo, NPC_Bowser, -70, -40, 80)
@ -292,7 +292,7 @@ EvtScript N(EVS_Inspect_BowsersDiary) = {
EVT_CALL(SpeakToNpc, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 5, NPC_Bowser, MSG_Peach_005A)
EVT_EXEC_WAIT(N(EVS_ApproachPeach_Ch1))
EVT_EXEC_WAIT(N(EVS_PickUpPeach_Ch1))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_005B)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_005B)
EVT_EXEC_WAIT(N(EVS_CarryPeachAway_Ch1))
EVT_WAIT(10)
EVT_CALL(SetNpcPos, NPC_PARTNER, -70, 120, -70)

20
src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c
View File

@ -89,14 +89,14 @@ EvtScript N(EVS_PickUpPeach_Ch3) = {
EVT_CALL(NpcMoveTo, NPC_Koopatrol_04, LVar0, LVar2, 5)
EVT_END_THREAD
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(1)
EVT_LOOP(4)
EVT_ADD(LVar1, 2)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Carried)
EVT_SUB(LVar0, 10)
EVT_LOOP(5)
EVT_ADD(LVar1, 4)
@ -172,11 +172,11 @@ EvtScript N(EVS_Scene_Chapter3) = {
EVT_CALL(SpeakToNpc, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 0, NPC_Bowser, MSG_Peach_0083)
EVT_THREAD
EVT_EXEC_WAIT(N(EVS_AnimateRotatingWall_AlmostCaught))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0)
EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0)
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(360)
@ -211,7 +211,7 @@ EvtScript N(EVS_Scene_Chapter3) = {
EVT_WAIT(30)
EVT_CALL(SetNpcAnimation, NPC_Bowser, ANIM_WorldBowser_Idle)
EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Bowser, MSG_Peach_0088)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted)
EVT_WAIT(1)
EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_262, 0)
EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0)
@ -228,13 +228,13 @@ EvtScript N(EVS_Scene_Chapter3) = {
EVT_CALL(NpcJump0, NPC_Kammy, -130, 0, -20, 10)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround)
EVT_WAIT(60)
EVT_CALL(DisablePlayerPhysics, FALSE)
EVT_CALL(N(SetPeachDepressed))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_SadStill)
EVT_CALL(func_802D1270, 30, -10, EVT_FLOAT(2.0))
EVT_CALL(DisablePlayerPhysics, TRUE)
EVT_CALL(N(ClearPeachDepressed))
@ -296,10 +296,10 @@ EvtScript N(EVS_Scene_Chapter3) = {
EVT_CALL(SetNpcPos, NPC_Koopatrol_04, 281, 0, -70)
EVT_CALL(SpeakToNpc, NPC_Koopatrol_03, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, NPC_Bowser, MSG_Peach_0095)
EVT_CALL(InterpPlayerYaw, 90, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_EXEC_WAIT(N(EVS_ApproachPeach_Ch3))
EVT_EXEC_WAIT(N(EVS_PickUpPeach_Ch3))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_0096)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_0096)
EVT_EXEC_WAIT(N(EVS_CarryPeachAway_Ch3))
EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Cringe)

4
src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c
View File

@ -17,7 +17,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 0)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0174)
EVT_CALL(N(ApproachPlayer50Units), -1, LVar3, LVar0, LVar2)
@ -28,7 +28,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01)
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)

4
src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c
View File

@ -75,7 +75,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 0)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim02)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0174)
EVT_CALL(N(ApproachPlayer50Units), -1, LVar3, LVar0, LVar2)
@ -86,7 +86,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HammerBros_Anim02)
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)

14
src/world/area_kkj/kkj_16/kkj_16_4_stealth.c
View File

@ -75,14 +75,14 @@ EvtScript N(EVS_PickUpPeach) = {
EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5)
EVT_END_THREAD
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(1)
EVT_LOOP(4)
EVT_ADD(LVar1, 2)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Carried)
EVT_ADD(LVar0, 10)
EVT_LOOP(5)
EVT_ADD(LVar1, 4)
@ -160,11 +160,11 @@ EvtScript N(EVS_ManageSneakingScenes) = {
EVT_WAIT(3)
EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 4)
EVT_END_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle)
EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0)
EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0)
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_THREAD
EVT_CALL(NpcFlyTo, NPC_PARTNER, -776, 50, -65, 10, 0, EASING_LINEAR)
EVT_END_THREAD
@ -190,7 +190,7 @@ EvtScript N(EVS_ManageSneakingScenes) = {
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_BattleBow_Talk, ANIM_Peach_A0001, 5, MSG_Peach_0077)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_BattleBow_Talk, ANIM_Peach1_Idle, 5, MSG_Peach_0077)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_0078)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0))
EVT_CALL(SpeakToNpc, NPC_HammerBros, ANIM_HammerBros_Anim0A, ANIM_HammerBros_Anim02, 0, NPC_Koopatrol_01, MSG_Peach_0079)
@ -223,7 +223,7 @@ EvtScript N(EVS_ManageSneakingScenes) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0))
EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10)
@ -234,7 +234,7 @@ EvtScript N(EVS_ManageSneakingScenes) = {
EVT_EXEC_WAIT(N(EVS_ApproachPeach))
EVT_EXEC_WAIT(N(EVS_PickUpPeach))
EVT_EXEC_WAIT(N(EVS_CarryPeachAway))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_007D)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_007D)
EVT_WAIT(10)
EVT_CALL(LoadPath, 40, EVT_PTR(N(TwinkFollowPath1)), ARRAY_COUNT(N(TwinkFollowPath1)), EASING_LINEAR)
EVT_LOOP(0)

26
src/world/area_kkj/kkj_17/kkj_17_3_chest.c
View File

@ -178,17 +178,17 @@ EvtScript N(EVS_CloseChest) = {
EvtScript N(EVS_FindMagicChest) = {
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_018E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_018F)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, NPC_PARTNER, MSG_Peach_018F)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0190)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_0191)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, NPC_PARTNER, MSG_Peach_0191)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0192)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_0193)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, NPC_PARTNER, MSG_Peach_0193)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_RETURN
EVT_END
};
@ -201,15 +201,15 @@ EvtScript N(EVS_UseMagicChest_Peach) = {
EVT_CASE_EQ(0)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0194)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_0195)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, NPC_PARTNER, MSG_Peach_0195)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0196)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, NPC_PARTNER, MSG_Peach_0197)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SpeakToNpc, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, NPC_PARTNER, MSG_Peach_0197)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CASE_DEFAULT
EVT_WAIT(10)
EVT_SET(LVar9, LVar0)

46
src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c
View File

@ -105,14 +105,14 @@ EvtScript N(EVS_PickUpPeach) = {
EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5)
EVT_END_THREAD
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(1)
EVT_LOOP(4)
EVT_ADD(LVar1, 2)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Carried)
EVT_ADD(LVar0, 10)
EVT_LOOP(5)
EVT_ADD(LVar1, 4)
@ -407,10 +407,10 @@ EvtScript N(EVS_RejectCake) = {
};
EvtScript N(EVS_SweatyPeach) = {
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(10)
EVT_CALL(InterpPlayerYaw, 90, 5)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 35)
EVT_LOOP(0)
@ -429,16 +429,16 @@ EvtScript N(EVS_Scene_GiveKitchenKey) = {
EVT_CALL(PlayerMoveTo, -125, 40, 0)
EVT_CALL(PlayerMoveTo, 50, 40, 0)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_009B)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_009B)
EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 35, 300, EVT_FLOAT(17.0), EVT_FLOAT(-11.0))
EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_009C)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_009D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_009D)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_GourmetGuy, ANIM_GourmetGuy_Talk, ANIM_GourmetGuy_Idle, 5, MSG_Peach_009E)
EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk)
EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 100, -20, 10)
@ -465,17 +465,17 @@ EvtScript N(EVS_Scene_JudgeCake) = {
EVT_CALL(DisablePlayerInput, TRUE)
EVT_IF_EQ(AB_KKJ19_AddedBerries, FALSE)
EVT_SET(MV_CakeItemIdx, ITEM_CAKE_WITH_ICING)
EVT_SET(LVar0, ANIM_Peach_D0002)
EVT_SET(LVar1, ANIM_Peach_A0027)
EVT_SET(LVar0, ANIM_Peach3_PresentBerryCake)
EVT_SET(LVar1, ANIM_Peach1_HoldIcingCake)
EVT_ELSE
EVT_IF_EQ(AB_KKJ19_AddedIcing, FALSE)
EVT_SET(MV_CakeItemIdx, ITEM_CAKE_WITH_BERRIES)
EVT_SET(LVar0, ANIM_Peach_D0003)
EVT_SET(LVar1, ANIM_Peach_A0029)
EVT_SET(LVar0, ANIM_Peach3_PresentIcingCake)
EVT_SET(LVar1, ANIM_Peach1_HoldBerryCake)
EVT_ELSE
EVT_SET(MV_CakeItemIdx, ITEM_CAKE_DONE)
EVT_SET(LVar0, ANIM_Peach_D0000)
EVT_SET(LVar1, ANIM_Peach_A0017)
EVT_SET(LVar0, ANIM_Peach3_PresentCompleteCake)
EVT_SET(LVar1, ANIM_Peach1_HoldCompleteCake)
EVT_END_IF
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_PLAYER, LVar0, LVar1, 5, MSG_Peach_00A2)
@ -560,15 +560,15 @@ EvtScript N(EVS_Scene_JudgeCake) = {
EVT_CALL(NpcMoveTo, NPC_GourmetGuy, -250, 70, 0)
EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0), -20, 300, EVT_FLOAT(17.0), EVT_FLOAT(-10.0))
EVT_CALL(InterpPlayerYaw, 270, 5)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00AE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00AE)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00AF)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00B0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00B0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00B1)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 120, 0, 10)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 0, 10)
@ -633,7 +633,7 @@ EvtScript N(EVS_Scene_JudgeCake) = {
EVT_CALL(DisablePlayerPhysics, TRUE)
EVT_EXEC_WAIT(N(EVS_ApproachPeach))
EVT_EXEC_WAIT(N(EVS_PickUpPeach))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_00B6)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_00B6)
EVT_THREAD
EVT_WAIT(30)
EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5)

74
src/world/area_kkj/kkj_19/kkj_19_5_baking.c
View File

@ -300,7 +300,7 @@ EvtScript N(EVS_SetCookwareOnTable) = {
};
EvtScript N(EVS_UpdatePeachMixingAnimations) = {
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0020)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Mixing1)
EVT_SET(LVar0, 0)
EVT_LOOP(0)
EVT_SWITCH(AB_KKJ19_BakeStepProgress)
@ -312,16 +312,16 @@ EvtScript N(EVS_UpdatePeachMixingAnimations) = {
// increment the animation
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0020)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Mixing1)
EVT_SET(LVar0, 1)
EVT_CASE_EQ(1)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0021)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Mixing2)
EVT_SET(LVar0, 2)
EVT_CASE_EQ(2)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0022)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Mixing3)
EVT_SET(LVar0, 3)
EVT_CASE_EQ(3)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0023)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Mixing4)
EVT_SET(LVar0, 0)
EVT_END_SWITCH
EVT_SET(LVar1, 1)
@ -787,18 +787,18 @@ EvtScript N(EVS_EnterKitchen_FirstTime) = {
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0))
EVT_CALL(PlayerMoveTo, 400, -30, 0)
EVT_WAIT(1)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround)
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(InterpPlayerYaw, 90, 5)
EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(17.0), EVT_FLOAT(-7.0))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00B9)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00B9)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_THREAD
EVT_WAIT(30)
EVT_CALL(SetPanTarget, CAM_DEFAULT, 630, 85, -140)
@ -837,21 +837,21 @@ EvtScript N(EVS_EnterKitchen_FirstTime) = {
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_IdleBook)
EVT_WAIT(20)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00BB)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00BB)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_ReadBook, ANIM_Twink_IdleBook, 0, MSG_Peach_00BC)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_00BD)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_00BD)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_BEGUN)
EVT_RETURN
EVT_END
@ -859,7 +859,7 @@ EvtScript N(EVS_EnterKitchen_FirstTime) = {
EvtScript N(EVS_EnterKitchen_TryAgain) = {
EVT_CALL(EnableModel, MODEL_o128, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0012)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ArmsCrossedIdle)
EVT_CALL(SetPlayerPos, 400, 0, -30)
EVT_CALL(InterpPlayerYaw, 90, 0)
EVT_CALL(SetNpcPos, NPC_PARTNER, 440, 25, -30)
@ -867,9 +867,9 @@ EvtScript N(EVS_EnterKitchen_TryAgain) = {
EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 300, EVT_FLOAT(17.0), EVT_FLOAT(-7.0))
EVT_WAIT(30)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00C2)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_00C3)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(ContinueSpeech, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 0, MSG_Peach_00C4)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_00C3)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(ContinueSpeech, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 0, MSG_Peach_00C4)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook)
EVT_WAIT(10)
@ -1057,7 +1057,7 @@ EvtScript N(EVS_ManageBaking) = {
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0))
EVT_CALL(PlayerMoveTo, LVar0, -74, 0)
EVT_CALL(PlayerMoveTo, 287, -74, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_00D5)
EVT_CALL(RemoveItemEntity, AB_KKJ19_CookwareItemIdx)
@ -1084,7 +1084,7 @@ EvtScript N(EVS_ManageBaking) = {
EVT_EXEC(N(EVS_SetupMusic))
EVT_EXEC_WAIT(N(EVS_FocusCam_PeachAndTwink))
EVT_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle)
EVT_CALL(MakeItemEntity, ITEM_CAKE_MIXED, 287, 16, -40, ITEM_SPAWN_MODE_DECORATION, 0)
EVT_SET(AB_KKJ19_CookwareItemIdx, LVar0)
EVT_END_THREAD
@ -1194,10 +1194,10 @@ EvtScript N(EVS_ManageBaking) = {
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0))
EVT_CALL(PlayerMoveTo, LVar0, -74, 0)
EVT_CALL(PlayerMoveTo, 287, -74, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle)
EVT_WAIT(10)
EVT_CALL(RemoveItemEntity, AB_KKJ19_CookwareItemIdx)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C001F)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_MixingFull)
EVT_WAIT(40)
EVT_CALL(N(SetHeldBakingItem), PEACH_BAKING_CAKE_MIXED)
EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
@ -1213,7 +1213,7 @@ EvtScript N(EVS_ManageBaking) = {
EVT_CALL(PlayerMoveTo, 240, 35, 0)
EVT_CALL(InterpPlayerYaw, 350, 5)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D000C)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PourBatter)
EVT_WAIT(20)
EVT_CALL(RemoveItemEntity, AB_KKJ19_CakeItemIdx)
EVT_CALL(MakeItemEntity, ITEM_CAKE_BATTER, 230, 16, 0, ITEM_SPAWN_MODE_DECORATION, 0)
@ -1386,9 +1386,9 @@ EvtScript N(EVS_ManageBaking) = {
EVT_IF_EQ(AF_KKJ19_FailedBakingTask, FALSE)
EVT_SET(AB_KKJ_CompletedBakeStep, CAKE_TYPE_DONE)
EVT_END_IF
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted)
EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Twink_ShoutJoy, ANIM_Twink_ShoutJoy, 0, MSG_Peach_00E4)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
// cake ready for gourmet guy (but not necessarily succcesful)
EVT_LABEL(LBL_FINISHED)
@ -1414,16 +1414,16 @@ EvtScript N(EVS_ManageBaking) = {
EVT_EXEC_WAIT(N(EVS_SetCookwareOnTable))
EVT_CALL(SetNpcPos, NPC_PARTNER, 440, 25, -30)
EVT_CALL(SetNpcYaw, NPC_PARTNER, 270)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SetPlayerPos, 400, 0, -30)
EVT_CALL(InterpPlayerYaw, 90, 0)
EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 350, EVT_FLOAT(17.0), EVT_FLOAT(-7.0))
EVT_WAIT(10)
EVT_CALL(N(FadeScreenFromBlack))
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_00CE)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Peach_00CF)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(ContinueSpeech, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 0, MSG_Peach_00D0)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_ArmsCrossedTalk, ANIM_Peach2_ArmsCrossedIdle, 5, MSG_Peach_00CF)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(ContinueSpeech, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 0, MSG_Peach_00D0)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_OpenBook)
EVT_WAIT(10)

10
src/world/area_kkj/kkj_20/kkj_20_4_npc.c
View File

@ -91,13 +91,13 @@ EvtScript N(EVS_Inspect_Dresser_Peach) = {
EVT_CALL(InterpNpcYaw, NPC_Toad, 270, 5)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Peach_0182)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0183)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0183)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_Peach_0184)
EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Walk)
EVT_CALL(SetNpcSpeed, NPC_Toad, EVT_FLOAT(3.0))

2
src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c
View File

@ -162,7 +162,7 @@ EvtScript N(EVS_NpcInit_Peach) = {
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Peach)))
EVT_CALL(SetNpcYaw, NPC_SELF, 90)
EVT_CALL(SetNpcPos, NPC_Peach, 278, 50, -253)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C001E)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TiedIdle)
EVT_RETURN
EVT_END
};

4
src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c
View File

@ -51,7 +51,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(NpcFacePlayer, NPC_SELF, 0)
EVT_WAIT(20)
EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0174)
EVT_CALL(N(ApproachPlayer50Units), -1, LVar3, LVar0, LVar2)
@ -62,7 +62,7 @@ EvtScript N(EVS_CapturePeach) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01)
EVT_END_IF
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_0175)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_WAIT(20)
EVT_CALL(GotoMapSpecial, EVT_PTR("kkj_14"), kkj_14_ENTRY_B, TRANSITION_13)
EVT_WAIT(100)

10
src/world/area_kkj/kkj_23/kkj_23_5_scene.c
View File

@ -78,14 +78,14 @@ EvtScript N(EVS_PickUpPeach) = {
EVT_CALL(NpcMoveTo, NPC_Koopatrol_02, LVar0, LVar2, 5)
EVT_END_THREAD
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(1)
EVT_LOOP(4)
EVT_ADD(LVar1, 2)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Carried)
EVT_SUB(LVar0, 15)
EVT_LOOP(5)
EVT_ADD(LVar1, 4)
@ -307,9 +307,9 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = {
EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0)
EVT_EXEC_WAIT(N(EVS_RemoveDisguise))
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0006, ANIM_Peach_C0006, 5, MSG_Peach_0155)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_GaspStill, ANIM_Peach2_GaspStill, 5, MSG_Peach_0155)
EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim05, ANIM_WorldKammy_Anim05, 5, MSG_Peach_0156)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim02)
EVT_CALL(NpcMoveTo, NPC_Kammy, 260, -50, 0)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim01)
@ -332,7 +332,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = {
EVT_END_THREAD
EVT_EXEC_WAIT(N(EVS_ApproachPeach))
EVT_EXEC_WAIT(N(EVS_PickUpPeach))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_0158)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_0158)
EVT_EXEC_WAIT(N(EVS_CarryPeachAway))
EVT_WAIT(20)
EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(6.0))

24
src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c
View File

@ -131,7 +131,7 @@ EvtScript N(EVS_NpcInit_Kammy) = {
EvtScript N(EVS_NpcInit_BattleKooper_01) = {
EVT_CALL(SetNpcPos, NPC_Peach_01, 400, 0, -30)
EVT_CALL(SetNpcYaw, NPC_Peach_01, 270)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C001E)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach2_TiedIdle)
EVT_RETURN
EVT_END
};
@ -157,17 +157,17 @@ AnimID N(ExtraAnims_Bowser)[] = {
};
AnimID N(ExtraAnims_Peach)[] = {
ANIM_Peach_C001D,
ANIM_Peach_A0001,
ANIM_Peach_A0002,
ANIM_Peach_C0000,
ANIM_Peach_C0006,
ANIM_Peach_C001E,
ANIM_Peach_D0009,
ANIM_Peach_D000A,
ANIM_Peach_D000B,
ANIM_Peach_C0026,
ANIM_Peach_D000F,
ANIM_Peach2_TiedStill,
ANIM_Peach1_Idle,
ANIM_Peach1_Walk,
ANIM_Peach2_RaiseArms,
ANIM_Peach2_GaspStill,
ANIM_Peach2_TiedIdle,
ANIM_Peach3_TiedTalk,
ANIM_Peach3_TiedShout,
ANIM_Peach3_TiedLaugh,
ANIM_Peach2_TalkIdle,
ANIM_Peach3_Pray,
ANIM_LIST_END
};

18
src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c
View File

@ -70,7 +70,7 @@ EvtScript N(EVS_NpcAux_Kammy_Broom) = {
EvtScript N(EVS_NpcInit_Peach) = {
EVT_CALL(SetNpcPos, NPC_Peach_01, 475, 0, 0)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach1_Idle)
EVT_RETURN
EVT_END
};
@ -174,14 +174,14 @@ AnimID N(ExtraAnims_Bowser)[] = {
};
AnimID N(ExtraAnims_Peach)[] = {
ANIM_Peach_A0001,
ANIM_Peach_A0002,
ANIM_Peach_C0000,
ANIM_Peach_C0006,
ANIM_Peach_C001E,
ANIM_Peach_D0009,
ANIM_Peach_C0026,
ANIM_Peach_D000F,
ANIM_Peach1_Idle,
ANIM_Peach1_Walk,
ANIM_Peach2_RaiseArms,
ANIM_Peach2_GaspStill,
ANIM_Peach2_TiedIdle,
ANIM_Peach3_TiedTalk,
ANIM_Peach2_TalkIdle,
ANIM_Peach3_Pray,
ANIM_LIST_END
};

10
src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c
View File

@ -45,7 +45,7 @@ EvtScript N(EVS_NpcInit_Bowser_03) = {
EvtScript N(EVS_NpcInit_Peach) = {
EVT_CALL(SetNpcCollisionSize, NPC_Peach_02, 48, 24)
EVT_CALL(SetNpcPos, NPC_Peach_02, 400, 0, 0)
EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach1_Idle)
EVT_RETURN
EVT_END
};
@ -75,10 +75,10 @@ AnimID N(ExtraAnims_Bowser)[] = {
};
AnimID N(ExtraAnims_Peach)[] = {
ANIM_Peach_A0001,
ANIM_Peach_A0002,
ANIM_Peach_C0000,
ANIM_Peach_C0006,
ANIM_Peach1_Idle,
ANIM_Peach1_Walk,
ANIM_Peach2_RaiseArms,
ANIM_Peach2_GaspStill,
ANIM_LIST_END
};

2
src/world/area_kkj/kkj_25/kkj_25_5_arena.c
View File

@ -332,7 +332,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = {
EVT_CALL(NpcJump0, NPC_Peach_01, LVar0, LVar1, LVar2, 7)
EVT_WAIT(10)
EVT_END_THREAD
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_D000A, ANIM_Peach_C001E, 0, MSG_CH8_007F)
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach3_TiedShout, ANIM_Peach2_TiedIdle, 0, MSG_CH8_007F)
EVT_WAIT(15)
EVT_CALL(SpeakToPlayer, NPC_Kammy_01, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim04, 512, MSG_CH8_0080)
EVT_WAIT(15)

10
src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c
View File

@ -70,7 +70,7 @@ EvtScript N(EVS_Scene_PeachBreaksFree) = {
EVT_CALL(SetNpcPos, NPC_Bowser_01, 200, 0, 0)
EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Idle)
EVT_CALL(SetNpcPos, NPC_Peach_01, 475, 0, 0)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C001E)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach2_TiedIdle)
EVT_CALL(SetNpcPos, NPC_Kammy_01, 550, 10, -50)
EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim04)
EVT_CALL(SetNpcDecoration, NPC_Bowser_01, 0, NPC_DECORATION_BOWSER_AURA)
@ -101,7 +101,7 @@ EvtScript N(EVS_Scene_PeachBreaksFree) = {
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_D000A, ANIM_Peach_C001E, 0, MSG_CH8_008E)
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach3_TiedShout, ANIM_Peach2_TiedIdle, 0, MSG_CH8_008E)
EVT_WAIT(10)
EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 20)
@ -189,8 +189,8 @@ EvtScript N(EVS_Scene_PeachBreaksFree) = {
EVT_WAIT(3)
EVT_END_LOOP
EVT_END_THREAD
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_D0009, ANIM_Peach_D000B, 5, MSG_CH8_0091)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_D000B)
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach3_TiedTalk, ANIM_Peach3_TiedLaugh, 5, MSG_CH8_0091)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach3_TiedLaugh)
EVT_SET(LVar2, 12)
EVT_LOOP(4)
EVT_CALL(MakeLerp, 90, 450, LVar2, EASING_LINEAR)
@ -209,7 +209,7 @@ EvtScript N(EVS_Scene_PeachBreaksFree) = {
EVT_SUB(LVar2, 2)
EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar3, LVar4, LVar5, 0)
EVT_END_LOOP
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach1_Idle)
EVT_CALL(SetNpcAnimation, NPC_Twink_01, ANIM_Twink_Idle)
EVT_WAIT(20)
EVT_SET(LVar0, MV_OrbitingEffectAIdx)

12
src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c
View File

@ -84,10 +84,10 @@ EvtScript N(EVS_Scene_KammyDefeated) = {
EVT_WAIT(20)
EVT_CALL(InterpNpcYaw, NPC_Peach_01, 270, 0)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_CH8_009C)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_CH8_009C)
EVT_WAIT(10)
EVT_CALL(InterpNpcYaw, NPC_Peach_01, 90, 0)
EVT_CALL(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_CH8_009D)
@ -96,13 +96,13 @@ EvtScript N(EVS_Scene_KammyDefeated) = {
EVT_CALL(SetMusicTrack, 0, SONG_PEACH_WISHES, 0, 8)
EVT_CALL(InterpNpcYaw, NPC_Peach_01, 270, 0)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_CH8_009E)
EVT_CALL(SpeakToPlayer, NPC_Peach_01, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_CH8_009E)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_CH8_009F)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach_D000F)
EVT_CALL(SetNpcAnimation, NPC_Peach_01, ANIM_Peach3_Pray)
EVT_WAIT(10)
EVT_CALL(LoadPath, 20, EVT_PTR(N(TwinkStrikeBowserPath)), ARRAY_COUNT(N(TwinkStrikeBowserPath)), EASING_QUADRATIC_IN)
EVT_LOOP(0)

10
src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c
View File

@ -349,11 +349,11 @@ EvtScript N(EVS_Scene_BowserDefeated) = {
EVT_WAIT(20)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_WAIT(20)
EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach_C0000, ANIM_Peach_A0001, 0, MSG_CH8_00AB)
EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach2_RaiseArms, ANIM_Peach1_Idle, 0, MSG_CH8_00AB)
EVT_THREAD
EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach_A0002)
EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach1_Walk)
EVT_CALL(NpcMoveTo, NPC_Peach_02, 200, 0, 85)
EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach1_Idle)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@ -367,7 +367,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = {
EVT_END_THREAD
EVT_CALL(NpcMoveTo, NPC_Twink_02, 230, 30, 85)
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach_C0000, ANIM_Peach_A0001, 0, MSG_CH8_00AC)
EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach2_RaiseArms, ANIM_Peach1_Idle, 0, MSG_CH8_00AC)
EVT_WAIT(20)
EVT_CALL(PlaySound, SOUND_8000006B)
EVT_SET(MV_DestructState, DESTRUCT_STATE_1)
@ -402,7 +402,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = {
EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-10.5))
EVT_CALL(SetCamDistance, CAM_DEFAULT, 300)
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach_C0006)
EVT_CALL(SetNpcAnimation, NPC_Peach_02, ANIM_Peach2_GaspStill)
EVT_CALL(SetNpcAnimation, NPC_Twink_02, ANIM_Twink_Cringe)
EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Shock)
EVT_CALL(SetNpcJumpscale, NPC_Bowser_03, EVT_FLOAT(1.0))

20
src/world/area_kkj/kkj_26/kkj_26_2_scenes.c
View File

@ -19,10 +19,10 @@ EvtScript N(EVS_Scene_WhereIsMario) = {
EVT_WAIT(50)
EVT_CALL(func_802D1270, 550, -20, EVT_FLOAT(2.0))
EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_0032)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_0032)
EVT_CALL(FadeOutMusic, 0, 4000)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_EXEC_WAIT(N(EVS_GotoMap_hos_00_1))
@ -47,20 +47,20 @@ EvtScript N(EVS_Scene_AfterAllSpiritsRescued) = {
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Peach_015E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0002)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Peach_015E)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 5, MSG_Peach_015F)
EVT_CALL(PlayerFaceNpc, NPC_PARTNER, 5)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_D0004, ANIM_Peach_A0001, 5, MSG_Peach_0160)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0160)
EVT_WAIT(10)
EVT_CALL(EnablePartnerAI)
EVT_CALL(func_802D1270, 480, -20, EVT_FLOAT(2.0))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000B)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_OpenDoors)
EVT_SET(LVar0, kkj_26_ENTRY_0)
EVT_SET(LVar1, COLLIDER_ttw)
EVT_SET(LVar2, MODEL_o85)

4
src/world/area_kkj/kkj_26/kkj_26_3_demo.c
View File

@ -13,9 +13,9 @@ EvtScript N(EVS_ProvideDemoInputs) = {
EVT_WAIT(40)
EVT_CALL(DemoJoystickXY, 0, 0)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0026)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_TalkIdle)
EVT_WAIT(20)
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_IF_EQ(GF_DemoSceneDone, TRUE)

16
src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c
View File

@ -77,12 +77,12 @@ EvtScript N(EVS_UseRotatingWall) = {
EVT_CALL(PlayerMoveTo, -205, -10, 15)
EVT_CALL(InterpPlayerYaw, 270, 5)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0013)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_ReachForButton)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_FA, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0014)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButton)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0015)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_AfterPressButton)
EVT_WAIT(10)
EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0))
EVT_EXEC_WAIT(N(EVS_Scene_RotatingWall))
@ -96,12 +96,12 @@ EvtScript N(EVS_UseRotatingWall_FirstTime) = {
EVT_CALL(DisablePlayerInput, TRUE)
EVT_CALL(FacePlayerTowardPoint, -222, 0, 5)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0013)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_ReachForButton)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtCollider, COLLIDER_o193, SOUND_FA, 0)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0014)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_PressButton)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_D0015)
EVT_CALL(SetPlayerAnimation, ANIM_Peach3_AfterPressButton)
EVT_WAIT(10)
EVT_THREAD
EVT_CALL(DisablePartnerAI, 0)
@ -113,8 +113,8 @@ EvtScript N(EVS_UseRotatingWall_FirstTime) = {
EVT_THREAD
EVT_CALL(InterpPlayerYaw, 270, 0)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0005, ANIM_Peach_C0006, 5, MSG_Peach_0048)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Gasp, ANIM_Peach2_GaspStill, 5, MSG_Peach_0048)
EVT_END_THREAD
EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0))
EVT_EXEC_WAIT(N(EVS_Scene_RotatingWall))

24
src/world/area_kkj/kkj_29/kkj_29_3_quiz.c
View File

@ -296,7 +296,7 @@ EvtScript N(EVS_SetNoAnswerEffects) = {
EVT_SET(LVar2, MODEL_g8)
EVT_CASE_EQ(CONTESTANT_PEACH)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_Idle)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle)
EVT_CALL(EnableTexPanning, MODEL_o65, FALSE)
EVT_CALL(EnableTexPanning, MODEL_o69, FALSE)
EVT_CALL(EnableModel, MODEL_o69, FALSE)
@ -399,7 +399,7 @@ EvtScript N(EVS_SetRightAnswerEffects) = {
EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10)
EVT_END_LOOP
EVT_END_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0016)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardHappy)
EVT_CASE_EQ(CONTESTANT_RIGHT)
EVT_CALL(EnableTexPanning, MODEL_o91, TRUE)
EVT_CALL(EnableModel, MODEL_o94, FALSE)
@ -429,7 +429,7 @@ EvtScript N(EVS_SetWrongAnswerEffects) = {
EVT_CALL(EnableTexPanning, MODEL_o64, FALSE)
EVT_CALL(EnableModel, MODEL_o118, FALSE)
EVT_CALL(EnableModel, MODEL_o116, TRUE)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0017)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardSad)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Twink_TalkSad)
EVT_CASE_EQ(CONTESTANT_RIGHT)
EVT_CALL(EnableTexPanning, MODEL_o89, FALSE)
@ -671,7 +671,7 @@ EvtScript N(EVS_DeclareWinner) = {
EVT_CASE_EQ(OUTCOME_PEACH_WON)
EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0121)
EVT_CALL(PlaySound, SOUND_8A)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted)
EVT_WAIT(1)
EVT_CALL(ContinueSpeech, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 0, MSG_Peach_0122)
EVT_WAIT(10)
@ -797,14 +797,14 @@ EvtScript N(EVS_PickUpPeach) = {
EVT_CALL(NpcMoveTo, NPC_Koopatrol_01, LVar0, LVar2, 5)
EVT_END_THREAD
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(1)
EVT_LOOP(4)
EVT_ADD(LVar1, 2)
EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2)
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0018)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Carried)
EVT_ADD(LVar0, 10)
EVT_LOOP(5)
EVT_ADD(LVar1, 4)
@ -912,9 +912,9 @@ EvtScript N(EVS_ManageQuizGame) = {
EVT_CALL(DisablePartnerAI, 0)
EVT_EXEC(N(EVS_TwinkHide))
EVT_THREAD
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp)
EVT_WAIT(60)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001)
EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle)
EVT_END_THREAD
EVT_WAIT(20)
EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_263, 0)
@ -954,7 +954,7 @@ EvtScript N(EVS_ManageQuizGame) = {
EVT_CALL(SpeakToPlayer, NPC_Koopatrol_01, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_Peach_00F3)
EVT_THREAD
EVT_CALL(func_802D1270, 0, -25, EVT_FLOAT(2.0))
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle)
EVT_CALL(SetPlayerPos, -230, 23, -140)
EVT_END_THREAD
EVT_THREAD
@ -991,7 +991,7 @@ EvtScript N(EVS_ManageQuizGame) = {
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F6)
EVT_CALL(PlaySound, SOUND_8A)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround)
EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0)
EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0)
EVT_WAIT(13)
@ -1001,7 +1001,7 @@ EvtScript N(EVS_ManageQuizGame) = {
EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0)
EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0)
EVT_WAIT(10)
EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0014)
EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle)
EVT_CALL(SetNpcAnimation, NPC_HammerBros, ANIM_HammerBros_Anim06)
EVT_CALL(SetNpcFlagBits, NPC_HammerBros, NPC_FLAG_GRAVITY, TRUE)
EVT_CALL(NpcMoveTo, NPC_HammerBros, -395, 0, 0)
@ -1284,7 +1284,7 @@ EvtScript N(EVS_ManageQuizGame) = {
EVT_EXEC_WAIT(N(EVS_ApproachPeach))
EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_012D)
EVT_EXEC_WAIT(N(EVS_PickUpPeach))
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach_C0018, ANIM_Peach_C0018, 5, MSG_Peach_012E)
EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach2_Carried, ANIM_Peach2_Carried, 5, MSG_Peach_012E)
EVT_EXEC_WAIT(N(EVS_CarryPeachAway))
EVT_WAIT(30)
EVT_CALL(FadeOutMusic, 0, 1000)

64
src/world/area_kpa/kpa_53/kpa_53_3_npc.c
View File

@ -15,11 +15,11 @@ API_CALLABLE(N(UpdateFollowerPosition)) {
npc->pos.x = (s32)(((s32)playerStatus->position.x - 700) * 0.85) + 765;
if (playerStatus->currentSpeed == 0.0f) {
animID = ANIM_Peach_A0001;
animID = ANIM_Peach1_Idle;
} else if (playerStatus->currentSpeed < 2.0f) {
animID = ANIM_Peach_A0002;
animID = ANIM_Peach1_Walk;
} else {
animID = ANIM_Peach_A0003;
animID = ANIM_Peach1_Run;
}
npc->currentAnim = animID;
evt_set_variable(script, outVar, playerStatus->targetYaw);
@ -135,50 +135,50 @@ EvtScript N(EVS_NpcInit_Duplighost) = {
};
EvtScript N(EVS_NpcInteract_Follower_FirstTime) = {
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0026)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_TalkIdle)
EVT_CALL(GetSelfVar, 0, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0023)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_0023)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_WAIT(1)
EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp)
EVT_WAIT(35)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0024)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_0024)
EVT_SET(GF_KPA53_Met_PeachImposter, TRUE)
EVT_CALL(SetSelfVar, 0, 1)
EVT_CALL(SetSelfVar, 1, 1)
EVT_CASE_EQ(1)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0025)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_0025)
EVT_CALL(SetSelfVar, 0, 2)
EVT_CASE_EQ(2)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0026)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_0026)
EVT_CALL(SetSelfVar, 0, 1)
EVT_END_SWITCH
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach1_Idle)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_NpcInteract_Follower) = {
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0026)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_TalkIdle)
EVT_CALL(GetSelfVar, 0, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0027)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_0027)
EVT_CALL(SetSelfVar, 0, 1)
EVT_CALL(SetSelfVar, 1, 1)
EVT_ELSE
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0028)
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_0028)
EVT_END_IF
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach1_Idle)
EVT_RETURN
EVT_END
};
@ -192,13 +192,13 @@ EvtScript N(EVS_NpcHit_Guardian_FirstTime) = {
EVT_CALL(DisablePlayerInput, TRUE)
EVT_CALL(SetNpcVar, NPC_Follower, 2, 1)
EVT_CALL(InterpNpcYaw, NPC_Follower, 270, 0)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0029)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_0029)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach1_Idle)
EVT_CALL(SetNpcVar, NPC_Follower, 2, 0)
EVT_CALL(DisablePlayerInput, FALSE)
EVT_END_CASE_GROUP
@ -216,30 +216,30 @@ EvtScript N(EVS_NpcHit_Guardian) = {
EVT_CALL(DisablePlayerInput, TRUE)
EVT_CALL(SetNpcVar, NPC_Follower, 2, 1)
EVT_CALL(InterpNpcYaw, NPC_Follower, 270, 0)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0026)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_TalkIdle)
EVT_CALL(GetSelfVar, 0, LVar1)
EVT_SWITCH(LVar1)
EVT_CASE_EQ(0)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002A)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_002A)
EVT_CALL(SetSelfVar, 0, 1)
EVT_CASE_EQ(1)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002B)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_002B)
EVT_CALL(SetSelfVar, 0, 2)
EVT_CASE_EQ(2)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_IF_LT(LVar0, 270)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002B)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_002B)
EVT_ELSE
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002C)
EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_002C)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1)
EVT_CALL(BindNpcAI, NPC_Duplighost, EVT_PTR(N(EVS_NpcAI_Duplighost_Caught)))
EVT_END_IF
EVT_END_SWITCH
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Follower, ANIM_Peach1_Idle)
EVT_CALL(SetNpcVar, NPC_Follower, 2, 0)
EVT_CALL(DisablePlayerInput, FALSE)
EVT_END_CASE_GROUP
@ -278,7 +278,7 @@ EvtScript N(EVS_NpcIdle_Follower) = {
EVT_CALL(InterpNpcYaw, NPC_Guardian, LVar0, 0)
EVT_CALL(SetNpcPos, NPC_Guardian, LVar1, LVar2, LVar3)
EVT_IF_LE(LVar1, 100)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Peach1_Idle)
EVT_CALL(SetNpcPos, NPC_SELF, 765, 0, -30)
EVT_CALL(SetNpcPos, NPC_Guardian, 765, 0, -30)
EVT_CALL(SetNpcPos, NPC_Duplighost, 150, 0, -30)
@ -291,7 +291,7 @@ EvtScript N(EVS_NpcIdle_Follower) = {
EVT_SET(LVarF, 2)
EVT_END_IF
EVT_IF_GE(LVar1, 765)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Peach1_Idle)
EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0)
EVT_SET(LVarF, 0)
EVT_END_IF

30
src/world/area_osr/osr_02/osr_02_3_npc.c
View File

@ -329,13 +329,13 @@ EvtScript N(EVS_Scene_ReturnStarRod) = {
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Outro_000A)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0000)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_RaiseArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 5, MSG_Outro_000B)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_TalkIdle)
EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 5, MSG_Outro_000B)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LowerArms)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Disappointed)
EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Disappointed, ANIM_Twink_Disappointed, 0, MSG_Outro_000C)
@ -345,9 +345,9 @@ EvtScript N(EVS_Scene_ReturnStarRod) = {
EVT_EXEC(N(EVS_Twink_FlyAway))
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp)
EVT_WAIT(250)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk)
EVT_CALL(NpcMoveTo, NPC_Peach, -10, 30, 40)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001)
EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle)
EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle)
EVT_CALL(InterpPlayerYaw, 270, 0)
EVT_WAIT(60)
@ -466,14 +466,14 @@ EvtScript N(EVS_NpcInit_StarRod) = {
};
AnimID N(ExtraAnims_Peach)[] = {
ANIM_Peach_A0001,
ANIM_Peach_A0002,
ANIM_Peach_C0000,
ANIM_Peach_C0001,
ANIM_Peach_C0002,
ANIM_Peach_C0006,
ANIM_Peach_C001E,
ANIM_Peach_C0026,
ANIM_Peach1_Idle,
ANIM_Peach1_Walk,
ANIM_Peach2_RaiseArms,
ANIM_Peach2_Talk,
ANIM_Peach2_LowerArms,
ANIM_Peach2_GaspStill,
ANIM_Peach2_TiedIdle,
ANIM_Peach2_TalkIdle,
ANIM_LIST_END
};

32
src/world/common/npc/Peach.h
View File

@ -2,20 +2,20 @@
#define PEACH_ANIMS \
{ \
.idle = ANIM_Peach_A0000, \
.walk = ANIM_Peach_A0000, \
.run = ANIM_Peach_A0000, \
.chase = ANIM_Peach_A0000, \
.anim_4 = ANIM_Peach_A0000, \
.anim_5 = ANIM_Peach_A0000, \
.death = ANIM_Peach_A0000, \
.hit = ANIM_Peach_A0000, \
.anim_8 = ANIM_Peach_A0000, \
.anim_9 = ANIM_Peach_A0000, \
.anim_A = ANIM_Peach_A0000, \
.anim_B = ANIM_Peach_A0000, \
.anim_C = ANIM_Peach_A0000, \
.anim_D = ANIM_Peach_A0000, \
.anim_E = ANIM_Peach_A0000, \
.anim_F = ANIM_Peach_A0000, \
.idle = ANIM_Peach1_Still, \
.walk = ANIM_Peach1_Still, \
.run = ANIM_Peach1_Still, \
.chase = ANIM_Peach1_Still, \
.anim_4 = ANIM_Peach1_Still, \
.anim_5 = ANIM_Peach1_Still, \
.death = ANIM_Peach1_Still, \
.hit = ANIM_Peach1_Still, \
.anim_8 = ANIM_Peach1_Still, \
.anim_9 = ANIM_Peach1_Still, \
.anim_A = ANIM_Peach1_Still, \
.anim_B = ANIM_Peach1_Still, \
.anim_C = ANIM_Peach1_Still, \
.anim_D = ANIM_Peach1_Still, \
.anim_E = ANIM_Peach1_Still, \
.anim_F = ANIM_Peach1_Still, \
}

2
src/world/partner/kooper.c
View File

@ -331,7 +331,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
if (!(kooper->jumpVelocity > 0.0f) && (playerStatus->position.y < kooper->moveToPos.z)) {
D_802BEC5C = 0;
kooper->flags &= ~ACTOR_FLAG_100;
kooper->flags &= ~NPC_FLAG_IGNORE_PLAYER_COLLISION;
partnerActionStatus->actingPartner = PARTNER_KOOPER;
partnerActionStatus->partnerActionState = PARTNER_ACTION_KOOPER_2;
kooper->rotation.z = 0.0f;

2
src/world/partner/parakarry.c
View File

@ -539,7 +539,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) {
parakarry->currentAnim = ANIM_WorldParakarry_Idle;
D_802BEBB0 = 0;
parakarry->jumpVelocity = 0.0f;
parakarry->flags &= ~ACTOR_FLAG_HP_OFFSET_BELOW;
parakarry->flags &= ~NPC_FLAG_JUMPING;
parakarry->animationSpeed = 1.0f;
partner_clear_player_tracking(parakarry);
partnerActionStatus->actingPartner = PARTNER_NONE;