pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

area_trd (#807)

Browse Source 
* EVT_PLAY_EFFECT

* area_trd data

* forgot a flag name

* fix bobomb spelling

* todo note

* fix macros

* fixed a couple more

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2022-10-07 14:45:58 -04:00 committed by GitHub
parent 5afce0b883
commit f96542f52a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
279 changed files with 9268 additions and 2544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -1380,7 +1380,7 @@ typedef struct GameStatus {
/* 0x098 */ Vec3f playerPos; /* 0x098 */ Vec3f playerPos;
/* 0x0A4 */ f32 playerYaw; /* 0x0A4 */ f32 playerYaw;
/* 0x0A8 */ s8 creditsViewportMode; /* 0x0A8 */ s8 creditsViewportMode;
/* 0x0A9 */ s8 unk_A9; /* 0x0A9 */ s8 unk_A9; // selected language?
/* 0x0AA */ s8 demoFlags; /* 0x0AA */ s8 demoFlags;
/* 0x0AB */ u8 soundOutputMode; /* 0x0AB */ u8 soundOutputMode;
/* 0x0AC */ s8 introState; /* 0x0AC */ s8 introState;

270
include/effects.h
View File

@ -5,141 +5,141 @@
#include "common_structs.h" #include "common_structs.h"
enum EffectID { enum EffectID {
EFFECT_00 = 0x00, EFFECT_00 = 0x00,
EFFECT_BIG_SMOKE_PUFF, EFFECT_BIG_SMOKE_PUFF = 0x01,
EFFECT_02, // unused EFFECT_02 = 0x02, // unused
EFFECT_03, // unused EFFECT_03 = 0x03, // unused
EFFECT_04, // unused EFFECT_04 = 0x04, // unused
EFFECT_05, // unused EFFECT_05 = 0x05, // unused
EFFECT_LANDING_DUST, EFFECT_LANDING_DUST = 0x06,
EFFECT_WALKING_DUST, EFFECT_WALKING_DUST = 0x07,
EFFECT_FLOWER_SPLASH, EFFECT_FLOWER_SPLASH = 0x08,
EFFECT_FLOWER_TRAIL, EFFECT_FLOWER_TRAIL = 0x09,
EFFECT_CLOUD_PUFF, EFFECT_CLOUD_PUFF = 0x0A,
EFFECT_CLOUD_TRAIL, EFFECT_CLOUD_TRAIL = 0x0B,
EFFECT_FOOTPRINT, EFFECT_FOOTPRINT = 0x0C,
EFFECT_FLOATING_FLOWER, EFFECT_FLOATING_FLOWER = 0x0D,
EFFECT_SNOWFLAKE, EFFECT_SNOWFLAKE = 0x0E,
EFFECT_STAR, EFFECT_STAR = 0x0F,
EFFECT_EMOTE, EFFECT_EMOTE = 0x10,
EFFECT_SPARKLES, EFFECT_SPARKLES = 0x11,
EFFECT_SHAPE_SPELL, EFFECT_SHAPE_SPELL = 0x12,
EFFECT_GATHER_ENERGY_PINK, EFFECT_GATHER_ENERGY_PINK = 0x13,
EFFECT_DROP_LEAVES, EFFECT_DROP_LEAVES = 0x14,
EFFECT_DUST, EFFECT_DUST = 0x15,
EFFECT_SHATTERING_STONES, EFFECT_SHATTERING_STONES = 0x16,
EFFECT_SMOKE_RING, EFFECT_SMOKE_RING = 0x17,
EFFECT_DAMAGE_STARS, EFFECT_DAMAGE_STARS = 0x18,
EFFECT_EXPLOSION, EFFECT_EXPLOSION = 0x19,
EFFECT_LENS_FLARE, EFFECT_LENS_FLARE = 0x1A,
EFFECT_GOT_ITEM_OUTLINE, EFFECT_GOT_ITEM_OUTLINE = 0x1B,
EFFECT_SPIKY_WHITE_AURA, EFFECT_SPIKY_WHITE_AURA = 0x1C,
EFFECT_SMOKE_IMPACT, EFFECT_SMOKE_IMPACT = 0x1D,
EFFECT_DAMAGE_INDICATOR, EFFECT_DAMAGE_INDICATOR = 0x1E,
EFFECT_PURPLE_RING, EFFECT_PURPLE_RING = 0x1F,
EFFECT_FLAME, EFFECT_FLAME = 0x20,
EFFECT_STARS_BURST, EFFECT_STARS_BURST = 0x21,
EFFECT_STARS_SHIMMER, EFFECT_STARS_SHIMMER = 0x22,
EFFECT_RISING_BUBBLE, EFFECT_RISING_BUBBLE = 0x23,
EFFECT_RING_BLAST, EFFECT_RING_BLAST = 0x24,
EFFECT_SHOCKWAVE, EFFECT_SHOCKWAVE = 0x25,
EFFECT_MUSIC_NOTE, EFFECT_MUSIC_NOTE = 0x26,
EFFECT_SMOKE_BURST, EFFECT_SMOKE_BURST = 0x27,
EFFECT_SWEAT, EFFECT_SWEAT = 0x28,
EFFECT_SLEEP_BUBBLE, EFFECT_SLEEP_BUBBLE = 0x29,
EFFECT_2A, // unused EFFECT_2A = 0x2A, // unused
EFFECT_WINDY_LEAVES, EFFECT_WINDY_LEAVES = 0x2B,
EFFECT_FALLING_LEAVES, EFFECT_FALLING_LEAVES = 0x2C,
EFFECT_STARS_SPREAD, EFFECT_STARS_SPREAD = 0x2D,
EFFECT_STEAM_BURST, EFFECT_STEAM_BURST = 0x2E,
EFFECT_STARS_ORBITING, EFFECT_STARS_ORBITING = 0x2F,
EFFECT_BIG_SNOWFLAKES, EFFECT_BIG_SNOWFLAKES = 0x30,
EFFECT_DEBUFF, EFFECT_DEBUFF = 0x31,
EFFECT_GREEN_IMPACT, EFFECT_GREEN_IMPACT = 0x32,
EFFECT_RADIAL_SHIMMER, EFFECT_RADIAL_SHIMMER = 0x33,
EFFECT_ENDING_DECALS, EFFECT_ENDING_DECALS = 0x34,
EFFECT_LIGHT_RAYS, EFFECT_LIGHT_RAYS = 0x35,
EFFECT_LIGHTNING, EFFECT_LIGHTNING = 0x36,
EFFECT_FIRE_BREATH, EFFECT_FIRE_BREATH = 0x37,
EFFECT_SHIMMER_BURST, EFFECT_SHIMMER_BURST = 0x38,
EFFECT_ENERGY_SHOCKWAVE, EFFECT_ENERGY_SHOCKWAVE = 0x39,
EFFECT_SHIMMER_WAVE, EFFECT_SHIMMER_WAVE = 0x3A,
EFFECT_AURA, EFFECT_AURA = 0x3B,
EFFECT_BULB_GLOW, EFFECT_BULB_GLOW = 0x3C,
EFFECT_3D, EFFECT_3D = 0x3D,
EFFECT_BLAST, EFFECT_BLAST = 0x3E,
EFFECT_FIRE_FLOWER, EFFECT_FIRE_FLOWER = 0x3F,
EFFECT_RECOVER, EFFECT_RECOVER = 0x40,
EFFECT_DISABLE_X, EFFECT_DISABLE_X = 0x41,
EFFECT_BOMBETTE_BREAKING, EFFECT_BOMBETTE_BREAKING = 0x42,
EFFECT_FIREWORK, EFFECT_FIREWORK = 0x43,
EFFECT_CONFETTI, EFFECT_CONFETTI = 0x44,
EFFECT_SNOWFALL, EFFECT_SNOWFALL = 0x45,
EFFECT_46, EFFECT_46 = 0x46,
EFFECT_GATHER_MAGIC, EFFECT_GATHER_MAGIC = 0x47,
EFFECT_ATTACK_RESULT_TEXT, EFFECT_ATTACK_RESULT_TEXT = 0x48,
EFFECT_SMALL_GOLD_SPARKLE, EFFECT_SMALL_GOLD_SPARKLE = 0x49,
EFFECT_FLASHING_BOX_SHOCKWAVE, EFFECT_FLASHING_BOX_SHOCKWAVE = 0x4A,
EFFECT_BALLOON, EFFECT_BALLOON = 0x4B,
EFFECT_FLOATING_ROCK, EFFECT_FLOATING_ROCK = 0x4C,
EFFECT_CHOMP_DROP, EFFECT_CHOMP_DROP = 0x4D,
EFFECT_QUIZMO_STAGE, EFFECT_QUIZMO_STAGE = 0x4E,
EFFECT_RADIATING_ENERGY_ORB, EFFECT_RADIATING_ENERGY_ORB = 0x4F,
EFFECT_QUIZMO_ANSWER, // unused EFFECT_QUIZMO_ANSWER = 0x50, // unused
EFFECT_MOTION_BLUR_FLAME, // three orbs emanating from super block during upgrading animation EFFECT_MOTION_BLUR_FLAME = 0x51, // three orbs emanating from super block during upgrading animation
EFFECT_ENERGY_ORB_WAVE, EFFECT_ENERGY_ORB_WAVE = 0x52,
EFFECT_MERLIN_HOUSE_STARS, EFFECT_MERLIN_HOUSE_STARS = 0x53,
EFFECT_QUIZMO_AUDIENCE, // unused EFFECT_QUIZMO_AUDIENCE = 0x54, // unused
EFFECT_BUTTERFLIES, EFFECT_BUTTERFLIES = 0x55,
EFFECT_STAT_CHANGE, EFFECT_STAT_CHANGE = 0x56,
EFFECT_SNAKING_STATIC, EFFECT_SNAKING_STATIC = 0x57,
EFFECT_THUNDERBOLT_RING, EFFECT_THUNDERBOLT_RING = 0x58,
EFFECT_SQUIRT, EFFECT_SQUIRT = 0x59,
EFFECT_WATER_BLOCK, EFFECT_WATER_BLOCK = 0x5A,
EFFECT_WATERFALL, EFFECT_WATERFALL = 0x5B,
EFFECT_WATER_FOUNTAIN, EFFECT_WATER_FOUNTAIN = 0x5C,
EFFECT_UNDERWATER, EFFECT_UNDERWATER = 0x5D,
EFFECT_LIGHTNING_BOLT, EFFECT_LIGHTNING_BOLT = 0x5E,
EFFECT_WATER_SPLASH, EFFECT_WATER_SPLASH = 0x5F,
EFFECT_SNOWMAN_DOLL, EFFECT_SNOWMAN_DOLL = 0x60,
EFFECT_FRIGHT_JAR, EFFECT_FRIGHT_JAR = 0x61,
EFFECT_STOP_WATCH, EFFECT_STOP_WATCH = 0x62,
EFFECT_63, EFFECT_63 = 0x63,
EFFECT_THROW_SPINY, EFFECT_THROW_SPINY = 0x64,
EFFECT_65, EFFECT_65 = 0x65,
EFFECT_TUBBA_HEART_ATTACK, EFFECT_TUBBA_HEART_ATTACK = 0x66,
EFFECT_WHIRLWIND, EFFECT_WHIRLWIND = 0x67,
EFFECT_RED_IMPACT, EFFECT_RED_IMPACT = 0x68,
EFFECT_FLOATING_CLOUD_PUFF, EFFECT_FLOATING_CLOUD_PUFF = 0x69,
EFFECT_6A, // unused EFFECT_6A = 0x6A, // unused
EFFECT_ENERGY_IN_OUT, EFFECT_ENERGY_IN_OUT = 0x6B,
EFFECT_TATTLE_WINDOW, EFFECT_TATTLE_WINDOW = 0x6C,
EFFECT_SHINY_FLARE, EFFECT_SHINY_FLARE = 0x6D,
EFFECT_HUFF_PUFF_BREATH, EFFECT_HUFF_PUFF_BREATH = 0x6E,
EFFECT_COLD_BREATH, EFFECT_COLD_BREATH = 0x6F,
EFFECT_EMBERS, EFFECT_EMBERS = 0x70,
EFFECT_HIEROGLYPHS, EFFECT_HIEROGLYPHS = 0x71,
EFFECT_MISC_PARTICLES, EFFECT_MISC_PARTICLES = 0x72,
EFFECT_STATIC_STATUS, EFFECT_STATIC_STATUS = 0x73,
EFFECT_MOVING_CLOUD, EFFECT_MOVING_CLOUD = 0x74,
EFFECT_75, EFFECT_75 = 0x75,
EFFECT_76, // unused EFFECT_76 = 0x76, // unused
EFFECT_FIREWORK_ROCKET, EFFECT_FIREWORK_ROCKET = 0x77,
EFFECT_PEACH_STAR_BEAM, EFFECT_PEACH_STAR_BEAM = 0x78,
EFFECT_CHAPTER_CHANGE, EFFECT_CHAPTER_CHANGE = 0x79,
EFFECT_ICE_SHARD, EFFECT_ICE_SHARD = 0x7A,
EFFECT_SPIRIT_CARD, EFFECT_SPIRIT_CARD = 0x7B,
EFFECT_LIL_OINK, EFFECT_LIL_OINK = 0x7C,
EFFECT_SOMETHING_ROTATING, EFFECT_SOMETHING_ROTATING = 0x7D,
EFFECT_BREAKING_JUNK, EFFECT_BREAKING_JUNK = 0x7E,
EFFECT_PARTNER_BUFF, EFFECT_PARTNER_BUFF = 0x7F,
EFFECT_QUIZMO_ASSISTANT, EFFECT_QUIZMO_ASSISTANT = 0x80,
EFFECT_ICE_PILLAR, EFFECT_ICE_PILLAR = 0x81,
EFFECT_SUN, EFFECT_SUN = 0x82,
EFFECT_STAR_SPIRITS_ENERGY, EFFECT_STAR_SPIRITS_ENERGY = 0x83,
EFFECT_PINK_SPARKLES, EFFECT_PINK_SPARKLES = 0x84,
EFFECT_STAR_OUTLINE, EFFECT_STAR_OUTLINE = 0x85,
EFFECT_86, EFFECT_86 = 0x86,
}; };
typedef struct Effect00FXData { typedef struct Effect00FXData {

1
include/enums.h
View File

@ -3489,6 +3489,7 @@ enum AnyPartnerAnims {
PARTNER_ANIM_RUN = 0x106, PARTNER_ANIM_RUN = 0x106,
PARTNER_ANIM_TALK = 0x107, PARTNER_ANIM_TALK = 0x107,
PARTNER_ANIM_HURT = 0x108, PARTNER_ANIM_HURT = 0x108,
PARTNER_ANIM_9 = 0x109,
}; };
enum FirstStrikes { enum FirstStrikes {

2
include/functions.h
View File

@ -667,7 +667,7 @@ s32 find_item(s32);
void enable_background_wave(void); void enable_background_wave(void);
void func_80035DF0(s16); void set_map_change_fade_rate(s16);
// State funcs // State funcs
void state_init_startup(void); void state_init_startup(void);

2
include/map.h
View File

@ -14,6 +14,8 @@
#define EVS_BindExitTriggers EVS_BindExitTriggers #define EVS_BindExitTriggers EVS_BindExitTriggers
#define EVS_EnterMap EVS_EnterMap #define EVS_EnterMap EVS_EnterMap
#define CLONED_MODEL(idx) (10000+(idx))
// TODO: consider moving Npc here // TODO: consider moving Npc here
#define ENTRY_COUNT(entryList) (sizeof(entryList) / sizeof(Vec4f)) #define ENTRY_COUNT(entryList) (sizeof(entryList) / sizeof(Vec4f))

12
include/npc.h
View File

@ -5,13 +5,11 @@
#include "enums.h" #include "enums.h"
#include "script_api/map.h" #include "script_api/map.h"
#define GET_MACRO(_1,_2,_3,NAME,ARGS...) NAME
#define NPC_GROUP(ARGS...) GET_MACRO(ARGS, NPC_GROUP_3, NPC_GROUP_2, NPC_GROUP_1)(ARGS)
// battle and stage are optional in overloaded NPC_GROUP macros // battle and stage are optional in overloaded NPC_GROUP macros
#define NPC_GROUP_1(npcs) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, 0, 0 } #define NPC_GROUP(args...) VFUNC(NPC_GROUP, args)
#define NPC_GROUP_2(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, 0 } #define NPC_GROUP1(npcs) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, 0, 0 }
#define NPC_GROUP_3(npcs, battle, stage) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, stage + 1 } #define NPC_GROUP2(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, 0 }
#define NPC_GROUP3(npcs, battle, stage) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, stage + 1 }
#define NO_DROPS { { F16(100), F16(0), 0, F16(0) }, } #define NO_DROPS { { F16(100), F16(0), 0, F16(0) }, }
@ -95,7 +93,7 @@ typedef struct MobileAISettings {
typedef struct StationaryAISettings { typedef struct StationaryAISettings {
/* 0x00 */ f32 unk_00; /* 0x00 */ f32 unk_00;
/* 0x04 */ s32 unk_04; /* 0x04 */ f32 unk_04;
/* 0x08 */ s32 playerSearchInterval; // how often to search for player (frames) /* 0x08 */ s32 playerSearchInterval; // how often to search for player (frames)
/* 0x0C */ f32 chaseSpeed; /* 0x0C */ f32 chaseSpeed;
/* 0x10 */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing /* 0x10 */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing

2
include/script_api/common.h
View File

@ -285,7 +285,7 @@ ApiStatus func_802D2C14(Evt* script, s32 isInitialCall);
ApiStatus func_802D7B10(Evt* script, s32 isInitialCall); ApiStatus func_802D7B10(Evt* script, s32 isInitialCall);
ApiStatus ShowConsumableChoicePopup(Evt* script, s32 isInitialCall); ApiStatus ShowConsumableChoicePopup(Evt* script, s32 isInitialCall);
ApiStatus func_800458CC(Evt* script, s32 isInitialCall); ApiStatus func_800458CC(Evt* script, s32 isInitialCall);
ApiStatus func_80045900(Evt* script, s32 isInitialCall); ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall);
ApiStatus ShowKeyChoicePopup(Evt* script, s32 isInitialCall); ApiStatus ShowKeyChoicePopup(Evt* script, s32 isInitialCall);
ApiStatus CloseChoicePopup(Evt* script, s32 isInitialCall); ApiStatus CloseChoicePopup(Evt* script, s32 isInitialCall);
ApiStatus InterruptUsePartner(Evt* script, s32 isInitialCall); ApiStatus InterruptUsePartner(Evt* script, s32 isInitialCall);

77
include/script_api/macros.h
View File

@ -571,6 +571,24 @@
/****** COMMON SCRIPTS ************************************************************************************************/ /****** COMMON SCRIPTS ************************************************************************************************/
#define EVT_SET_VEC2(baseVar, x, y, z) \
EVT_SET(baseVar + 0, x) \
EVT_SET(baseVar + 1, y)
#define EVT_SETF_VEC2(baseVar, x, y, z) \
EVT_SETF(baseVar + 0, x) \
EVT_SETF(baseVar + 1, y)
#define EVT_SET_VEC3(baseVar, x, y, z) \
EVT_SET(baseVar + 0, x) \
EVT_SET(baseVar + 1, y) \
EVT_SET(baseVar + 2, z)
#define EVT_SETF_VEC3(baseVar, x, y, z) \
EVT_SETF(baseVar + 0, x) \
EVT_SETF(baseVar + 1, y) \
EVT_SETF(baseVar + 2, z)
#define EVT_EXIT_WALK(walkDistance, exitIdx, map, entryIdx) \ #define EVT_EXIT_WALK(walkDistance, exitIdx, map, entryIdx) \
{ \ { \
EVT_SET_GROUP(EVT_GROUP_1B) \ EVT_SET_GROUP(EVT_GROUP_1B) \
@ -595,7 +613,7 @@
EVT_END \ EVT_END \
} }
#define EVT_EXIT_DOUBLE_DOOR(exitIdx, colliderID, leftDoorModelID, rightDoorModelID, map, entryIdx) \ #define EVT_EXIT_DOUBLE_DOOR(exitIdx, map, entryIdx, colliderID, leftDoorModelID, rightDoorModelID) \
{ \ { \
EVT_SET_GROUP(EVT_GROUP_1B) \ EVT_SET_GROUP(EVT_GROUP_1B) \
EVT_CALL(DisablePlayerInput, TRUE) \ EVT_CALL(DisablePlayerInput, TRUE) \
@ -633,4 +651,61 @@
EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) \ EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) \
EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE)
// allow macros with variable number of arguments
// see https://stackoverflow.com/questions/11761703/overloading-macro-on-number-of-arguments
// solution provided by R1tschY and edited by Gabriel Staples
#define __NARG__(args...) \
__NARG_I_(args,__RSEQ_N())
#define __NARG_I_(args...) \
__ARG_N(args)
#define __ARG_N( \
_1, _2, _3, _4, _5, _6, _7, _8, _9,_10, \
_11,_12,_13,_14,_15,_16,_17,_18,_19,_20, \
_21,_22,_23,_24,_25,_26,_27,_28,_29,_30, \
_31,_32,_33,_34,_35,_36,_37,_38,_39,_40, \
_41,_42,_43,_44,_45,_46,_47,_48,_49,_50, \
_51,_52,_53,_54,_55,_56,_57,_58,_59,_60, \
_61,_62,_63,N,...) N
#define __RSEQ_N() \
63,62,61,60, \
59,58,57,56,55,54,53,52,51,50, \
49,48,47,46,45,44,43,42,41,40, \
39,38,37,36,35,34,33,32,31,30, \
29,28,27,26,25,24,23,22,21,20, \
19,18,17,16,15,14,13,12,11,10, \
9,8,7,6,5,4,3,2,1,0
#define _VFUNC_(name, n) name##n
#define _VFUNC(name, n) _VFUNC_(name, n)
#define VFUNC(func, args...) _VFUNC(func, __NARG__(args)) (args)
#define EVT_PLAY_EFFECT(args...) VFUNC(EVT_PLAY_EFFECT, args)
#define EVT_PLAY_EFFECT1(effect) \
EVT_CALL(PlayEffect, effect, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT2(effect, subtype) \
EVT_CALL(PlayEffect, effect, subtype, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT3(effect, subtype, a) \
EVT_CALL(PlayEffect, effect, subtype, a, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT4(effect, subtype, a, b) \
EVT_CALL(PlayEffect, effect, subtype, a, b, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT5(effect, subtype, a, b, c) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, 0, 0, 0, 0, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT6(effect, subtype, a, b, c, d) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, 0, 0, 0, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT7(effect, subtype, a, b, c, d, e) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, 0, 0, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT8(effect, subtype, a, b, c, d, e, f) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, 0, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT9(effect, subtype, a, b, c, d, e, f, g) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, 0, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT10(effect, subtype, a, b, c, d, e, f, g, h) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, 0, 0, 0, 0)
#define EVT_PLAY_EFFECT11(effect, subtype, a, b, c, d, e, f, g, h, i) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, i, 0, 0, 0)
#define EVT_PLAY_EFFECT12(effect, subtype, a, b, c, d, e, f, g, h, i, j) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, i, j, 0, 0)
#define EVT_PLAY_EFFECT13(effect, subtype, a, b, c, d, e, f, g, h, i, j, k) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, i, j, k, 0)
#define EVT_PLAY_EFFECT14(effect, subtype, a, b, c, d, e, f, g, h, i, j, k, l) \
EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, i, j, k, l)
#endif #endif

6
include/variables.h
View File

@ -94,9 +94,9 @@ extern s16 gMapTransitionAlpha;
extern s8 D_800A0930; extern s8 D_800A0930;
extern s8 D_800A0931; extern s8 D_800A0931;
extern s16 D_800A0932[1]; extern s16 D_800A0932[1];
extern s16 D_800A0942; extern s16 gMapTransitionFadeRate;
extern s16 D_800A0944; extern s16 gMapTransitionState;
extern s16 D_800A0946; extern s16 gMapTransitionStateTime;
extern s16 D_800A0948; extern s16 D_800A0948;
extern s16 D_800A0954; extern s16 D_800A0954;
extern s16 D_800A0956; extern s16 D_800A0956;

89
src/111f0_len_860.c
View File

@ -2,9 +2,10 @@
#include "nu/nusys.h" #include "nu/nusys.h"
void init_enter_world_shared(void); void init_enter_world_shared(void);
s16 update_enter_map_screen_overlay(s16* progress);
void func_80035DF0(s16 arg0) { void set_map_change_fade_rate(s16 fadeRate) {
D_800A0942 = arg0; gMapTransitionFadeRate = fadeRate;
} }
void state_init_enter_demo(void) { void state_init_enter_demo(void) {
@ -19,10 +20,10 @@ void state_init_enter_world(void) {
} }
void init_enter_world_shared(void) { void init_enter_world_shared(void) {
D_800A0944 = 0; gMapTransitionState = 0;
D_800A0946 = 4; gMapTransitionStateTime = 4;
gGameStatusPtr->exitTangent = 0.0f; gGameStatusPtr->exitTangent = 0.0f;
gMapTransitionAlpha = 0xFF; gMapTransitionAlpha = 255;
nuContRmbForceStopEnd(); nuContRmbForceStopEnd();
update_exit_map_screen_overlay(&gMapTransitionAlpha); update_exit_map_screen_overlay(&gMapTransitionAlpha);
@ -33,16 +34,16 @@ void init_enter_world_shared(void) {
} }
void state_step_enter_world(void) { void state_step_enter_world(void) {
switch (D_800A0944) { switch (gMapTransitionState) {
case 0: case 0:
if (D_800A0946 == 0) { if (gMapTransitionStateTime == 0) {
gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->isBattle = FALSE;
gGameStatusPtr->disableScripts = FALSE; gGameStatusPtr->disableScripts = FALSE;
if (D_800A0948 == 0) { if (D_800A0948 == 0) {
load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 0); load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_MAP);
} else { } else {
load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 1); load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_FILE_SELECT);
} }
gGameStatusPtr->prevArea = gGameStatusPtr->areaID; gGameStatusPtr->prevArea = gGameStatusPtr->areaID;
@ -51,10 +52,10 @@ void state_step_enter_world(void) {
disable_player_input(); disable_player_input();
} }
update_cameras(); update_cameras();
D_800A0946 = 2; gMapTransitionStateTime = 2;
D_800A0944++; gMapTransitionState++;
} else { } else {
D_800A0946--; gMapTransitionStateTime--;
} }
break; break;
case 1: case 1:
@ -63,11 +64,11 @@ void state_step_enter_world(void) {
update_player(); update_player();
update_cameras(); update_cameras();
if (D_800A0946 != 0) { if (gMapTransitionStateTime != 0) {
D_800A0946--; gMapTransitionStateTime--;
} else if (!does_script_exist(gGameStatusPtr->mainScriptID)) { } else if (!does_script_exist(gGameStatusPtr->mainScriptID)) {
gOverrideFlags &= ~GLOBAL_OVERRIDES_8; gOverrideFlags &= ~GLOBAL_OVERRIDES_8;
D_800A0944++; gMapTransitionState++;
} }
break; break;
case 2: case 2:
@ -76,7 +77,7 @@ void state_step_enter_world(void) {
update_effects(); update_effects();
update_cameras(); update_cameras();
if ((update_enter_map_screen_overlay(&gMapTransitionAlpha) << 0x10) != 0) { if (update_enter_map_screen_overlay(&gMapTransitionAlpha) != 0) {
if (gGameStatusPtr->demoState == 0) { if (gGameStatusPtr->demoState == 0) {
enable_player_input(); enable_player_input();
} }
@ -95,8 +96,8 @@ void state_drawUI_enter_world(void) {
void state_init_change_map(void) { void state_init_change_map(void) {
gMapTransitionAlpha = 0x00; gMapTransitionAlpha = 0x00;
D_800A0942 = 0x14; gMapTransitionFadeRate = 20;
D_800A0944 = 0x00; gMapTransitionState = 0;
if (gGameStatusPtr->prevArea != gGameStatusPtr->areaID) { if (gGameStatusPtr->prevArea != gGameStatusPtr->areaID) {
gGameStatusPtr->didAreaChange = TRUE; gGameStatusPtr->didAreaChange = TRUE;
@ -107,7 +108,7 @@ void state_init_change_map(void) {
} }
void state_step_change_map(void) { void state_step_change_map(void) {
switch (D_800A0944) { switch (gMapTransitionState) {
case 0: case 0:
update_npcs(); update_npcs();
update_player(); update_player();
@ -115,22 +116,22 @@ void state_step_change_map(void) {
update_cameras(); update_cameras();
if ((update_exit_map_screen_overlay(&gMapTransitionAlpha) << 0x10) != 0) { if ((update_exit_map_screen_overlay(&gMapTransitionAlpha) << 0x10) != 0) {
D_800A0944++; gMapTransitionState++;
} }
break; break;
case 1: case 1:
gOverrideFlags |= GLOBAL_OVERRIDES_8; gOverrideFlags |= GLOBAL_OVERRIDES_8;
nuContRmbForceStop(); nuContRmbForceStop();
D_800A0946 = 4; gMapTransitionStateTime = 4;
D_800A0944++; gMapTransitionState++;
break; break;
case 2: case 2:
if (gGameStatusPtr->demoState != 0) { if (gGameStatusPtr->demoState != 0) {
set_game_mode(0x11); set_game_mode(GAME_MODE_DEMO);
} }
if (D_800A0946 != 0) { if (gMapTransitionStateTime != 0) {
D_800A0946--; gMapTransitionStateTime--;
} else { } else {
gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->isBattle = FALSE;
gGameStatusPtr->disableScripts = FALSE; gGameStatusPtr->disableScripts = FALSE;
@ -141,8 +142,8 @@ void state_step_change_map(void) {
disable_player_input(); disable_player_input();
} }
update_cameras(); update_cameras();
D_800A0946 = 2; gMapTransitionStateTime = 2;
D_800A0944++; gMapTransitionState++;
} }
break; break;
case 3: case 3:
@ -151,11 +152,11 @@ void state_step_change_map(void) {
update_player(); update_player();
update_cameras(); update_cameras();
if (D_800A0946 != 0) { if (gMapTransitionStateTime != 0) {
D_800A0946--; gMapTransitionStateTime--;
} else if (!does_script_exist(gGameStatusPtr->mainScriptID)) { } else if (!does_script_exist(gGameStatusPtr->mainScriptID)) {
gOverrideFlags &= ~GLOBAL_OVERRIDES_8; gOverrideFlags &= ~GLOBAL_OVERRIDES_8;
D_800A0944++; gMapTransitionState++;
} }
break; break;
case 4: case 4:
@ -164,7 +165,7 @@ void state_step_change_map(void) {
update_effects(); update_effects();
update_cameras(); update_cameras();
if ((update_enter_map_screen_overlay(&gMapTransitionAlpha) << 0x10) != 0) { if (update_enter_map_screen_overlay(&gMapTransitionAlpha) != 0) {
if (gGameStatusPtr->demoState == 0) { if (gGameStatusPtr->demoState == 0) {
enable_player_input(); enable_player_input();
} }
@ -176,35 +177,35 @@ void state_step_change_map(void) {
} }
void state_drawUI_change_map(void) { void state_drawUI_change_map(void) {
if (D_800A0944 == 4 || D_800A0944 == 0) { if (gMapTransitionState == 4 || gMapTransitionState == 0) {
draw_status_ui(); draw_status_ui();
} }
} }
void func_80036430(void) { void func_80036430(void) {
gMapTransitionAlpha = 0xFF; gMapTransitionAlpha = 255;
D_800A0942 = 0x14; gMapTransitionFadeRate = 20;
D_800A0944 = 0x01; gMapTransitionState = 0x01;
gPlayerStatus.flags |= PS_FLAGS_1000; gPlayerStatus.flags |= PS_FLAGS_1000;
} }
void func_8003646C(void) { void func_8003646C(void) {
switch (D_800A0944) { switch (gMapTransitionState) {
case 1: case 1:
gOverrideFlags |= GLOBAL_OVERRIDES_8; gOverrideFlags |= GLOBAL_OVERRIDES_8;
nuContRmbForceStop(); nuContRmbForceStop();
D_800A0946 = 4; gMapTransitionStateTime = 4;
D_800A0944++; gMapTransitionState++;
break; break;
case 2: case 2:
if (D_800A0946 != 0) { if (gMapTransitionStateTime != 0) {
D_800A0946--; gMapTransitionStateTime--;
} else { } else {
gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->isBattle = FALSE;
gGameStatusPtr->disableScripts = FALSE; gGameStatusPtr->disableScripts = FALSE;
load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 0); load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 0);
nuContRmbForceStopEnd(); nuContRmbForceStopEnd();
D_800A0944++; gMapTransitionState++;
} }
break; break;
case 3: case 3:
@ -212,15 +213,15 @@ void func_8003646C(void) {
update_npcs(); update_npcs();
if (!does_script_exist(gGameStatusPtr->mainScriptID)) { if (!does_script_exist(gGameStatusPtr->mainScriptID)) {
gOverrideFlags &= ~GLOBAL_OVERRIDES_8; gOverrideFlags &= ~GLOBAL_OVERRIDES_8;
D_800A0944++; gMapTransitionState++;
break; break;
} }
return; return;
case 4: case 4:
gMapTransitionAlpha -= D_800A0942; gMapTransitionAlpha -= gMapTransitionFadeRate;
if (gMapTransitionAlpha < 0) { if (gMapTransitionAlpha < 0) {
gMapTransitionAlpha = 0; gMapTransitionAlpha = 0;
D_800A0944++; gMapTransitionState++;
set_screen_overlay_params_front(255, -1.0f); set_screen_overlay_params_front(255, -1.0f);
set_game_mode(GAME_MODE_CHANGE_MAP); set_game_mode(GAME_MODE_CHANGE_MAP);
} }

6
src/1AF120.c
View File

@ -393,7 +393,7 @@ EvtScript D_80296014 = {
EVT_WAIT(8) EVT_WAIT(8)
EVT_LABEL(10) EVT_LABEL(10)
EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };
@ -405,11 +405,11 @@ EvtScript D_8029621C = {
EVT_ADD(LVar5, -5) EVT_ADD(LVar5, -5)
EVT_ADD(LVar6, 18) EVT_ADD(LVar6, 18)
EVT_ADD(LVar7, 5) EVT_ADD(LVar7, 5)
EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15)
EVT_WAIT(2) EVT_WAIT(2)
EVT_ADD(LVar5, 10) EVT_ADD(LVar5, 10)
EVT_ADD(LVar6, -14) EVT_ADD(LVar6, -14)
EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15)
EVT_END_CHILD_THREAD EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity) EVT_CALL(GetDamageIntensity)
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)

60
src/1a1f0_len_5390.c
View File

@ -21,7 +21,7 @@ void spawn_drops(Enemy* enemy);
s32 D_80077C40 = 0; s32 D_80077C40 = 0;
extern EvtScript D_800936DC; extern EvtScript EVS_NpcHitRecoil;
EvtScript D_80077C44 = { EvtScript D_80077C44 = {
EVT_WAIT(10) EVT_WAIT(10)
@ -31,7 +31,7 @@ EvtScript D_80077C44 = {
EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_100, TRUE) EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcYaw, NPC_BTL_MERLEE, 0) EVT_CALL(SetNpcYaw, NPC_BTL_MERLEE, 0)
EVT_CALL(GetCamLookAtObjVector) EVT_CALL(GetCamLookAtObjVector)
EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, LocalVar(0), LocalVar(1), LocalVar(2)) EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, LVar0, LocalVar(1), LocalVar(2))
EVT_THREAD EVT_THREAD
EVT_CALL(MerleeUpdateFX) EVT_CALL(MerleeUpdateFX)
EVT_END_THREAD EVT_END_THREAD
@ -46,14 +46,14 @@ EvtScript D_80077C44 = {
EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_CALL(DeleteNpc, NPC_BTL_MERLEE)
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(PlaySound, SOUND_2075) EVT_CALL(PlaySound, SOUND_2075)
EVT_CALL(GetPlayerPos, LocalVar(0), LocalVar(1), LocalVar(2)) EVT_CALL(GetPlayerPos, LVar0, LocalVar(1), LocalVar(2))
EVT_CALL(PlayMerleeGatherFX, LocalVar(0), LocalVar(1), LocalVar(2)) EVT_CALL(PlayMerleeGatherFX, LVar0, LocalVar(1), LocalVar(2))
EVT_CALL(PlayMerleeOrbFX, LocalVar(0), LocalVar(1), LocalVar(2)) EVT_CALL(PlayMerleeOrbFX, LVar0, LocalVar(1), LocalVar(2))
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(ShowMerleeCoinMessage) EVT_CALL(ShowMerleeCoinMessage)
EVT_WAIT(15) EVT_WAIT(15)
EVT_CALL(HasMerleeCasts) EVT_CALL(HasMerleeCasts)
EVT_IF_EQ(LocalVar(0), 1) EVT_IF_EQ(LVar0, 1)
EVT_RETURN EVT_RETURN
EVT_END_IF EVT_END_IF
EVT_CALL(ShowMerleeRanOutMessage) EVT_CALL(ShowMerleeRanOutMessage)
@ -63,8 +63,8 @@ EvtScript D_80077C44 = {
}; };
EvtScript SCRIPT_NpcDefeat = { EvtScript SCRIPT_NpcDefeat = {
EVT_CALL(GetBattleOutcome, LocalVar(0)) EVT_CALL(GetBattleOutcome, LVar0)
EVT_SWITCH(LocalVar(0)) EVT_SWITCH(LVar0)
EVT_CASE_EQ(0) EVT_CASE_EQ(0)
EVT_CALL(OnDefeatEnemy) EVT_CALL(OnDefeatEnemy)
EVT_CASE_EQ(1) EVT_CASE_EQ(1)
@ -81,7 +81,7 @@ EvtScript D_80077E9C = {
}; };
EnemyDrops D_80077EB8 = { EnemyDrops D_80077EB8 = {
.dropFlags = 0x80, .dropFlags = NPC_DROP_FLAGS_80,
.itemDropChance = 10, .itemDropChance = 10,
.itemDrops = { .itemDrops = {
{ {
@ -129,22 +129,22 @@ EnemyDrops D_80077EB8 = {
}; };
EvtScript EnemyNpcHit = { EvtScript EnemyNpcHit = {
EVT_CALL(GetOwnerEncounterTrigger, LocalVar(0)) EVT_CALL(GetOwnerEncounterTrigger, LVar0)
EVT_SWITCH(LocalVar(0)) EVT_SWITCH(LVar0)
EVT_CASE_EQ(1) EVT_CASE_EQ(ENCOUNTER_TRIGGER_NONE)
EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP)
EVT_CASE_OR_EQ(4) EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER)
EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER)
EVT_CALL(GetSelfAnimationFromTable, 7, LocalVar(0)) EVT_CALL(GetSelfAnimationFromTable, ENEMY_ANIM_HIT, LVar0)
EVT_EXEC_WAIT(D_800936DC) EVT_EXEC_WAIT(EVS_NpcHitRecoil)
EVT_CASE_EQ(3) EVT_CASE_EQ(ENCOUNTER_TRIGGER_SPIN)
EVT_THREAD EVT_THREAD
EVT_CALL(func_800458CC, LocalVar(0)) EVT_CALL(func_800458CC, LVar0)
EVT_IF_EQ(LocalVar(0), 0) EVT_IF_EQ(LVar0, 0)
EVT_SET(LocalVar(10), 0) EVT_SET(LVarA, 0)
EVT_LOOP(30) EVT_LOOP(30)
EVT_ADD(LocalVar(10), 40) EVT_ADD(LVarA, 40)
EVT_CALL(SetNpcRotation, NPC_SELF, 0, LocalVar(10), 0) EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVarA, 0)
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_END_IF EVT_END_IF
@ -157,14 +157,14 @@ EvtScript EnemyNpcHit = {
EvtScript EnemyNpcDefeat = { EvtScript EnemyNpcDefeat = {
EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0)
EVT_CALL(GetBattleOutcome, LocalVar(0)) EVT_CALL(GetBattleOutcome, LVar0)
EVT_SWITCH(LocalVar(0)) EVT_SWITCH(LVar0)
EVT_CASE_EQ(0) EVT_CASE_EQ(OUTCOME_PLAYER_WON)
EVT_CALL(DoNpcDefeat) EVT_CALL(DoNpcDefeat)
EVT_CASE_EQ(2) EVT_CASE_EQ(OUTCOME_PLAYER_FLED)
EVT_CALL(func_80045900, 0) EVT_CALL(OnPlayerFled, 0)
EVT_CASE_EQ(3) EVT_CASE_EQ(OUTCOME_ENEMY_FLED)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, ENEMY_FLAGS_10, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_END_SWITCH EVT_END_SWITCH
EVT_RETURN EVT_RETURN

2
src/38F00.c
View File

@ -10,7 +10,7 @@ EvtScript D_800936C0 = {
EVT_END EVT_END
}; };
EvtScript D_800936DC = { EvtScript EVS_NpcHitRecoil = {
EVT_CALL(SetNpcAnimation, NPC_SELF, LVar0) EVT_CALL(SetNpcAnimation, NPC_SELF, LVar0)
EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar3, LVar2) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar3, LVar2)
EVT_SET(LVar1, LVar3) EVT_SET(LVar1, LVar3)

2
src/EDEA00.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE EDEA00 #define NAMESPACE EDEA00
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"
// must include this before LakituAI for the debug string to end up in the right position // must include this before LakituAI for the debug string to end up in the right position
#include "world/common/enemy/FlyingAI.inc.c" #include "world/common/enemy/FlyingAI.inc.c"

2
src/battle/area_sbk/stage/sbk_02.c
View File

@ -38,7 +38,7 @@ EvtScript N(beforeBattle_8021F800) = {
EVT_SET(LVar0, 5) EVT_SET(LVar0, 5)
EVT_SET(LVar1, 240) EVT_SET(LVar1, 240)
EVT_EXEC(N(8021F720)) EVT_EXEC(N(8021F720))
EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SUN)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

2
src/cd180_len_38f0.c
View File

@ -615,7 +615,7 @@ s32 update_exit_map_screen_overlay(s16* progress) {
return 0; return 0;
} }
u8 update_enter_map_screen_overlay(s16* progress) { s16 update_enter_map_screen_overlay(s16* progress) {
u8 frontType = 0; u8 frontType = 0;
s32 amt = 20; s32 amt = 20;
u8 ret = FALSE; u8 ret = FALSE;

6
src/encounter_api.c
View File

@ -801,14 +801,14 @@ ApiStatus func_800458CC(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
ApiStatus func_80045900(Evt* script, s32 isInitialCall) { ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall) {
Enemy* enemy = script->owner1.enemy; Enemy* enemy = script->owner1.enemy;
Npc* npc = get_npc_unsafe(enemy->npcID); Npc* npc = get_npc_unsafe(enemy->npcID);
s32 var0 = evt_get_variable(script, *script->ptrReadPos); s32 skipReaction = evt_get_variable(script, *script->ptrReadPos);
enemy->aiFlags |= ENEMY_AI_FLAGS_4; enemy->aiFlags |= ENEMY_AI_FLAGS_4;
if (var0 == 0) { if (!skipReaction) {
s32 unk; s32 unk;
if (!(enemy->aiFlags & ENEMY_AI_FLAGS_10)) { if (!(enemy->aiFlags & ENEMY_AI_FLAGS_10)) {

12
src/evt/map_api.c
View File

@ -420,12 +420,12 @@ ApiStatus RotateGroup(Evt* script, s32 isInitialCall) {
ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) { ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
s32 var1 = evt_get_variable(script, *args); s32 modelID = evt_get_variable(script, *args);
s32 index = get_transform_group_index(var1); s32 transformIndex = get_transform_group_index(modelID);
ModelTransformGroup* transformGroup; ModelTransformGroup* transformGroup;
f32 x, y, z; f32 x, y, z;
if (index == -1) { if (transformIndex == -1) {
apply_transform_to_children(ScaleModel, script); apply_transform_to_children(ScaleModel, script);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -436,10 +436,10 @@ ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) {
y = evt_get_float_variable(script, *args++); y = evt_get_float_variable(script, *args++);
z = evt_get_float_variable(script, *args++); z = evt_get_float_variable(script, *args++);
transformGroup = get_transform_group(index); transformGroup = get_transform_group(transformIndex);
index = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match transformIndex = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match
if (!(index)) { if (!(transformIndex)) {
guScaleF(transformGroup->matrixB, x, y, z); guScaleF(transformGroup->matrixB, x, y, z);
transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000); transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000);
} else { } else {

2
src/hud_element.h
View File

@ -239,7 +239,7 @@ extern HudScript* wPartnerHudScripts[];
#define hs_RandomRestart(max, cutoff) HUD_ELEMENT_OP_RandomRestart, max, cutoff, #define hs_RandomRestart(max, cutoff) HUD_ELEMENT_OP_RandomRestart, max, cutoff,
#define hs_op_15(arg0) HUD_ELEMENT_OP_op_15, arg0, #define hs_op_15(arg0) HUD_ELEMENT_OP_op_15, arg0,
#define hs_RandomBranch(...) HUD_ELEMENT_OP_RandomBranch, (sizeof((s32[]){__VA_ARGS__})/sizeof(s32)), __VA_ARGS__, #define hs_RandomBranch(args...) HUD_ELEMENT_OP_RandomBranch, (sizeof((s32[]){args})/sizeof(s32)), args,
#define hs_SetFlags(arg0) HUD_ELEMENT_OP_SetFlags, arg0, #define hs_SetFlags(arg0) HUD_ELEMENT_OP_SetFlags, arg0,
#define hs_ClearFlags(arg0) HUD_ELEMENT_OP_ClearFlags, arg0, #define hs_ClearFlags(arg0) HUD_ELEMENT_OP_ClearFlags, arg0,
#define hs_PlaySound(arg0) HUD_ELEMENT_OP_PlaySound, arg0, #define hs_PlaySound(arg0) HUD_ELEMENT_OP_PlaySound, arg0,

2
src/move_table.inc.c
View File

@ -1119,7 +1119,7 @@ MoveData gMoveTable[] = {
.costFP = 0, .costFP = 0,
.costBP = 1 .costBP = 1
}, },
{ // move 70: Unused_FinalBombomb { // move 70: Unused_FinalBobomb
.nameMsg = "ファイナルボムヘイ", .nameMsg = "ファイナルボムヘイ",
.fullDescMsg = 0, .fullDescMsg = 0,
.shortDescMsg = 0, .shortDescMsg = 0,

2
src/world/area_dgb/dgb_02/C2EBA0.c
View File

@ -162,7 +162,7 @@ EvtScript N(80241AB0) = {
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0)
EVT_CALL(func_80045900, 1) EVT_CALL(OnPlayerFled, 1)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

2
src/world/area_dgb/dgb_03/C31730.c
View File

@ -400,7 +400,7 @@ EvtScript N(80243970) = {
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0)
EVT_CALL(func_80045900, 1) EVT_CALL(OnPlayerFled, 1)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

2
src/world/area_dgb/dgb_05/C3AA10.c
View File

@ -126,7 +126,7 @@ EvtScript N(802418C0) = {
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0)
EVT_CALL(func_80045900, 1) EVT_CALL(OnPlayerFled, 1)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

2
src/world/area_dgb/dgb_06/C3D080.c
View File

@ -88,7 +88,7 @@ EvtScript N(main) = {
#define CHEST_ITEM 19 #define CHEST_ITEM 19
#define CHEST_FLAG 1048 #define CHEST_FLAG 1048
#include "world/common/atomic/Chest.inc.c" #include "world/common/atomic/Chest.old.inc.c"
EvtScript N(makeEntities) = { EvtScript N(makeEntities) = {
EVT_CALL(MakeEntity, &Entity_Chest, -300, 50, -200, 0, 0, MAKE_ENTITY_END) EVT_CALL(MakeEntity, &Entity_Chest, -300, 50, -200, 0, 0, MAKE_ENTITY_END)

2
src/world/area_dgb/dgb_07/C3DBF0.c
View File

@ -103,7 +103,7 @@ EvtScript N(802417F0) = {
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0)
EVT_CALL(func_80045900, 1) EVT_CALL(OnPlayerFled, 1)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

2
src/world/area_dgb/dgb_08/C3FDB0.c
View File

@ -178,7 +178,7 @@ EvtScript N(802441D4) = {
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0)
EVT_CALL(func_80045900, 1) EVT_CALL(OnPlayerFled, 1)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

2
src/world/area_dgb/dgb_09/C46BE0.c
View File

@ -196,7 +196,7 @@ EvtScript N(80244000) = {
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0)
EVT_CALL(func_80045900, 1) EVT_CALL(OnPlayerFled, 1)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

2
src/world/area_dgb/dgb_12/C4DEF0.c
View File

@ -133,7 +133,7 @@ static s32 N(pad_868)[] = {
#define CHEST_ITEM 19 #define CHEST_ITEM 19
#define CHEST_FLAG 1057 #define CHEST_FLAG 1057
#include "world/common/atomic/Chest.inc.c" #include "world/common/atomic/Chest.old.inc.c"
EvtScript N(makeEntities) = { EvtScript N(makeEntities) = {
EVT_CALL(MakeEntity, &Entity_Chest, -225, 0, -245, 0, 0, MAKE_ENTITY_END) EVT_CALL(MakeEntity, &Entity_Chest, -225, 0, -245, 0, 0, MAKE_ENTITY_END)

2
src/world/area_dgb/dgb_15/C4F510.c
View File

@ -161,7 +161,7 @@ EvtScript N(80241EA0) = {
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0)
EVT_CALL(func_80045900, 1) EVT_CALL(OnPlayerFled, 1)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

2
src/world/area_dgb/dgb_16/C52540.c
View File

@ -118,7 +118,7 @@ EvtScript N(802417C0) = {
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0)
EVT_CALL(func_80045900, 1) EVT_CALL(OnPlayerFled, 1)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

4
src/world/area_dgb/dgb_18/C56EF0.c
View File

@ -1,7 +1,7 @@
#include "dgb_18.h" #include "dgb_18.h"
// replace below with: // replace below with:
// #include "world/common/atomic/Chest.inc.c" // #include "world/common/atomic/Chest.old.inc.c"
// after data is done // after data is done
#include "world/common/StashVars.inc.c" #include "world/common/StashVars.inc.c"
@ -10,4 +10,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

6
src/world/area_end/end_00/end_00_4_allies.c
View File

@ -39,13 +39,13 @@ EvtScript N(EVS_ParadePhase_Luigi) = {
}; };
EvtScript N(EVS_ParadePhase_Partners) = { EvtScript N(EVS_ParadePhase_Partners) = {
EVT_CALL(PlayEffect, EFFECT_CONFETTI, 3, -2545, 200, 0, 1, 800, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_CONFETTI, 3, -2545, 200, 0, 1, 800)
EVT_CALL(EnableNpcShadow, NPC_Goombario, FALSE) EVT_CALL(EnableNpcShadow, NPC_Goombario, FALSE)
EVT_CALL(EnableNpcShadow, NPC_Bombette, FALSE) EVT_CALL(EnableNpcShadow, NPC_Bombette, FALSE)
EVT_CHILD_THREAD EVT_CHILD_THREAD
EVT_LOOP(0) EVT_LOOP(0)
EVT_WAIT(25) EVT_WAIT(25)
EVT_CALL(PlayEffect, EFFECT_CONFETTI, 4, -2530, 95, 5, 1, 20, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_CONFETTI, 4, -2530, 95, 5, 1, 20)
EVT_WAIT(20) EVT_WAIT(20)
EVT_END_LOOP EVT_END_LOOP
EVT_END_CHILD_THREAD EVT_END_CHILD_THREAD
@ -109,7 +109,7 @@ EvtScript N(EVS_QuizCrew) = {
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(GetNpcPos, NPC_ChuckQuizmo, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_ChuckQuizmo, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 80) EVT_ADD(LVar1, 80)
EVT_CALL(PlayEffect, EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2)
EVT_CALL(SetNpcAnimation, NPC_VannaT, ANIM_VannaT_Clap) EVT_CALL(SetNpcAnimation, NPC_VannaT, ANIM_VannaT_Clap)
EVT_WAIT(60) EVT_WAIT(60)
EVT_CALL(SetNpcAnimation, NPC_ChuckQuizmo, ANIM_ChuckQuizmo_CloseHat) EVT_CALL(SetNpcAnimation, NPC_ChuckQuizmo, ANIM_ChuckQuizmo_CloseHat)

16
src/world/area_end/end_00/end_00_5_koopas.c
View File

@ -34,7 +34,7 @@ EvtScript N(EVS_KoopaBros_Red) = {
EVT_CALL(GetNpcPos, NPC_KoopaBrosRed, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_KoopaBrosRed, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 5) EVT_ADD(LVar0, 5)
EVT_ADD(LVar1, 30) EVT_ADD(LVar1, 30)
EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40)
EVT_WAIT(100) EVT_WAIT(100)
EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim20) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim20)
EVT_WAIT(60) EVT_WAIT(60)
@ -53,7 +53,7 @@ EvtScript N(EVS_KoopaBros_Black) = {
EVT_CALL(GetNpcPos, NPC_KoopaBrosBlack, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_KoopaBrosBlack, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, -5) EVT_ADD(LVar0, -5)
EVT_ADD(LVar1, 30) EVT_ADD(LVar1, 30)
EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40)
EVT_WAIT(95) EVT_WAIT(95)
EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim20) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim20)
EVT_WAIT(60) EVT_WAIT(60)
@ -72,7 +72,7 @@ EvtScript N(EVS_KoopaBros_Yellow) = {
EVT_CALL(GetNpcPos, NPC_KoopaBrosYellow, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_KoopaBrosYellow, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, 5) EVT_ADD(LVar0, 5)
EVT_ADD(LVar1, 30) EVT_ADD(LVar1, 30)
EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40)
EVT_WAIT(90) EVT_WAIT(90)
EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim20) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim20)
EVT_WAIT(60) EVT_WAIT(60)
@ -91,7 +91,7 @@ EvtScript N(EVS_KoopaBros_Green) = {
EVT_CALL(GetNpcPos, NPC_KoopaBrosGreen, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_KoopaBrosGreen, LVar0, LVar1, LVar2)
EVT_ADD(LVar0, -5) EVT_ADD(LVar0, -5)
EVT_ADD(LVar1, 30) EVT_ADD(LVar1, 30)
EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40)
EVT_WAIT(85) EVT_WAIT(85)
EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim20) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim20)
EVT_WAIT(60) EVT_WAIT(60)
@ -114,7 +114,7 @@ EvtScript N(EVS_Bobomb1) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim16) EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim16)
EVT_CALL(GetNpcPos, NPC_Bobomb1, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Bobomb1, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2)
EVT_CALL(EnableNpcShadow, NPC_Bobomb1, FALSE) EVT_CALL(EnableNpcShadow, NPC_Bobomb1, FALSE)
EVT_CALL(NpcFlyTo, NPC_Bobomb1, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) EVT_CALL(NpcFlyTo, NPC_Bobomb1, LVar0, 200, LVar2, 10, 0, EASING_LINEAR)
EVT_CALL(SetNpcPos, NPC_Bobomb1, -1870, 200, 40) EVT_CALL(SetNpcPos, NPC_Bobomb1, -1870, 200, 40)
@ -136,7 +136,7 @@ EvtScript N(EVS_Bobomb2) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim16) EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim16)
EVT_CALL(GetNpcPos, NPC_Bobomb2, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Bobomb2, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2)
EVT_CALL(EnableNpcShadow, NPC_Bobomb2, FALSE) EVT_CALL(EnableNpcShadow, NPC_Bobomb2, FALSE)
EVT_CALL(NpcFlyTo, NPC_Bobomb2, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) EVT_CALL(NpcFlyTo, NPC_Bobomb2, LVar0, 200, LVar2, 10, 0, EASING_LINEAR)
EVT_CALL(SetNpcPos, NPC_Bobomb2, -1860, 200, 13) EVT_CALL(SetNpcPos, NPC_Bobomb2, -1860, 200, 13)
@ -158,7 +158,7 @@ EvtScript N(EVS_Bobomb3) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim16) EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim16)
EVT_CALL(GetNpcPos, NPC_Bobomb3, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Bobomb3, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2)
EVT_CALL(EnableNpcShadow, NPC_Bobomb3, FALSE) EVT_CALL(EnableNpcShadow, NPC_Bobomb3, FALSE)
EVT_CALL(NpcFlyTo, NPC_Bobomb3, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) EVT_CALL(NpcFlyTo, NPC_Bobomb3, LVar0, 200, LVar2, 10, 0, EASING_LINEAR)
EVT_CALL(SetNpcPos, NPC_Bobomb3, -1840, 200, 13) EVT_CALL(SetNpcPos, NPC_Bobomb3, -1840, 200, 13)
@ -180,7 +180,7 @@ EvtScript N(EVS_Bobomb4) = {
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim16) EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim16)
EVT_CALL(GetNpcPos, NPC_Bobomb4, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Bobomb4, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2)
EVT_CALL(EnableNpcShadow, NPC_Bobomb4, FALSE) EVT_CALL(EnableNpcShadow, NPC_Bobomb4, FALSE)
EVT_CALL(NpcFlyTo, NPC_Bobomb4, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) EVT_CALL(NpcFlyTo, NPC_Bobomb4, LVar0, 200, LVar2, 10, 0, EASING_LINEAR)
EVT_CALL(SetNpcPos, NPC_Bobomb4, -1830, 200, 40) EVT_CALL(SetNpcPos, NPC_Bobomb4, -1830, 200, 40)

2
src/world/area_end/end_00/end_00_7_boos.c
View File

@ -213,7 +213,7 @@ EvtScript N(EVS_ParadePhase_GoombaKing) = {
EVT_END_IF EVT_END_IF
EVT_WAIT(1) EVT_WAIT(1)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, 0, LVar2)
EVT_CALL(SetNpcFlagBits, NPC_GoombaKing, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_GoombaKing, NPC_FLAG_GRAVITY, FALSE)
EVT_WAIT(60) EVT_WAIT(60)
EVT_THREAD EVT_THREAD

6
src/world/area_end/end_00/end_00_9_huff_n_puff.c
View File

@ -226,11 +226,11 @@ EvtScript N(EVS_YoshiKids) = {
EVT_EXEC(N(EVS_Puffs_Hurt)) EVT_EXEC(N(EVS_Puffs_Hurt))
EVT_THREAD EVT_THREAD
EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2)
EVT_CALL(GetNpcPos, NPC_TuffPuff1, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_TuffPuff1, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2)
EVT_CALL(GetNpcPos, NPC_TuffPuff2, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_TuffPuff2, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2)
EVT_CALL(MakeLerp, 750, 375, 5, EASING_LINEAR) EVT_CALL(MakeLerp, 750, 375, 5, EASING_LINEAR)
EVT_LOOP(0) EVT_LOOP(0)
EVT_CALL(UpdateLerp) EVT_CALL(UpdateLerp)

4
src/world/area_end/end_00/end_00_A_crystal_king.c
View File

@ -44,7 +44,7 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
EVT_WAIT(10) EVT_WAIT(10)
EVT_KILL_THREAD(LVarA) EVT_KILL_THREAD(LVarA)
EVT_CALL(GetNpcPos, NPC_TrueCrystalKing, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_TrueCrystalKing, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1)
EVT_CALL(SetNpcPos, NPC_TrueCrystalKing, 1800, 0, 0) EVT_CALL(SetNpcPos, NPC_TrueCrystalKing, 1800, 0, 0)
EVT_CALL(SetNpcYaw, NPC_TrueCrystalKing, 270) EVT_CALL(SetNpcYaw, NPC_TrueCrystalKing, 270)
EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim0E) EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim0E)
@ -91,7 +91,7 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = {
EVT_WAIT(10) EVT_WAIT(10)
EVT_KILL_THREAD(LVarB) EVT_KILL_THREAD(LVarB)
EVT_CALL(GetNpcPos, NPC_FakeCrystalKing, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_FakeCrystalKing, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1)
EVT_CALL(SetNpcPos, NPC_FakeCrystalKing, 0, -500, 0) EVT_CALL(SetNpcPos, NPC_FakeCrystalKing, 0, -500, 0)
EVT_CALL(SetNpcPos, NPC_Duplighost2, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_Duplighost2, LVar0, LVar1, LVar2)
EVT_CALL(SetNpcJumpscale, NPC_Duplighost2, EVT_FLOAT(0.5)) EVT_CALL(SetNpcJumpscale, NPC_Duplighost2, EVT_FLOAT(0.5))

28
src/world/area_end/end_00/end_00_B_bowser.c
View File

@ -29,9 +29,9 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 1930, 0, 0, 2160, 100, 0, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 1930, 0, 0, 2160, 100, 0, 10)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2160, 100, 0, 1930, 0, 0, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2160, 100, 0, 1930, 0, 0, 10)
EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) EVT_EXEC(N(EVS_JrTroopa_SpinningDodge))
EVT_CALL(NpcJump1, NPC_JrTroopa, 1890, 0, 0, 20) EVT_CALL(NpcJump1, NPC_JrTroopa, 1890, 0, 0, 20)
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
@ -39,7 +39,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2060, 60, 0, 1890, 0, 0, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2060, 60, 0, 1890, 0, 0, 10)
EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) EVT_EXEC(N(EVS_JrTroopa_SpinningDodge))
EVT_CALL(NpcJump1, NPC_JrTroopa, 2040, 0, 0, 20) EVT_CALL(NpcJump1, NPC_JrTroopa, 2040, 0, 0, 20)
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
@ -51,7 +51,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 1940, 60, 0, 2040, 0, 0, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 1940, 60, 0, 2040, 0, 0, 10)
EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) EVT_EXEC(N(EVS_JrTroopa_SpinningDodge))
EVT_CALL(NpcJump1, NPC_JrTroopa, 2160, 0, 0, 20) EVT_CALL(NpcJump1, NPC_JrTroopa, 2160, 0, 0, 20)
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle)
@ -59,19 +59,19 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2160, 0, 0, 1940, 60, 0, 20, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2160, 0, 0, 1940, 60, 0, 20)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14)
EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, 1940, 60, 0, EVT_FLOAT(0.5), 10, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 1940, 60, 0, EVT_FLOAT(0.5), 10)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcPos, NPC_Kammy, 0, -500, 0) EVT_CALL(SetNpcPos, NPC_Kammy, 0, -500, 0)
EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, 2100, 60, 0, EVT_FLOAT(0.5), 10, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 2100, 60, 0, EVT_FLOAT(0.5), 10)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcPos, NPC_Kammy, 2100, 60, 0) EVT_CALL(SetNpcPos, NPC_Kammy, 2100, 60, 0)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2100, 60, 0, 2160, 0, 0, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2100, 60, 0, 2160, 0, 0, 10)
EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) EVT_EXEC(N(EVS_JrTroopa_SpinningDodge))
EVT_CALL(NpcJump1, NPC_JrTroopa, 2100, 0, 0, 20) EVT_CALL(NpcJump1, NPC_JrTroopa, 2100, 0, 0, 20)
EVT_THREAD EVT_THREAD
@ -91,7 +91,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_WAIT(150) EVT_WAIT(150)
EVT_THREAD EVT_THREAD
EVT_WAIT(35) EVT_WAIT(35)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2040, 60, -20, 2180, 0, 20, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2040, 60, -20, 2180, 0, 20, 10)
EVT_WAIT(35) EVT_WAIT(35)
EVT_CALL(SetNpcPos, NPC_Kammy, 2390, 120, -20) EVT_CALL(SetNpcPos, NPC_Kammy, 2390, 120, -20)
EVT_CALL(NpcFlyTo, NPC_Kammy, 2440, 60, -20, 10, -10, EASING_LINEAR) EVT_CALL(NpcFlyTo, NPC_Kammy, 2440, 60, -20, 10, -10, EASING_LINEAR)
@ -105,7 +105,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2400, 0, 20, 2440, 60, -20, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2400, 0, 20, 2440, 60, -20, 10)
EVT_THREAD EVT_THREAD
EVT_CALL(NpcFlyTo, NPC_Kammy, 2300, 60, -20, 20, -10, EASING_LINEAR) EVT_CALL(NpcFlyTo, NPC_Kammy, 2300, 60, -20, 20, -10, EASING_LINEAR)
EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0) EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0)
@ -113,7 +113,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2300, 60, -20, 2390, 40, 0, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2300, 60, -20, 2390, 40, 0, 10)
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_WAIT(10) EVT_WAIT(10)
@ -125,10 +125,10 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff)
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff)
EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2480, 0, 20, 2390, 40, 0, 10, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2480, 0, 20, 2390, 40, 0, 10)
EVT_END_THREAD EVT_END_THREAD
EVT_WAIT(60) EVT_WAIT(60)
EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, 2390, 40, 5, EVT_FLOAT(5.0), 30, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 2390, 40, 5, EVT_FLOAT(5.0), 30)
EVT_THREAD EVT_THREAD
EVT_CALL(SetNpcAnimation, NPC_HammerBros1, ANIM_ParadeKoopas_Bowser_HammerBrosPanic) EVT_CALL(SetNpcAnimation, NPC_HammerBros1, ANIM_ParadeKoopas_Bowser_HammerBrosPanic)
EVT_CALL(NpcMoveTo, NPC_HammerBros1, 2180, 0, 30) EVT_CALL(NpcMoveTo, NPC_HammerBros1, 2180, 0, 30)
@ -170,7 +170,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = {
EVT_CALL(NpcMoveTo, NPC_BurntBowserPropeller, 2270, 0, 60) EVT_CALL(NpcMoveTo, NPC_BurntBowserPropeller, 2270, 0, 60)
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(NpcMoveTo, NPC_BurntBowser, 2270, 0, 60) EVT_CALL(NpcMoveTo, NPC_BurntBowser, 2270, 0, 60)
EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 0, 2270, 40, -5, 2280, 40, -5, 5, 2, 30, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, 2270, 40, -5, 2280, 40, -5, 5, 2, 30, 0, 0, 0)
EVT_WAIT(20) EVT_WAIT(20)
EVT_THREAD EVT_THREAD
EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim07) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim07)

2
src/world/area_end/end_01/end_01_4_opera_float.c
View File

@ -122,7 +122,7 @@ EvtScript N(EVS_MakeSpiritAppear) = {
EVT_SUB(LVar3, 120) EVT_SUB(LVar3, 120)
EVT_SET(LVar5, LVar3) EVT_SET(LVar5, LVar3)
EVT_ADD(LVar5, 15) EVT_ADD(LVar5, 15)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar2, LVar5, LVar4, 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar2, LVar5, LVar4, 30)
EVT_CALL(SetNpcPos, LVarA, LVar2, LVar3, LVar4) EVT_CALL(SetNpcPos, LVarA, LVar2, LVar3, LVar4)
EVT_CALL(N(UpdateStarSpiritRotation)) EVT_CALL(N(UpdateStarSpiritRotation))
EVT_RETURN EVT_RETURN

6
src/world/area_end/end_01/end_01_5_flower_float.c
View File

@ -58,8 +58,8 @@ EvtScript N(EVS_Amayze_Dayzees) = {
EVT_ADD(LVar4, 30) EVT_ADD(LVar4, 30)
EVT_SUB(LVar5, 2) EVT_SUB(LVar5, 2)
EVT_LOOP(0) EVT_LOOP(0)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30)
EVT_WAIT(15) EVT_WAIT(15)
EVT_END_LOOP EVT_END_LOOP
EVT_RETURN EVT_RETURN
@ -158,7 +158,7 @@ EvtScript N(EVS_ParadePhase_Wizards) = {
EVT_CALL(SetNpcAnimation, NPC_Merlow, ANIM_ParadeWizard_Merle_MerlowRelease) EVT_CALL(SetNpcAnimation, NPC_Merlow, ANIM_ParadeWizard_Merle_MerlowRelease)
EVT_CALL(SetNpcAnimation, NPC_Merlar, ANIM_ParadeWizard_Merle_MerlarRelease) EVT_CALL(SetNpcAnimation, NPC_Merlar, ANIM_ParadeWizard_Merle_MerlarRelease)
EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 6, LVar0, LVar1, LVar2, 1, 20, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 6, LVar0, LVar1, LVar2, 1, 20, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT(30) EVT_WAIT(30)
EVT_EXEC(N(EVS_Sun)) EVT_EXEC(N(EVS_Sun))
EVT_EXEC_GET_TID(N(EVS_TexPan_FlowerFloat_WisterwoodBody), LVarB) EVT_EXEC_GET_TID(N(EVS_TexPan_FlowerFloat_WisterwoodBody), LVarB)

6
src/world/area_flo/flo_13/CC3850.c
View File

@ -300,7 +300,7 @@ EvtScript N(802442B0) = {
EVT_CALL(SetSelfVar, 10, 100) EVT_CALL(SetSelfVar, 10, 100)
EVT_CALL(DoNpcDefeat) EVT_CALL(DoNpcDefeat)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(func_80045900, 0) EVT_CALL(OnPlayerFled, 0)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)
@ -733,7 +733,7 @@ EvtScript N(80245444) = {
EVT_ADD(LVar0, 30) EVT_ADD(LVar0, 30)
EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(3.5)) EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(3.5))
EVT_CALL(NpcMoveTo, 0, LVar0, 60, 0) EVT_CALL(NpcMoveTo, 0, LVar0, 60, 0)
EVT_CALL(N(UnkFunc41), 0, 8) EVT_CALL(N(ChangeNpcToPartner), 0, 8)
EVT_CALL(N(LoadPartyImage)) EVT_CALL(N(LoadPartyImage))
EVT_EXEC(N(802438CC)) EVT_EXEC(N(802438CC))
EVT_WAIT(15) EVT_WAIT(15)
@ -1242,7 +1242,7 @@ NpcGroupList N(npcGroupList_80247984) = {
{}, {},
}; };
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"
#define AI_LAKITU_FIRST_SPINY_ID 50 #define AI_LAKITU_FIRST_SPINY_ID 50
#define AI_LAKITU_LAST_SPINY_ID 55 #define AI_LAKITU_LAST_SPINY_ID 55

2
src/world/area_flo/flo_13/flo_13.h
View File

@ -9,7 +9,7 @@
#define NAMESPACE flo_13 #define NAMESPACE flo_13
ApiStatus N(func_80240000_CC3810)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CC3810)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall); ApiStatus N(ChangeNpcToPartner)(Evt* script, s32 isInitialCall);
ApiStatus N(LakituAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(LakituAI_Main)(Evt* script, s32 isInitialCall);
ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFunc42)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc42)(Evt* script, s32 isInitialCall);

2
src/world/area_flo/flo_17/CD7350.c
View File

@ -380,7 +380,7 @@ EvtScript N(80244590) = {
EVT_CALL(SetSelfVar, 10, 100) EVT_CALL(SetSelfVar, 10, 100)
EVT_CALL(DoNpcDefeat) EVT_CALL(DoNpcDefeat)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(func_80045900, 0) EVT_CALL(OnPlayerFled, 0)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(SetEnemyFlagBits, -1, 16, 1)
EVT_CALL(RemoveNpc, NPC_SELF) EVT_CALL(RemoveNpc, NPC_SELF)

2
src/world/area_hos/hos_06/A3B4B0.c
View File

@ -10,7 +10,7 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_8024228C_A3B76C); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_8024228C_A3B76C);

2
src/world/area_isk/isk_04/97BF60.c
View File

@ -5,7 +5,7 @@
#include "world/partners.h" #include "world/partners.h"
extern s32 D_80242288_97D8B8; extern s32 D_80242288_97D8B8;
// duplicate of func_802400C0_9BD720 // duplicate of SetupDemoScene from trd_09
ApiStatus func_8024095C_97BF8C(Evt* script, s32 isInitialCall) { ApiStatus func_8024095C_97BF8C(Evt* script, s32 isInitialCall) {
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;

2
src/world/area_isk/isk_09/9864E0.c
View File

@ -10,7 +10,7 @@ static char* N(exit_str_1) = "";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
ApiStatus func_802402BC_98679C(Evt* script, s32 isInitialCall) { ApiStatus func_802402BC_98679C(Evt* script, s32 isInitialCall) {
Entity* bigChest = get_entity_by_index(script->varTable[0]); Entity* bigChest = get_entity_by_index(script->varTable[0]);

2
src/world/area_iwa/iwa_03/918BB0.c
View File

@ -9,7 +9,7 @@ static char* N(exit_str_1) = "";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
ApiStatus func_802402BC_918E6C(Evt* script, s32 isInitialCall) { ApiStatus func_802402BC_918E6C(Evt* script, s32 isInitialCall) {
s32 result = -1; s32 result = -1;

2
src/world/area_iwa/iwa_10/91F5A0.c
View File

@ -1,6 +1,6 @@
#include "iwa_10.h" #include "iwa_10.h"
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"
#include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c"

2
src/world/area_jan/jan_04/B44AC0.c
View File

@ -6,4 +6,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_jan/jan_04/B44D80.c
View File

@ -1,3 +1,3 @@
#include "jan_04.h" #include "jan_04.h"
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"

2
src/world/area_kkj/kkj_17/AF1C60.c
View File

@ -13,7 +13,7 @@ static char* N(exit_str_1) = "";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
ApiStatus func_802402BC_AF1F1C(Evt* script, s32 isInitialCall) { ApiStatus func_802402BC_AF1F1C(Evt* script, s32 isInitialCall) {
PopupMenu *menu; PopupMenu *menu;

2
src/world/area_kkj/kkj_20/AFDB40.c
View File

@ -9,4 +9,4 @@ static char* N(exit_str_1) = "";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_kmr/kmr_02/8B0070.c
View File

@ -28,7 +28,7 @@ static char* N(exit_str_4) = "nok_02";
static char* N(exit_str_5) = "kmr_03"; static char* N(exit_str_5) = "kmr_03";
static char* N(exit_str_6) = "\0\0\0\0"; static char* N(exit_str_6) = "\0\0\0\0";
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084);

2
src/world/area_kmr/kmr_03/8C7F90.c
View File

@ -2,7 +2,7 @@
#include "message_ids.h" #include "message_ids.h"
#include "../../partners.h" #include "../../partners.h"
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"
#include "world/common/CheckPartnerFlags1000.inc.c" #include "world/common/CheckPartnerFlags1000.inc.c"

2
src/world/area_kmr/kmr_03/8C8140.c
View File

@ -135,7 +135,7 @@ EvtScript N(npcAI_80240B50) = {
EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(SpeakToPlayer, 0, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A8) EVT_CALL(SpeakToPlayer, 0, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A8)
EVT_CALL(N(UnkFunc41), 0, 5) EVT_CALL(N(ChangeNpcToPartner), 0, 5)
EVT_SET(GB_StoryProgress, -121) EVT_SET(GB_StoryProgress, -121)
EVT_CALL(UseSettingsFrom, 0, -220, 20, -72) EVT_CALL(UseSettingsFrom, 0, -220, 20, -72)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)

2
src/world/area_kmr/kmr_03/kmr_03.h
View File

@ -10,7 +10,7 @@
#define NAMESPACE kmr_03 #define NAMESPACE kmr_03
ApiStatus N(UnkPositionFunc)(Evt* script, s32 isInitialCall); ApiStatus N(UnkPositionFunc)(Evt* script, s32 isInitialCall);
ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall); ApiStatus N(ChangeNpcToPartner)(Evt* script, s32 isInitialCall);
ApiStatus N(func_802401B0_8C8140)(Evt* script, s32 isInitialCall); ApiStatus N(func_802401B0_8C8140)(Evt* script, s32 isInitialCall);
extern NpcGroupList N(npcGroupList_80241450); extern NpcGroupList N(npcGroupList_80241450);

2
src/world/area_kmr/kmr_10/8D84D0.c
View File

@ -9,7 +9,7 @@ static char* N(exit_str_1) = "mac_00";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
#ifdef NON_EQUIVALENT #ifdef NON_EQUIVALENT
// 0x1E4 is probably a linker constant. We need to learn more about animations, // 0x1E4 is probably a linker constant. We need to learn more about animations,

2
src/world/area_kpa/kpa_14/A57830.c
View File

@ -6,7 +6,7 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
#include "world/common/SetEntityFlags100000.inc.c" #include "world/common/SetEntityFlags100000.inc.c"

2
src/world/area_kpa/kpa_15/A596A0.c
View File

@ -6,4 +6,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_kzn/kzn_02/kzn_02_3_npc.c
View File

@ -107,7 +107,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = {
EVT_THREAD EVT_THREAD
EVT_LABEL(15) EVT_LABEL(15)
EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10)
EVT_CALL(GetSelfVar, 0, LVar3) EVT_CALL(GetSelfVar, 0, LVar3)
EVT_IF_EQ(LVar3, 1) EVT_IF_EQ(LVar3, 1)
EVT_WAIT(1) EVT_WAIT(1)

5
src/world/area_kzn/kzn_02/kzn_02_4_demo.c
View File

@ -51,7 +51,7 @@ EvtScript N(EVS_MonitorDemoState) = {
s32 N(DemoSceneState) = 0; s32 N(DemoSceneState) = 0;
API_CALLABLE(SetupDemoScene) { API_CALLABLE(N(SetupDemoScene)) {
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
switch (N(DemoSceneState)) { switch (N(DemoSceneState)) {
@ -76,8 +76,9 @@ API_CALLABLE(SetupDemoScene) {
return ApiStatus_BLOCK; return ApiStatus_BLOCK;
} }
EvtScript N(EVS_PlayDemoScene) = { EvtScript N(EVS_PlayDemoScene) = {
EVT_CALL(SetupDemoScene) EVT_CALL(N(SetupDemoScene))
EVT_SET(GF_DemoSceneDone, FALSE) EVT_SET(GF_DemoSceneDone, FALSE)
EVT_EXEC(N(EVS_MonitorDemoState)) EVT_EXEC(N(EVS_MonitorDemoState))
EVT_EXEC(N(EVS_ProvideDemoInputs)) EVT_EXEC(N(EVS_ProvideDemoInputs))

2
src/world/area_kzn/kzn_04/kzn_04_3_npc.c
View File

@ -37,7 +37,7 @@ EvtScript N(EVS_FireBar_Defeated) = {
EVT_CALL(RandInt, 30, LVar5) EVT_CALL(RandInt, 30, LVar5)
EVT_ADD(LVar1, LVar4) EVT_ADD(LVar1, LVar4)
EVT_ADD(LVar2, LVar5) EVT_ADD(LVar2, LVar5)
EVT_CALL(PlayEffect, EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2)
EVT_END_LOOP EVT_END_LOOP
EVT_IF_EQ(LVarA, NPC_FireBar_1A) EVT_IF_EQ(LVarA, NPC_FireBar_1A)
EVT_IF_EQ(AF_KZN04_FireBar1_Coins, FALSE) EVT_IF_EQ(AF_KZN04_FireBar1_Coins, FALSE)

2
src/world/area_kzn/kzn_08/kzn_08_2_entity.c
View File

@ -9,7 +9,7 @@ s32** N(varStash) = NULL;
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
EvtScript N(D_80244BB4_C76034) = { EvtScript N(D_80244BB4_C76034) = {
EVT_SET_GROUP(EVT_GROUP_00) EVT_SET_GROUP(EVT_GROUP_00)

12
src/world/area_kzn/kzn_10/kzn_10_2_extra.c
View File

@ -52,23 +52,23 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = {
EvtScript N(D_80241224_C7F3A4) = { EvtScript N(D_80241224_C7F3A4) = {
EVT_SET_GROUP(EVT_GROUP_0A) EVT_SET_GROUP(EVT_GROUP_0A)
EVT_LOOP(5) EVT_LOOP(5)
EVT_CALL(PlayEffect, EFFECT_DUST, 1, -430, 100, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 1, -430, 100, 0, 30)
EVT_WAIT(2) EVT_WAIT(2)
EVT_END_LOOP EVT_END_LOOP
EVT_LABEL(0) EVT_LABEL(0)
EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 100) EVT_ADD(LVar1, 100)
EVT_CALL(PlayEffect, EFFECT_DUST, 1, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 1, LVar0, LVar1, LVar2, 40)
EVT_WAIT(20) EVT_WAIT(20)
EVT_SUB(LVar0, 100) EVT_SUB(LVar0, 100)
EVT_ADD(LVar1, 50) EVT_ADD(LVar1, 50)
EVT_CALL(PlayEffect, EFFECT_DUST, 1, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 1, LVar0, LVar1, LVar2, 40)
EVT_WAIT(20) EVT_WAIT(20)
EVT_IF_EQ(AF_KZN_Tromp1_ShakingDone, FALSE) EVT_IF_EQ(AF_KZN_Tromp1_ShakingDone, FALSE)
EVT_GOTO(0) EVT_GOTO(0)
EVT_END_IF EVT_END_IF
EVT_LOOP(8) EVT_LOOP(8)
EVT_CALL(PlayEffect, EFFECT_DUST, 1, 400, -80, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 1, 400, -80, 0, 40)
EVT_WAIT(5) EVT_WAIT(5)
EVT_END_LOOP EVT_END_LOOP
EVT_RETURN EVT_RETURN
@ -124,7 +124,7 @@ EvtScript N(EVS_SetupSpinyTromp) = {
EVT_GOTO(10) EVT_GOTO(10)
EVT_END_IF EVT_END_IF
EVT_SUB(LVar2, 55) EVT_SUB(LVar2, 55)
EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, UNK_FUNC_50_LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, UNK_FUNC_50_LVar1, LVar2, 0)
EVT_EXEC(N(D_80241224_C7F3A4)) EVT_EXEC(N(D_80241224_C7F3A4))
EVT_THREAD EVT_THREAD
EVT_CALL(GetCurrentPartner, LVar0) EVT_CALL(GetCurrentPartner, LVar0)
@ -206,7 +206,7 @@ EvtScript N(EVS_SetupSpinyTromp) = {
EVT_SET(LVar0, 418) EVT_SET(LVar0, 418)
EVT_SET(LVar2, 0) EVT_SET(LVar2, 0)
EVT_CALL(N(UnkFunc46)) EVT_CALL(N(UnkFunc46))
EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar2, 0, 1, 20, 3, 8, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar2, 0, 1, 20, 3, 8)
EVT_END_THREAD EVT_END_THREAD
EVT_SET(LVar0, LVar8) EVT_SET(LVar0, LVar8)
EVT_SET(LVar1, LVar9) EVT_SET(LVar1, LVar9)

2
src/world/area_kzn/kzn_11/kzn_11_3_npc.c
View File

@ -38,7 +38,7 @@ EvtScript N(EVS_FireBar_Defeated) = {
EVT_CALL(RandInt, 30, LVar5) EVT_CALL(RandInt, 30, LVar5)
EVT_ADD(LVar1, LVar4) EVT_ADD(LVar1, LVar4)
EVT_ADD(LVar2, LVar5) EVT_ADD(LVar2, LVar5)
EVT_CALL(PlayEffect, EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2)
EVT_END_LOOP EVT_END_LOOP
EVT_IF_EQ(LVarA, NPC_FireBar_1A) EVT_IF_EQ(LVarA, NPC_FireBar_1A)
EVT_IF_EQ(AF_KZN11_FireBar1_Coins, FALSE) EVT_IF_EQ(AF_KZN11_FireBar1_Coins, FALSE)

2
src/world/area_kzn/kzn_17/kzn_17_4_extra.c
View File

@ -118,7 +118,7 @@ EvtScript N(EVS_SetupSpinyTromp) = {
EVT_KILL_THREAD(MV_ScreenShakeTID) EVT_KILL_THREAD(MV_ScreenShakeTID)
EVT_CALL(ModifyColliderFlags, 0, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, 0, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK)
EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_1E4, 0) EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_1E4, 0)
EVT_CALL(PlayEffect, EFFECT_BOMBETTE_BREAKING, 2, 32, 32, 1, 10, 45, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 2, 32, 32, 1, 10, 45)
EVT_CALL(EnableModel, MODEL_mae, FALSE) EVT_CALL(EnableModel, MODEL_mae, FALSE)
EVT_CALL(EnableModel, MODEL_ato, TRUE) EVT_CALL(EnableModel, MODEL_ato, TRUE)
EVT_THREAD EVT_THREAD

2
src/world/area_kzn/kzn_20/kzn_20_1_main.c
View File

@ -187,7 +187,7 @@ BombTrigger N(WeakWallBombTrigger) = {
}; };
EvtScript N(EVS_OnBreakWall) = { EvtScript N(EVS_OnBreakWall) = {
EVT_CALL(PlayEffect, EFFECT_BOMBETTE_BREAKING, 0, 2, 2, 1, 10, 30, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 2, 2, 1, 10, 30)
EVT_CALL(EnableGroup, MODEL_bom_mae, FALSE) EVT_CALL(EnableGroup, MODEL_bom_mae, FALSE)
EVT_CALL(EnableGroup, MODEL_bom_ato, TRUE) EVT_CALL(EnableGroup, MODEL_bom_ato, TRUE)
EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK)

6
src/world/area_kzn/kzn_20/kzn_20_2_npc.c
View File

@ -74,10 +74,10 @@ EvtScript N(EVS_SpawnFallingDust) = {
EVT_LOOP(0) EVT_LOOP(0)
EVT_CALL(RandInt, 100, LVar0) EVT_CALL(RandInt, 100, LVar0)
EVT_SUB(LVar0, 100) EVT_SUB(LVar0, 100)
EVT_CALL(PlayEffect, EFFECT_DUST, 1, LVar0, 350, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 1, LVar0, 350, 0, 60)
EVT_CALL(RandInt, 100, LVar0) EVT_CALL(RandInt, 100, LVar0)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(PlayEffect, EFFECT_DUST, 1, LVar0, 350, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 1, LVar0, 350, 0, 60)
EVT_WAIT(30) EVT_WAIT(30)
EVT_END_LOOP EVT_END_LOOP
EVT_RETURN EVT_RETURN
@ -309,7 +309,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar2, -10) EVT_ADD(LVar2, -10)
EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10)
EVT_IF_EQ(MV_SceneState, SCENE_STATE_KOLORADO_BURNED) EVT_IF_EQ(MV_SceneState, SCENE_STATE_KOLORADO_BURNED)
EVT_BREAK_LOOP EVT_BREAK_LOOP
EVT_END_IF EVT_END_IF

8
src/world/area_kzn/kzn_23/kzn_23_2_extra.c
View File

@ -182,19 +182,19 @@ EvtScript N(EVS_SpawnPyroclasts) = {
EVT_EXEC(N(EVS_PlayPyroclastSounds)) EVT_EXEC(N(EVS_PlayPyroclastSounds))
EVT_SWITCH(LVar0) EVT_SWITCH(LVar0)
EVT_CASE_EQ(0) EVT_CASE_EQ(0)
EVT_CALL(PlayEffect, EFFECT_65, 2, 50, 2650, -20, 1, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_65, 2, 50, 2650, -20, 1)
EVT_SET(LVarE, LVarF) EVT_SET(LVarE, LVarF)
EVT_CALL(LoadPath, 15, EVT_PTR(N(PyroclastPathA)), ARRAY_COUNT(N(PyroclastPathA)), EASING_QUADRATIC_OUT) EVT_CALL(LoadPath, 15, EVT_PTR(N(PyroclastPathA)), ARRAY_COUNT(N(PyroclastPathA)), EASING_QUADRATIC_OUT)
EVT_CASE_EQ(1) EVT_CASE_EQ(1)
EVT_CALL(PlayEffect, EFFECT_65, 2, -20, 2650, -20, 1, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_65, 2, -20, 2650, -20, 1)
EVT_SET(LVarE, LVarF) EVT_SET(LVarE, LVarF)
EVT_CALL(LoadPath, 10, EVT_PTR(N(PyroclastPathB)), ARRAY_COUNT(N(PyroclastPathB)), EASING_QUADRATIC_OUT) EVT_CALL(LoadPath, 10, EVT_PTR(N(PyroclastPathB)), ARRAY_COUNT(N(PyroclastPathB)), EASING_QUADRATIC_OUT)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_CALL(PlayEffect, EFFECT_65, 2, 10, 2650, -20, 1, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_65, 2, 10, 2650, -20, 1)
EVT_SET(LVarE, LVarF) EVT_SET(LVarE, LVarF)
EVT_CALL(LoadPath, 15, EVT_PTR(N(PyroclastPathC)), ARRAY_COUNT(N(PyroclastPathC)), EASING_QUADRATIC_OUT) EVT_CALL(LoadPath, 15, EVT_PTR(N(PyroclastPathC)), ARRAY_COUNT(N(PyroclastPathC)), EASING_QUADRATIC_OUT)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(PlayEffect, EFFECT_65, 2, -50, 2650, -20, 1, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_65, 2, -50, 2650, -20, 1)
EVT_SET(LVarE, LVarF) EVT_SET(LVarE, LVarF)
EVT_CALL(LoadPath, 20, EVT_PTR(N(PyroclastPathD)), ARRAY_COUNT(N(PyroclastPathD)), EASING_QUADRATIC_OUT) EVT_CALL(LoadPath, 20, EVT_PTR(N(PyroclastPathD)), ARRAY_COUNT(N(PyroclastPathD)), EASING_QUADRATIC_OUT)
EVT_END_SWITCH EVT_END_SWITCH

4
src/world/area_mac/mac_06/mac_06_3.c
View File

@ -2,8 +2,8 @@
#include "model.h" #include "model.h"
#include "effects.h" #include "effects.h"
#define CLONED_MODEL_GULL 11000 #define CLONED_MODEL_GULL CLONED_MODEL(1000)
#define CLONED_MODEL_UNUSED 10000 #define CLONED_MODEL_UNUSED CLONED_MODEL(0)
NpcSettings N(NpcSettings_Whale) = { NpcSettings N(NpcSettings_Whale) = {
.height = 24, .height = 24,

10
src/world/area_mgm/mgm_02/mgm_02.h
View File

@ -21,11 +21,11 @@ enum {
NPC_Fuzzy_03 = 12, NPC_Fuzzy_03 = 12,
NPC_Fuzzy_04 = 13, NPC_Fuzzy_04 = 13,
NPC_Fuzzy_05 = 14, NPC_Fuzzy_05 = 14,
NPC_Bombomb_01 = 30, NPC_Bobomb_01 = 30,
NPC_Bombomb_02 = 31, NPC_Bobomb_02 = 31,
NPC_Bombomb_03 = 32, NPC_Bobomb_03 = 32,
NPC_Bombomb_04 = 33, NPC_Bobomb_04 = 33,
NPC_Bombomb_05 = 34, NPC_Bobomb_05 = 34,
NPC_Luigi_01 = 100, NPC_Luigi_01 = 100,
NPC_Luigi_02 = 101, NPC_Luigi_02 = 101,
NPC_Luigi_03 = 102, NPC_Luigi_03 = 102,

72
src/world/area_mgm/mgm_02/mgm_02_2_npc.c
View File

@ -20,7 +20,7 @@ void partner_enable_input(void);
#define SMASH_DATA_VAR_IDX 0 #define SMASH_DATA_VAR_IDX 0
#define FUZZY_NPC_ID_BASE NPC_Fuzzy_01 #define FUZZY_NPC_ID_BASE NPC_Fuzzy_01
#define BOBOMB_NPC_ID_BASE NPC_Bombomb_01 #define BOBOMB_NPC_ID_BASE NPC_Bobomb_01
#define LUIGI_NPC_ID_BASE NPC_Luigi_01 #define LUIGI_NPC_ID_BASE NPC_Luigi_01
extern HudScript HES_BlueMeter; extern HudScript HES_BlueMeter;
@ -1030,7 +1030,7 @@ NpcSettings N(NpcSettings_Fuzzy) = {
.onDefeat = &EnemyNpcDefeat, .onDefeat = &EnemyNpcDefeat,
}; };
NpcSettings N(NpcSettings_Bombomb) = { NpcSettings N(NpcSettings_Bobomb) = {
.height = 23, .height = 23,
.radius = 20, .radius = 20,
.level = 6, .level = 6,
@ -1114,7 +1114,7 @@ EvtScript N(EVS_HideBoxWithSmoke) = {
EVT_WAIT(1) EVT_WAIT(1)
EVT_CALL(GetColliderCenter, LVar1) EVT_CALL(GetColliderCenter, LVar1)
EVT_SUB(LVar1, 5) EVT_SUB(LVar1, 5)
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };
@ -1472,7 +1472,7 @@ EvtScript N(EVS_OnHitBox) = {
EVT_SWITCH(LVarC) EVT_SWITCH(LVarC)
EVT_CASE_EQ(2) EVT_CASE_EQ(2)
EVT_ADD(LVar1, 2) EVT_ADD(LVar1, 2)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 25, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 25)
EVT_CASE_EQ(3) EVT_CASE_EQ(3)
EVT_CALL(TranslateModel, LVarA, 0, -9, 0) EVT_CALL(TranslateModel, LVarA, 0, -9, 0)
EVT_WAIT(1) EVT_WAIT(1)
@ -1484,11 +1484,11 @@ EvtScript N(EVS_OnHitBox) = {
EVT_CALL(ModifyColliderFlags, 0, LVarB, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, 0, LVarB, COLLIDER_FLAGS_UPPER_MASK)
EVT_WAIT(4) EVT_WAIT(4)
EVT_SUB(LVar1, 5) EVT_SUB(LVar1, 5)
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2)
EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(0)
EVT_CASE_OR_EQ(1) EVT_CASE_OR_EQ(1)
EVT_SUB(LVar1, 5) EVT_SUB(LVar1, 5)
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(EnableModel, LVarA, FALSE) EVT_CALL(EnableModel, LVarA, FALSE)
@ -1643,11 +1643,11 @@ EvtScript N(EVS_Toad_GovernGame) = {
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, TRUE)
EVT_CALL(N(CreateSignpost)) EVT_CALL(N(CreateSignpost))
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 355, 45, -175, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 355, 45, -175)
EVT_THREAD EVT_THREAD
EVT_CALL(SetNpcPos, NPC_Toad, 358, -20, 185) EVT_CALL(SetNpcPos, NPC_Toad, 358, -20, 185)
EVT_CALL(EnableNpcShadow, NPC_Toad, TRUE) EVT_CALL(EnableNpcShadow, NPC_Toad, TRUE)
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 358, 5, 189, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 358, 5, 189)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 0) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@ -1767,11 +1767,11 @@ EvtScript N(EVS_NpcInteract_Toad) = {
EVT_WAIT(25) EVT_WAIT(25)
EVT_THREAD EVT_THREAD
EVT_WAIT(12) EVT_WAIT(12)
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 358, -10, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 358, -10, 185)
EVT_CALL(SetNpcPos, NPC_Toad, 358, 500, 185) EVT_CALL(SetNpcPos, NPC_Toad, 358, 500, 185)
EVT_CALL(EnableNpcShadow, NPC_Toad, FALSE) EVT_CALL(EnableNpcShadow, NPC_Toad, FALSE)
EVT_CALL(N(DestroySignpost)) EVT_CALL(N(DestroySignpost))
EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 355, 30, -180, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 355, 30, -180)
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5)
EVT_CALL(PushSong, 133, 0) EVT_CALL(PushSong, 133, 0)
@ -1855,7 +1855,7 @@ EvtScript N(EVS_NpcInit_Fuzzy) = {
EVT_END EVT_END
}; };
EvtScript N(EVS_NpcInit_Bombomb) = { EvtScript N(EVS_NpcInit_Bobomb) = {
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bobomb_Anim0B) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bobomb_Anim0B)
EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 0, 0)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_JUMPING, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_JUMPING, TRUE)
@ -2063,13 +2063,13 @@ StaticNpc N(NpcData_Fuzzy_05) = {
.tattle = MSG_NpcTattle_MGM_SmashAttackGuide, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide,
}; };
StaticNpc N(NpcData_Bombomb_01) = { StaticNpc N(NpcData_Bobomb_01) = {
.id = NPC_Bombomb_01, .id = NPC_Bobomb_01,
.settings = &N(NpcSettings_Bombomb), .settings = &N(NpcSettings_Bobomb),
.pos = { NPC_DISPOSE_LOCATION }, .pos = { NPC_DISPOSE_LOCATION },
.yaw = 0, .yaw = 0,
.flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000,
.init = &N(EVS_NpcInit_Bombomb), .init = &N(EVS_NpcInit_Bobomb),
.drops = { .drops = {
.dropFlags = NPC_DROP_FLAGS_80, .dropFlags = NPC_DROP_FLAGS_80,
.heartDrops = NO_DROPS, .heartDrops = NO_DROPS,
@ -2096,13 +2096,13 @@ StaticNpc N(NpcData_Bombomb_01) = {
.tattle = MSG_NpcTattle_MGM_SmashAttackGuide, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide,
}; };
StaticNpc N(NpcData_Bombomb_02) = { StaticNpc N(NpcData_Bobomb_02) = {
.id = NPC_Bombomb_02, .id = NPC_Bobomb_02,
.settings = &N(NpcSettings_Bombomb), .settings = &N(NpcSettings_Bobomb),
.pos = { NPC_DISPOSE_LOCATION }, .pos = { NPC_DISPOSE_LOCATION },
.yaw = 0, .yaw = 0,
.flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000,
.init = &N(EVS_NpcInit_Bombomb), .init = &N(EVS_NpcInit_Bobomb),
.drops = { .drops = {
.dropFlags = NPC_DROP_FLAGS_80, .dropFlags = NPC_DROP_FLAGS_80,
.heartDrops = NO_DROPS, .heartDrops = NO_DROPS,
@ -2129,13 +2129,13 @@ StaticNpc N(NpcData_Bombomb_02) = {
.tattle = MSG_NpcTattle_MGM_SmashAttackGuide, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide,
}; };
StaticNpc N(NpcData_Bombomb_03) = { StaticNpc N(NpcData_Bobomb_03) = {
.id = NPC_Bombomb_03, .id = NPC_Bobomb_03,
.settings = &N(NpcSettings_Bombomb), .settings = &N(NpcSettings_Bobomb),
.pos = { NPC_DISPOSE_LOCATION }, .pos = { NPC_DISPOSE_LOCATION },
.yaw = 0, .yaw = 0,
.flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000,
.init = &N(EVS_NpcInit_Bombomb), .init = &N(EVS_NpcInit_Bobomb),
.drops = { .drops = {
.dropFlags = NPC_DROP_FLAGS_80, .dropFlags = NPC_DROP_FLAGS_80,
.heartDrops = NO_DROPS, .heartDrops = NO_DROPS,
@ -2162,13 +2162,13 @@ StaticNpc N(NpcData_Bombomb_03) = {
.tattle = MSG_NpcTattle_MGM_SmashAttackGuide, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide,
}; };
StaticNpc N(NpcData_Bombomb_04) = { StaticNpc N(NpcData_Bobomb_04) = {
.id = NPC_Bombomb_04, .id = NPC_Bobomb_04,
.settings = &N(NpcSettings_Bombomb), .settings = &N(NpcSettings_Bobomb),
.pos = { NPC_DISPOSE_LOCATION }, .pos = { NPC_DISPOSE_LOCATION },
.yaw = 0, .yaw = 0,
.flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000,
.init = &N(EVS_NpcInit_Bombomb), .init = &N(EVS_NpcInit_Bobomb),
.drops = { .drops = {
.dropFlags = NPC_DROP_FLAGS_80, .dropFlags = NPC_DROP_FLAGS_80,
.heartDrops = NO_DROPS, .heartDrops = NO_DROPS,
@ -2195,13 +2195,13 @@ StaticNpc N(NpcData_Bombomb_04) = {
.tattle = MSG_NpcTattle_MGM_SmashAttackGuide, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide,
}; };
StaticNpc N(NpcData_Bombomb_05) = { StaticNpc N(NpcData_Bobomb_05) = {
.id = NPC_Bombomb_05, .id = NPC_Bobomb_05,
.settings = &N(NpcSettings_Bombomb), .settings = &N(NpcSettings_Bobomb),
.pos = { NPC_DISPOSE_LOCATION }, .pos = { NPC_DISPOSE_LOCATION },
.yaw = 0, .yaw = 0,
.flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000,
.init = &N(EVS_NpcInit_Bombomb), .init = &N(EVS_NpcInit_Bobomb),
.drops = { .drops = {
.dropFlags = NPC_DROP_FLAGS_80, .dropFlags = NPC_DROP_FLAGS_80,
.heartDrops = NO_DROPS, .heartDrops = NO_DROPS,
@ -2558,11 +2558,11 @@ NpcGroupList N(DefaultNPCs) = {
NPC_GROUP(N(NpcData_Fuzzy_03)), NPC_GROUP(N(NpcData_Fuzzy_03)),
NPC_GROUP(N(NpcData_Fuzzy_04)), NPC_GROUP(N(NpcData_Fuzzy_04)),
NPC_GROUP(N(NpcData_Fuzzy_05)), NPC_GROUP(N(NpcData_Fuzzy_05)),
NPC_GROUP(N(NpcData_Bombomb_01)), NPC_GROUP(N(NpcData_Bobomb_01)),
NPC_GROUP(N(NpcData_Bombomb_02)), NPC_GROUP(N(NpcData_Bobomb_02)),
NPC_GROUP(N(NpcData_Bombomb_03)), NPC_GROUP(N(NpcData_Bobomb_03)),
NPC_GROUP(N(NpcData_Bombomb_04)), NPC_GROUP(N(NpcData_Bobomb_04)),
NPC_GROUP(N(NpcData_Bombomb_05)), NPC_GROUP(N(NpcData_Bobomb_05)),
NPC_GROUP(N(NpcData_Luigis)), NPC_GROUP(N(NpcData_Luigis)),
{} {}
}; };

2
src/world/area_nok/nok_04/9EDBF0.c
View File

@ -59,7 +59,7 @@ trees in this room are labeled with a 0 through 5 system, meaning there are "6"
static char* N(exit_str_0) = "nok_03"; static char* N(exit_str_0) = "nok_03";
static char* N(exit_str_1) = ""; static char* N(exit_str_1) = "";
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"
#include "common/UnkFloatFunc.inc.c" #include "common/UnkFloatFunc.inc.c"

2
src/world/area_obk/obk_07/BCEBF0.c
View File

@ -9,4 +9,4 @@ static char* N(exit_str_1) = "";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_obk/obk_09/BDA7B0.c
View File

@ -1,3 +1,3 @@
#include "obk_09.h" #include "obk_09.h"
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"

2
src/world/area_omo/omo_04/DAD400.c
View File

@ -9,7 +9,7 @@ static char* N(exit_str_1) = "";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c" #include "world/common/UnsetCamera0MoveFlag1.inc.c"

2
src/world/area_omo/omo_06/DB8180.c
View File

@ -6,4 +6,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_omo/omo_07/DC01D0.c
View File

@ -8,7 +8,7 @@ static char* N(exit_str_2) = "omo_07";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c" #include "world/common/UnsetCamera0MoveFlag1.inc.c"

2
src/world/area_omo/omo_09/DCD3F0.c
View File

@ -6,4 +6,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_omo/omo_12/DDF310.c
View File

@ -1,6 +1,6 @@
#include "omo_12.h" #include "omo_12.h"
#include "world/common/UnkFunc41.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c"
#include "world/common/atomic/DarkRoom.inc.c" #include "world/common/atomic/DarkRoom.inc.c"

2
src/world/area_omo/omo_13/DE36C0.c
View File

@ -6,4 +6,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_pra/pra_05/D55BD0.c
View File

@ -8,4 +8,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_pra/pra_11/D61520.c
View File

@ -8,4 +8,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_pra/pra_12/D62D10.c
View File

@ -10,4 +10,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10);
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_pra/pra_14/D67D20.c
View File

@ -8,4 +8,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_pra/pra_27/D799F0.c
View File

@ -10,4 +10,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0);
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_pra/pra_28/D7B2A0.c
View File

@ -10,4 +10,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0);
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_pra/pra_35/D8FBA0.c
View File

@ -6,4 +6,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

4
src/world/area_sam/sam_01/CF7E80.c
View File

@ -28,7 +28,7 @@ extern s32 N(LetterDelivery_SavedNpcAnim);
#include "common/GetItemEntityPosition.inc.c" #include "common/GetItemEntityPosition.inc.c"
#include "world/common/UnkTrigFunc001.inc.c" #include "world/common/GetLeftRightPoints.inc.c"
#define NAMESPACE dup_sam_01 #define NAMESPACE dup_sam_01
#include "world/common/StashVars.inc.c" #include "world/common/StashVars.inc.c"
@ -40,4 +40,4 @@ extern s32 N(LetterDelivery_SavedNpcAnim);
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_sam/sam_10/D37800.c
View File

@ -11,7 +11,7 @@ static char* N(exit_str_3) = "";
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402BC_D37ABC); INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402BC_D37ABC);

2
src/world/area_sbk/sbk_02/sbk_02_1_main.c
View File

@ -50,7 +50,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs)))
EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC_WAIT(N(EVS_MakeEntities))
EVT_IF_LT(GB_StoryProgress, STORY_CH2_UNCOVERED_DRY_DRY_RUINS) EVT_IF_LT(GB_StoryProgress, STORY_CH2_UNCOVERED_DRY_DRY_RUINS)
EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SUN)
EVT_SET(MV_Unk_00, LVarF) EVT_SET(MV_Unk_00, LVarF)
EVT_END_IF EVT_END_IF
EVT_IF_EQ(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) EVT_IF_EQ(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION)

44
src/world/area_sbk/sbk_02/sbk_02_2_ruins.c
View File

@ -60,8 +60,8 @@ s32 N(D_80241250_92B500)[] = {
}; };
EvtScript N(D_80241258_92B508) = { EvtScript N(D_80241258_92B508) = {
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 0, 0, 0, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 0, 0, 0, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, 0, 0, 0, 60)
EVT_CALL(PlaySoundAtCollider, COLLIDER_iwa, SOUND_5F, 0) EVT_CALL(PlaySoundAtCollider, COLLIDER_iwa, SOUND_5F, 0)
EVT_SET(LVar2, 0) EVT_SET(LVar2, 0)
EVT_CALL(MakeLerp, 0, -50, 50, EASING_LINEAR) EVT_CALL(MakeLerp, 0, -50, 50, EASING_LINEAR)
@ -298,8 +298,8 @@ EvtScript N(D_80241DE0_92C090) = {
EVT_LOOP(30) EVT_LOOP(30)
EVT_CALL(RandInt, 290, LVar0) EVT_CALL(RandInt, 290, LVar0)
EVT_ADD(LVar0, -110) EVT_ADD(LVar0, -110)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -35, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, LVar0, 0, -35, 60)
EVT_WAIT(10) EVT_WAIT(10)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -308,24 +308,24 @@ EvtScript N(D_80241DE0_92C090) = {
EVT_LOOP(15) EVT_LOOP(15)
EVT_CALL(RandInt, 180, LVar0) EVT_CALL(RandInt, 180, LVar0)
EVT_ADD(LVar0, 170) EVT_ADD(LVar0, 170)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -300, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, LVar0, 0, -300, 60)
EVT_WAIT(20) EVT_WAIT(20)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_WAIT(100) EVT_WAIT(100)
EVT_LOOP(5) EVT_LOOP(5)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, -180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, -180, 0, 260, 60)
EVT_WAIT(40) EVT_WAIT(40)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_WAIT(110) EVT_WAIT(110)
EVT_LOOP(4) EVT_LOOP(4)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, 180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, 180, 0, 260, 60)
EVT_WAIT(50) EVT_WAIT(50)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -365,8 +365,8 @@ EvtScript N(D_802422F0_92C5A0) = {
EVT_LOOP(10) EVT_LOOP(10)
EVT_CALL(RandInt, 290, LVar0) EVT_CALL(RandInt, 290, LVar0)
EVT_ADD(LVar0, -110) EVT_ADD(LVar0, -110)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -35, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, LVar0, 0, -35, 60)
EVT_WAIT(10) EVT_WAIT(10)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -375,23 +375,23 @@ EvtScript N(D_802422F0_92C5A0) = {
EVT_LOOP(5) EVT_LOOP(5)
EVT_CALL(RandInt, 180, LVar0) EVT_CALL(RandInt, 180, LVar0)
EVT_ADD(LVar0, 170) EVT_ADD(LVar0, 170)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -300, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, LVar0, 0, -300, 60)
EVT_WAIT(20) EVT_WAIT(20)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_LOOP(3) EVT_LOOP(3)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, -180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, -180, 0, 260, 60)
EVT_WAIT(40) EVT_WAIT(40)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_WAIT(10) EVT_WAIT(10)
EVT_LOOP(2) EVT_LOOP(2)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, 180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, 180, 0, 260, 60)
EVT_WAIT(50) EVT_WAIT(50)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -568,11 +568,11 @@ EvtScript N(D_80243310_92D5C0) = {
EVT_BREAK_LOOP EVT_BREAK_LOOP
EVT_END_IF EVT_END_IF
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 61, 2, -83, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 61, 2, -83, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, 61, 2, -83, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, 61, 2, -83, 60)
EVT_WAIT(3) EVT_WAIT(3)
EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -61, 2, -83, 20, 10, 0, 60, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, -61, 2, -83, 20, 10, 0, 60)
EVT_CALL(PlayEffect, EFFECT_DUST, 2, -61, 2, -83, 60, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_DUST, 2, -61, 2, -83, 60)
EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0))
EVT_RETURN EVT_RETURN
EVT_END EVT_END

12
src/world/area_sbk/sbk_02/sbk_02_3_npc.c
View File

@ -226,16 +226,16 @@ EvtScript N(D_80244330_92E5E0) = {
EVT_ADD(LVar2, 10) EVT_ADD(LVar2, 10)
EVT_ADD(LVar3, 30) EVT_ADD(LVar3, 30)
EVT_LOOP(5) EVT_LOOP(5)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20)
EVT_WAIT(6) EVT_WAIT(6)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20)
EVT_WAIT(6) EVT_WAIT(6)
EVT_END_LOOP EVT_END_LOOP
EVT_WAIT(20) EVT_WAIT(20)
EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 20) EVT_ADD(LVar1, 20)
EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30)
EVT_WAIT(30) EVT_WAIT(30)
EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002)
EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle)
@ -266,7 +266,7 @@ EvtScript N(D_80244330_92E5E0) = {
EVT_THREAD EVT_THREAD
EVT_LOOP(25) EVT_LOOP(25)
EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT(4) EVT_WAIT(4)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -336,7 +336,7 @@ EvtScript N(EVS_NpcInteract_Toad) = {
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0)
EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
EVT_SET(GF_TradingEvent2_Active, FALSE) EVT_SET(GF_TradingEvent2_Active, FALSE)
EVT_RETURN EVT_RETURN
@ -365,7 +365,7 @@ EvtScript N(EVS_NpcInteract_Toad) = {
EVT_WAIT(10) EVT_WAIT(10)
EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2)
EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0)
EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION)
EVT_SET(GF_TradingEvent2_Active, FALSE) EVT_SET(GF_TradingEvent2_Active, FALSE)
EVT_ADD(GB_TradingEvent_Count, 1) EVT_ADD(GB_TradingEvent_Count, 1)

6
src/world/area_sbk/sbk_20/sbk_20_2_entity.c
View File

@ -9,7 +9,7 @@ EvtScript N(EVS_OnHitInertBlock) = {
EVT_IF_EQ(GF_SBK20_ItemBlock_Mushroom, FALSE) EVT_IF_EQ(GF_SBK20_ItemBlock_Mushroom, FALSE)
EVT_CALL(PlaySound, SOUND_B) EVT_CALL(PlaySound, SOUND_B)
EVT_CALL(PlaySoundAt, SOUND_2108, 0, -80, 60, -200) EVT_CALL(PlaySoundAt, SOUND_2108, 0, -80, 60, -200)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -80, 73, -200, 10, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -80, 73, -200, 10)
EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -80, 60, -200, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -80, 60, -200, 0, ITEM_MUSHROOM, MAKE_ENTITY_END)
EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_Mushroom) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_Mushroom)
EVT_END_IF EVT_END_IF
@ -17,7 +17,7 @@ EvtScript N(EVS_OnHitInertBlock) = {
EVT_IF_EQ(GF_SBK20_ItemBlock_SuperShroom, FALSE) EVT_IF_EQ(GF_SBK20_ItemBlock_SuperShroom, FALSE)
EVT_CALL(PlaySound, SOUND_B) EVT_CALL(PlaySound, SOUND_B)
EVT_CALL(PlaySoundAt, SOUND_2108, 0, -180, 60, -200) EVT_CALL(PlaySoundAt, SOUND_2108, 0, -180, 60, -200)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -180, 73, -200, 10, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -180, 73, -200, 10)
EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -180, 60, -200, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -180, 60, -200, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END)
EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_SuperShroom) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_SuperShroom)
EVT_END_IF EVT_END_IF
@ -25,7 +25,7 @@ EvtScript N(EVS_OnHitInertBlock) = {
EVT_IF_EQ(GF_SBK20_ItemBlock_UltraShroom, FALSE) EVT_IF_EQ(GF_SBK20_ItemBlock_UltraShroom, FALSE)
EVT_CALL(PlaySound, SOUND_B) EVT_CALL(PlaySound, SOUND_B)
EVT_CALL(PlaySoundAt, SOUND_2108, 0, -130, 60, -150) EVT_CALL(PlaySoundAt, SOUND_2108, 0, -130, 60, -150)
EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -130, 73, -150, 10, 0, 0, 0, 0, 0, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -130, 73, -150, 10)
EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -130, 60, -150, 0, ITEM_ULTRA_SHROOM, MAKE_ENTITY_END) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -130, 60, -150, 0, ITEM_ULTRA_SHROOM, MAKE_ENTITY_END)
EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_UltraShroom) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_UltraShroom)
EVT_END_IF EVT_END_IF

2
src/world/area_tik/tik_02/86CA50.c
View File

@ -6,4 +6,4 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"

2
src/world/area_tik/tik_05/8750D0.c
View File

@ -11,7 +11,7 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
extern s16 Entity_ScriptSpring_AnimLaunch[]; extern s16 Entity_ScriptSpring_AnimLaunch[];

2
src/world/area_tik/tik_09/882BF0.c
View File

@ -2,4 +2,4 @@
#include "world/common/enemy/TackleAI.inc.c" #include "world/common/enemy/TackleAI.inc.c"
#include "world/common/GetDefeatedEnemyCount.inc.c" #include "world/common/util/GetDefeatedEnemyCount.inc.c"

2
src/world/area_tik/tik_12/8891C0.c
View File

@ -8,6 +8,6 @@
#include "world/common/SomeItemEntityFunc.inc.c" #include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c" #include "world/common/IsItemBadge.inc.c"
#include "world/common/atomic/SuperBlock.inc.c" #include "world/common/atomic/SuperBlock.inc.c"

22
src/world/area_trd/trd.h
View File

@ -21,12 +21,28 @@ enum {
}; };
enum { enum {
AF_TRD_04 = AreaFlag(4), AF_TRD01_RaiseStairs = AreaFlag(1),
AF_TRD08_FireBar1_Coins = AreaFlag(11), AF_TRD02_LowerStairs = AreaFlag(2),
AF_TRD08_FireBar2_Coins = AreaFlag(12), AF_TRD04_LowerStairs = AreaFlag(4),
AF_TRD_MetPrisoner1 = AreaFlag(6),
AF_TRD_MetPrisoner2 = AreaFlag(7),
AF_TRD_MetPrisoner3 = AreaFlag(8),
AF_TRD_MetPrisoner4 = AreaFlag(9),
AF_TRD08_FireBar1_Coins = AreaFlag(11),
AF_TRD08_FireBar2_Coins = AreaFlag(12),
AF_TRD_FakeBowserRevealed = AreaFlag(13),
}; };
extern MapSettings trd_00_settings;
extern MapSettings trd_01_settings;
extern MapSettings trd_02_settings;
extern MapSettings trd_03_settings;
extern MapSettings trd_04_settings; extern MapSettings trd_04_settings;
extern MapSettings trd_05_settings;
extern MapSettings trd_06_settings;
extern MapSettings trd_07_settings;
extern MapSettings trd_08_settings; extern MapSettings trd_08_settings;
extern MapSettings trd_09_settings;
extern MapSettings trd_10_settings;
#endif #endif

9
src/world/area_trd/trd_00/999C70.c
View File

@ -1,9 +0,0 @@
#include "trd_00.h"
static char* N(exit_str_0) = "nok_15";
static char* N(exit_str_1) = "trd_01";
static char* N(exit_str_2) = "trd_05";
static char* N(exit_str_3) = "";
#include "world/common/atomic/TexturePan.inc.c"

9
src/world/area_trd/trd_00/999F80.c
View File

@ -1,9 +0,0 @@
#include "trd_00.h"
#include "world/common/StashVars.inc.c"
#include "world/common/GetItemName.inc.c"
#include "world/common/SomeItemEntityFunc.inc.c"
#include "world/common/CheckItemFlags40.inc.c"

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