pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-07-27 05:15:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

sounds halfway named (#1110)

Browse Source 
* first few

* more

* more sounds

* for now

* visually separate remaining sounds

* checkpoint

* star power refactor

* standard name

* fix

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-08-12 17:08:33 -04:00 committed by GitHub
parent ff4935de77
commit 308af519a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
373 changed files with 3623 additions and 6073 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/common_structs.h
View File

@ -24,6 +24,7 @@ typedef void NoArgCallback(void*);
#define PAL_BIN u16
typedef s32 b32;
typedef s16 b16;
typedef s8 b8;
typedef s32 HitID;
@ -184,7 +185,7 @@ typedef struct NpcQuizmoBlur {
} NpcQuizmoBlur; // size = 0x8;
typedef struct NpcHistoryPoint {
/* 0x00 */ s8 isAirborne;
/* 0x00 */ b8 isAirborne;
/* 0x01 */ char unk_01[0x3];
/* 0x04 */ Vec3f pos;
} NpcHistoryPoint; // size = 0x10
@ -245,7 +246,7 @@ typedef struct Npc {
/* 0x080 */ s32 collisionChannel; /* flags used with collision tracing */
/* 0x084 */ s16 curFloor; /* colliderID */
/* 0x086 */ s16 curWall; /* colliderID */
/* 0x088 */ s16 isFacingAway;
/* 0x088 */ b16 isFacingAway;
/* 0x08A */ s16 yawCamOffset;
/* 0x08C */ s16 turnAroundYawAdjustment;
/* 0x08E */ s16 duration; // TODO: name less vaguely
@ -760,7 +761,7 @@ typedef struct Camera {
/* 0x002 */ s16 moveFlags;
/* 0x004 */ s16 updateMode;
/* 0x006 */ s16 needsInit;
/* 0x008 */ s16 isChangingMap;
/* 0x008 */ b16 isChangingMap;
/* 0x00A */ s16 viewportW;
/* 0x00C */ s16 viewportH;
/* 0x00E */ s16 viewportStartX;
@ -881,9 +882,9 @@ typedef struct BattleStatus {
/* 0x081 */ s8 actionSuccess;
/* 0x082 */ char unk_82;
/* 0x083 */ s8 actionCommandMode;
/* 0x084 */ s8 actionResult;
/* 0x084 */ s8 actionResult; // actionResultAmount?
/* 0x085 */ s8 unk_85;
/* 0x086 */ s8 unk_86;
/* 0x086 */ s8 unk_86; // actionResult?
/* 0x087 */ s8 blockResult; /* 0 = fail, 1 = success, -1 = mashed */
/* 0x088 */ s8 itemUsesLeft; /* set to 2 for double dip, 3 for triple dip */
/* 0x089 */ s8 hpDrainCount;
@ -1198,7 +1199,7 @@ typedef struct MessagePrintState {
/* 0x45E */ u8 printDelayTime; // delay to print each chunk
/* 0x45F */ u8 charsPerChunk; // how many chars to print at once
/* 0x460 */ s32 curLinePos; // position along current line
/* 0x464 */ u8 unk_464;
/* 0x464 */ u8 windowScrollRate;
/* 0x465 */ char unk_465;
/* 0x466 */ u16 nextLinePos; // ?
/* 0x468 */ u8 lineCount;
@ -1416,8 +1417,7 @@ typedef struct GameStatus {
/* 0x07F */ s8 peachDisguise; /* (1 = koopatrol, 2 = hammer bros, 3 = clubba) */
/* 0x080 */ u8 peachBakingIngredient; ///< @see enum PeachBakingItems
/* 0x081 */ s8 multiplayerEnabled;
/* 0x082 */ s8 unk_82;
/* 0x083 */ s8 unk_83;
/* 0x082 */ Vec2b unk_82;
/* 0x084 */ s8 playerSpriteSet;
/* 0x085 */ char unk_85;
/* 0x086 */ s16 areaID;
@ -1432,7 +1432,7 @@ typedef struct GameStatus {
/* 0x0A4 */ f32 playerYaw;
/* 0x0A8 */ s8 creditsViewportMode;
/* 0x0A9 */ s8 unk_A9; // selected language?
/* 0x0AA */ s8 demoFlags;
/* 0x0AA */ s8 demoBattleFlags;
/* 0x0AB */ u8 soundOutputMode;
/* 0x0AC */ s8 introState;
/* 0x0AD */ s8 introCounter;
@ -1716,7 +1716,7 @@ typedef struct DecorationTable {
} DecorationTable; // size = 0x8E8
typedef struct PlayerPathElement {
/* 0x00 */ s8 isJumping;
/* 0x00 */ b8 isJumping;
/* 0x03 */ char unk_01[3];
/* 0x04 */ Vec3f pos;
} PlayerPathElement; // size = 0x10
@ -1905,7 +1905,7 @@ typedef struct Actor {
/* 0x21C */ s8 statusAfflicted;
/* 0x21D */ s8 disableDismissTimer;
/* 0x21E */ s16 unk_21E;
/* 0x220 */ s8 isGlowing; // also used for goombario charge amount
/* 0x220 */ b8 isGlowing; // also used for goombario charge amount
/* 0x221 */ s8 attackBoost;
/* 0x222 */ s8 defenseBoost;
/* 0x223 */ s8 chillOutAmount; /* attack reduction */

2
include/dead.h
View File

@ -252,7 +252,7 @@
#define AssignPanelFlag dead_AssignPanelFlag
#define Entity_HiddenPanel dead_Entity_HiddenPanel
#define ShakeCam dead_ShakeCam
#define func_802D62E4 dead_func_802D62E4
#define StopTrackingSoundPos dead_StopTrackingSoundPos
#define IsStartingConversation dead_IsStartingConversation
#define ModifyGlobalOverrideFlags dead_ModifyGlobalOverrideFlags
#define FindKeyItem dead_FindKeyItem

62
include/effects.h
View File

@ -181,26 +181,22 @@ typedef struct SnowflakeFXData {
typedef struct StarFXData {
/* 0x000 */ s32 unk_00;
/* 0x004 */ f32 unk_04;
/* 0x008 */ f32 unk_08;
/* 0x00C */ f32 unk_0C;
/* 0x010 */ f32 unk_10;
/* 0x014 */ f32 unk_14;
/* 0x018 */ f32 unk_18;
/* 0x004 */ Vec3f pos;
/* 0x010 */ Vec3f vel;
/* 0x01C */ f32 unk_1C;
/* 0x020 */ f32 unk_20;
/* 0x024 */ f32 unk_24;
/* 0x024 */ f32 angle;
/* 0x028 */ s32 unk_28;
/* 0x02C */ f32 unk_2C;
/* 0x030 */ s32 unk_30;
/* 0x034 */ f32 unk_34;
/* 0x038 */ s32 unk_38;
/* 0x038 */ s32 type;
/* 0x03C */ s32 unk_3C;
/* 0x040 */ Mtx unk_40[8];
/* 0x240 */ f32 unk_240;
/* 0x244 */ s32 unk_244;
/* 0x248 */ s32 unk_248;
/* 0x24C */ s32 unk_24C;
/* 0x240 */ f32 scale;
/* 0x244 */ s32 primR;
/* 0x248 */ s32 primG;
/* 0x24C */ s32 primB;
} StarFXData; // size = 0x250
typedef struct EmoteFXData {
@ -572,17 +568,17 @@ typedef struct ShockwaveFXData {
} ShockwaveFXData; // size = 0x58
typedef struct MusicNoteFXData {
/* 0x00 */ s32 unk_00;
/* 0x00 */ s32 type;
/* 0x04 */ Vec3f pos;
/* 0x10 */ f32 unk_10;
/* 0x14 */ s32 unk_14;
/* 0x10 */ f32 scale;
/* 0x14 */ s32 alpha;
/* 0x18 */ s32 timeLeft;
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
/* 0x24 */ f32 unk_24;
/* 0x28 */ f32 unk_28;
/* 0x2C */ f32 unk_2C;
/* 0x30 */ f32 unk_30;
/* 0x1C */ s32 lifetime;
/* 0x20 */ s32 noteType;
/* 0x24 */ f32 velX;
/* 0x28 */ f32 velY;
/* 0x2C */ f32 finalVelX;
/* 0x30 */ f32 finalVelY;
} MusicNoteFXData; // size = 0x34
typedef struct SmokeBurstFXData {
@ -1077,22 +1073,18 @@ typedef struct FireFlowerFXData {
} FireFlowerFXData; // size = 0x4C
typedef struct RecoverFXData {
/* 0x00 */ s32 unk_00;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ f32 unk_1C;
/* 0x00 */ s32 type;
/* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3f vel;
/* 0x1C */ f32 angle;
/* 0x20 */ s32 unk_20;
/* 0x24 */ f32 unk_24;
/* 0x28 */ s32 unk_28;
/* 0x2C */ s32 unk_2C;
/* 0x30 */ s32 unk_30;
/* 0x24 */ f32 offsetX;
/* 0x28 */ s32 alpha;
/* 0x2C */ s32 timeLeft;
/* 0x30 */ s32 lifetime;
/* 0x34 */ s32 unk_34;
/* 0x38 */ f32 unk_38;
/* 0x3C */ f32 unk_3C;
/* 0x38 */ f32 scaleX;
/* 0x3C */ f32 scaleY;
/* 0x40 */ s32 unk_40;
/* 0x44 */ s32 unk_44;
} RecoverFXData; // size = 0x48

2
include/entity.h
View File

@ -210,7 +210,7 @@ typedef struct ChestData {
typedef struct BlueWarpPipeData {
/* 0x00 */ s32 unk_00; // proably flags
/* 0x04 */ s32 timer;
/* 0x08 */ s32 isRaised;
/* 0x08 */ b32 isRaised;
/* 0x0C */ s32 entryID;
/* 0x10 */ EvtScript* onEnterPipeEvt;
/* 0x14 */ s32 flagIndex;

1839
include/enums.h
View File

File diff suppressed because it is too large Load Diff

9
include/macros.h
View File

@ -47,7 +47,7 @@
#define PTR_LIST_END ((void*) -1)
#define API_CALLABLE(name) ApiStatus name(Evt* script, s32 isInitialCall)
#define API_CALLABLE(name) ApiStatus name(Evt* script, b32 isInitialCall)
// standardized padding macros for map overlays
#define MAP_RODATA_PAD(n,name) const s32 N(rodata_pad_##name)[n] = {};
@ -257,6 +257,13 @@
} \
};
#define UNPACK_PAL_R(color) (((color) >> 11) & 0x1F)
#define UNPACK_PAL_G(color) (((color) >> 6) & 0x1F)
#define UNPACK_PAL_B(color) (((color) >> 1) & 0x1F)
#define UNPACK_PAL_A(color) ((color) & 1)
#define PACK_PAL_RGBA(r, g, b, a) (((r) << 11) | ((g) << 6) | ((b) << 1) | (a));
#define PM_CC_01 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0
#define PM_CC_02 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0
#define PM_CC_03 TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0

4
include/npc.h
View File

@ -223,7 +223,7 @@ typedef struct {
/* 0x1C */ Vec3i detectPos;
/* 0x28 */ VecXZi detectSize;
/* 0x30 */ enum TerritoryShape detectShape;
/* 0x34 */ s32 isFlying;
/* 0x34 */ b32 isFlying;
} EnemyTerritoryWander; // size = 0x38
typedef struct {
@ -233,7 +233,7 @@ typedef struct {
/* 0x80 */ Vec3i detectPos;
/* 0x8C */ VecXZi detectSize;
/* 0x94 */ enum TerritoryShape detectShape;
/* 0x98 */ s32 isFlying;
/* 0x98 */ b32 isFlying;
} EnemyTerritoryPatrol; // size = 0x9C
typedef union {

6
include/script_api/common.h
View File

@ -4,8 +4,8 @@
#include "common_structs.h"
#include "macros.h"
ApiStatus FadeBackgroundToBlack(Evt* script, s32 isInitialCall);
ApiStatus UnfadeBackgroundFromBlack(Evt* script, s32 isInitialCall);
ApiStatus FadeBackgroundDarken(Evt* script, s32 isInitialCall);
ApiStatus FadeBackgroundLighten(Evt* script, s32 isInitialCall);
ApiStatus GetCamLookAtObjVector(Evt* script, s32 isInitialCall);
ApiStatus HasMerleeCasts(Evt* script, s32 isInitialCall);
ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall);
@ -331,7 +331,7 @@ ApiStatus SetPlayerImgFXFlags(Evt* script, s32 isInitialCall);
ApiStatus UpdatePlayerImgFX(Evt* script, s32 isInitialCall);
ApiStatus PushSong(Evt* script, s32 isInitialCall);
ApiStatus PopSong(Evt* script, s32 isInitialCall);
ApiStatus func_802D62E4(Evt* script, s32 isInitialCall);
ApiStatus StopTrackingSoundPos(Evt* script, s32 isInitialCall);
ApiStatus func_80044238(Evt* script, s32 isInitialCall);
ApiStatus MakeLocalVertexCopy(Evt* script, s32 isInitialCall);
ApiStatus SetCustomGfx(Evt* script, s32 isInitialCall);

2
include/variables.h
View File

@ -116,7 +116,7 @@ extern s32 gCurrentDisplayContextIndex;
extern s16 gCurrentCamID;
extern s32 D_8029C890[10][5];
extern s32 PartnerWishAnims[][5];
extern HeapNode heap_battleHead;

24
src/16F740.c
View File

@ -238,7 +238,7 @@ void btl_state_update_normal_start(void) {
read_background_size(&gBackgroundImage);
}
if (gGameStatusPtr->demoFlags & 1) {
if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) {
set_curtain_scale_goal(1.0f);
}
@ -446,7 +446,7 @@ void btl_state_update_normal_start(void) {
btl_set_state(BATTLE_STATE_ENEMY_FIRST_STRIKE);
break;
default:
if (!(gGameStatusPtr->demoFlags & 1)) {
if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) {
actor = battleStatus->playerActor;
if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) {
script = start_script(&EVS_PeachEnterStage, EVT_PRIORITY_A, 0);
@ -486,7 +486,7 @@ void btl_state_update_normal_start(void) {
btl_cam_use_preset(BTL_CAM_DEFAULT);
}
if (!(gGameStatusPtr->demoFlags & 1)) {
if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) {
BattleScreenFadeAmt -= 10;
} else {
BattleScreenFadeAmt -= 50;
@ -771,7 +771,7 @@ void btl_state_update_begin_player_turn(void) {
fx_water_splash(0, player->curPos.x - 15.0f, player->curPos.y + 32.0f, player->curPos.z + 5.0f, 1.0f, 24);
fx_water_splash(1, player->curPos.x + 15.0f, player->curPos.y + 22.0f, player->curPos.z + 5.0f, 1.0f, 24);
battleStatus->waterBlockEffect = NULL;
sfx_play_sound(SOUND_0299);
sfx_play_sound(SOUND_DESTROY_WATER_BLOCK);
btl_show_battle_message(BTL_MSG_WATER_BLOCK_END, 60);
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_WATER_BLOCK;
} else {
@ -918,11 +918,11 @@ back:
}
if (player->transparentStatus != 0) {
player->transparentDuration--;
part->flags |= ACTOR_PART_FLAG_100;
part->flags |= ACTOR_PART_FLAG_TRANSPARENT;
do {
if (player->transparentDuration <= 0) {
player->transparentStatus = 0;
part->flags &= ~ACTOR_PART_FLAG_100;
part->flags &= ~ACTOR_PART_FLAG_TRANSPARENT;
remove_status_transparent(player->hudElementDataIndex);
}
} while (0); // TODO required to match
@ -2763,7 +2763,7 @@ void btl_state_update_player_move(void) {
break;
}
if (gGameStatusPtr->demoFlags & 1) {
if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) {
btl_set_state(BATTLE_STATE_END_DEMO_BATTLE);
break;
}
@ -3258,7 +3258,7 @@ void btl_state_update_partner_move(void) {
break;
}
if (gGameStatusPtr->demoFlags & 1) {
if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) {
btl_set_state(BATTLE_STATE_END_DEMO_BATTLE);
break;
}
@ -3266,7 +3266,7 @@ void btl_state_update_partner_move(void) {
if (playerData->curPartner == PARTNER_GOOMBARIO
&& battleStatus->moveCategory == BTL_MENU_TYPE_CHANGE_PARTNER
&& battleStatus->selectedMoveID != MOVE_CHARGE) {
partner->isGlowing = 0;
partner->isGlowing = FALSE;
gBattleStatus.flags1 &= ~BS_FLAGS1_GOOMBARIO_CHARGED;
}
if (btl_check_player_defeated()) {
@ -3677,7 +3677,7 @@ void btl_state_update_enemy_move(void) {
}
if (battleStatus->stateFreezeCount == 0) {
if (gGameStatusPtr->demoFlags & 1) {
if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) {
btl_set_state(BATTLE_STATE_END_DEMO_BATTLE);
} else {
btl_update_ko_status();
@ -3952,7 +3952,7 @@ void btl_state_update_first_strike(void) {
if (battleStatus->stateFreezeCount == 0) {
decrement_status_bar_disabled();
if (!(gGameStatusPtr->demoFlags & 1)) {
if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) {
Actor* target;
if (btl_check_player_defeated() || btl_check_enemies_defeated()) {
@ -4003,7 +4003,7 @@ void btl_state_draw_first_stike(void) {
if (BattleScreenFadeAmt == 0) {
set_screen_overlay_params_front(OVERLAY_NONE, -1.0f);
} else {
if (!(gGameStatusPtr->demoFlags & 1)) {
if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) {
BattleScreenFadeAmt -= 20;
} else {
BattleScreenFadeAmt -= 50;

36
src/16c8e0.c
View File

@ -51,22 +51,22 @@ HudScript* bHPDigitHudScripts[] = {
s32 BattleScreenFadeAmt = 0xFF;
EvtScript BtlPutPartnerAway = {
EVT_CALL(DispatchEvent, 256, 62)
EVT_CALL(DispatchEvent, ACTOR_PARTNER, EVENT_PUT_PARTNER_AWAY)
EVT_CHILD_THREAD
EVT_SETF(LVar0, EVT_FLOAT(1.0))
EVT_LOOP(10)
EVT_CALL(SetActorScale, 256, LVar0, LVar0, EVT_FLOAT(1.0))
EVT_CALL(SetActorScale, ACTOR_PARTNER, LVar0, LVar0, EVT_FLOAT(1.0))
EVT_SUBF(LVar0, EVT_FLOAT(0.1))
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_CALL(EnablePartnerBlur)
EVT_CALL(PlaySoundAtActor, 0, 14)
EVT_CALL(PlaySoundAtActor, 0, SOUND_PARTNER_GET_OUT)
EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 25)
EVT_CALL(SetActorJumpGravity, 256, EVT_FLOAT(1.0))
EVT_CALL(SetGoalPos, 256, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, 256, 10, 0, 0, 1)
EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.0))
EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_PARTNER, 10, 0, 0, 1)
EVT_CALL(DisablePartnerBlur)
EVT_RETURN
EVT_END
@ -76,22 +76,22 @@ EvtScript BtlBringPartnerOut = {
EVT_CHILD_THREAD
EVT_SETF(LVar0, EVT_FLOAT(0.1))
EVT_LOOP(20)
EVT_CALL(SetActorScale, 256, LVar0, LVar0, EVT_FLOAT(1.0))
EVT_CALL(SetActorScale, ACTOR_PARTNER, LVar0, LVar0, EVT_FLOAT(1.0))
EVT_ADDF(LVar0, EVT_FLOAT(0.05))
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetActorScale, 256, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, 0, 13)
EVT_CALL(GetGoalPos, 256, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, 256, EVT_FLOAT(1.0))
EVT_CALL(PlaySoundAtActor, 0, SOUND_PARTNER_PUT_AWAY)
EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.0))
EVT_IF_EQ(LVar1, 0)
EVT_CALL(JumpToGoal, 256, 20, 0, 0, 1)
EVT_CALL(JumpToGoal, ACTOR_PARTNER, 20, 0, 0, 1)
EVT_ELSE
EVT_CALL(JumpToGoal, 256, 20, 0, 0, 1)
EVT_CALL(JumpToGoal, ACTOR_PARTNER, 20, 0, 0, 1)
EVT_END_IF
EVT_CALL(GetActorPos, 256, LVar0, LVar1, LVar2)
EVT_CALL(ForceHomePos, 256, LVar0, LVar1, LVar2)
EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
EVT_CALL(ForceHomePos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
EVT_RETURN
EVT_END
};
@ -745,9 +745,9 @@ void tattle_cam_pre_render(Camera* camera) {
} else {
for (i = 0; i < ARRAY_COUNT(gTattleBgPalette); i++) {
u16 palColor = gGameStatusPtr->backgroundPalette[i];
u16 blendedB = blend_background_channel_COPY((palColor >> 1) & 0x1F, fogB >> 3, fogA);
u16 blendedG = blend_background_channel_COPY((palColor >> 6) & 0x1F, fogG >> 3, fogA);
u16 blendedR = blend_background_channel_COPY((palColor >> 11) & 0x1F, fogR >> 3, fogA);
u16 blendedB = blend_background_channel_COPY(UNPACK_PAL_B(palColor), fogB >> 3, fogA);
u16 blendedG = blend_background_channel_COPY(UNPACK_PAL_G(palColor), fogG >> 3, fogA);
u16 blendedR = blend_background_channel_COPY(UNPACK_PAL_R(palColor), fogR >> 3, fogA);
gTattleBgPalette[i] = blendedB << 1 | blendedG << 6 | blendedR << 11 | 1;
}
}

38
src/17D6A0.c
View File

@ -618,8 +618,8 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
.delay = { 30, 30 }
},
[ACTOR_TYPE_LAKITU] = {
.walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.walk = { SOUND_FLIGHT, SOUND_FLIGHT },
.fly = { SOUND_FLIGHT, SOUND_FLIGHT },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { -5, -5 }
@ -660,15 +660,15 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
.delay = { 30, 30 }
},
[ACTOR_TYPE_RUFF_PUFF] = {
.walk = { SOUND_LRAW_0295, NULL },
.fly = { SOUND_LRAW_0295, NULL },
.walk = { SOUND_FLIGHT, NULL },
.fly = { SOUND_FLIGHT, NULL },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { 30, 30 }
},
[ACTOR_TYPE_SPIKE] = {
.walk = { SOUND_LRAW_0295, NULL },
.fly = { SOUND_LRAW_0295, NULL },
.walk = { SOUND_FLIGHT, NULL },
.fly = { SOUND_FLIGHT, NULL },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { 30, 30 }
@ -709,7 +709,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
.delay = { 30, 30 }
},
[ACTOR_TYPE_DUPLIGHOST] = {
.walk = { SOUND_02CA, SOUND_02CA },
.walk = { SOUND_DUPLIGHOST_STEP, SOUND_DUPLIGHOST_STEP },
.fly = { NULL, NULL },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
@ -758,15 +758,15 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
.delay = { 30, 30 }
},
[ACTOR_TYPE_GHOST_SUSHIE] = {
.walk = { SOUND_029A, SOUND_029A },
.walk = { SOUND_SUSHIE_STEP, SOUND_SUSHIE_STEP },
.fly = { NULL, NULL },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { 30, 30 }
},
[ACTOR_TYPE_GHOST_LAKILESTER] = {
.walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.walk = { SOUND_FLIGHT, SOUND_FLIGHT },
.fly = { SOUND_FLIGHT, SOUND_FLIGHT },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { -5, -5 }
@ -1010,8 +1010,8 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
.delay = { 30, 30 }
},
[ACTOR_TYPE_UNUSED_66] = {
.walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.walk = { SOUND_FLIGHT, SOUND_FLIGHT },
.fly = { SOUND_FLIGHT, SOUND_FLIGHT },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { -5, -5 }
@ -1115,15 +1115,15 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
.delay = { 30, 30 }
},
[ACTOR_TYPE_SUSHIE] = {
.walk = { SOUND_029A, SOUND_029A },
.walk = { SOUND_SUSHIE_STEP, SOUND_SUSHIE_STEP },
.fly = { NULL, NULL },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { 30, 30 }
},
[ACTOR_TYPE_LAKILESTER] = {
.walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.walk = { SOUND_FLIGHT, SOUND_FLIGHT },
.fly = { SOUND_FLIGHT, SOUND_FLIGHT },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { -5, -5 }
@ -1178,7 +1178,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
.delay = { 30, 30 }
},
[ACTOR_TYPE_LEE] = {
.walk = { SOUND_02CA, SOUND_02CA },
.walk = { SOUND_DUPLIGHOST_STEP, SOUND_DUPLIGHOST_STEP },
.fly = { NULL, NULL },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
@ -1227,15 +1227,15 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
.delay = { 30, 30 }
},
[ACTOR_TYPE_LEE_SUSHIE] = {
.walk = { SOUND_029A, SOUND_029A },
.walk = { SOUND_SUSHIE_STEP, SOUND_SUSHIE_STEP },
.fly = { NULL, NULL },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { 30, 30 }
},
[ACTOR_TYPE_LEE_LAKILESTER] = {
.walk = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.fly = { SOUND_LRAW_0295, SOUND_LRAW_0295 },
.walk = { SOUND_FLIGHT, SOUND_FLIGHT },
.fly = { SOUND_FLIGHT, SOUND_FLIGHT },
.jump = SOUND_ACTOR_JUMP,
.hurt = SOUND_ACTOR_HURT,
.delay = { -5, -5 }

3
src/17FEB0.c
View File

@ -758,7 +758,8 @@ ApiStatus ItemCheckHit(Evt* script, s32 isInitialCall) {
flags = *args++;
if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) {
gBattleStatus.flags1 |= BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE;
gBattleStatus.flags1 |= BS_FLAGS1_10;
gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & BS_FLAGS1_10) {
gBattleStatus.flags1 |= BS_FLAGS1_10;
gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;

35
src/182B30.c
View File

@ -10,13 +10,6 @@ enum StandardPalettes {
STANDARD_PAL_STATIC = 3,
};
#define UNPACK_PAL_R(color) (((color) >> 11) & 0x1F)
#define UNPACK_PAL_G(color) (((color) >> 6) & 0x1F)
#define UNPACK_PAL_B(color) (((color) >> 1) & 0x1F)
#define UNPACK_PAL_A(color) ((color) & 1)
#define PACK_PAL_RGBA(r, g, b, a) (((r) << 11) | ((g) << 6) | ((b) << 1) | (a));
// lerp from A to B as alpha does from 0 to 255
#define LERP_COMPONENT(a, b, alpha) ((a) * (255 - (alpha)) + (b) * (alpha)) / 255;
@ -770,7 +763,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) {
set_standard_shadow_scale(shadow, dist);
shadow->scale.x *= actorPart->shadowScale;
}
if (actorPart->opacity < 255 || actorPart->flags & ACTOR_PART_FLAG_100) {
if (actorPart->opacity < 255 || actorPart->flags & ACTOR_PART_FLAG_TRANSPARENT) {
actor->renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
}
}
@ -988,9 +981,9 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
}
if (actor->transparentStatus == STATUS_KEY_TRANSPARENT) {
part->flags |= ACTOR_PART_FLAG_100;
part->flags |= ACTOR_PART_FLAG_TRANSPARENT;
} else {
part->flags &= ~ACTOR_PART_FLAG_100;
part->flags &= ~ACTOR_PART_FLAG_TRANSPARENT;
}
do {
@ -1152,7 +1145,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
if (actor->staticStatus == STATUS_KEY_STATIC) {
create_status_static(actor->hudElementDataIndex, STATUS_KEY_STATIC);
}
if ((actor->transparentStatus == STATUS_KEY_TRANSPARENT) || (part->flags & ACTOR_PART_FLAG_100)) {
if ((actor->transparentStatus == STATUS_KEY_TRANSPARENT) || (part->flags & ACTOR_PART_FLAG_TRANSPARENT)) {
create_status_transparent(actor->hudElementDataIndex, STATUS_KEY_TRANSPARENT);
}
if (actor->chillOutAmount != 0) {
@ -1434,7 +1427,7 @@ void update_player_actor_shadow(void) {
set_standard_shadow_scale(shadow, distance);
shadow->scale.x *= player->shadowScale * player->scalingFactor;
if (parts->opacity >= 255 && !(parts->flags & ACTOR_PART_FLAG_100)) {
if (parts->opacity >= 255 && !(parts->flags & ACTOR_PART_FLAG_TRANSPARENT)) {
player->renderMode = RENDER_MODE_ALPHATEST;
} else {
player->renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
@ -1597,7 +1590,7 @@ void appendGfx_player_actor(void* arg0) {
}
if (player->transparentStatus == STATUS_KEY_TRANSPARENT) {
playerParts->flags |= ACTOR_PART_FLAG_100;
playerParts->flags |= ACTOR_PART_FLAG_TRANSPARENT;
if (FALSE) { // TODO required to match - also whyyyyyy compiler, whyyyyy
back:
@ -1606,7 +1599,7 @@ void appendGfx_player_actor(void* arg0) {
goto end;
}
} else {
playerParts->flags &= ~ACTOR_PART_FLAG_100;
playerParts->flags &= ~ACTOR_PART_FLAG_TRANSPARENT;
}
do {
@ -1785,7 +1778,7 @@ void appendGfx_player_actor(void* arg0) {
playerParts->curAnimation = get_player_anim_for_status(STATUS_KEY_STATIC);
animChanged = TRUE;
}
if ((player->transparentStatus == STATUS_KEY_TRANSPARENT) || (playerParts->flags & ACTOR_PART_FLAG_100)) {
if ((player->transparentStatus == STATUS_KEY_TRANSPARENT) || (playerParts->flags & ACTOR_PART_FLAG_TRANSPARENT)) {
if (!animChanged) {
playerParts->curAnimation = get_player_anim_for_status(STATUS_KEY_TRANSPARENT);
animChanged = TRUE;
@ -1819,7 +1812,7 @@ void appendGfx_player_actor(void* arg0) {
create_status_static(player->hudElementDataIndex, STATUS_KEY_STATIC);
}
}
if ((player->transparentStatus == STATUS_KEY_TRANSPARENT) || (playerParts->flags & ACTOR_PART_FLAG_100)) {
if ((player->transparentStatus == STATUS_KEY_TRANSPARENT) || (playerParts->flags & ACTOR_PART_FLAG_TRANSPARENT)) {
create_status_transparent(player->hudElementDataIndex, STATUS_KEY_TRANSPARENT);
}
} else {
@ -1953,7 +1946,7 @@ s32 render_with_adjusted_palettes(b32 isNpcSprite, ActorPart* part, s32 yaw, Mat
sprDrawOpts = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & ACTOR_PART_FLAG_100) {
if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) {
sprDrawOpts = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = opacity * 120 / 255;
}
@ -2056,7 +2049,7 @@ void func_8025950C(ActorPart* part, s32 yaw, Matrix4f mtx) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & ACTOR_PART_FLAG_100) {
if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = (opacity * 120) / 255;
}
@ -2100,7 +2093,7 @@ void func_802596C0(ActorPart* part, s32 yaw, Matrix4f mtx) {
opacity = part->opacity;
}
if (part->flags & ACTOR_PART_FLAG_100) {
if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = (opacity * 120) / 255;
}
@ -2125,7 +2118,7 @@ void func_802597B0(ActorPart* part, s32 yaw, Matrix4f mtx) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & ACTOR_PART_FLAG_100) {
if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = (opacity * 120) / 255;
}
@ -2167,7 +2160,7 @@ void func_8025995C(ActorPart* part, s32 yaw, Matrix4f mtx) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & ACTOR_PART_FLAG_100) {
if (part->flags & ACTOR_PART_FLAG_TRANSPARENT) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = (opacity * 120) / 255;
}

16
src/18F340.c
View File

@ -338,7 +338,7 @@ API_CALLABLE(BattleMerleeFadeStageToBlack) {
script->functionTemp[0] = 25;
}
set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0]) * 10) & 0xFE);
set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0]) * 10) & 254);
script->functionTemp[0]--;
if (script->functionTemp[0] == 0) {
@ -1001,13 +1001,13 @@ EvtScript EVS_Player_HandleEvent = {
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE)
EVT_CASE_OR_EQ(EVENT_IMMUNE)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208C)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_NO_DAMGE)
EVT_SET_CONST(LVar1, ANIM_Mario1_Idle)
EVT_EXEC_WAIT(EVS_Player_NoDamageHit)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(EVENT_18)
EVT_CASE_OR_EQ(EVENT_BLOCK)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208C)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_NO_DAMGE)
EVT_SET_CONST(LVar0, 1)
EVT_SET_CONST(LVar1, ANIM_Mario1_Crouch)
EVT_EXEC_WAIT(EVS_Player_NoDamageHit)
@ -1331,7 +1331,7 @@ EvtScript D_80287404 = {
EVT_IF_EQ(LVar1, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 18)
@ -1352,7 +1352,7 @@ EvtScript D_80287404 = {
EVT_CALL(RemoveItemEntity, LVarA)
EVT_ELSE
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_USE_ITEM)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower)
EVT_WAIT(4)
EVT_ADD(LVar1, 45)
@ -1405,7 +1405,7 @@ EvtScript D_80287834 = {
EvtScript EVS_PlayEatFX = {
EVT_THREAD
EVT_LOOP(4)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK)
EVT_WAIT(10)
EVT_END_LOOP
EVT_END_THREAD
@ -1418,7 +1418,7 @@ EvtScript EVS_PlayEatFX = {
EvtScript EVS_PlayDrinkFX = {
EVT_THREAD
EVT_LOOP(4)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EAT_OR_DRINK)
EVT_WAIT(10)
EVT_END_LOOP
EVT_END_THREAD
@ -1485,7 +1485,7 @@ EvtScript EVS_UseLifeShroom = {
EVT_END_LOOP
EVT_CALL(RemoveEffect, LVar0)
EVT_CALL(RemoveItemEntity, LVarA)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2055)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_START_RECOVERY)
EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 1, LVar3, LVar4, LVar5, 70, 70, 10, 20)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0373)

14
src/190B20.c
View File

@ -1219,7 +1219,7 @@ void load_player_actor(void) {
player->actorBlueprint = &bPlayerActorBlueprint;
player->actorType = bPlayerActorBlueprint.type;
if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoFlags & 2)) {
if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_PARTNER_ACTING)) {
player->homePos.x = player->curPos.x = -130.0f;
player->homePos.y = player->curPos.y = 0.0f;
player->homePos.z = player->curPos.z = -10.0f;
@ -1281,7 +1281,7 @@ void load_player_actor(void) {
player->koDuration = 0;
player->transparentStatus = 0;
player->transparentDuration = 0;
player->isGlowing = 0;
player->isGlowing = FALSE;
player->unk_21E = 0;
player->disableDismissTimer = 0;
player->attackBoost = 0;
@ -1440,7 +1440,7 @@ void load_partner_actor(void) {
ASSERT(actorBP != NULL);
nuPiReadRom(partnerData->dmaStart, partnerData->dmaDest, partnerData->dmaEnd - partnerData->dmaStart);
if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoFlags & 2)) {
if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_PARTNER_ACTING)) {
x = -95.0f;
y = partnerData->y;
z = 0.0f;
@ -1520,7 +1520,7 @@ void load_partner_actor(void) {
partnerActor->koDuration = 0;
partnerActor->transparentStatus = 0;
partnerActor->transparentDuration = 0;
partnerActor->isGlowing = 0;
partnerActor->isGlowing = FALSE;
partnerActor->unk_21E = 0;
partnerActor->disableDismissTimer = 0;
partnerActor->attackBoost = 0;
@ -1772,7 +1772,7 @@ Actor* create_actor(Formation formation) {
actor->koDuration = 0;
actor->transparentStatus = 0;
actor->transparentDuration = 0;
actor->isGlowing = 0;
actor->isGlowing = FALSE;
actor->unk_21E = 0;
actor->disableDismissTimer = 0;
actor->attackBoost = 0;
@ -2861,7 +2861,7 @@ void remove_player_buffs(s32 buffs) {
if (buffs & PLAYER_BUFF_TRANSPARENT && (player->transparentStatus != 0)) {
player->transparentDuration = 0;
player->transparentStatus = 0;
playerActorParts->flags &= ~ACTOR_PART_FLAG_100;
playerActorParts->flags &= ~ACTOR_PART_FLAG_TRANSPARENT;
remove_status_transparent(player->hudElementDataIndex);
}
if (buffs & PLAYER_BUFF_WATER_BLOCK && (battleStatus->waterBlockTurnsLeft != 0)) {
@ -2875,7 +2875,7 @@ void remove_player_buffs(s32 buffs) {
fx_water_splash(1, player->curPos.x + 15.0f, player->curPos.y + 22.0f, player->curPos.z + 5.0f, 1.0f, 0x18);
battleStatus->waterBlockEffect = NULL;
sfx_play_sound(SOUND_0299);
sfx_play_sound(SOUND_DESTROY_WATER_BLOCK);
}
if (buffs & PLAYER_BUFF_TURBO_CHARGE && (battleStatus->turboChargeTurnsLeft != 0)) {
battleStatus->turboChargeTurnsLeft = 0;

2
src/19FAF0.c
View File

@ -417,7 +417,7 @@ HitResult calc_player_damage_enemy(void) {
sfx_play_sound_at_position(SOUND_2073, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
break;
case 6:
sfx_play_sound_at_position(SOUND_205B, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_FLOWERS_LAUGH, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
break;
}
}

14
src/1A5830.c
View File

@ -2999,7 +2999,7 @@ ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) {
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 damageAmount;
s32 scriptExists;
s32 eventID;
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -3007,13 +3007,17 @@ ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) {
actor = get_actor(actorID);
damageAmount = evt_get_variable(script, *args++);
eventID = evt_get_variable(script, *args++);
if (dispatch_damage_event_actor_0(actor, damageAmount, evt_get_variable(script, *args++)) < 0) {
if (dispatch_damage_event_actor_0(actor, damageAmount, eventID) < 0) {
return ApiStatus_BLOCK;
}
scriptExists = does_script_exist_by_ref(script) != 0;
return scriptExists * ApiStatus_DONE2;
if (does_script_exist_by_ref(script)) {
return ApiStatus_DONE2;
} else {
return ApiStatus_BLOCK;
}
}
ApiStatus DispatchEvent(Evt* script, s32 isInitialCall) {
@ -3434,7 +3438,7 @@ ApiStatus ClearStatusEffects(Evt* script, s32 isInitialCall) {
actor->disableEffect->data.disableX->koDuration = 0;
actor->attackBoost = 0;
actor->defenseBoost = 0;
actor->isGlowing = 0;
actor->isGlowing = FALSE;
return ApiStatus_DONE2;
}

24
src/80850_len_3060.c
View File

@ -568,7 +568,7 @@ void update_status_bar(void) {
return;
}
if (gGameStatusPtr->isBattle == 0 && playerData->coins != uiStatus->displayCoins) {
if (!gGameStatusPtr->isBattle && playerData->coins != uiStatus->displayCoins) {
status_bar_start_blinking_coins();
}
@ -612,7 +612,7 @@ void update_status_bar(void) {
}
if (uiStatus->displayHP != playerData->curHP) {
if (gGameStatusPtr->isBattle == 0 && playerData->curHP < uiStatus->displayHP) {
if (!gGameStatusPtr->isBattle && playerData->curHP < uiStatus->displayHP) {
status_bar_start_blinking_hp();
}
if (uiStatus->displayHP < playerData->curHP) {
@ -630,7 +630,7 @@ void update_status_bar(void) {
}
if (uiStatus->displayFP != playerData->curFP) {
if (gGameStatusPtr->isBattle == 0 && playerData->curFP < uiStatus->displayFP) {
if (!gGameStatusPtr->isBattle && playerData->curFP < uiStatus->displayFP) {
status_bar_start_blinking_fp();
}
if (uiStatus->displayFP < playerData->curFP) {
@ -672,7 +672,7 @@ void update_status_bar(void) {
}
switch (uiStatus->hidden) {
case 0:
case FALSE:
uiStatus->drawPosY += 10;
if (uiStatus->drawPosY >= 18) {
uiStatus->drawPosY = 18;
@ -684,8 +684,8 @@ void update_status_bar(void) {
} else {
if (!uiStatus->ignoreChanges) {
if (!uiStatus->unk_3B[0] || playerStatus->actionState != ACTION_STATE_IDLE) {
if (gGameStatusPtr->isBattle == 0) {
uiStatus->hidden = 1;
if (!gGameStatusPtr->isBattle) {
uiStatus->hidden = TRUE;
uiStatus->showTimer = 0;
uiStatus->unk_3B[1] = 0;
}
@ -694,7 +694,7 @@ void update_status_bar(void) {
}
}
break;
case 1:
case TRUE:
uiStatus->drawPosY -= 5;
if (uiStatus->drawPosY < -100) {
uiStatus->drawPosY = -100;
@ -707,9 +707,9 @@ void update_status_bar(void) {
uiStatus->showTimer++;
}
if (uiStatus->showTimer >= 240 && gGameStatusPtr->isBattle == 0) {
if (uiStatus->showTimer >= 240 && !gGameStatusPtr->isBattle) {
uiStatus->showTimer = 210;
uiStatus->hidden = 0;
uiStatus->hidden = FALSE;
uiStatus->unk_3B[0] = 1;
uiStatus->unk_3B[1] = 1;
}
@ -1355,7 +1355,7 @@ s32 is_status_bar_visible(void) {
void status_bar_start_blinking_hp(void) {
UiStatus* uiStatus = &gUIStatus;
if (gGameStatusPtr->isBattle == 0) {
if (!gGameStatusPtr->isBattle) {
uiStatus->hpBlinkTimer = 120;
}
@ -1378,7 +1378,7 @@ void status_bar_stop_blinking_hp(void) {
void status_bar_start_blinking_fp(void) {
UiStatus* uiStatus = &gUIStatus;
if (gGameStatusPtr->isBattle == 0) {
if (!gGameStatusPtr->isBattle) {
uiStatus->fpBlinkTimer = 120;
}
@ -1400,7 +1400,7 @@ void status_bar_stop_blinking_fp(void) {
void status_bar_start_blinking_coins(void) {
UiStatus* uiStatus = &gUIStatus;
if (gGameStatusPtr->isBattle == 0) {
if (!gGameStatusPtr->isBattle) {
uiStatus->coinsBlinkTimer = 120;
}

8
src/8800.c
View File

@ -192,8 +192,8 @@ void render_frame(s32 isSecondPass) {
camera->unkMatrix = &gDisplayContext->matrixStack[gMatrixListPos];
matrixListPos = gMatrixListPos++;
guRotate(&gDisplayContext->matrixStack[matrixListPos], -camera->trueRot.x, 0.0f, 1.0f, 0.0f);
camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82;
camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_83;
camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82.x;
camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_82.y;
if (!(camera->flags & CAMERA_FLAG_ORTHO)) {
if (gCurrentCamID != CAM_3) {
@ -436,8 +436,8 @@ void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height) {
camera->vpAlt.vp.vscale[2] = 0x1FF;
camera->vpAlt.vp.vscale[3] = 0;
camera->vpAlt.vp.vtrans[0] = gGameStatusPtr->unk_82 + 4 * (s16) ((u16) camera->viewportStartX + (camera->viewportW / 2));
camera->vpAlt.vp.vtrans[1] = gGameStatusPtr->unk_83 + 4 * (s16) ((u16) camera->viewportStartY + (camera->viewportH / 2));
camera->vpAlt.vp.vtrans[0] = gGameStatusPtr->unk_82.x + 4 * (s16) ((u16) camera->viewportStartX + (camera->viewportW / 2));
camera->vpAlt.vp.vtrans[1] = gGameStatusPtr->unk_82.y + 4 * (s16) ((u16) camera->viewportStartY + (camera->viewportH / 2));
camera->vpAlt.vp.vtrans[2] = 0x200;
camera->vpAlt.vp.vtrans[3] = 0;
}

8
src/C50A0.c
View File

@ -1654,7 +1654,7 @@ void render_item_entities(void) {
alpha = alpha * (255 - a1) / 255;
}
if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_HIDING)) {
if (gSpriteShadingProfile->flags) {
if (gSpriteShadingProfile->flags != 0) {
gDPSetRenderMode(gMainGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS,
AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA));
} else {
@ -1668,7 +1668,7 @@ void render_item_entities(void) {
if (!(item->flags & ITEM_ENTITY_FLAG_40000)) {
gDPLoadTLUT_pal16(gMainGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data);
if (gSpriteShadingProfile->flags) {
if (gSpriteShadingProfile->flags != 0) {
gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data);
gDPSetTile(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 2, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD);
gDPLoadSync(gMainGfxPos++);
@ -2371,9 +2371,9 @@ void update_item_entity_collectable(ItemEntity* item) {
item->flags |= ITEM_ENTITY_FLAG_DONE_FALLING;
} else {
if (IS_BADGE(item->itemID)) {
sfx_play_sound_at_position(SOUND_021B, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_BADGE_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
} else if (IS_ITEM(item->itemID)) {
sfx_play_sound_at_position(SOUND_021A, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_ITEM_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
} else {
switch (item->itemID) {
case ITEM_HEART:

126
src/actor_api.c
View File

@ -2855,7 +2855,7 @@ ApiStatus GetStatusFlags(Evt* script, s32 isInitialCall) {
}
for (partsTable = actor->partsTable; partsTable != NULL; partsTable = partsTable->nextPart) {
if (partsTable->flags & 0x100) {
if (partsTable->flags & ACTOR_PART_FLAG_TRANSPARENT) {
flags |= STATUS_FLAG_TRANSPARENT;
}
if (partsTable->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) {
@ -2969,7 +2969,6 @@ ApiStatus GetBattleVar(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus ResetAllActorSounds(Evt* script, s32 isInitialCall) {
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
@ -2985,39 +2984,39 @@ s32 SetActorSounds(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 temp_s0_4;
s32 temp_s1;
s32 temp_s3;
s32 soundType;
s32 sound1;
s32 sound2;
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
}
temp_s3 = evt_get_variable(script, *args++);
temp_s0_4 = evt_get_variable(script, *args++);
temp_s1 = evt_get_variable(script, *args++);
soundType = evt_get_variable(script, *args++);
sound1 = evt_get_variable(script, *args++);
sound2 = evt_get_variable(script, *args++);
actor = get_actor(actorID);
switch (temp_s3) {
case 0:
actor->actorTypeData1[0] = temp_s0_4;
actor->actorTypeData1[1] = temp_s1;
switch (soundType) {
case ACTOR_SOUND_WALK:
actor->actorTypeData1[0] = sound1;
actor->actorTypeData1[1] = sound2;
break;
case 1:
actor->actorTypeData1[2] = temp_s0_4;
actor->actorTypeData1[3] = temp_s1;
case ACTOR_SOUND_FLY:
actor->actorTypeData1[2] = sound1;
actor->actorTypeData1[3] = sound2;
break;
case 2:
actor->actorTypeData1[4] = temp_s0_4;
case ACTOR_SOUND_JUMP:
actor->actorTypeData1[4] = sound1;
break;
case 3:
actor->actorTypeData1[5] = temp_s0_4;
case ACTOR_SOUND_HURT:
actor->actorTypeData1[5] = sound1;
break;
case 4:
actor->actorTypeData1b[0] = temp_s0_4;
case ACTOR_SOUND_WALK_INCREMENT:
actor->actorTypeData1b[0] = sound1;
break;
case 5:
actor->actorTypeData1b[1] = temp_s0_4;
case ACTOR_SOUND_FLY_INCREMENT:
actor->actorTypeData1b[1] = sound1;
break;
}
@ -3028,36 +3027,38 @@ ApiStatus ResetActorSounds(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 temp_s3;
s32 soundType;
s32 sound1;
s32 sound2;
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
}
temp_s3 = evt_get_variable(script, *args++);
evt_get_variable(script, *args++);
evt_get_variable(script, *args++);
soundType = evt_get_variable(script, *args++);
sound1 = evt_get_variable(script, *args++);
sound2 = evt_get_variable(script, *args++);
actor = get_actor(actorID);
switch (temp_s3) {
case 0:
switch (soundType) {
case ACTOR_SOUND_WALK:
actor->actorTypeData1[0] = bActorSoundTable[actor->actorType].walk[0];
actor->actorTypeData1[1] = bActorSoundTable[actor->actorType].walk[1];
break;
case 1:
case ACTOR_SOUND_FLY:
actor->actorTypeData1[2] = bActorSoundTable[actor->actorType].fly[0];
actor->actorTypeData1[3] = bActorSoundTable[actor->actorType].fly[1];
break;
case 2:
case ACTOR_SOUND_JUMP:
actor->actorTypeData1[4] = bActorSoundTable[actor->actorType].jump;
break;
case 3:
case ACTOR_SOUND_HURT:
actor->actorTypeData1[5] = bActorSoundTable[actor->actorType].hurt;
break;
case 4:
case ACTOR_SOUND_WALK_INCREMENT:
actor->actorTypeData1b[0] = bActorSoundTable[actor->actorType].delay[0];
break;
case 5:
case ACTOR_SOUND_FLY_INCREMENT:
actor->actorTypeData1b[1] = bActorSoundTable[actor->actorType].delay[1];
break;
}
@ -3070,40 +3071,40 @@ ApiStatus SetPartSounds(Evt* script, s32 isInitialCall) {
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 partID;
s32 temp_s1_5;
s32 temp_s2;
s32 temp_s4;
s32 soundType;
s32 sound1;
s32 sound2;
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
}
partID = evt_get_variable(script, *args++);
temp_s4 = evt_get_variable(script, *args++);
temp_s1_5 = evt_get_variable(script, *args++);
temp_s2 = evt_get_variable(script, *args++);
soundType = evt_get_variable(script, *args++);
sound1 = evt_get_variable(script, *args++);
sound2 = evt_get_variable(script, *args++);
actorPart = get_actor_part(get_actor(actorID), partID);
switch (temp_s4) {
case 0:
actorPart->partTypeData[0] = temp_s1_5;
actorPart->partTypeData[1] = temp_s2;
switch (soundType) {
case ACTOR_SOUND_WALK:
actorPart->partTypeData[0] = sound1;
actorPart->partTypeData[1] = sound2;
break;
case 1:
actorPart->partTypeData[2] = temp_s1_5;
actorPart->partTypeData[3] = temp_s2;
case ACTOR_SOUND_FLY:
actorPart->partTypeData[2] = sound1;
actorPart->partTypeData[3] = sound2;
break;
case 2:
actorPart->partTypeData[4] = temp_s1_5;
case ACTOR_SOUND_JUMP:
actorPart->partTypeData[4] = sound1;
break;
case 3:
actorPart->partTypeData[5] = temp_s1_5;
case ACTOR_SOUND_HURT:
actorPart->partTypeData[5] = sound1;
break;
case 4:
actorPart->actorTypeData2b[0] = temp_s1_5;
case ACTOR_SOUND_WALK_INCREMENT:
actorPart->actorTypeData2b[0] = sound1;
break;
case 5:
actorPart->actorTypeData2b[1] = temp_s1_5;
case ACTOR_SOUND_FLY_INCREMENT:
actorPart->actorTypeData2b[1] = sound1;
break;
}
@ -3131,7 +3132,6 @@ ApiStatus SetActorType(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus ShowShockEffect(Evt* script, s32 isInitialCall) {
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
@ -3248,10 +3248,10 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
break;
case 2:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
dispatch_event_actor(actor, EVENT_RECEIVE_BUFF);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
actor->isGlowing = 1;
actor->isGlowing = TRUE;
actor->attackBoost += attackBoost;
if (actor->attackBoost > 20) {
actor->attackBoost = 20;
@ -3372,10 +3372,10 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
break;
case 2:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
dispatch_event_actor(actor, EVENT_RECEIVE_BUFF);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
actor->isGlowing = 1;
actor->isGlowing = TRUE;
actor->defenseBoost += defenseBoost;
if (actor->defenseBoost > 20) {
actor->defenseBoost = 20;
@ -3483,7 +3483,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
break;
case 2:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
dispatch_event_actor(actor, EVENT_RECEIVE_BUFF);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
inflict_status(actor, 0xE, vanished);
@ -3589,7 +3589,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
break;
case 2:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
dispatch_event_actor(actor, EVENT_RECEIVE_BUFF);
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(15);
inflict_status(actor, 0xB, electrified);
@ -3695,7 +3695,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
switch (script->functionTemp[0]) {
case 1:
if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
dispatch_event_actor(actor, EVENT_RECEIVE_BUFF);
fx_recover(0, x2, y2, z2, hpBoost);
show_start_recovery_shimmer(x1, y1, z1, hpBoost);
script->functionTemp[3] = 30;

116
src/audio/sfx.c
View File

@ -11,13 +11,13 @@ SHIFT_BSS u16 gCurrentRoomDoorSounds;
// map logical looping soundIDs to raw ones
s32 LoopingSounds[] = {
[SOUND_LOOP_IDX(SOUND_LOOP_00)] SOUND_LRAW_0287,
[SOUND_LOOP_IDX(SOUND_LOOP_01)] SOUND_LRAW_02A8,
[SOUND_LOOP_IDX(SOUND_LOOP_BOBOMB_FUSE)] SOUND_LRAW_BOBOMB_FUSE,
[SOUND_LOOP_IDX(SOUND_LOOP_02)] SOUND_LRAW_0054,
[SOUND_LOOP_IDX(SOUND_LOOP_03)] SOUND_LRAW_0056,
[SOUND_LOOP_IDX(SOUND_LOOP_04)] SOUND_LRAW_0024,
[SOUND_LOOP_IDX(SOUND_LOOP_05)] SOUND_LRAW_0027,
[SOUND_LOOP_IDX(SOUND_LOOP_06)] SOUND_LRAW_0021,
[SOUND_LOOP_IDX(SOUND_LOOP_07)] SOUND_LRAW_0022,
[SOUND_LOOP_IDX(SOUND_LOOP_TRD_02_LOWER_STAIRS)] SOUND_LRAW_TRD_02_LOWER_STAIRS,
[SOUND_LOOP_IDX(SOUND_LOOP_TRD_04_LOWER_STAIRS)] SOUND_LRAW_TRD_04_LOWER_STAIRS,
[SOUND_LOOP_IDX(SOUND_LOOP_TRD_FLOWING_WATER)] SOUND_LRAW_TRD_FLOWING_WATER,
[SOUND_LOOP_IDX(SOUND_LOOP_TRD_RAISE_STAIRS)] SOUND_LRAW_TRD_RAISE_STAIRS,
[SOUND_LOOP_IDX(SOUND_LOOP_08)] SOUND_LRAW_CHEERING,
[SOUND_LOOP_IDX(SOUND_LOOP_09)] SOUND_LRAW_0273,
[SOUND_LOOP_IDX(SOUND_LOOP_0A)] SOUND_LRAW_0275,
@ -25,16 +25,16 @@ s32 LoopingSounds[] = {
[SOUND_LOOP_IDX(SOUND_LOOP_0C)] SOUND_LRAW_0274,
[SOUND_LOOP_IDX(SOUND_LOOP_0D)] SOUND_LRAW_0273,
[SOUND_LOOP_IDX(SOUND_LOOP_0E)] SOUND_LRAW_0274,
[SOUND_LOOP_IDX(SOUND_LOOP_0F)] SOUND_LRAW_0099,
[SOUND_LOOP_IDX(SOUND_LOOP_10)] SOUND_LRAW_009E,
[SOUND_LOOP_IDX(SOUND_LOOP_OBK_LOWER_CHAIN)] SOUND_LRAW_OBK_LOWER_CHAIN,
[SOUND_LOOP_IDX(SOUND_LOOP_MOVE_STATUE)] SOUND_LRAW_MOVE_STATUE,
[SOUND_LOOP_IDX(SOUND_LOOP_11)] SOUND_LRAW_032E,
[SOUND_LOOP_IDX(SOUND_LOOP_12)] SOUND_LRAW_008E,
[SOUND_LOOP_IDX(SOUND_LOOP_13)] SOUND_LRAW_0089,
[SOUND_LOOP_IDX(SOUND_LOOP_14)] SOUND_LRAW_0083,
[SOUND_LOOP_IDX(SOUND_LOOP_QUIZ_TICKING)] SOUND_LRAW_QUIZ_TICKING,
[SOUND_LOOP_IDX(SOUND_LOOP_AUDIENCE_MURMUR)] SOUND_LRAW_AUDIENCE_MURMUR,
[SOUND_LOOP_IDX(SOUND_LOOP_TOYBOX_TRAIN_GEAR)] SOUND_LRAW_TOYBOX_TRAIN_GEAR,
[SOUND_LOOP_IDX(SOUND_LOOP_15)] SOUND_LRAW_0388,
[SOUND_LOOP_IDX(SOUND_LOOP_16)] SOUND_LRAW_00A0,
[SOUND_LOOP_IDX(SOUND_LOOP_OMO_ROTATING_WHEEL)] SOUND_LRAW_OMO_ROTATING_WHEEL,
[SOUND_LOOP_IDX(SOUND_LOOP_17)] SOUND_LRAW_004A,
[SOUND_LOOP_IDX(SOUND_LOOP_18)] SOUND_LRAW_009F,
[SOUND_LOOP_IDX(SOUND_LOOP_MOVE_LARGE_STATUE)] SOUND_LRAW_MOVE_LARGE_STATUE,
[SOUND_LOOP_IDX(SOUND_LOOP_19)] SOUND_LRAW_0168,
[SOUND_LOOP_IDX(SOUND_LOOP_1A)] SOUND_LRAW_0185,
[SOUND_LOOP_IDX(SOUND_LOOP_1B)] SOUND_LRAW_0052,
@ -47,7 +47,7 @@ s32 LoopingSounds[] = {
[SOUND_LOOP_IDX(SOUND_LOOP_22)] SOUND_LRAW_0199,
[SOUND_LOOP_IDX(SOUND_LOOP_23)] SOUND_LRAW_0194,
[SOUND_LOOP_IDX(SOUND_LOOP_24)] SOUND_LRAW_019A,
[SOUND_LOOP_IDX(SOUND_LOOP_25)] SOUND_LRAW_0091,
[SOUND_LOOP_IDX(SOUND_LOOP_PUFF_PUFF_MACHINE)] SOUND_LRAW_PUFF_PUFF_MACHINE,
[SOUND_LOOP_IDX(SOUND_LOOP_26)] SOUND_LRAW_0164,
[SOUND_LOOP_IDX(SOUND_LOOP_27)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_28)] SOUND_LRAW_0271,
@ -85,35 +85,35 @@ s32 LoopingSounds[] = {
[SOUND_LOOP_IDX(SOUND_LOOP_48)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_49)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_4A)] SOUND_LRAW_0050,
[SOUND_LOOP_IDX(SOUND_LOOP_4B)] SOUND_LRAW_0070,
[SOUND_LOOP_IDX(SOUND_LOOP_WINDILL_GEARS)] SOUND_LRAW_WINDILL_GEARS,
[SOUND_LOOP_IDX(SOUND_LOOP_4C)] SOUND_LRAW_036C,
[SOUND_LOOP_IDX(SOUND_LOOP_4D)] SOUND_LRAW_036D,
[SOUND_LOOP_IDX(SOUND_LOOP_4E)] SOUND_LRAW_0295,
[SOUND_LOOP_IDX(SOUND_LOOP_4E)] SOUND_FLIGHT,
[SOUND_LOOP_IDX(SOUND_LOOP_4F)] SOUND_LRAW_0043,
[SOUND_LOOP_IDX(SOUND_LOOP_50)] SOUND_LRAW_0197,
[SOUND_LOOP_IDX(SOUND_LOOP_51)] SOUND_LRAW_0221,
[SOUND_LOOP_IDX(SOUND_LOOP_52)] SOUND_LRAW_022A,
[SOUND_LOOP_IDX(SOUND_LOOP_53)] SOUND_LRAW_022B,
[SOUND_LOOP_IDX(SOUND_LOOP_54)] SOUND_LRAW_2040,
[SOUND_LOOP_IDX(SOUND_LOOP_KPA_CHAIN_DRIVE)] SOUND_LRAW_KPA_CHAIN_DRIVE,
[SOUND_LOOP_IDX(SOUND_LOOP_KPA_FILL_WATER)] SOUND_LRAW_KPA_FILL_WATER,
[SOUND_LOOP_IDX(SOUND_LOOP_KPA_DRAIN_WATER)] SOUND_LRAW_KPA_DRAIN_WATER,
[SOUND_LOOP_IDX(SOUND_LOOP_KPA_FLIP_BRIDGE_PANEL)] SOUND_KPA_FLIP_BRIDGE_PANEL,
[SOUND_LOOP_IDX(SOUND_LOOP_JR_TROOPA_SWIM)] SOUND_LRAW_JR_TROOPA_SWIM,
[SOUND_LOOP_IDX(SOUND_LOOP_56)] SOUND_LRAW_0033,
[SOUND_LOOP_IDX(SOUND_LOOP_57)] SOUND_LRAW_0034,
[SOUND_LOOP_IDX(SOUND_LOOP_KKJ_RUMBLING)] SOUND_LRAW_KKJ_RUMBLING,
[SOUND_LOOP_IDX(SOUND_LOOP_OSR_RUMBLING)] SOUND_LRAW_OSR_RUMBLING,
[SOUND_LOOP_IDX(SOUND_LOOP_58)] SOUND_LRAW_0039,
[SOUND_LOOP_IDX(SOUND_LOOP_59)] SOUND_LRAW_004C,
[SOUND_LOOP_IDX(SOUND_LOOP_5A)] SOUND_LRAW_004D,
[SOUND_LOOP_IDX(SOUND_LOOP_5B)] SOUND_LRAW_01B1,
[SOUND_LOOP_IDX(SOUND_LOOP_5C)] SOUND_LRAW_01B2,
[SOUND_LOOP_IDX(SOUND_LOOP_5D)] SOUND_LRAW_0094,
[SOUND_LOOP_IDX(SOUND_LOOP_DGB_COLLAPSE)] SOUND_LRAW_DGB_COLLAPSE,
[SOUND_LOOP_IDX(SOUND_LOOP_5E)] SOUND_LRAW_005D,
[SOUND_LOOP_IDX(SOUND_LOOP_5F)] SOUND_LRAW_005B,
[SOUND_LOOP_IDX(SOUND_LOOP_60)] SOUND_LRAW_0060,
[SOUND_LOOP_IDX(SOUND_LOOP_61)] SOUND_LRAW_01B3,
[SOUND_LOOP_IDX(SOUND_LOOP_62)] SOUND_NONE,
[SOUND_LOOP_IDX(SOUND_LOOP_63)] SOUND_LRAW_00AD,
[SOUND_LOOP_IDX(SOUND_LOOP_64)] SOUND_LRAW_00AE,
[SOUND_LOOP_IDX(SOUND_LOOP_65)] SOUND_LRAW_00AF,
[SOUND_LOOP_IDX(SOUND_LOOP_66)] SOUND_LRAW_023D,
[SOUND_LOOP_IDX(SOUND_LOOP_67)] SOUND_LRAW_00A2,
[SOUND_LOOP_IDX(SOUND_LOOP_STAR_SANCTUARY_FAR)] SOUND_LRAW_STAR_SANCTUARY_FAR,
[SOUND_LOOP_IDX(SOUND_LOOP_STAR_SANCTUARY_NEAR)] SOUND_LRAW_STAR_SANCTUARY_NEAR,
[SOUND_LOOP_IDX(SOUND_LOOP_STAR_SANCTUARY_INSIDE)] SOUND_LRAW_STAR_SANCTUARY_INSIDE,
[SOUND_LOOP_IDX(SOUND_LOOP_BOWSER_PROPELLER)] SOUND_LRAW_BOWSER_PROPELLER,
[SOUND_LOOP_IDX(SOUND_LOOP_STAR_CARD_APPEARS)] SOUND_LRAW_STAR_CARD_APPEARS,
[SOUND_LOOP_IDX(SOUND_LOOP_68)] SOUND_LRAW_0248,
[SOUND_LOOP_IDX(SOUND_LOOP_69)] SOUND_LRAW_0249,
[SOUND_LOOP_IDX(SOUND_LOOP_6A)] SOUND_LRAW_0391,
@ -124,26 +124,26 @@ s32 LoopingSounds[] = {
};
// all sound IDs for alternating sounds
s32 D_8014F48C[] = { SOUND_SRAW_FIRE_BAR_0_A, SOUND_SRAW_FIRE_BAR_0_B };
s32 D_8014F494[] = { SOUND_SRAW_FIRE_BAR_1_A, SOUND_SRAW_FIRE_BAR_1_B };
s32 D_8014F49C[] = { SOUND_SRAW_FIRE_BAR_2_A, SOUND_SRAW_FIRE_BAR_2_B };
s32 D_8014F4A4[] = { SOUND_SRAW_FIRE_BAR_3_A, SOUND_SRAW_FIRE_BAR_3_B };
s32 D_8014F4AC[] = { SOUND_SRAW_FIRE_BAR_4_A, SOUND_SRAW_FIRE_BAR_4_B };
s32 D_8014F4B4[] = { SOUND_SRAW_FIRE_BAR_5_A, SOUND_SRAW_FIRE_BAR_5_B };
s32 D_8014F4BC[] = { SOUND_SRAW_FIRE_BAR_6_A, SOUND_SRAW_FIRE_BAR_6_B };
s32 D_8014F4C4[] = { SOUND_SRAW_FIRE_BAR_7_A, SOUND_SRAW_FIRE_BAR_7_B };
s32 D_8014F4CC[] = { SOUND_SRAW_FIRE_BAR_8_A, SOUND_SRAW_FIRE_BAR_8_B };
s32 D_8014F4D4[] = { SOUND_SRAW_FIRE_BAR_9_A, SOUND_SRAW_FIRE_BAR_9_B };
s32 D_8014F4DC[] = { SOUND_SRAW_FIRE_BAR_DEAD, SOUND_SRAW_FIRE_BAR_DEAD };
s32 FireBar0Sounds[] = { SOUND_SRAW_FIRE_BAR_0_A, SOUND_SRAW_FIRE_BAR_0_B };
s32 FireBar1Sounds[] = { SOUND_SRAW_FIRE_BAR_1_A, SOUND_SRAW_FIRE_BAR_1_B };
s32 FireBar2Sounds[] = { SOUND_SRAW_FIRE_BAR_2_A, SOUND_SRAW_FIRE_BAR_2_B };
s32 FireBar3Sounds[] = { SOUND_SRAW_FIRE_BAR_3_A, SOUND_SRAW_FIRE_BAR_3_B };
s32 FireBar4Sounds[] = { SOUND_SRAW_FIRE_BAR_4_A, SOUND_SRAW_FIRE_BAR_4_B };
s32 FireBar5Sounds[] = { SOUND_SRAW_FIRE_BAR_5_A, SOUND_SRAW_FIRE_BAR_5_B };
s32 FireBar6Sounds[] = { SOUND_SRAW_FIRE_BAR_6_A, SOUND_SRAW_FIRE_BAR_6_B };
s32 FireBar7Sounds[] = { SOUND_SRAW_FIRE_BAR_7_A, SOUND_SRAW_FIRE_BAR_7_B };
s32 FireBar8Sounds[] = { SOUND_SRAW_FIRE_BAR_8_A, SOUND_SRAW_FIRE_BAR_8_B };
s32 FireBar9Sounds[] = { SOUND_SRAW_FIRE_BAR_9_A, SOUND_SRAW_FIRE_BAR_9_B };
s32 FireBarDeadSounds[] = { SOUND_SRAW_FIRE_BAR_DEAD, SOUND_SRAW_FIRE_BAR_DEAD };
s32 D_8014F4E4[] = { SOUND_SRAW_0B_A, SOUND_SRAW_0B_B };
s32 D_8014F4EC[] = { SOUND_SRAW_0C_A, SOUND_SRAW_0C_B };
s32 D_8014F4F4[] = { SOUND_SRAW_0D_A, SOUND_SRAW_0D_B };
s32 D_8014F4FC[] = { SOUND_SRAW_0E_A, SOUND_SRAW_0E_B };
s32 D_8014F504[] = { SOUND_BOO_VANISH_A, SOUND_BOO_VANISH_B };
s32 D_8014F50C[] = { SOUND_BOO_APPEAR_A, SOUND_BOO_APPEAR_B };
s32 BooVanishSounds[] = { SOUND_BOO_VANISH_A, SOUND_BOO_VANISH_B };
s32 BooAppearSounds[] = { SOUND_BOO_APPEAR_A, SOUND_BOO_APPEAR_B };
s32 D_8014F514[] = { SOUND_SRAW_11_A, SOUND_SRAW_11_B };
s32 D_8014F51C[] = { SOUND_SRAW_12_A, SOUND_SRAW_12_B };
s32 D_8014F524[] = { SOUND_SRAW_13_A, SOUND_SRAW_13_B };
s32 RavenLeapSounds[] = { SOUND_RAVEN_LEAP_A, SOUND_RAVEN_LEAP_B };
s32 D_8014F52C[] = { SOUND_SRAW_14_A, SOUND_SRAW_14_B, SOUND_SRAW_14_C };
s32 D_8014F538[] = { SOUND_SRAW_15_A, SOUND_SRAW_15_B };
s32 D_8014F540[] = { SOUND_SRAW_16_A, SOUND_SRAW_16_B };
@ -163,26 +163,26 @@ s32 D_8014F59C[] = { SOUND_SRAW_21_A, SOUND_SRAW_21_B };
// map logical alternating soundIDs to lists of raw ones
AlternatingSoundSet AlternatingSounds[] = {
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_0, D_8014F48C),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_1, D_8014F494),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_2, D_8014F49C),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_3, D_8014F4A4),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_4, D_8014F4AC),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_5, D_8014F4B4),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_6, D_8014F4BC),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_7, D_8014F4C4),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_8, D_8014F4CC),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_9, D_8014F4D4),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_DEAD, D_8014F4DC),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_0, FireBar0Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_1, FireBar1Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_2, FireBar2Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_3, FireBar3Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_4, FireBar4Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_5, FireBar5Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_6, FireBar6Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_7, FireBar7Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_8, FireBar8Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_9, FireBar9Sounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_DEAD, FireBarDeadSounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_0B, D_8014F4E4),
SEQ_SOUND_ENTRY(SOUND_SEQ_0C, D_8014F4EC),
SEQ_SOUND_ENTRY(SOUND_SEQ_0D, D_8014F4F4),
SEQ_SOUND_ENTRY(SOUND_SEQ_0E, D_8014F4FC),
SEQ_SOUND_ENTRY(SOUND_SEQ_0F, D_8014F504),
SEQ_SOUND_ENTRY(SOUND_SEQ_10, D_8014F50C),
SEQ_SOUND_ENTRY(SOUND_SEQ_BOO_VANISH, BooVanishSounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_BOO_APPEAR, BooAppearSounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_11, D_8014F514),
SEQ_SOUND_ENTRY(SOUND_SEQ_12, D_8014F51C),
SEQ_SOUND_ENTRY(SOUND_SEQ_13, D_8014F524),
SEQ_SOUND_ENTRY(SOUND_SEQ_RAVEN_LEAP, RavenLeapSounds),
SEQ_SOUND_ENTRY(SOUND_SEQ_14, D_8014F52C),
SEQ_SOUND_ENTRY(SOUND_SEQ_15, D_8014F538),
SEQ_SOUND_ENTRY(SOUND_SEQ_16, D_8014F540),
@ -389,7 +389,7 @@ SoundInstance* sfx_get_env_sound_instance(s32 soundID) {
return NULL;
}
void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) {
void sfx_play_sound_looping(s32 soundID, u8 volume, u8 pan, s16 pitchShift) {
SoundInstance* sound = gCurrentEnvSounds;
s32 i;
@ -400,12 +400,12 @@ void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) {
}
sound->pan = pan;
sound->soundID = soundId;
sound->soundID = soundID;
sound->volume = volume;
sound->pitchShift = pitchShift;
sound->flags |= SOUND_INSTANCE_FLAG_ACTIVE;
snd_start_sound_with_shift(soundId, volume, pan, pitchShift);
snd_start_sound_with_shift(soundID, volume, pan, pitchShift);
}
void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y, f32 z) {

12
src/background.c
View File

@ -144,9 +144,9 @@ void appendGfx_background_texture(void) {
} else {
for (i = 0; i < ARRAY_COUNT(gBackgroundPalette); i++) {
u16 palColor = gGameStatusPtr->backgroundPalette[i];
blendedB = blend_background_channel((palColor >> 1) & 0x1F, fogB >> 3, fogA);
blendedG = blend_background_channel((palColor >> 6) & 0x1F, fogG >> 3, fogA);
blendedR = blend_background_channel((palColor >> 11) & 0x1F, fogR >> 3, fogA);
blendedB = blend_background_channel(UNPACK_PAL_B(palColor), fogB >> 3, fogA);
blendedG = blend_background_channel(UNPACK_PAL_G(palColor), fogG >> 3, fogA);
blendedR = blend_background_channel(UNPACK_PAL_R(palColor), fogR >> 3, fogA);
gBackgroundPalette[i] = blendedB << 1 | blendedG << 6 | blendedR << 11 | 1;
}
}
@ -156,9 +156,9 @@ void appendGfx_background_texture(void) {
default:
for (i = 0; i < ARRAY_COUNT(gBackgroundPalette); i++) {
u16 palColor = gGameStatusPtr->backgroundPalette[i];
blendedB = (b2 >> 3) + ((((palColor >> 1) & 0x1F) * b1) >> 8);
blendedG = (g2 >> 3) + ((((palColor >> 6) & 0x1F) * g1) >> 8);
blendedR = (r2 >> 3) + ((((palColor >> 11) & 0x1F) * r1) >> 8);
blendedB = (b2 >> 3) + ((UNPACK_PAL_B(palColor) * b1) >> 8);
blendedG = (g2 >> 3) + ((UNPACK_PAL_G(palColor) * g1) >> 8);
blendedR = (r2 >> 3) + ((UNPACK_PAL_R(palColor) * r1) >> 8);
if (blendedB > 0x1F) {
blendedB = 0x1F;

6
src/background_gfx.c
View File

@ -42,9 +42,9 @@ s32 gfx_frame_filter_pass_0(const u16* frameBuffer0, const u16* frameBuffer1, s3
s32 pixel = SCREEN_WIDTH * y + x;
out->a = (frameBuffer1[pixel] >> 2) & 0xF;
out->r = (frameBuffer0[pixel] >> 11);
out->g = (frameBuffer0[pixel] >> 6) & 0x1F;
out->b = (frameBuffer0[pixel] >> 1) & 0x1F;
out->r = UNPACK_PAL_R(frameBuffer0[pixel]);
out->g = UNPACK_PAL_G(frameBuffer0[pixel]);
out->b = UNPACK_PAL_B(frameBuffer0[pixel]);
}
void gfx_frame_filter_pass_1(Color_RGBA8* filterBuf0, Color_RGBA8 filterBuf1, u16* out) {

4
src/battle/action_cmd.c
View File

@ -274,7 +274,7 @@ void action_command_init_status(void) {
}
}
if (gGameStatusPtr->demoFlags & 1) {
if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) {
actionCommandStatus->autoSucceed = TRUE;
}
@ -553,7 +553,7 @@ s32 check_block_input(s32 buttonMask) {
return TRUE;
}
if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_NOT_LEARNED || (gGameStatusPtr->demoFlags & 1)) {
if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_NOT_LEARNED || (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) {
return FALSE;
}

2
src/battle/action_cmd/body_slam.c
View File

@ -132,7 +132,7 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[2], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButton);
if (!actionCommandStatus->isBarFilled) {
sfx_play_sound(SOUND_0234);
sfx_play_sound(SOUND_TIMING_BAR_GO);
actionCommandStatus->isBarFilled = TRUE;
}
}

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

@ -215,14 +215,14 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[4], &HES_TimingCharge3);
battleStatus->actionResult = 0;
if (actionCommandStatus->frameCounter == 0 && actionCommandStatus->playHammerSounds) {
sfx_play_sound(SOUND_0233);
sfx_play_sound(SOUND_TIMING_BAR_TICK);
}
} else if (actionCommandStatus->frameCounter < temp_f20 * 2) {
hud_element_set_script(actionCommandStatus->hudElements[3], &HES_TimingCharge2);
battleStatus->actionResult = 1;
if (actionCommandStatus->frameCounter == temp_f20) {
if (actionCommandStatus->playHammerSounds) {
sfx_play_sound(SOUND_0233);
sfx_play_sound(SOUND_TIMING_BAR_TICK);
}
}
} else if (actionCommandStatus->frameCounter < temp_f20 * 3.0f) {
@ -230,7 +230,7 @@ void N(update)(void) {
battleStatus->actionResult = 2;
if (actionCommandStatus->frameCounter == temp_f20 * 2) {
if (actionCommandStatus->playHammerSounds) {
sfx_play_sound(SOUND_0233);
sfx_play_sound(SOUND_TIMING_BAR_TICK);
}
}
}
@ -240,7 +240,7 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[1], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[5], &HES_StickTapNeutral);
if (actionCommandStatus->playHammerSounds) {
sfx_play_sound(SOUND_0234);
sfx_play_sound(SOUND_TIMING_BAR_GO);
}
if (actionCommandStatus->autoSucceed != 0 && actionCommandStatus->autoSucceed != 2) {
actionCommandStatus->autoSucceed = 2;

2
src/battle/action_cmd/jump.c
View File

@ -187,7 +187,7 @@ void N(update)(void) {
void N(draw)(void) {
hud_element_draw_clipped(gActionCommandStatus.hudElements[0]);
if (!(gGameStatusPtr->demoFlags & 1)) {
if (!(gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED)) {
hud_element_draw_clipped(gActionCommandStatus.hudElements[1]);
}
}

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

@ -139,7 +139,7 @@ void N(update)(void) {
actionCommandStatus->hudPosX + ((actionCommandStatus->unk_5D - 1) * 20) + 16,
actionCommandStatus->hudPosY);
hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED);
sfx_play_sound(SOUND_0233);
sfx_play_sound(SOUND_TIMING_BAR_TICK);
actionCommandStatus->lookBackCounter = 1;
actionCommandStatus->state = 12;
// fallthrough
@ -263,7 +263,7 @@ void N(update)(void) {
}
actionCommandStatus->state = 11;
battleStatus->actionResult++;
sfx_play_sound(SOUND_021C);
sfx_play_sound(SOUND_APPROVE);
return;
}

10
src/battle/action_cmd/water_block.c
View File

@ -349,16 +349,16 @@ void N(update)(void) {
btl_set_popup_duration(99);
if (actionCommandStatus->frameCounter == 42) {
hud_element_set_script(actionCommandStatus->hudElements[11], &HES_TimingCharge3);
sfx_play_sound(SOUND_0233);
sfx_play_sound(SOUND_TIMING_BAR_TICK);
}
if (actionCommandStatus->frameCounter == 22) {
hud_element_set_script(actionCommandStatus->hudElements[12], &HES_TimingCharge2);
sfx_play_sound(SOUND_0233);
sfx_play_sound(SOUND_TIMING_BAR_TICK);
}
if (actionCommandStatus->frameCounter == 2) {
hud_element_set_script(actionCommandStatus->hudElements[2], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown);
sfx_play_sound(SOUND_0234);
sfx_play_sound(SOUND_TIMING_BAR_GO);
}
actionCommandStatus->frameCounter--;
if (actionCommandStatus->frameCounter == 0) {
@ -428,7 +428,7 @@ void N(update)(void) {
if (actionCommandStatus->frameCounter == 2) {
hud_element_set_script(actionCommandStatus->hudElements[3], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown);
sfx_play_sound(SOUND_0234);
sfx_play_sound(SOUND_TIMING_BAR_GO);
}
actionCommandStatus->frameCounter--;
if (actionCommandStatus->frameCounter == 0) {
@ -502,7 +502,7 @@ void N(update)(void) {
if (actionCommandStatus->frameCounter == 2) {
hud_element_set_script(actionCommandStatus->hudElements[4], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown);
sfx_play_sound(SOUND_0234);
sfx_play_sound(SOUND_TIMING_BAR_GO);
}
actionCommandStatus->frameCounter--;
if (actionCommandStatus->frameCounter == 0) {

16
src/battle/area/dig/actor/tubba_blubba.c
View File

@ -277,8 +277,8 @@ EvtScript N(attackFistDrop) = {
EVT_END_IF
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_WAIT(30)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim02)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -305,8 +305,8 @@ EvtScript N(attackFistDrop) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(10)
EVT_WAIT(30)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim02)
@ -337,8 +337,8 @@ EvtScript N(attackBodyCrush) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim10)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_THREAD
EVT_WAIT(12)
@ -406,8 +406,8 @@ EvtScript N(attackBodyCrush) = {
EVT_CALL(MoveBattleCamOver, 20)
EVT_SET(LVarF, LVar0)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(10)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5)
EVT_IF_FLAG(LVar5, STATUS_FLAG_SHRINK)

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

@ -807,7 +807,7 @@ EvtScript N(OnDeath) = {
EVT_KILL_THREAD(LVar0)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0)
EVT_CALL(RemoveEffect, LVar0)
EVT_CALL(StopSound, SOUND_035C)
EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim08)
@ -909,7 +909,7 @@ EvtScript N(OnBurnDeath) = {
EVT_KILL_THREAD(LVar0)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0)
EVT_CALL(RemoveEffect, LVar0)
EVT_CALL(StopSound, SOUND_035C)
EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim27)
@ -2228,7 +2228,7 @@ EvtScript N(electricCharge) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_charged2)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_3, EVT_PTR(N(IdleAnimations_charged3)))
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHARGE_LIGHTNING)
EVT_CALL(N(StartRumbleWithParams), 70, 120)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3))
@ -2295,7 +2295,7 @@ EvtScript N(attackGroundLightning) = {
EVT_GOTO(1)
EVT_END_IF
EVT_END_THREAD
EVT_CALL(StopSound, SOUND_035C)
EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D3)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar2, 10)
@ -2372,7 +2372,7 @@ EvtScript N(electicCharge_copy) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_charged2)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_3, EVT_PTR(N(IdleAnimations_charged3)))
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHARGE_LIGHTNING)
EVT_CALL(N(StartRumbleWithParams), 70, 120)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3))
@ -2459,7 +2459,7 @@ EvtScript N(attackDirectLightning) = {
EVT_GOTO(1)
EVT_END_IF
EVT_END_THREAD
EVT_CALL(StopSound, SOUND_035C)
EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035B)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
@ -2576,8 +2576,8 @@ EvtScript N(attackDirectLightning) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 10, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(30)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim01)
@ -5180,9 +5180,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(func_80269470)
EVT_END_IF
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(1)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_1)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TUFF_PUFF_BIT_ARRAY), LVar0)

4
src/battle/area/flo2/actor/spike.c
View File

@ -290,7 +290,7 @@ EvtScript N(attack) = {
EVT_SETF(LVar3, EVT_FLOAT(1.0))
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY)
EVT_THREAD
EVT_LOOP(15)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)
@ -311,7 +311,7 @@ EvtScript N(attack) = {
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_ThrowSpiny)
EVT_WAIT(3)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_02C6)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_LAKILESTER_THROW_SPINY)
EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_JUMP, 0, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)

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

@ -236,8 +236,8 @@ EvtScript N(takeTurn_80219444) = {
EVT_CALL(CloseActionCommandInfo)
EVT_SET(LVarF, LVar0)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(10)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)

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

@ -985,8 +985,8 @@ EvtScript N(shapeSpell) = {
EVT_WAIT(30)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, 16)
EVT_SWITCH(LVar9)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_IF_EQ(LFlag0, TRUE)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SPELL_CAST2)
EVT_END_IF
@ -1117,8 +1117,8 @@ EvtScript N(shapeSpell) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_IF
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_WAIT(20)
EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP

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

@ -485,21 +485,21 @@ EvtScript N(EVS_HandleEvent) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(AddGoalPos, ACTOR_SELF, 30, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_CALL(AddGoalPos, ACTOR_SELF, 15, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_CALL(AddGoalPos, ACTOR_SELF, 5, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_ChainChomp_SlowBite)
EVT_EXEC_WAIT(N(EVS_Chomp_HopHome))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5))
EVT_END_THREAD
@ -691,7 +691,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_ADD(LVar0, 45)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -715,7 +715,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -727,7 +727,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_SUB(LVar0, 25)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -737,7 +737,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_SUB(LVar0, 15)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -793,7 +793,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -803,7 +803,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_ADD(LVar0, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -813,7 +813,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_ADD(LVar0, 20)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -822,7 +822,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_END_THREAD
EVT_SUB(LVar0, 10)
EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -891,7 +891,7 @@ EvtScript N(EVS_Chomp_HopToPos) = {
EVT_IF_LT(LVar4, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -903,7 +903,7 @@ EvtScript N(EVS_Chomp_HopToPos) = {
EVT_ADD(LVar3, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -917,7 +917,7 @@ EvtScript N(EVS_Chomp_HopToPos) = {
EVT_IF_LT(LVar4, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -928,7 +928,7 @@ EvtScript N(EVS_Chomp_HopToPos) = {
EVT_SUB(LVar3, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)

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

@ -721,7 +721,7 @@ EvtScript N(EVS_Attack_DropDebris) = {
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 70)
EVT_CALL(PlaySound, SOUND_20E7)
EVT_CALL(PlaySound, SOUND_LEVITATE)
EVT_PLAY_EFFECT(EFFECT_CHOMP_DROP, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0)
EVT_WAIT(15)
EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0)
@ -743,7 +743,7 @@ EvtScript N(EVS_Attack_DropDebris) = {
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 20)
EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0)
EVT_CALL(PlaySound, SOUND_20E8)
EVT_CALL(PlaySound, SOUND_ILLUSION_DISSOLVE)
EVT_ELSE
EVT_WAIT(50)
EVT_CALL(PlaySound, SOUND_20E9)
@ -751,7 +751,7 @@ EvtScript N(EVS_Attack_DropDebris) = {
EVT_CALL(StartRumble, 10)
EVT_CALL(PlaySound, SOUND_20EA)
EVT_WAIT(20)
EVT_CALL(PlaySound, SOUND_20E8)
EVT_CALL(PlaySound, SOUND_ILLUSION_DISSOLVE)
EVT_END_IF
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_DebrisDropState, LVar0)
EVT_SWITCH(LVar0)
@ -1047,7 +1047,7 @@ EvtScript N(EVS_Move_SummonChomp) = {
EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2)
EVT_CALL(MoveBattleCamOver, 5)
EVT_WAIT(4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2061)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_BITE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19)
EVT_CALL(SetBattleCamZoom, 200)
EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2)
@ -1128,7 +1128,7 @@ EvtScript N(EVS_SummonedChompHop) = {
EVT_IF_LT(LVar6, LVar4)
EVT_CALL(SetGoalPos, LVarB, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, LVarB, LVar3, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5))
EVT_END_THREAD
@ -1136,7 +1136,7 @@ EvtScript N(EVS_SummonedChompHop) = {
EVT_SUB(LVar5, LVar4)
EVT_CALL(SetGoalPos, LVarB, LVar5, LVar1, LVar2)
EVT_CALL(JumpToGoal, LVarB, LVar3, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHAIN_CHOMP_THUD)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5))
EVT_END_THREAD

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

@ -386,7 +386,7 @@ EvtScript N(handleEvent_802197FC) = {
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Fuzzipede_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_EQ(EVENT_SWAP_PARTNER)
EVT_CASE_EQ(EVENT_RECEIVE_BUFF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim19)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))

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

@ -309,8 +309,8 @@ EvtScript N(takeTurn_8021A5A0) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Midair)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -421,8 +421,8 @@ EvtScript N(takeTurn_8021A5A0) = {
EVT_END_SWITCH
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)

8
src/battle/area/kmr_part_2/actor/blue_goomba_2.c
View File

@ -305,8 +305,8 @@ EvtScript N(takeTurn_8021E0F0) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Midair)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -417,8 +417,8 @@ EvtScript N(takeTurn_8021E0F0) = {
EVT_END_SWITCH
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)

8
src/battle/area/kmr_part_2/actor/goomba_king.c
View File

@ -414,8 +414,8 @@ EvtScript N(80221680) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0x80000000, 0, 0, 0)
EVT_END_IF
@ -493,8 +493,8 @@ EvtScript N(80221CD4) = {
EVT_END_THREAD
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_THREAD
EVT_WAIT(12)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_0301)

8
src/battle/area/kmr_part_2/actor/red_goomba_1.c
View File

@ -309,8 +309,8 @@ EvtScript N(takeTurn_8021C3B0) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Midair)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -421,8 +421,8 @@ EvtScript N(takeTurn_8021C3B0) = {
EVT_END_SWITCH
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)

8
src/battle/area/kmr_part_2/actor/red_goomba_2.c
View File

@ -305,8 +305,8 @@ EvtScript N(takeTurn_8021FAF0) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Midair)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -417,8 +417,8 @@ EvtScript N(takeTurn_8021FAF0) = {
EVT_END_SWITCH
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)

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

@ -405,8 +405,8 @@ EvtScript N(takeTurn_80225314) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Jump)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Midair)

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

@ -215,7 +215,7 @@ EvtScript N(8022C6D4) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 30)
EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
EVT_WAIT(30)
EVT_END_IF
EVT_END_IF
@ -826,13 +826,13 @@ EvtScript N(8022ED10) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 6, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpikedParaJrTroopa_FlyFast)
@ -840,7 +840,7 @@ EvtScript N(8022ED10) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_SUB(LVar0, 80)
EVT_SET(LVar1, 20)
@ -872,7 +872,7 @@ EvtScript N(8022ED10) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpikedParaJrTroopa_FlyFast)
@ -880,7 +880,7 @@ EvtScript N(8022ED10) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_SpikedParaJrTroopa_Dive)
@ -924,12 +924,12 @@ EvtScript N(8022F468) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 6, BS_FLAGS1_10)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_THREAD
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))

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

@ -355,8 +355,8 @@ EvtScript N(takeTurn_802234A4) = {
EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)

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

@ -145,7 +145,7 @@ EvtScript N(8022A750) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 30)
EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
EVT_WAIT(30)
EVT_END_IF
EVT_END_IF
@ -396,8 +396,8 @@ EvtScript N(takeTurn_8022B4F0) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5)
EVT_SUB(LVar3, 120)

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

@ -133,7 +133,7 @@ EvtScript N(80225F7C) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 30)
EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
EVT_WAIT(30)
EVT_END_IF
EVT_END_IF
@ -406,13 +406,13 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 5, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ParaJrTroopa_FlyFast)
@ -420,7 +420,7 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_SUB(LVar0, 80)
EVT_SET(LVar1, 20)
@ -451,7 +451,7 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ParaJrTroopa_FlyFast)
@ -459,7 +459,7 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ParaJrTroopa_Dive)
@ -469,8 +469,8 @@ EvtScript N(takeTurn_80226F58) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SET(LVarF, LVar0)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)

18
src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c
View File

@ -126,7 +126,7 @@ EvtScript N(80228084) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 30)
EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
EVT_WAIT(30)
EVT_END_IF
EVT_END_IF
@ -455,13 +455,13 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 6, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedParaJrTroopa_FlyFast)
@ -469,7 +469,7 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_SUB(LVar0, 80)
EVT_SET(LVar1, 20)
@ -500,7 +500,7 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_PARAGOOMBA_PREDIVE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedParaJrTroopa_FlyFast)
@ -508,7 +508,7 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedParaJrTroopa_Dive)
@ -518,8 +518,8 @@ EvtScript N(takeTurn_8022936C) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SET(LVarF, LVar0)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)

24
src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c
View File

@ -386,15 +386,15 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, ((0)), 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_WAIT(10)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66)
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
@ -402,7 +402,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_SUB(LVar0, 80)
@ -444,7 +444,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
@ -452,7 +452,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
@ -462,8 +462,8 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((0)), 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0)
@ -782,8 +782,8 @@ EvtScript N(takeTurn_8021E788) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Midair)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, ((0)), 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -894,8 +894,8 @@ EvtScript N(takeTurn_8021E788) = {
EVT_END_SWITCH
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((0)), 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)

8
src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c
View File

@ -321,8 +321,8 @@ EvtScript N(takeTurn_8021B19C) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Midair)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, ((0)), 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -433,8 +433,8 @@ EvtScript N(takeTurn_8021B19C) = {
EVT_END_SWITCH
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((0)), 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))
EVT_WAIT(1)

8
src/battle/area/kpa2/actor/bowser.c
View File

@ -483,8 +483,8 @@ EvtScript N(attackFlameBreath) = {
EVT_END
};
#include "common/FadeBackgroundToBlack.inc.c"
#include "common/UnfadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundDarken.inc.c"
#include "common/FadeBackgroundLighten.inc.c"
EvtScript N(attackShockwaveDrain) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
@ -495,7 +495,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_WAIT(10)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 15)
EVT_SUB(LVar2, 3)
@ -513,7 +513,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_SET(LVar1, 55)
EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0)
EVT_THREAD
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_THREAD
EVT_WAIT(8)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)

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

@ -145,8 +145,8 @@ ActorBlueprint NAMESPACE = {
#include "common/StartRumbleWithParams.inc.c"
#include "common/UnkFireBreathFXFunc.inc.c"
#include "common/UnkBowserFunc1.inc.c"
#include "common/FadeBackgroundToBlack.inc.c"
#include "common/UnfadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundDarken.inc.c"
#include "common/FadeBackgroundLighten.inc.c"
#include "common/RemoveChillOut.inc.c"
#include "common/StarRodAppearEffect.inc.c"
#include "common/StarRodPowerUpEffect.inc.c"
@ -531,7 +531,7 @@ EvtScript N(unkDecorationScript) = {
};
EvtScript N(useStarRod) = {
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
@ -598,7 +598,7 @@ EvtScript N(useStarRod) = {
EVT_END_THREAD
EVT_WAIT(75)
EVT_THREAD
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)

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

@ -157,8 +157,8 @@ ActorBlueprint NAMESPACE = {
#include "common/StartRumbleWithParams.inc.c"
#include "common/UnkBowserFunc1.inc.c"
#include "common/FadeBackgroundToBlack.inc.c"
#include "common/UnfadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundDarken.inc.c"
#include "common/FadeBackgroundLighten.inc.c"
#include "common/RemoveChillOut.inc.c"
#include "common/StarRodAppearEffect.inc.c"
#include "common/StarRodPowerUpEffect.inc.c"
@ -355,8 +355,8 @@ EvtScript N(handleEvent) = {
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
EVT_WAIT(1000)
EVT_CASE_EQ(EVENT_SWAP_PARTNER)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CASE_EQ(EVENT_RECEIVE_BUFF)
EVT_CALL(N(FadeBackgroundLighten))
EVT_CASE_EQ(EVENT_STAR_BEAM)
EVT_CALL(FreezeBattleCam, TRUE)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 1)
@ -587,7 +587,7 @@ EvtScript N(unkDecorationScript) = {
};
EvtScript N(useStarRod) = {
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
@ -654,7 +654,7 @@ EvtScript N(useStarRod) = {
EVT_END_THREAD
EVT_WAIT(75)
EVT_THREAD
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
@ -754,7 +754,7 @@ EvtScript N(recover) = {
EVT_CALL(MoveBattleCamOver, 40)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
@ -1323,7 +1323,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_WAIT(10)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -1364,7 +1364,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0)
EVT_END_IF
EVT_THREAD
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_THREAD
EVT_WAIT(8)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)

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

@ -156,8 +156,8 @@ ActorBlueprint NAMESPACE = {
#define BOWSER_LARGE
#include "common/StartRumbleWithParams.inc.c"
#include "common/UnkBowserFunc1.inc.c"
#include "common/FadeBackgroundToBlack.inc.c"
#include "common/UnfadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundDarken.inc.c"
#include "common/FadeBackgroundLighten.inc.c"
#include "common/RemoveChillOut.inc.c"
#include "common/StarRodAppearEffect.inc.c"
#include "common/StarRodPowerUpEffect.inc.c"
@ -294,8 +294,8 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PostJump)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0))
EVT_CASE_EQ(EVENT_SWAP_PARTNER)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CASE_EQ(EVENT_RECEIVE_BUFF)
EVT_CALL(N(FadeBackgroundLighten))
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
@ -438,7 +438,7 @@ EvtScript N(unkDecorationScript) = {
};
EvtScript N(useStarRod) = {
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
@ -505,7 +505,7 @@ EvtScript N(useStarRod) = {
EVT_END_THREAD
EVT_WAIT(75)
EVT_THREAD
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
@ -605,7 +605,7 @@ EvtScript N(recover) = {
EVT_CALL(MoveBattleCamOver, 40)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
@ -1174,7 +1174,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_WAIT(10)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -1215,7 +1215,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0)
EVT_END_IF
EVT_THREAD
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_THREAD
EVT_WAIT(8)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1516,7 +1516,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1565,10 +1565,10 @@ EvtScript N(attackLightningBlast) = {
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_WAIT(20)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_ELSE
EVT_WAIT(20)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_IF
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
@ -1592,7 +1592,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(HIT_RESULT_10)
EVT_WAIT(30)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF

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

@ -199,8 +199,8 @@ API_CALLABLE(N(MakeLightnings)) {
return ApiStatus_DONE2;
}
#include "common/UnkBowserFunc1.inc.c"
#include "common/FadeBackgroundToBlack.inc.c"
#include "common/UnfadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundDarken.inc.c"
#include "common/FadeBackgroundLighten.inc.c"
#include "common/RemoveChillOut.inc.c"
#include "common/StarRodAppearEffect.inc.c"
#include "common/StarRodPowerUpEffect.inc.c"
@ -429,8 +429,8 @@ EvtScript N(handleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PostJump)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0))
EVT_CASE_EQ(EVENT_SWAP_PARTNER)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CASE_EQ(EVENT_RECEIVE_BUFF)
EVT_CALL(N(FadeBackgroundLighten))
EVT_CASE_EQ(EVENT_30)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt)
@ -697,7 +697,7 @@ EvtScript N(unkDecorationScript) = {
};
EvtScript N(useStarRod) = {
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
@ -764,7 +764,7 @@ EvtScript N(useStarRod) = {
EVT_END_THREAD
EVT_WAIT(75)
EVT_THREAD
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpLaugh)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
@ -864,7 +864,7 @@ EvtScript N(recover) = {
EVT_CALL(MoveBattleCamOver, 40)
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
@ -1407,7 +1407,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_WAIT(10)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
@ -1448,7 +1448,7 @@ EvtScript N(attackShockwaveDrain) = {
EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0)
EVT_END_IF
EVT_THREAD
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_THREAD
EVT_WAIT(8)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1512,8 +1512,8 @@ EvtScript N(attackShockwaveDrain) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle)
EVT_WAIT(15)
@ -1749,7 +1749,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1798,10 +1798,10 @@ EvtScript N(attackLightningBlast) = {
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_WAIT(20)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_ELSE
EVT_WAIT(20)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_END_IF
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_SET(LVar1, ANIM_BattleBowser_Walk)
@ -1825,7 +1825,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CASE_OR_EQ(HIT_RESULT_10)
EVT_WAIT(30)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_IF_EQ(LVarF, HIT_RESULT_10)
EVT_RETURN
EVT_END_IF

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

@ -205,7 +205,7 @@ EvtScript N(bulletShot) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0))
EVT_END_THREAD
EVT_CALL(StartRumble, 9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BULLET_BILL_FIRE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 33)
EVT_ADD(LVar1, 19)

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

@ -598,8 +598,8 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_END_IF
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_MAIN, 180)
@ -658,8 +658,8 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 30)
@ -744,8 +744,8 @@ EvtScript N(takeTurn_Chan) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_THREAD
EVT_LOOP(0)
@ -793,8 +793,8 @@ EvtScript N(takeTurn_Chan) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 40)

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

@ -268,11 +268,11 @@ EvtScript N(flyingTackle) = {
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Crouch)
EVT_WAIT(20)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02CB, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
@ -315,8 +315,8 @@ EvtScript N(flyingTackle) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Land)
@ -846,8 +846,8 @@ EvtScript N(EVS_Move_Headbonk) = {
EVT_CALL(N(UnkFunc62), LVarA, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk)
EVT_CALL(N(ActorJumpToPos))
@ -963,8 +963,8 @@ EvtScript N(EVS_Move_Headbonk) = {
EVT_END_SWITCH
EVT_LABEL(100)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(YieldTurn)
EVT_EXEC_WAIT(N(8021F08C))
EVT_END_CASE_GROUP
@ -1481,8 +1481,8 @@ EvtScript N(takeTurn_80221200) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_THREAD
EVT_CALL(N(UnkActorPosFunc))
@ -1543,8 +1543,8 @@ EvtScript N(takeTurn_80221200) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_SWITCH
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1829,8 +1829,8 @@ EvtScript N(takeTurn_802229C4) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2020)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0)
@ -1885,8 +1885,8 @@ EvtScript N(takeTurn_802229C4) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_SWITCH
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBombette_Idle)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 8)
@ -2215,8 +2215,8 @@ EvtScript N(80223B74) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_THREAD
EVT_WAIT(5)
@ -2259,8 +2259,8 @@ EvtScript N(80223B74) = {
EVT_END_SWITCH
EVT_CALL(PlaySound, SOUND_NONE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
@ -2599,8 +2599,8 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_WAIT(15)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0))
@ -2711,8 +2711,8 @@ EvtScript N(takeTurn_80224CA0) = {
EVT_END_IF
EVT_END_LOOP
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_WAIT(10)
EVT_CALL(YieldTurn)
EVT_THREAD
@ -3129,8 +3129,8 @@ EvtScript N(takeTurn_80226004) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_COS_IN_OUT)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_THREAD
EVT_WAIT(5)
@ -3203,8 +3203,8 @@ EvtScript N(takeTurn_80226004) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE), SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_SWITCH
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(func_802196A4_465B34, 1)
EVT_CALL(func_80219658_465AE8, 1)
@ -3486,8 +3486,8 @@ EvtScript N(takeTurn_802270BC) = {
EVT_WAIT(15)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
@ -3541,7 +3541,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_END_SWITCH
EVT_END_THREAD
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_BELLY_FLOP)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Jump)
@ -3555,15 +3555,15 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(LandJump, ACTOR_SELF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(AddGoalPos, ACTOR_SELF, -15, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -3631,7 +3631,7 @@ EvtScript N(takeTurn_802270BC) = {
EVT_END_SWITCH
EVT_END_THREAD
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_BELLY_FLOP)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Jump)
@ -3660,8 +3660,8 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_SWITCH
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Fall)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 60)
@ -3669,19 +3669,19 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_ADD(LVar0, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_ADD(LVar0, 20)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_ADD(LVar0, 10)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -3998,7 +3998,7 @@ EvtScript N(takeTurn_80228B78) = {
EVT_SETF(LVar3, EVT_FLOAT(1.0))
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY)
EVT_THREAD
EVT_LOOP(15)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)
@ -4023,8 +4023,8 @@ EvtScript N(takeTurn_80228B78) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_201B)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_BattleLakilester_SpinySpin)
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_3, EVT_FLOAT(1.5))
@ -4076,8 +4076,8 @@ EvtScript N(takeTurn_80228B78) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_SWITCH
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_WAIT(15)
EVT_CALL(YieldTurn)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)

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

@ -248,8 +248,8 @@ EvtScript N(takeTurn_8022AA54) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 8, TRUE)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(10)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -279,8 +279,8 @@ EvtScript N(takeTurn_8022AA54) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)

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

@ -252,8 +252,8 @@ EvtScript N(singleStrike2) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -284,8 +284,8 @@ EvtScript N(singleStrike2) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 8, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_THREAD
@ -349,8 +349,8 @@ EvtScript N(doubleStrike2) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -413,8 +413,8 @@ EvtScript N(doubleStrike2) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_WAIT(15)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)

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

@ -279,8 +279,8 @@ EvtScript N(singleStrike3) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -311,8 +311,8 @@ EvtScript N(singleStrike3) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_THREAD
@ -376,8 +376,8 @@ EvtScript N(doubleStrike3) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -440,8 +440,8 @@ EvtScript N(doubleStrike3) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_WAIT(15)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
@ -507,8 +507,8 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -630,8 +630,8 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_WAIT(15)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
@ -768,8 +768,8 @@ EvtScript N(8023059C) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
@ -801,8 +801,8 @@ EvtScript N(80230914) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)

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

@ -636,8 +636,8 @@ EvtScript N(EVS_Attack_ShellToss) = {
EVT_WAIT(10)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 3, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 3, BS_FLAGS1_10)
EVT_SWITCH(LVarB)
@ -844,8 +844,8 @@ EvtScript N(EVS_Attack_HeavyStomp) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_ACTOR_JUMP)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim06)
EVT_THREAD

12
src/battle/area/omo2/actor/general_guy.c
View File

@ -26,9 +26,9 @@ enum N(ActorPartIDs) {
PRT_2 = 2,
};
#include "common/FadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundDarken.inc.c"
#include "common/UnfadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundLighten.inc.c"
s32 N(DefenseTable)[] = {
ELEMENT_NORMAL, 0,
@ -440,7 +440,7 @@ EvtScript N(attack_lightning_shot) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_THREAD
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_END_THREAD
EVT_CALL(GetModelCenter, 39)
EVT_THREAD
@ -483,7 +483,7 @@ EvtScript N(attack_lightning_shot) = {
EVT_IF_NE(LVar0, 0)
EVT_CALL(SetDarknessMode, BTL_DARKNESS_MODE_3)
EVT_END_IF
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_GeneralGuy_Anim02)
EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))
@ -512,7 +512,7 @@ EvtScript N(attack_lightning_shot) = {
EVT_IF_NE(LVar0, 0)
EVT_CALL(SetDarknessMode, BTL_DARKNESS_MODE_3)
EVT_END_IF
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_GeneralGuy_Anim02)
EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))
@ -560,7 +560,7 @@ EvtScript N(attack_lightning_shot) = {
EVT_IF_NE(LVar0, 0)
EVT_CALL(SetDarknessMode, BTL_DARKNESS_MODE_3)
EVT_END_IF
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_CALL(SetAnimation, ACTOR_ENEMY0, PRT_MAIN, ANIM_GeneralGuy_Anim02)
EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch))

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

@ -1162,7 +1162,7 @@ EvtScript N(shy_guy_attack2) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim03)

4
src/battle/area/omo2_3/actor/shy_stack.c
View File

@ -1270,9 +1270,9 @@ EvtScript N(takeTurn) = {
EVT_WAIT(20)
EVT_ADD(LVar0, 4)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_DRAW)
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_FIRE)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)

6
src/battle/area/omo3/actor/big_lantern_ghost.c
View File

@ -550,8 +550,8 @@ EvtScript N(attackHeavyJump) = {
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim10)
EVT_THREAD
EVT_WAIT(10)
@ -662,7 +662,7 @@ EvtScript N(attackLightBeam) = {
EVT_CALL(SetBattleCamOffsetZ, 35)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EB)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_LIGHT)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim0F)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_LANTERN_BRIGHTNESS), LVar5)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LANTERN_BRIGHTNESS), 11)

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

@ -786,7 +786,7 @@ EvtScript N(handleEvent) = {
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim19)
EVT_EXEC_WAIT(EVS_Enemy_AirLift)
EVT_CASE_EQ(EVENT_SWAP_PARTNER)
EVT_CASE_EQ(EVENT_RECEIVE_BUFF)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 20)
EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0)
@ -1245,7 +1245,7 @@ EvtScript N(MakeIllusions) = {
EVT_IF_FLAG(LVar0, N(FLAG_LOW_HP))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1D)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEVITATE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar7, LVar8, LVar9)
EVT_CALL(MakeLerp, 0, 41, 30, EASING_SIN_OUT)
EVT_LABEL(10)

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

@ -382,7 +382,7 @@ EvtScript N(attack) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 60)
EVT_WAIT(60)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MONSTAR_CAST_SPELL)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_036E)
EVT_THREAD
EVT_WAIT(10)

10
src/battle/area/tik2/actor/electro_blooper.c
View File

@ -251,8 +251,8 @@ API_CALLABLE(N(unused_func)) {
return ApiStatus_DONE2;
}
#include "common/FadeBackgroundToBlack.inc.c"
#include "common/UnfadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundDarken.inc.c"
#include "common/FadeBackgroundLighten.inc.c"
API_CALLABLE(N(UpdateSnakingStatic)) {
Bytecode* args = script->ptrReadPos;
@ -525,7 +525,7 @@ EvtScript N(electricCharge) = {
EVT_CALL(SetBattleCamZoom, 320)
EVT_CALL(MoveBattleCamOver, 50)
EVT_WAIT(20)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(N(StartRumbleWithParams), 70, 80)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 40, EVT_FLOAT(0.3))
@ -540,7 +540,7 @@ EvtScript N(electricCharge) = {
EVT_WAIT(20)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
@ -865,7 +865,7 @@ EvtScript N(charge) = {
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, LVar3, -1, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVarF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CHARGE_LIGHTNING)
EVT_CALL(SetPartEventFlags, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_ATTACK_CHARGED | ACTOR_EVENT_FLAG_ELECTRIFIED)
EVT_CALL(func_8026ED20, ACTOR_SELF, PRT_MAIN, 1)
EVT_CALL(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, PAL_ADJUST_STATIC)

12
src/battle/area/tik2/actor/super_blooper.c
View File

@ -256,8 +256,8 @@ API_CALLABLE(N(unused_func)) {
return ApiStatus_DONE2;
}
#include "common/FadeBackgroundToBlack.inc.c"
#include "common/UnfadeBackgroundToBlack.inc.c"
#include "common/FadeBackgroundDarken.inc.c"
#include "common/FadeBackgroundLighten.inc.c"
#include "common/SpitInk.inc.c"
EvtScript N(init) = {
@ -676,7 +676,7 @@ EvtScript N(makeBabies) = {
EVT_CALL(MoveBattleCamOver, 40)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(N(StartRumbleWithParams), 50, 20)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.3))
@ -726,7 +726,7 @@ EvtScript N(makeBabies) = {
EVT_END_IF
EVT_WAIT(2)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim0C)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
@ -746,7 +746,7 @@ EvtScript N(getEnraged) = {
EVT_CALL(MoveBattleCamOver, 50)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundDarken))
EVT_CALL(N(StartRumbleWithParams), 70, 80)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 40, EVT_FLOAT(0.3))
@ -760,7 +760,7 @@ EvtScript N(getEnraged) = {
EVT_EXEC_WAIT(N(enrage))
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(N(UnfadeBackgroundToBlack))
EVT_CALL(N(FadeBackgroundLighten))
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_RESTART)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN

38
src/battle/battle.c
View File

@ -101,7 +101,7 @@ BattleArea gBattleAreas[] = {
};
void reset_battle_status(void) {
gGameStatusPtr->demoFlags = 0;
gGameStatusPtr->demoBattleFlags = 0;
gBattleState = BATTLE_STATE_0;
D_800DC4E0 = 1;
gBattleSubState = BTL_SUBSTATE_INIT;
@ -216,7 +216,7 @@ void load_demo_battle(u32 index) {
u32 mode;
s32 battleID;
gGameStatusPtr->demoFlags = 0;
gGameStatusPtr->demoBattleFlags = 0;
gGameStatusPtr->areaID = 0;
gGameStatusPtr->mapID = 0;
gGameStatusPtr->isBattle = FALSE;
@ -248,36 +248,36 @@ void load_demo_battle(u32 index) {
set_screen_overlay_params_front(OVERLAY_TYPE_9, 255.0f);
switch (index) {
case 0:
case 0: // hammer first strike on Fuzzies
setup_demo_player();
mode = 0;
playerData->hasActionCommands = FALSE;
battleID = BTL_DIG_FORMATION_00;
break;
case 1:
case 1: // jump on Monty Mole
setup_demo_player();
mode = 0;
playerData->curPartner = PARTNER_BOW;
battleID = BTL_DIG_FORMATION_01;
break;
case 2:
case 2: // Parakarry shell shot against Pokey
setup_demo_player();
mode = 0;
playerData->curPartner = PARTNER_PARAKARRY;
gGameStatusPtr->demoFlags |= 2;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_PARTNER_ACTING;
battleID = BTL_DIG_FORMATION_02;
break;
case 3:
case 3: // Thunder Rage on Shy Guys at the slot machine
setup_demo_player();
mode = 0;
playerData->curPartner = PARTNER_WATT;
battleID = BTL_DIG_FORMATION_03;
break;
case 4:
case 4: // stomped by Tubba Blubba
setup_demo_player();
playerData->curPartner = PARTNER_KOOPER;
gGameStatusPtr->demoFlags |= 4;
mode = 0;
playerData->curPartner = PARTNER_KOOPER;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_ENEMY_ACTING;
battleID = BTL_DIG_FORMATION_04;
break;
default:
@ -294,32 +294,32 @@ void load_demo_battle(u32 index) {
gCurrentEncounter.firstStrikeType = FIRST_STRIKE_NONE;
gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_NONE;
gCurrentEncounter.hitTier = 0;
gGameStatusPtr->demoFlags |= 0x10;
gGameStatusPtr->demoFlags |= 0x20;
gGameStatusPtr->demoFlags |= 0x40;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_10;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_20;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_40;
break;
case 1:
gCurrentEncounter.firstStrikeType = FIRST_STRIKE_PLAYER;
gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_HAMMER;
gCurrentEncounter.hitTier = playerData->hammerLevel;
gGameStatusPtr->demoFlags |= 0x10;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_10;
break;
case 2:
gCurrentEncounter.firstStrikeType = FIRST_STRIKE_PLAYER;
gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_JUMP;
gCurrentEncounter.hitTier = playerData->bootsLevel;
gGameStatusPtr->demoFlags |= 0x10;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_10;
break;
case 3:
gCurrentEncounter.firstStrikeType = FIRST_STRIKE_PLAYER;
gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_PARTNER;
gGameStatusPtr->demoFlags |= 0x20;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_20;
break;
case 4:
gCurrentEncounter.firstStrikeType = FIRST_STRIKE_ENEMY;
gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_NONE;
gCurrentEncounter.hitTier = 0;
gGameStatusPtr->demoFlags |= 0x40;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_40;
break;
}
@ -327,9 +327,7 @@ void load_demo_battle(u32 index) {
gCurrentEncounter.unk_07 = 0;
gCurrentEncounter.instigatorValue = 0;
set_battle_stage(BTL_STAGE_DEFAULT);
gGameStatusPtr->demoFlags |= 1;
gGameStatusPtr->demoBattleFlags |= DEMO_BTL_FLAG_ENABLED;
gOverrideFlags &= ~GLOBAL_OVERRIDES_8;
load_battle(battleID);
}
static const f32 padding[] = { 0.0f, 0.0f };

4
src/battle/common/actor/amazy_dayzee.inc.c
View File

@ -313,8 +313,8 @@ EvtScript N(attackPainfulSong) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 15), 20, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_WAIT(20)

2
src/battle/common/actor/anti_guy.inc.c
View File

@ -343,7 +343,7 @@ EvtScript N(80222824) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim03)

2
src/battle/common/actor/bill_blaster.inc.c
View File

@ -221,7 +221,7 @@ EvtScript N(EVS_Move_FireBullet) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0))
EVT_END_THREAD
EVT_CALL(StartRumble, 9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BULLET_BILL_FIRE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 33)
EVT_ADD(LVar1, 19)

2
src/battle/common/actor/blue_shy_guy.inc.c
View File

@ -332,7 +332,7 @@ EvtScript N(8021BC2C) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim09)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim03)

4
src/battle/common/actor/bob_omb.inc.c
View File

@ -169,7 +169,7 @@ EvtScript N(EVS_Ignite) = {
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_HandleEvent_Ignited)))
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, TRUE)
EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_Ignited)))
EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_01)
EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_BOBOMB_FUSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_WalkLit)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0))
@ -625,7 +625,7 @@ EvtScript N(EVS_Attack_Blast) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_01)
EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_BOBOMB_FUSE)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)

4
src/battle/common/actor/crazee_dayzee.inc.c
View File

@ -306,8 +306,8 @@ EvtScript N(attackPainfulSong) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 20), 4, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)
EVT_WAIT(20)

2
src/battle/common/actor/dark_koopa.inc.c
View File

@ -723,7 +723,7 @@ EvtScript N(attackDizzyTornado) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2026)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DIZZY_SHELL)
EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 1, ACTOR_DECORATION_WHIRLWIND)
EVT_WAIT(40)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_10)

10
src/battle/common/actor/dark_paratroopa.inc.c
View File

@ -448,7 +448,7 @@ EvtScript N(takeTurn) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_ParaTroopa_Dark_Windup)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -457,7 +457,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0))
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR)
EVT_WAIT(6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 25)
@ -517,7 +517,7 @@ EvtScript N(takeTurn) = {
EVT_RETURN
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_ParaTroopa_Dark_Windup)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -526,7 +526,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0))
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR)
EVT_WAIT(6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0))
@ -1275,7 +1275,7 @@ EvtScript N(koopa_attackDizzyTornado) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2026)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DIZZY_SHELL)
EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 1, ACTOR_DECORATION_WHIRLWIND)
EVT_WAIT(40)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_10)

2
src/battle/common/actor/duplighost.inc.c
View File

@ -250,7 +250,7 @@ EvtScript N(attack) = {
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Duplighost_Anim07)
EVT_WAIT(20)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02CB, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)

2
src/battle/common/actor/duplighost/ghost_lakilester.inc.c
View File

@ -287,7 +287,7 @@ EvtScript N(lakilester_takeTurn) = {
EVT_SETF(LVar3, EVT_FLOAT(1.0))
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY)
EVT_THREAD
EVT_LOOP(15)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)

18
src/battle/common/actor/duplighost/ghost_sushie.inc.c
View File

@ -296,7 +296,7 @@ EvtScript N(sushie_takeTurn) = {
EVT_END_SWITCH
EVT_END_THREAD
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_BELLY_FLOP)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Jump)
@ -310,15 +310,15 @@ EvtScript N(sushie_takeTurn) = {
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(LandJump, ACTOR_SELF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(AddGoalPos, ACTOR_SELF, -15, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -386,7 +386,7 @@ EvtScript N(sushie_takeTurn) = {
EVT_END_SWITCH
EVT_END_THREAD
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_BELLY_FLOP)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Jump)
@ -424,19 +424,19 @@ EvtScript N(sushie_takeTurn) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_ADD(LVar0, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_ADD(LVar0, 20)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_ADD(LVar0, 10)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUSHIE_STEP)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)

32
src/battle/common/actor/ember.inc.c
View File

@ -383,7 +383,7 @@ EvtScript N(handleEvent_8021B8BC) = {
EVT_EXEC_WAIT(EVS_Enemy_Death)
EVT_RETURN
EVT_CASE_EQ(47)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07)
EVT_EXEC_WAIT(EVS_Enemy_ShockHit)
@ -392,7 +392,7 @@ EvtScript N(handleEvent_8021B8BC) = {
EVT_EXEC_WAIT(EVS_Enemy_JumpBack)
EVT_EXEC_WAIT(N(8021B2FC))
EVT_CASE_EQ(38)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Blue_Anim07)
EVT_EXEC_WAIT(EVS_Enemy_ShockHit)
@ -471,8 +471,8 @@ EvtScript N(8021BE64) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim01)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, 16)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim04)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -517,8 +517,8 @@ EvtScript N(8021BE64) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_SET(LVar0, 1)
EVT_SET(LVar1, 4587780)
@ -597,8 +597,8 @@ EvtScript N(8021C654) = {
EVT_WAIT(30)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, 16)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim06)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -640,8 +640,8 @@ EvtScript N(8021C654) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_FIRE | DAMAGE_TYPE_NO_CONTACT), 0, 0, 3, 32)
EVT_WAIT(20)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_EXEC_WAIT(N(8021B2FC))
EVT_END_CASE_GROUP
@ -669,12 +669,12 @@ EvtScript N(8021CBC8) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_SIN_OUT)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, 16)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
EVT_CASE_OR_EQ(5)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_WAIT(10)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_JUMP)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim04)
@ -708,7 +708,7 @@ EvtScript N(8021CBC8) = {
EVT_END_SWITCH
EVT_WAIT(5)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_JUMP)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim04)
@ -729,8 +729,8 @@ EvtScript N(8021CBC8) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR)

2
src/battle/common/actor/green_shy_guy.inc.c
View File

@ -332,7 +332,7 @@ EvtScript N(80220D2C) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim09)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Green_Anim03)

28
src/battle/common/actor/groove_guy.inc.c
View File

@ -356,7 +356,7 @@ EvtScript N(sleepySpin) = {
EVT_SET(LVar1, 0)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GROOVE_GUY_TWIRL)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C)
EVT_SET(LVar0, 0)
EVT_LOOP(30)
@ -402,7 +402,7 @@ EvtScript N(sleepySpin) = {
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0)
EVT_END_THREAD
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GROOVE_GUY_LEAP)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0B)
EVT_SET(LVar0, 0)
EVT_LOOP(15)
@ -414,7 +414,7 @@ EvtScript N(sleepySpin) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GROOVE_GUY_SPIN_DOWN)
EVT_THREAD
EVT_SET(LVar0, 0)
EVT_LOOP(20)
@ -623,55 +623,55 @@ s32 func_8021878C_512D5C(Evt* script, s32 isInitialCall) {
EvtScript N(8022671C) = {
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C)
EVT_WAIT(4)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0B)
EVT_WAIT(4)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C)
EVT_WAIT(4)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0D)
EVT_WAIT(4)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C)
EVT_WAIT(4)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0B)
EVT_WAIT(4)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C)
EVT_WAIT(4)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0D)
EVT_WAIT(4)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0C)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
@ -682,7 +682,7 @@ EvtScript N(8022671C) = {
EVT_END_IF
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(func_8021878C_512D5C, LVar0, LVar1, LVar2, LVar3, 48)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GROOVE_GUY_SUMMON)
EVT_SET(LVar0, 0)
EVT_LOOP(48)
EVT_ADD(LVar0, 30)
@ -757,7 +757,7 @@ EvtScript N(80226DEC) = {
EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE)
EVT_THREAD
EVT_LOOP(2)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_02E2)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_GROOVE_GUY_TWIRL)
EVT_WAIT(25)
EVT_END_LOOP
EVT_END_THREAD

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

@ -352,7 +352,7 @@ EvtScript N(attackHammerThrow) = {
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_HAMMER_1, ACTOR_SOUND_JUMP, 0, 0)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_02E9)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_HAMMER_BROS_THROW)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 20)
@ -380,7 +380,7 @@ EvtScript N(attackHammerThrow) = {
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_HAMMER_1, ACTOR_SOUND_JUMP, 0, 0)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_02E9)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_HAMMER_1, SOUND_HAMMER_BROS_THROW)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_HAMMER_1, EVT_FLOAT(1.3))
@ -416,7 +416,7 @@ EvtScript N(hammerMiss) = {
EVT_WAIT(4)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, FALSE)
EVT_CALL(SetPartSounds, ACTOR_SELF, LVar0, ACTOR_SOUND_JUMP, 0, 0)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_02E9)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_HAMMER_BROS_THROW)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3)
EVT_SET(LVar2, 10)
@ -445,7 +445,7 @@ EvtScript N(hammerHit) = {
EVT_WAIT(4)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, FALSE)
EVT_CALL(SetPartSounds, ACTOR_SELF, LVar0, ACTOR_SOUND_JUMP, 0, 0)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_02E9)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_HAMMER_BROS_THROW)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3)
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar0, EVT_FLOAT(1.3))

2
src/battle/common/actor/hurt_plant.inc.c
View File

@ -304,7 +304,7 @@ EvtScript N(takeTurn_8021E33C) = {
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HurtPlant_Anim05)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HURT_PLANT_BITE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HurtPlant_Anim06)
EVT_WAIT(6)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)

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

@ -243,7 +243,7 @@ EvtScript N(8021B678) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
@ -251,7 +251,7 @@ EvtScript N(8021B678) = {
EVT_ADD(LVar1, 20)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
@ -677,7 +677,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
@ -685,7 +685,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_SUB(LVar0, 80)
@ -727,7 +727,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
@ -735,7 +735,7 @@ EvtScript N(takeTurn_8021D1DC) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))

6
src/battle/common/actor/koopatrol.inc.c
View File

@ -1057,19 +1057,19 @@ EvtScript N(summonFriend) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim02)
EVT_WAIT(20)
EVT_LOOP(2)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim02)
EVT_WAIT(8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim09)
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim02)
EVT_WAIT(8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CALL_FOR_BACKUP)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim09)
EVT_WAIT(8)

4
src/battle/common/actor/lakitu.inc.c
View File

@ -353,8 +353,8 @@ EvtScript N(attackSpinyFlip) = {
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_2, EVT_FLOAT(1.0))

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

@ -280,7 +280,7 @@ EvtScript N(handleEvent_80219500) = {
EVT_EXEC_WAIT(EVS_Enemy_Death)
EVT_RETURN
EVT_CASE_EQ(EVENT_SHOCK_HIT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07)
EVT_EXEC_WAIT(EVS_Enemy_ShockHit)
@ -289,7 +289,7 @@ EvtScript N(handleEvent_80219500) = {
EVT_EXEC_WAIT(EVS_Enemy_JumpBack)
EVT_EXEC_WAIT(N(80219464))
EVT_CASE_EQ(EVENT_SHOCK_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0359 | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_FLY | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_LavaBubble_Anim07)
EVT_EXEC_WAIT(EVS_Enemy_ShockHit)
@ -571,7 +571,7 @@ EvtScript N(fireballs_Player) = {
EVT_SET(LVarA, LVar0)
EVT_WAIT(10)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_JUMP)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim04)
@ -605,7 +605,7 @@ EvtScript N(fireballs_Player) = {
EVT_END_SWITCH
EVT_WAIT(5)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMBER_JUMP)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim04)

4
src/battle/common/actor/magikoopa.inc.c
View File

@ -1168,8 +1168,8 @@ EvtScript N(attackMagicBlast) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_IF
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(2)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_WAIT(20)
EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP

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

@ -399,7 +399,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
@ -407,7 +407,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_SUB(LVar0, 80)
@ -449,7 +449,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
@ -457,7 +457,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))

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

@ -401,7 +401,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
@ -409,7 +409,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_SUB(LVar0, 80)
@ -451,7 +451,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(SetBattleCamZoom, 300)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8))
@ -459,7 +459,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))

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

@ -459,7 +459,7 @@ EvtScript N(EVS_Flying_TakeTurn) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Windup)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -468,7 +468,7 @@ EvtScript N(EVS_Flying_TakeTurn) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0))
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR)
EVT_WAIT(6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 25)
@ -528,7 +528,7 @@ EvtScript N(EVS_Flying_TakeTurn) = {
EVT_RETURN
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_PREDIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Windup)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -537,7 +537,7 @@ EvtScript N(EVS_Flying_TakeTurn) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0))
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR)
EVT_WAIT(6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0))

2
src/battle/common/actor/pink_shy_guy.inc.c
View File

@ -332,7 +332,7 @@ EvtScript N(8021F22C) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TIMING_BAR_GO)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim09)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Pink_Anim03)

18
src/battle/common/actor/pokey.inc.c
View File

@ -534,7 +534,7 @@ EvtScript N(EVS_Attack_GroundSmash) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Idle2)
EVT_END_SWITCH
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_SWAY)
EVT_CALL(MakeLerp, 0, -40, 20, EASING_COS_IN_OUT)
EVT_LABEL(0)
EVT_CALL(UpdateLerp)
@ -545,7 +545,7 @@ EvtScript N(EVS_Attack_GroundSmash) = {
EVT_END_IF
EVT_CHILD_THREAD
EVT_WAIT(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_SMASH)
EVT_END_CHILD_THREAD
EVT_CALL(MakeLerp, -40, 90, 5, EASING_QUADRATIC_IN)
EVT_LABEL(3)
@ -781,14 +781,14 @@ EvtScript N(EVS_TakeTurn) = {
EVT_CASE_EQ(3)
EVT_END_SWITCH
EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_SWAY)
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Anim_Windup, LVar1)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1)
EVT_WAIT(12)
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Anim_Throw, LVar1)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1)
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_THROW)
EVT_WAIT(3)
EVT_EXEC_WAIT(N(EVS_DecrementSize))
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
@ -933,7 +933,7 @@ EvtScript N(EVS_SummonBackup) = {
EVT_END_IF
EVT_CHILD_THREAD
EVT_WAIT(8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_BACK)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_FORWARD)
EVT_END_CHILD_THREAD
// lean forward
EVT_CALL(MakeLerp, -20, 30, 20, EASING_COS_IN_OUT)
@ -946,7 +946,7 @@ EvtScript N(EVS_SummonBackup) = {
EVT_END_IF
EVT_CHILD_THREAD
EVT_WAIT(6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_FORWARD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_LEAN_BACK)
EVT_END_CHILD_THREAD
// lean back
EVT_CALL(MakeLerp, 30, -40, 20, EASING_COS_IN_OUT)
@ -959,7 +959,7 @@ EvtScript N(EVS_SummonBackup) = {
EVT_END_IF
EVT_CHILD_THREAD
EVT_WAIT(4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_REACH_DOWN)
EVT_END_CHILD_THREAD
// smash into ground
EVT_CALL(MakeLerp, -40, 90, 10, EASING_COS_IN_OUT)
@ -1039,8 +1039,8 @@ EvtScript N(EVS_SummonBackup) = {
EvtScript N(EVS_Attack_SinglePartLeap) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_02EC, SOUND_02EC)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EC, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_POKEY_STEP, SOUND_POKEY_STEP)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_POKEY_STEP, SOUND_NONE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)

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

@ -521,14 +521,14 @@ EvtScript N(takeTurn_80219D88) = {
EVT_CASE_EQ(3)
EVT_END_SWITCH
EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0342)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_SWAY)
EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1)
EVT_WAIT(12)
EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar1)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1)
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02CE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POKEY_THROW)
EVT_WAIT(3)
EVT_EXEC_WAIT(N(8021B1B4))
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
@ -594,8 +594,8 @@ EvtScript N(takeTurn_80219D88) = {
EvtScript N(8021A6C8) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_02EC, SOUND_02EC)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EC, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_POKEY_STEP, SOUND_POKEY_STEP)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_POKEY_STEP, SOUND_NONE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)

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