diff --git a/include/common_structs.h b/include/common_structs.h index d86b9fdd23..9f1ca7793f 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -416,7 +416,7 @@ typedef union X32 { } X32; typedef struct Evt { - /* 0x000 */ u8 state; + /* 0x000 */ u8 stateFlags; /* 0x001 */ u8 currentArgc; /* 0x002 */ u8 currentOpcode; /* 0x003 */ u8 priority; @@ -1514,7 +1514,7 @@ typedef struct SelectableTarget { } SelectableTarget; // size = 0x14 typedef struct ActorPartMovement { - /* 0x00 */ Vec3f unk_00; + /* 0x00 */ Vec3f absolutePosition; /* 0x0C */ Vec3f goalPos; /* 0x18 */ Vec3f unk_18; /* 0x24 */ f32 jumpScale; diff --git a/include/enums.h b/include/enums.h index 66d098ec4e..a30cf51382 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3381,7 +3381,7 @@ enum PlayerStatusAnimFlags { PA_FLAGS_SHIVERING = 0x00000400, PA_FLAGS_OPENED_HIDDEN_PANEL = 0x00000800, PA_FLAGS_USING_PEACH_PHYSICS = 0x00001000, - PA_FLAGS_IN_DISGUISE = 0x00002000, + PA_FLAGS_INVISIBLE = 0x00002000, PA_FLAGS_8BIT_MARIO = 0x00004000, PA_FLAGS_NPC_COLLIDED = 0x00008000, PA_FLAGS_SPINNING = 0x00010000, @@ -4437,37 +4437,11 @@ enum ProjectileHitboxAttackStates { enum MusicSettingsFlags { MUSIC_SETTINGS_FLAGS_1 = 0x00000001, - MUSIC_SETTINGS_FLAGS_2 = 0x00000002, + MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX = 0x00000002, MUSIC_SETTINGS_FLAGS_4 = 0x00000004, MUSIC_SETTINGS_FLAGS_8 = 0x00000008, MUSIC_SETTINGS_FLAGS_10 = 0x00000010, MUSIC_SETTINGS_FLAGS_20 = 0x00000020, - MUSIC_SETTINGS_FLAGS_40 = 0x00000040, - MUSIC_SETTINGS_FLAGS_80 = 0x00000080, - MUSIC_SETTINGS_FLAGS_100 = 0x00000100, - MUSIC_SETTINGS_FLAGS_200 = 0x00000200, - MUSIC_SETTINGS_FLAGS_400 = 0x00000400, - MUSIC_SETTINGS_FLAGS_800 = 0x00000800, - MUSIC_SETTINGS_FLAGS_1000 = 0x00001000, - MUSIC_SETTINGS_FLAGS_2000 = 0x00002000, - MUSIC_SETTINGS_FLAGS_4000 = 0x00004000, - MUSIC_SETTINGS_FLAGS_8000 = 0x00008000, - MUSIC_SETTINGS_FLAGS_10000 = 0x00010000, - MUSIC_SETTINGS_FLAGS_20000 = 0x00020000, - MUSIC_SETTINGS_FLAGS_40000 = 0x00040000, - MUSIC_SETTINGS_FLAGS_80000 = 0x00080000, - MUSIC_SETTINGS_FLAGS_100000 = 0x00100000, - MUSIC_SETTINGS_FLAGS_200000 = 0x00200000, - MUSIC_SETTINGS_FLAGS_400000 = 0x00400000, - MUSIC_SETTINGS_FLAGS_800000 = 0x00800000, - MUSIC_SETTINGS_FLAGS_1000000 = 0x01000000, - MUSIC_SETTINGS_FLAGS_2000000 = 0x02000000, - MUSIC_SETTINGS_FLAGS_4000000 = 0x04000000, - MUSIC_SETTINGS_FLAGS_8000000 = 0x08000000, - MUSIC_SETTINGS_FLAGS_10000000 = 0x10000000, - MUSIC_SETTINGS_FLAGS_20000000 = 0x20000000, - MUSIC_SETTINGS_FLAGS_40000000 = 0x40000000, - MUSIC_SETTINGS_FLAGS_80000000 = 0x80000000, }; // the lower byte of Collider::flags diff --git a/include/functions.h b/include/functions.h index 94b1986192..5e1a8b09ec 100644 --- a/include/functions.h +++ b/include/functions.h @@ -939,7 +939,7 @@ void func_800E9810(void); void func_800E983C(void); void func_800E984C(void); s32 func_800E9860(void); -void func_800E98C4(void); +void status_menu_respond_to_changes(void); void func_800E98EC(void); void func_800E9900(void); void func_800F0C9C(void); @@ -981,7 +981,7 @@ void func_8025DA60(ActorPart*, s32); void func_8025DBC8(ActorPart*, s32); void func_8025DD40(ActorPart*, s32); void func_8025DE88(ActorPart*, s32); -void func_800E9894(void); +void status_menu_ignore_changes(void); void func_8013A854(u32); void set_script_flags(Evt* script, s32 flags); diff --git a/include/macros.h b/include/macros.h index 3b788bbdb9..1ea95ec35b 100644 --- a/include/macros.h +++ b/include/macros.h @@ -16,9 +16,10 @@ #define ALIGN16(val) (((val) + 0xF) & ~0xF) #define ALIGN8(val) (((val) + 0x7) & ~0x7) -#define NAMESUFFIX -#define A(sym) NS(AREA, sym, NAMESUFFIX) -#define N(sym) NS(NAMESPACE, sym, NAMESUFFIX) +#define NAME_SUFFIX +#define NAME_PREFIX +#define A(sym) NS(AREA, NAME_PREFIX, sym, NAME_SUFFIX) +#define N(sym) NS(NAMESPACE, NAME_PREFIX, sym, NAME_SUFFIX) #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) @@ -76,6 +77,8 @@ #define MAX_TEX_PANNERS 16 #define MAX_ITEM_ENTITIES 256 +#define MAX_STAR_PIECES 222 + #define SCREEN_WIDTH 320 #define SCREEN_HEIGHT 240 @@ -132,8 +135,8 @@ /// X.10 fixed-point literal #define X10(f) (s32)(f * 1024.0f) -#define _NS(x, y, z) x ## _ ## y ## z -#define NS(x, y, z) _NS(x, y, z) +#define _NS(w, x, y, z) w ## _ ## x ## y ## z +#define NS(w, x, y, z) _NS(w, x, y, z) #define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0))) diff --git a/include/map.h b/include/map.h index 532a9287a1..df605d0868 100644 --- a/include/map.h +++ b/include/map.h @@ -53,14 +53,9 @@ typedef struct MapConfig { /* 0x10 */ void* dmaDest; /* 0x14 */ char* bgName; /* 0x18 */ MapInit init; ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading. - /* 0x1C */ union { - u32 word; - struct { - char unk_1C[0x2]; - s8 songVariation; ///< 0 or 1. @see bgm_get_map_default_variation - s8 flags; - } bytes; - } unk_1C; + /* 0x1C */ char unk_1C[0x2]; + /* 0x1E */ s8 songVariation; ///< 0 or 1. @see bgm_get_map_default_variation + /* 0x1F */ s8 sfxReverb; } MapConfig; // size = 0x20 typedef struct AreaConfig { diff --git a/include/npc.h b/include/npc.h index ac3e4c4aba..c409e3917c 100644 --- a/include/npc.h +++ b/include/npc.h @@ -22,10 +22,10 @@ } #define GENEROUS_HEART_DROPS(attempts) { \ - { F16(20), F16(80), attempts, F16(50) } \ - { F16(30), F16(70), attempts, F16(50) } \ - { F16(50), F16(60), attempts, F16(40) } \ - { F16(80), F16(50), attempts, F16(40) } \ + { F16(20), F16(80), attempts, F16(50) }, \ + { F16(30), F16(70), attempts, F16(50) }, \ + { F16(50), F16(60), attempts, F16(40) }, \ + { F16(80), F16(50), attempts, F16(40) }, \ { F16(100), F16(40), attempts, F16(30) }, \ } diff --git a/include/saved_byte_names.h b/include/saved_byte_names.h index 1049de5e79..65f0b67c0e 100644 --- a/include/saved_byte_names.h +++ b/include/saved_byte_names.h @@ -316,37 +316,37 @@ enum GameBytes { GB_Unused_KPA_0F = GameByte(0x138), GB_Unused_KPA_10 = GameByte(0x139), GB_Unused_KPA_11 = GameByte(0x13A), - GB_Unused_END_00 = GameByte(0x13B), - GB_Unused_END_01 = GameByte(0x13C), - GB_Unused_END_02 = GameByte(0x13D), - GB_Unused_END_03 = GameByte(0x13E), - GB_Unused_END_04 = GameByte(0x13F), - GB_Unused_END_05 = GameByte(0x140), - GB_Unused_END_06 = GameByte(0x141), - GB_Unused_END_07 = GameByte(0x142), - GB_Unused_END_08 = GameByte(0x143), - GB_Unused_END_09 = GameByte(0x144), - GB_Unused_END_0A = GameByte(0x145), - GB_Unused_END_0B = GameByte(0x146), - GB_Unused_END_0C = GameByte(0x147), - GB_Unused_END_0D = GameByte(0x148), - GB_Unused_END_0E = GameByte(0x149), - GB_Unused_END_0F = GameByte(0x14A), - GB_Unused_END_10 = GameByte(0x14B), - GB_Unused_END_11 = GameByte(0x14C), - GB_Unused_END_12 = GameByte(0x14D), - GB_Unused_END_13 = GameByte(0x14E), - GB_Unused_END_14 = GameByte(0x14F), - GB_Unused_OSR_00 = GameByte(0x150), - GB_Unused_BAT_00 = GameByte(0x151), - GB_Unused_BAT_01 = GameByte(0x152), - GB_Unused_BAT_02 = GameByte(0x153), - GB_Unused_BAT_03 = GameByte(0x154), - GB_Unused_BAT_04 = GameByte(0x155), - GB_Unused_BAT_05 = GameByte(0x156), - GB_Unused_BAT_06 = GameByte(0x157), - GB_Unused_BAT_07 = GameByte(0x158), - GB_Unused_BAT_08 = GameByte(0x159), + GB_Unused_OSR_00 = GameByte(0x13B), + GB_Unused_OSR_01 = GameByte(0x13C), + GB_Unused_OSR_02 = GameByte(0x13D), + GB_Unused_OSR_03 = GameByte(0x13E), + GB_Unused_OSR_04 = GameByte(0x13F), + GB_Unused_OSR_05 = GameByte(0x140), + GB_Unused_OSR_06 = GameByte(0x141), + GB_Unused_OSR_07 = GameByte(0x142), + GB_Unused_OSR_08 = GameByte(0x143), + GB_Unused_OSR_09 = GameByte(0x144), + GB_Unused_END_00 = GameByte(0x145), + GB_Unused_END_01 = GameByte(0x146), + GB_Unused_END_02 = GameByte(0x147), + GB_Unused_END_03 = GameByte(0x148), + GB_Unused_END_04 = GameByte(0x149), + GB_Unused_END_05 = GameByte(0x14A), + GB_Unused_END_06 = GameByte(0x14B), + GB_Unused_END_07 = GameByte(0x14C), + GB_Unused_END_08 = GameByte(0x14D), + GB_Unused_END_09 = GameByte(0x14E), + GB_Unused_END_0A = GameByte(0x14F), + GB_Unused_BAT_00 = GameByte(0x150), + GB_Unused_BAT_01 = GameByte(0x151), + GB_Unused_BAT_02 = GameByte(0x152), + GB_Unused_BAT_03 = GameByte(0x153), + GB_Unused_BAT_04 = GameByte(0x154), + GB_Unused_BAT_05 = GameByte(0x155), + GB_Unused_BAT_06 = GameByte(0x156), + GB_Unused_BAT_07 = GameByte(0x157), + GB_Unused_BAT_08 = GameByte(0x158), + GB_Unused_BAT_09 = GameByte(0x159), GB_KootFavor_State = GameByte(0x15A), ///< 0 = none, 1 = rejected, 2 = accepted GB_KootFavor_Completed = GameByte(0x15B), GB_KootFavor_Current = GameByte(0x15C), ///< 0 if none active diff --git a/include/script_api/common.h b/include/script_api/common.h index 70eca08cfb..7467f0527b 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -46,6 +46,7 @@ ApiStatus ClearDefeatedEnemies(Evt* script, s32 isInitialCall); ApiStatus SetEnemyFlagBits(Evt* script, s32 isInitialCall); ApiStatus GetSelfAnimationFromTable(Evt* script, s32 isInitialCall); ApiStatus func_800457F8(Evt* script, s32 isInitialCall); +ApiStatus func_800457C4(Evt* script, s32 isInitialCall); ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall); ApiStatus MakeEntity(Evt* script, s32 isInitialCall); ApiStatus SetEntityCullMode(Evt* script, s32 isInitialCall); @@ -154,6 +155,7 @@ ApiStatus EnablePartnerAI(Evt* script, s32 isInitialCall); ApiStatus BringPartnerOut(Evt* script, s32 isInitialCall); ApiStatus PutPartnerAway(Evt* script, s32 isInitialCall); ApiStatus GetCurrentPartnerID(Evt* script, s32 isInitialCall); +ApiStatus PartnerCanUseAbility(Evt* script, s32 isInitialCall); ApiStatus PartnerIsFlying(Evt* script, s32 isInitialCall); ApiStatus SetNpcDecoration(Evt* script, s32 isInitialCall); ApiStatus PlaySoundAtNpc(Evt* script, s32 isInitialCall); @@ -231,6 +233,7 @@ ApiStatus ClampAngleFloat(Evt* script, s32 isInitialCall); ApiStatus FadeOutMusic(Evt* script, s32 isInitialCall); ApiStatus SetMusicTrack(Evt* script, s32 isInitialCall); ApiStatus FadeInMusic(Evt* script, s32 isInitialCall); +ApiStatus EnableMusicProximityMix(Evt* script, s32 isInitialCall); ApiStatus SetMusicTrackVolumes(Evt* script, s32 isInitialCall); ApiStatus ClearAmbientSounds(Evt* script, s32 isInitialCall); ApiStatus PlayAmbientSounds(Evt* script, s32 isInitialCall); @@ -319,6 +322,7 @@ ApiStatus PopSong(Evt* script, s32 isInitialCall); ApiStatus func_802D62E4(Evt* script, s32 isInitialCall); ApiStatus func_80044238(Evt* script, s32 isInitialCall); ApiStatus MakeLocalVertexCopy(Evt* script, s32 isInitialCall); +ApiStatus SetCustomGfx(Evt* script, s32 isInitialCall); ApiStatus SetCustomGfxBuilders(Evt* script, s32 isInitialCall); ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall); ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index 0477143673..bd7bcf19c9 100644 --- a/include/variables.h +++ b/include/variables.h @@ -122,12 +122,13 @@ extern s16 D_8009A6A4; extern s16 D_8009A6A6; extern s8 D_800A0920; -extern s32 D_800A0924; +extern s32 SavedReverbMode; extern s8 D_800A0921; extern s16 D_800A0922; extern char wMapTexName[]; extern char wMapHitName[]; extern char wMapShapeName[]; +extern char wMapBgName[]; extern struct ShapeFile* D_80210000; // shouldnt be a pointer extern u8 D_802D9D70; // player alpha1 copy? extern u8 D_802D9D71; // player alpha2 copy? diff --git a/src/16F740.c b/src/16F740.c index 28bca99ccc..60144f86e4 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -352,8 +352,8 @@ void btl_state_update_normal_start(void) { actor->unk_208 = 0; if (i == 0) { actor->unk_208 = currentEncounter->unk_10; - if (currentEncounter->dizzyAttackStatus == 4) { - inflict_status_set_duration(actor, 4, 0x24, currentEncounter->dizzyAttackDuration); + if (currentEncounter->dizzyAttackStatus == STATUS_DIZZY) { + inflict_status_set_duration(actor, STATUS_DIZZY, STATUS_DIZZY_TURN_MOD, currentEncounter->dizzyAttackDuration); } } } @@ -368,8 +368,8 @@ void btl_state_update_normal_start(void) { actor->unk_208 = 0; if (i == 0) { actor->unk_208 = 0; - if (currentEncounter->dizzyAttackStatus == 4) { - inflict_status_set_duration(actor, 4, 0x24, currentEncounter->dizzyAttackDuration); + if (currentEncounter->dizzyAttackStatus == STATUS_DIZZY) { + inflict_status_set_duration(actor, STATUS_DIZZY, STATUS_DIZZY_TURN_MOD, currentEncounter->dizzyAttackDuration); } } @@ -379,9 +379,9 @@ void btl_state_update_normal_start(void) { load_player_actor(); actor = battleStatus->playerActor; if (gBattleStatus.flags2 & 0x40) { - script = start_script(D_80284A30, 0xA, 0); + script = start_script(D_80284A30, EVT_PRIORITY_A, 0); } else { - script = start_script(D_80284A20, 0xA, 0); + script = start_script(D_80284A20, EVT_PRIORITY_A, 0); } actor->takeTurnScript = script; actor->takeTurnID = script->id; diff --git a/src/1A5830.c b/src/1A5830.c index d40ce8a552..3221c5b610 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -1001,14 +1001,121 @@ ApiStatus BindNextTurn(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "1A5830", JumpToGoal); +ApiStatus JumpToGoal(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Actor* actor; + ActorState* actorState; + s32 actorID; + f32 posX, posY, posZ; + f32 goalX, goalY, goalZ; + f32 moveDist; + + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + if (script->functionTemp[0] == 0) { + actorID = evt_get_variable(script, *args++); + if (actorID == ACTOR_SELF) { + actorID = script->owner1.enemyID; + } + script->functionTempPtr[1] = actor = get_actor(actorID); + actorState = &actor->state; + actor->state.moveTime = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + script->functionTemp[3] = 0; + if (evt_get_variable(script, *args++) != 0) { + script->functionTemp[3] |= 1; + } + if (evt_get_variable(script, *args++) != 0) { + script->functionTemp[3] |= 2; + } + + actor->state.currentPos.x = actor->currentPos.x; + actor->state.currentPos.y = actor->currentPos.y; + actor->state.currentPos.z = actor->currentPos.z; + + posX = actor->state.currentPos.x; + posY = actor->state.currentPos.y; + posZ = actor->state.currentPos.z; + goalX = actor->state.goalPos.x; + goalY = actor->state.goalPos.y; + goalZ = actor->state.goalPos.z; + actor->state.angle = atan2(posX, posZ, goalX, goalZ); + actor->state.distance = dist2D(posX, posZ, goalX, goalZ); + + // make relative + posX = (goalX - posX); + posY = (goalY - posY); + posZ = (goalZ - posZ); + + if (actor->state.moveTime == 0) { + actor->state.moveTime = actor->state.distance / actor->state.speed; + moveDist = actor->state.distance - (actor->state.moveTime * actor->state.speed); + } else { + actor->state.speed = actor->state.distance / actor->state.moveTime; + moveDist = actor->state.distance - (actor->state.moveTime * actor->state.speed); + } + + if (actorState->moveTime == 0) { + return ApiStatus_DONE2; + } + + actorState->velocity = (actorState->acceleration * actorState->moveTime * 0.5f) + (posY / actorState->moveTime); + actorState->speed += (moveDist / actorState->moveTime); + + if (script->functionTemp[2] != 0) { + set_animation(actor->actorID, (s8) actor->state.jumpPartIndex, actor->state.animJumpRise); + } + if (!(script->functionTemp[3] & 2) && (actor->actorTypeData1[4] != 0)) { + sfx_play_sound_at_position(actor->actorTypeData1[4], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); + } + script->functionTemp[0] = 1; + } + + actor = script->functionTempPtr[1]; + actorState = &actor->state; + + actor->state.currentPos.y += actor->state.velocity; + actor->state.velocity -= actor->state.acceleration; + + if ((script->functionTemp[2] != 0) && (actor->state.velocity < 0.0f)) { + set_animation(actor->actorID, (s8) actor->state.jumpPartIndex, actor->state.animJumpFall); + } + if (actorState->velocity < 0.0f) { + if (actorState->currentPos.y < actorState->goalPos.y) { + actorState->currentPos.y = actorState->goalPos.y; + } + } + + add_xz_vec3f(&actorState->currentPos, actorState->speed, actorState->angle); + actor->currentPos.x = actorState->currentPos.x; + actor->currentPos.y = actorState->currentPos.y; + actor->currentPos.z = actorState->currentPos.z; + + actorState->moveTime--; + if (actorState->moveTime > 0) { + return ApiStatus_BLOCK; + } + + if (script->functionTemp[3] & 1) { + play_movement_dust_effects(2, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z, actorState->angle); + } + actor->currentPos.x = actorState->goalPos.x; + actor->currentPos.y = actorState->goalPos.y; + actor->currentPos.z = actorState->goalPos.z; + if (script->functionTemp[2] != 0) { + set_animation(actor->actorID, (s8) actorState->jumpPartIndex, actorState->animJumpLand); + } + return ApiStatus_DONE1; +} ApiStatus IdleJumpToGoal(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; ActorMovement* fly; - f32 x, y, z; + f32 posX, posY, posZ; f32 goalX, goalY, goalZ; - f32 var_f8; + f32 moveDist; Actor* actor; if (isInitialCall) { @@ -1033,30 +1140,34 @@ ApiStatus IdleJumpToGoal(Evt* script, s32 isInitialCall) { fly->currentPos.y = actor->currentPos.y; fly->currentPos.z = actor->currentPos.z; - x = fly->currentPos.x; - y = fly->currentPos.y; - z = fly->currentPos.z; + posX = fly->currentPos.x; + posY = fly->currentPos.y; + posZ = fly->currentPos.z; goalX = fly->goalPos.x; goalY = fly->goalPos.y; goalZ = fly->goalPos.z; - fly->angle = atan2(x, z, goalX, goalZ); - fly->distance = dist2D(x, z, goalX, goalZ); - y = goalY - y; + fly->angle = atan2(posX, posZ, goalX, goalZ); + fly->distance = dist2D(posX, posZ, goalX, goalZ); + + // make relative + posX = (goalX - posX); + posY = (goalY - posY); + posZ = (goalZ - posZ); if (fly->flyTime == 0) { fly->flyTime = fly->distance / fly->speed; - var_f8 = fly->distance - (fly->flyTime * fly->speed); + moveDist = fly->distance - (fly->flyTime * fly->speed); } else { fly->speed = fly->distance / fly->flyTime; - var_f8 = fly->distance - (fly->flyTime * fly->speed); + moveDist = fly->distance - (fly->flyTime * fly->speed); } if (fly->flyTime == 0) { return ApiStatus_DONE2; } - fly->velocity = ((fly->acceleration * fly->flyTime) * 0.5f) + (y / fly->flyTime); - fly->speed += var_f8 / fly->flyTime; + fly->velocity = ((fly->acceleration * fly->flyTime) * 0.5f) + (posY / fly->flyTime); + fly->speed += moveDist / fly->flyTime; script->functionTemp[0] = TRUE; } @@ -1090,9 +1201,9 @@ ApiStatus IdleJumpToGoal(Evt* script, s32 isInitialCall) { ApiStatus JumpToGoalSimple2(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; ActorState* state; - f32 x, y, z; + f32 posX, posY, posZ; f32 goalX, goalY, goalZ; - f32 var_f8; + f32 moveDist; Actor* actor; if (isInitialCall) { @@ -1114,30 +1225,34 @@ ApiStatus JumpToGoalSimple2(Evt* script, s32 isInitialCall) { state->currentPos.y = actor->currentPos.y; state->currentPos.z = actor->currentPos.z; - x = state->currentPos.x; - y = state->currentPos.y; - z = state->currentPos.z; + posX = state->currentPos.x; + posY = state->currentPos.y; + posZ = state->currentPos.z; goalX = state->goalPos.x; goalY = state->goalPos.y; goalZ = state->goalPos.z; - state->angle = atan2(x, z, goalX, goalZ); - state->distance = dist2D(x, z, goalX, goalZ); - y -= goalY; + state->angle = atan2(posX, posZ, goalX, goalZ); + state->distance = dist2D(posX, posZ, goalX, goalZ); + + // make relative (note: negated) + posX = (posX - goalX); + posY = (posY - goalY); + posZ = (posZ - goalZ); if (state->moveTime == 0) { state->moveTime = state->distance / state->speed; - var_f8 = state->distance - (state->moveTime * state->speed); + moveDist = state->distance - (state->moveTime * state->speed); } else { state->speed = state->distance / state->moveTime; - var_f8 = state->distance - (state->moveTime * state->speed); + moveDist = state->distance - (state->moveTime * state->speed); } if (state->moveTime == 0) { return ApiStatus_DONE2; } - state->velocity = ((state->acceleration * state->moveTime) * 0.5f) + (y / state->moveTime); - state->speed += var_f8 / state->moveTime; + state->velocity = ((state->acceleration * state->moveTime) * 0.5f) + (posY / state->moveTime); + state->speed += moveDist / state->moveTime; if (actor->actorTypeData1[4] != 0) { sfx_play_sound_at_position(actor->actorTypeData1[4], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); } @@ -1176,10 +1291,10 @@ ApiStatus LandJump(Evt* script, s32 isInitialCall) { Actor* actor; if (isInitialCall) { - script->functionTemp[0] = 0; + script->functionTemp[0] = FALSE; } - if (script->functionTemp[0] == 0) { + if (!script->functionTemp[0]) { s32 actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { @@ -1191,7 +1306,7 @@ ApiStatus LandJump(Evt* script, s32 isInitialCall) { actor->state.currentPos.x = actor->currentPos.x; actor->state.currentPos.y = actor->currentPos.y; actor->state.currentPos.z = actor->currentPos.z; - script->functionTemp[0] = 1; + script->functionTemp[0] = TRUE; } actor = script->functionTempPtr[1]; @@ -1216,7 +1331,7 @@ ApiStatus FallToGoal(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Actor* actor; ActorState* state; - f32 x, y, z; + f32 posX, posY, posZ; f32 goalX, goalY, goalZ; if (isInitialCall) { @@ -1239,16 +1354,20 @@ ApiStatus FallToGoal(Evt* script, s32 isInitialCall) { actor->state.currentPos.y = actor->currentPos.y; actor->state.currentPos.z = actor->currentPos.z; - x = actor->state.currentPos.x; - y = actor->state.currentPos.y; - z = actor->state.currentPos.z; + posX = actor->state.currentPos.x; + posY = actor->state.currentPos.y; + posZ = actor->state.currentPos.z; goalX = actor->state.goalPos.x; goalY = actor->state.goalPos.y; goalZ = actor->state.goalPos.z; - actor->state.angle = atan2(x, z, goalX, goalZ); - actor->state.distance = dist2D(x, z, goalX, goalZ); - y = goalY - y; + actor->state.angle = atan2(posX, posZ, goalX, goalZ); + actor->state.distance = dist2D(posX, posZ, goalX, goalZ); + + // make relative + posX = (goalX - posX); + posY = (goalY - posY); + posZ = (goalZ - posZ); if (actor->state.moveTime == 0) { actor->state.moveTime = actor->state.distance / actor->state.speed; @@ -1257,7 +1376,7 @@ ApiStatus FallToGoal(Evt* script, s32 isInitialCall) { } state->velocity = 0.0f; - state->acceleration = (y / state->moveTime - state->velocity) / (-state->moveTime * 0.5); + state->acceleration = (posY / state->moveTime - state->velocity) / (-state->moveTime * 0.5); if (actor->actorTypeData1[4] != 0) { sfx_play_sound_at_position(actor->actorTypeData1[4], 0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); @@ -1376,8 +1495,8 @@ s32 JumpPartTo(Evt* script, s32 isInitialCall) { ActorPart* part; ActorPartMovement* movement; s32 actorID, partIndex; - f32 x, y, z; - f32 x1, y1, z1; + f32 posX, posY, posZ; + f32 goalX, goalY, goalZ; f32 deltaDist; if (isInitialCall) { @@ -1397,31 +1516,34 @@ s32 JumpPartTo(Evt* script, s32 isInitialCall) { script->functionTempPtr[2] = part; movement = part->movement; - x = evt_get_variable(script, *args++); - y = evt_get_variable(script, *args++); - z = evt_get_variable(script, *args++); - movement->goalPos.x = x; - movement->goalPos.y = y; - movement->goalPos.z = z; + posX = evt_get_variable(script, *args++); + posY = evt_get_variable(script, *args++); + posZ = evt_get_variable(script, *args++); + movement->goalPos.x = posX; + movement->goalPos.y = posY; + movement->goalPos.z = posZ; movement->moveTime = evt_get_variable(script, *args++); script->functionTemp[3] = evt_get_variable(script, *args++); - x1 = movement->goalPos.x; - y1 = movement->goalPos.y; - z1 = movement->goalPos.z; + goalX = movement->goalPos.x; + goalY = movement->goalPos.y; + goalZ = movement->goalPos.z; - movement->unk_00.x = part->absolutePosition.x; - movement->unk_00.y = part->absolutePosition.y; - movement->unk_00.z = part->absolutePosition.z; + movement->absolutePosition.x = part->absolutePosition.x; + movement->absolutePosition.y = part->absolutePosition.y; + movement->absolutePosition.z = part->absolutePosition.z; - x = movement->unk_00.x; - y = movement->unk_00.y; - z = movement->unk_00.z; + posX = movement->absolutePosition.x; + posY = movement->absolutePosition.y; + posZ = movement->absolutePosition.z; - movement->angle = atan2(x, z, x1, z1); - movement->distance = dist2D(x, z, x1, z1); + movement->angle = atan2(posX, posZ, goalX, goalZ); + movement->distance = dist2D(posX, posZ, goalX, goalZ); - y = y1 - y; + // make relative + posX = (goalX - posX); + posY = (goalY - posY); + posZ = (goalZ - posZ); if (movement->moveTime == 0) { movement->moveTime = movement->distance / movement->moveSpeed; @@ -1431,7 +1553,7 @@ s32 JumpPartTo(Evt* script, s32 isInitialCall) { deltaDist = movement->distance - movement->moveTime * movement->moveSpeed; } movement->moveSpeed += deltaDist / movement->moveTime; - movement->unk_2C = movement->jumpScale * movement->moveTime * 0.5f + y / movement->moveTime; + movement->unk_2C = movement->jumpScale * movement->moveTime * 0.5f + posY / movement->moveTime; if (part->partTypeData[4] != 0) { sfx_play_sound_at_position(part->partTypeData[4], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } @@ -1440,12 +1562,12 @@ s32 JumpPartTo(Evt* script, s32 isInitialCall) { part = script->functionTempPtr[2]; movement = part->movement; - movement->unk_00.y += movement->unk_2C; + movement->absolutePosition.y += movement->unk_2C; movement->unk_2C -= movement->jumpScale; - add_xz_vec3f_copy1(&movement->unk_00, movement->moveSpeed, movement->angle); - part->absolutePosition.x = movement->unk_00.x; - part->absolutePosition.y = movement->unk_00.y; - part->absolutePosition.z = movement->unk_00.z; + add_xz_vec3f_copy1(&movement->absolutePosition, movement->moveSpeed, movement->angle); + part->absolutePosition.x = movement->absolutePosition.x; + part->absolutePosition.y = movement->absolutePosition.y; + part->absolutePosition.z = movement->absolutePosition.z; movement->moveTime--; if (movement->moveTime <= 0) { @@ -1467,8 +1589,8 @@ s32 FallPartTo(Evt* script, s32 isInitialCall) { ActorPart* part; ActorPartMovement* movement; s32 actorID, partIndex; - f32 x, y, z; - f32 x1, y1, z1; + f32 posX, posY, posZ; + f32 goalX, goalY, goalZ; if (isInitialCall) { script->functionTemp[0] = 0; @@ -1487,30 +1609,33 @@ s32 FallPartTo(Evt* script, s32 isInitialCall) { script->functionTempPtr[2] = part; movement = part->movement; - x = evt_get_variable(script, *args++); - y = evt_get_variable(script, *args++); - z = evt_get_variable(script, *args++); - movement->goalPos.x = x; - movement->goalPos.y = y; - movement->goalPos.z = z; + posX = evt_get_variable(script, *args++); + posY = evt_get_variable(script, *args++); + posZ = evt_get_variable(script, *args++); + movement->goalPos.x = posX; + movement->goalPos.y = posY; + movement->goalPos.z = posZ; movement->moveTime = evt_get_variable(script, *args++); - x1 = movement->goalPos.x; - y1 = movement->goalPos.y; - z1 = movement->goalPos.z; + goalX = movement->goalPos.x; + goalY = movement->goalPos.y; + goalZ = movement->goalPos.z; - movement->unk_00.x = part->absolutePosition.x; - movement->unk_00.y = part->absolutePosition.y; - movement->unk_00.z = part->absolutePosition.z; + movement->absolutePosition.x = part->absolutePosition.x; + movement->absolutePosition.y = part->absolutePosition.y; + movement->absolutePosition.z = part->absolutePosition.z; - x = movement->unk_00.x; - y = movement->unk_00.y; - z = movement->unk_00.z; + posX = movement->absolutePosition.x; + posY = movement->absolutePosition.y; + posZ = movement->absolutePosition.z; - movement->angle = atan2(x, z, x1, z1); - movement->distance = dist2D(x, z, x1, z1); + movement->angle = atan2(posX, posZ, goalX, goalZ); + movement->distance = dist2D(posX, posZ, goalX, goalZ); - y = y1 - y; + // make relative + posX = (goalX - posX); + posY = (goalY - posY); + posZ = (goalZ - posZ); if (movement->moveTime == 0) { movement->moveTime = movement->distance / movement->moveSpeed; @@ -1519,7 +1644,7 @@ s32 FallPartTo(Evt* script, s32 isInitialCall) { } movement->unk_2C = 0.0f; - movement->jumpScale = (y / movement->moveTime - movement->unk_2C) / (-movement->moveTime * 0.5); + movement->jumpScale = (posY / movement->moveTime - movement->unk_2C) / (-movement->moveTime * 0.5); if (part->partTypeData[4] != 0) { sfx_play_sound_at_position(part->partTypeData[4], 0, part->absolutePosition.x, part->absolutePosition.y, part->absolutePosition.z); } @@ -1528,12 +1653,12 @@ s32 FallPartTo(Evt* script, s32 isInitialCall) { part = script->functionTempPtr[2]; movement = part->movement; - movement->unk_00.y += movement->unk_2C; + movement->absolutePosition.y += movement->unk_2C; movement->unk_2C -= movement->jumpScale; - add_xz_vec3f_copy1(&movement->unk_00, movement->moveSpeed, movement->angle); - part->absolutePosition.x = movement->unk_00.x; - part->absolutePosition.y = movement->unk_00.y; - part->absolutePosition.z = movement->unk_00.z; + add_xz_vec3f_copy1(&movement->absolutePosition, movement->moveSpeed, movement->angle); + part->absolutePosition.x = movement->absolutePosition.x; + part->absolutePosition.y = movement->absolutePosition.y; + part->absolutePosition.z = movement->absolutePosition.z; movement->moveTime--; if (movement->moveTime <= 0) { @@ -1570,20 +1695,20 @@ s32 LandJumpPart(Evt* script, s32 isInitialCall) { script->functionTempPtr[1] = actor; script->functionTempPtr[2] = part; movement = part->movement; - movement->unk_00.x = part->absolutePosition.x; - movement->unk_00.y = part->absolutePosition.y; - movement->unk_00.z = part->absolutePosition.z; + movement->absolutePosition.x = part->absolutePosition.x; + movement->absolutePosition.y = part->absolutePosition.y; + movement->absolutePosition.z = part->absolutePosition.z; script->functionTemp[0] = 1; } part = script->functionTempPtr[2]; movement = part->movement; - movement->unk_00.y += movement->unk_2C; + movement->absolutePosition.y += movement->unk_2C; movement->unk_2C -= movement->jumpScale; - add_xz_vec3f_copy1(&movement->unk_00, movement->moveSpeed, movement->angle); - part->absolutePosition.x = movement->unk_00.x; - part->absolutePosition.y = movement->unk_00.y; - part->absolutePosition.z = movement->unk_00.z; + add_xz_vec3f_copy1(&movement->absolutePosition, movement->moveSpeed, movement->angle); + part->absolutePosition.x = movement->absolutePosition.x; + part->absolutePosition.y = movement->absolutePosition.y; + part->absolutePosition.z = movement->absolutePosition.z; if (part->absolutePosition.y < 0.0f) { part->absolutePosition.y = 0.0f; @@ -1600,8 +1725,8 @@ s32 RunPartTo(Evt* script, s32 isInitialCall) { ActorPart* part; ActorPartMovement* movement; s32 actorID, partIndex; - f32 x, y, z; - f32 x1, y1, z1; + f32 posX, posY, posZ; + f32 goalX, goalY, goalZ; f32 deltaDist; if (isInitialCall) { @@ -1621,28 +1746,28 @@ s32 RunPartTo(Evt* script, s32 isInitialCall) { script->functionTempPtr[2] = part; movement = part->movement; - x = evt_get_variable(script, *args++); - y = evt_get_variable(script, *args++); - z = evt_get_variable(script, *args++); - movement->goalPos.x = x; - movement->goalPos.y = y; - movement->goalPos.z = z; + posX = evt_get_variable(script, *args++); + posY = evt_get_variable(script, *args++); + posZ = evt_get_variable(script, *args++); + movement->goalPos.x = posX; + movement->goalPos.y = posY; + movement->goalPos.z = posZ; movement->moveTime = evt_get_variable(script, *args++); - x1 = movement->goalPos.x; - y1 = movement->goalPos.y; - z1 = movement->goalPos.z; + goalX = movement->goalPos.x; + goalY = movement->goalPos.y; + goalZ = movement->goalPos.z; - movement->unk_00.x = part->absolutePosition.x; - movement->unk_00.y = part->absolutePosition.y; - movement->unk_00.z = part->absolutePosition.z; + movement->absolutePosition.x = part->absolutePosition.x; + movement->absolutePosition.y = part->absolutePosition.y; + movement->absolutePosition.z = part->absolutePosition.z; - x = movement->unk_00.x; - y = movement->unk_00.y; - z = movement->unk_00.z; + posX = movement->absolutePosition.x; + posY = movement->absolutePosition.y; + posZ = movement->absolutePosition.z; - movement->angle = atan2(x, z, x1, z1); - movement->distance = dist2D(x, z, x1, z1); + movement->angle = atan2(posX, posZ, goalX, goalZ); + movement->distance = dist2D(posX, posZ, goalX, goalZ); if (movement->moveTime == 0) { movement->moveTime = movement->distance / movement->moveSpeed; @@ -1664,15 +1789,15 @@ s32 RunPartTo(Evt* script, s32 isInitialCall) { movement = part->movement; actor = script->functionTempPtr[1]; - add_xz_vec3f_copy1(&movement->unk_00, movement->moveSpeed, movement->angle); + add_xz_vec3f_copy1(&movement->absolutePosition, movement->moveSpeed, movement->angle); if (movement->moveSpeed < 4.0f) { - play_movement_dust_effects(0, movement->unk_00.x, movement->unk_00.y, movement->unk_00.z, movement->angle); + play_movement_dust_effects(0, movement->absolutePosition.x, movement->absolutePosition.y, movement->absolutePosition.z, movement->angle); } else { - play_movement_dust_effects(1, movement->unk_00.x, movement->unk_00.y, movement->unk_00.z, movement->angle); + play_movement_dust_effects(1, movement->absolutePosition.x, movement->absolutePosition.y, movement->absolutePosition.z, movement->angle); } - part->absolutePosition.x = movement->unk_00.x; - part->absolutePosition.y = movement->unk_00.y; - part->absolutePosition.z = movement->unk_00.z; + part->absolutePosition.x = movement->absolutePosition.x; + part->absolutePosition.y = movement->absolutePosition.y; + part->absolutePosition.z = movement->absolutePosition.z; if (part->partTypeData[0] != 0 && part->partTypeData[1] != 0) { if (part->actorTypeData2b[0] >= 0) { diff --git a/src/77480.c b/src/77480.c index c331b8fe33..fab0562dc9 100644 --- a/src/77480.c +++ b/src/77480.c @@ -817,7 +817,7 @@ s32 get_overriding_player_anim(s32 anim) { if (!func_800DFCF4()) { return -1; } - } else if (!(playerStatus->animFlags & PA_FLAGS_IN_DISGUISE)) { + } else if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { anim = ANIM_Peach_C0010; } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].hold); @@ -1480,7 +1480,7 @@ void render_player_model(void) { playerStatus->alpha2 = 0; } - if (!(playerStatus->animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { rtPtr->appendGfxArg = playerStatus; rtPtr->distance = -z; rtPtr->renderMode = playerStatus->renderMode; diff --git a/src/7E9D0.c b/src/7E9D0.c index ab7125edb1..9b588dedb0 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -310,7 +310,7 @@ void phys_peach_update(void) { } while (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED); peach_check_for_parasol_input(); - if (playerStatus->animFlags & PA_FLAGS_IN_DISGUISE) { + if (playerStatus->animFlags & PA_FLAGS_INVISIBLE) { peach_sync_disguise_npc(); } } @@ -555,7 +555,7 @@ void peach_force_disguise_action(s32 useParasol) { if (useParasol) { set_action_state(ACTION_STATE_USE_SNEAKY_PARASOL); } else { - playerStatus->animFlags &= ~PA_FLAGS_IN_DISGUISE; + playerStatus->animFlags &= ~PA_FLAGS_INVISIBLE; gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_DISGUISED; playerStatus->peachDisguise = 0; free_npc_by_index(PeachDisguiseNpcIndex); @@ -575,7 +575,7 @@ void peach_check_for_parasol_input(void) { D_8010C92C--; if (D_8010C92C == 0) { if (gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DISGUISED) { - playerStatus->animFlags |= PA_FLAGS_IN_DISGUISE; + playerStatus->animFlags |= PA_FLAGS_INVISIBLE; gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_DISGUISED; disguiseNpc = peach_make_disguise_npc(gGameStatusPtr->peachDisguise); diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index fa79ddc354..cebabe0c35 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -313,7 +313,7 @@ void initialize_status_menu(void) { uiStatus->hidden = 0; uiStatus->showTimer = 210; uiStatus->unk_3B[0] = 0; - uiStatus->ignoreChanges = 0; + uiStatus->ignoreChanges = FALSE; uiStatus->unk_45[0] = 0; uiStatus->unk_45[1] = 0; uiStatus->hpBlinking = 0; @@ -618,7 +618,7 @@ void show_coin_counter(void) { uiStatus->unk_6C[2] = uiStatus->ignoreChanges; } - uiStatus->ignoreChanges = 1; + uiStatus->ignoreChanges = TRUE; D_8010CD10 = 1; } } @@ -688,7 +688,7 @@ void func_800E97E4(void) { UiStatus* uiStatus = &gUIStatus; uiStatus->drawPosY = -100; - uiStatus->ignoreChanges = 0; + uiStatus->ignoreChanges = FALSE; uiStatus->showTimer = 0; uiStatus->hidden = 1; uiStatus->unk_3B[0] = 0; @@ -700,7 +700,7 @@ void func_800E9810(void) { uiStatus->showTimer = 210; uiStatus->drawPosY = 0; - uiStatus->ignoreChanges = 0; + uiStatus->ignoreChanges = FALSE; uiStatus->hidden = 0; uiStatus->unk_3B[0] = 1; uiStatus->unk_3B[1] = 0; @@ -728,19 +728,19 @@ s32 func_800E9860(void) { return ret; } -void func_800E9894(void) { - gUIStatus.ignoreChanges = 1; +void status_menu_ignore_changes(void) { + gUIStatus.ignoreChanges = TRUE; } void func_800E98A8(void) { UiStatus* uiStatus = &gUIStatus; - uiStatus->ignoreChanges = 1; + uiStatus->ignoreChanges = TRUE; uiStatus->drawPosY = 18; } -void func_800E98C4(void) { - gUIStatus.ignoreChanges = 0; +void status_menu_respond_to_changes(void) { + gUIStatus.ignoreChanges = FALSE; } s32 func_800E98D4(void) { @@ -912,7 +912,7 @@ void reset_status_menu(void) { uiStatus->hidden = 0; uiStatus->showTimer = 210; uiStatus->unk_3B[0] = 0; - uiStatus->ignoreChanges = 0; + uiStatus->ignoreChanges = FALSE; uiStatus->unk_45[0] = 0; uiStatus->unk_45[1] = 0; uiStatus->hpBlinking = 0; @@ -1247,8 +1247,8 @@ s32 add_star_pieces(s32 amt) { s32 newSP = playerData->starPieces; newSP += amt; - if (newSP > 222) { - newSP = 222; + if (newSP > MAX_STAR_PIECES) { + newSP = MAX_STAR_PIECES; } if (newSP < 0) { newSP = 0; @@ -1304,7 +1304,7 @@ s32 recover_fp(s32 amt) { s32 ret; if (amt == -2) { - playerData->curMaxFP += 1; + playerData->curMaxFP++; playerData->curFP = playerData->curMaxFP; return playerData->curMaxFP; } @@ -1326,7 +1326,7 @@ s32 recover_hp(s32 amt) { s32 ret; if (amt == -2) { - playerData->curMaxHP += 1; + playerData->curMaxHP++; playerData->curHP = playerData->curMaxHP; return playerData->curMaxHP; } diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index 3e10ac80c4..bb8b7f1f60 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -185,7 +185,7 @@ void destroy_popup_menu(void) { gPopupMenu->popupType == POPUP_TYPE_USE_KEY ) && !gGameStatusPtr->isBattle) { if (D_8010D69A == 0) { - func_800E98C4(); + status_menu_respond_to_changes(); } close_status_menu(); } @@ -1213,7 +1213,7 @@ void create_popup_menu(PopupMenu* popup) { s32 numEntries; D_8010D69A = func_800E98D4(); - func_800E9894(); + status_menu_ignore_changes(); open_status_menu_short(); gPopupMenu = popup; popup->result = 0; diff --git a/src/audio/e0b30_len_b80.c b/src/audio/e0b30_len_b80.c index d42d93c9a2..60c6b2c87a 100644 --- a/src/audio/e0b30_len_b80.c +++ b/src/audio/e0b30_len_b80.c @@ -52,7 +52,7 @@ s32 bgm_get_map_default_variation(s32 songID) { if (SongsUsingVariationFlag[i] == songID) { MapConfig* map = &gAreas[gGameStatusPtr->areaID].maps[gGameStatusPtr->mapID]; - return map->unk_1C.bytes.songVariation & 1; + return map->songVariation & 1; } } @@ -175,8 +175,6 @@ void bgm_update_music_settings(void) { bgm_update_volume(); } -static const f32 padding = 0.0f; - s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) { MusicSettings* musicSetting; s32 mapSongVariation; @@ -215,7 +213,7 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s musicSetting->variation = variation; musicSetting->fadeOutTime = fadeOutTime; musicSetting->state = 1; - musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_2; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX; return 1; } @@ -254,7 +252,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1 musicSetting->variation = variation; musicSetting->flags |= MUSIC_SETTINGS_FLAGS_20; musicSetting->state = 1; - musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_2; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX; return 1; } @@ -266,7 +264,7 @@ s32 bgm_adjust_proximity(s32 playerIndex, s32 mix, s16 state) { return FALSE; } - if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_2)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX)) { return FALSE; } diff --git a/src/audio/private.h b/src/audio/private.h index 6d6c31a795..80070110aa 100644 --- a/src/audio/private.h +++ b/src/audio/private.h @@ -302,8 +302,8 @@ void sfx_reset_door_sounds(void); void sfx_clear_sounds(void); void sfx_clear_env_sounds(s16 playSounds); void sfx_update_looping_sound_params(void); -void func_801497FC(s32 arg0); -s32 func_80149828(void); +void sfx_set_reverb_mode(s32 arg0); +s32 sfx_get_reverb_mode(void); void sfx_stop_env_sounds(void); */ SoundInstance* sfx_get_env_sound_instance(s32 soundID); diff --git a/src/audio/public.h b/src/audio/public.h index 73f2eeb4e8..f03fc1fd5c 100644 --- a/src/audio/public.h +++ b/src/audio/public.h @@ -74,8 +74,8 @@ void sfx_reset_door_sounds(void); void sfx_clear_sounds(void); void sfx_clear_env_sounds(s16 playSounds); void sfx_update_looping_sound_params(void); -void func_801497FC(s32 arg0); -s32 func_80149828(void); +void sfx_set_reverb_mode(s32 arg0); +s32 sfx_get_reverb_mode(void); void sfx_stop_env_sounds(void); //SoundInstance* sfx_get_env_sound_instance(s32 soundID); void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift); diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 6e8547be3a..3f2234fcfc 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -301,7 +301,7 @@ void sfx_clear_sounds(void) { bzero(&D_801598A0, sizeof(D_801598A0)); bzero(&D_801599B8, sizeof(D_801599B8)); D_80159AD0 = D_801598A0; - func_801497FC(0); + sfx_set_reverb_mode(0); sfx_reset_door_sounds(); } @@ -345,12 +345,12 @@ void sfx_update_looping_sound_params(void) { } } -void func_801497FC(s32 arg0) { - func_800561E4(arg0); - D_80159AD4 = arg0; +void sfx_set_reverb_mode(s32 mode) { + func_800561E4(mode); + D_80159AD4 = mode; } -s32 func_80149828(void) { +s32 sfx_get_reverb_mode(void) { return D_80159AD4; } diff --git a/src/evt/f8f60_len_1560.c b/src/evt/f8f60_len_1560.c index 3549894ce4..b9519bc858 100644 --- a/src/evt/f8f60_len_1560.c +++ b/src/evt/f8f60_len_1560.c @@ -516,10 +516,10 @@ ApiStatus ShowStatusMenu(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (evt_get_variable(script, *args++) != 0) { - func_800E9894(); + status_menu_ignore_changes(); close_status_menu(); } else { - func_800E98C4(); + status_menu_respond_to_changes(); } return ApiStatus_DONE2; diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index a9a5deb056..6364df24ab 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -115,11 +115,11 @@ ApiStatus FadeInMusic(Evt* script, s32 isInitialCall) { } } -ApiStatus func_802D5EE0(Evt* script, s32 isInitialCall) { +ApiStatus EnableMusicProximityMix(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 playerIndex = evt_get_variable(script, *args++); - gMusicSettings[playerIndex].flags |= MUSIC_SETTINGS_FLAGS_2; + gMusicSettings[playerIndex].flags |= MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX; return ApiStatus_DONE2; } diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 9c56ff4abf..8e3e173ea1 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -99,7 +99,7 @@ void sort_scripts(void) { for (i = 0; i < MAX_SCRIPTS; i++) { curScript = (*gCurrentScriptListPtr)[i]; if (curScript != NULL) { - if (curScript->state != 0) { + if (curScript->stateFlags != 0) { scriptIndexList[numValidScripts] = i; scriptIdList[numValidScripts] = curScript->id; numValidScripts++; @@ -231,7 +231,7 @@ void suspend_frozen_scripts(Evt* script) { suspend_all_group(groupFlags); } -Evt* start_script(EvtScript* source, s32 priority, s32 initialState) { +Evt* start_script(EvtScript* source, s32 priority, s32 flags) { Evt* newScript; s32 curScriptIndex; s32 scriptListCount; @@ -250,7 +250,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 initialState) { gNumScripts++; ASSERT(newScript != NULL); - newScript->state = initialState | EVT_FLAG_ACTIVE; + newScript->stateFlags = flags | EVT_FLAG_ACTIVE; newScript->currentOpcode = 0; newScript->priority = priority; newScript->ptrNextLine = (Bytecode*)source; @@ -283,7 +283,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 initialState) { find_script_labels(newScript); - if (gIsUpdatingScripts && (newScript->state & EVT_FLAG_RUN_IMMEDIATELY)) { + if (gIsUpdatingScripts && (newScript->stateFlags & EVT_FLAG_RUN_IMMEDIATELY)) { scriptListCount = gScriptListCount++; gScriptIndexList[scriptListCount] = curScriptIndex; gScriptIdList[scriptListCount] = newScript->id; @@ -298,7 +298,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 initialState) { return newScript; } -Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 groupFlags) { +Evt* start_script_in_group(EvtScript* source, u8 priority, u8 flags, u8 groupFlags) { Evt* newScript; s32 scriptListCount; s32 i; @@ -322,7 +322,7 @@ Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 g // Some of this function is surely macros. I think we'll learn more as we do others in this file. -Ethan do { - newScript->state = initialState | EVT_FLAG_ACTIVE; + newScript->stateFlags = flags | EVT_FLAG_ACTIVE; newScript->currentOpcode = 0; newScript->priority = priority; newScript->id = gStaticScriptCounter++; @@ -353,7 +353,7 @@ Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 g find_script_labels(newScript); - if (gIsUpdatingScripts && (newScript->state & EVT_FLAG_RUN_IMMEDIATELY)) { + if (gIsUpdatingScripts && (newScript->stateFlags & EVT_FLAG_RUN_IMMEDIATELY)) { scriptListCount = gScriptListCount++; gScriptIndexList[scriptListCount] = curScriptIndex; gScriptIdList[scriptListCount] = newScript->id; @@ -370,7 +370,7 @@ Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 g return newScript; } -Evt* start_child_script(Evt* parentScript, EvtScript* source, s32 initialState) { +Evt* start_child_script(Evt* parentScript, EvtScript* source, s32 flags) { s32 curScriptIndex; s32 scriptListCount; Evt* child; @@ -390,8 +390,8 @@ Evt* start_child_script(Evt* parentScript, EvtScript* source, s32 initialState) ASSERT(child != NULL); parentScript->childScript = child; - parentScript->state |= EVT_FLAG_BLOCKED_BY_CHILD; - child->state = initialState | EVT_FLAG_ACTIVE; + parentScript->stateFlags |= EVT_FLAG_BLOCKED_BY_CHILD; + child->stateFlags = flags | EVT_FLAG_ACTIVE; child->ptrCurrentLine = child->ptrFirstLine = child->ptrNextLine = (Bytecode*)source; @@ -459,7 +459,7 @@ Evt* func_802C39F8(Evt* parentScript, Bytecode* nextLine, s32 newState) { gNumScripts++; ASSERT(child != NULL); - child->state = newState | EVT_FLAG_ACTIVE; + child->stateFlags = newState | EVT_FLAG_ACTIVE; child->ptrNextLine = nextLine; child->ptrFirstLine = nextLine; child->ptrCurrentLine = nextLine; @@ -516,7 +516,7 @@ Evt* func_802C3C10(Evt* script, Bytecode* line, s32 arg2) { script->ptrCurrentLine = line; script->currentOpcode = 0; script->frameCounter = 0; - script->state |= arg2; + script->stateFlags |= arg2; script->timeScale = 1.0f; if (script->userData != NULL) { @@ -581,7 +581,7 @@ void update_scripts(void) { for (i = 0; i < gScriptListCount; i++) { Evt* script = (*gCurrentScriptListPtr)[gScriptIndexList[i]]; - if (script != NULL && script->id == gScriptIdList[i] && script->state != 0 && !(script->state & (EVT_FLAG_SUSPENDED | EVT_FLAG_BLOCKED_BY_CHILD | EVT_FLAG_SUSPENDED_IN_GROUP))) { + if (script != NULL && script->id == gScriptIdList[i] && script->stateFlags != 0 && !(script->stateFlags & (EVT_FLAG_SUSPENDED | EVT_FLAG_BLOCKED_BY_CHILD | EVT_FLAG_SUSPENDED_IN_GROUP))) { s32 stop = FALSE; s32 status; @@ -646,7 +646,7 @@ void kill_script(Evt* instanceToKill) { blockingParent = instanceToKill->blockingParent; if (blockingParent != NULL) { blockingParent->childScript = NULL; - blockingParent->state &= ~EVT_FLAG_BLOCKED_BY_CHILD; + blockingParent->stateFlags &= ~EVT_FLAG_BLOCKED_BY_CHILD; for (j = 0; j < ARRAY_COUNT(blockingParent->varTable); j++) { blockingParent->varTable[j] = instanceToKill->varTable[j]; @@ -777,7 +777,7 @@ void suspend_group_script(Evt* script, s32 groupFlags) { } if ((script->groupFlags & groupFlags) != 0) { - script->state |= EVT_FLAG_SUSPENDED_IN_GROUP; + script->stateFlags |= EVT_FLAG_SUSPENDED_IN_GROUP; } } @@ -798,7 +798,7 @@ void resume_group_script(Evt* script, s32 groupFlags) { } if ((script->groupFlags & groupFlags) != 0) { - script->state &= ~EVT_FLAG_SUSPENDED_IN_GROUP; + script->stateFlags &= ~EVT_FLAG_SUSPENDED_IN_GROUP; } } @@ -921,7 +921,7 @@ void set_script_flags(Evt* script, s32 flags) { Evt* childScript = script->childScript; s32 i; - script->state |= flags; + script->stateFlags |= flags; if (childScript != NULL) { set_script_flags(childScript, flags); } @@ -939,7 +939,7 @@ void clear_script_flags(Evt* script, s32 flags) { Evt* childScript = script->childScript; s32 i; - script->state &= ~flags; + script->stateFlags &= ~flags; if (childScript != NULL) { clear_script_flags(childScript, flags); } diff --git a/src/state_file_select.c b/src/state_file_select.c index 228c75a4ae..895c4692f7 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -308,7 +308,7 @@ void state_step_exit_language_select(void) { calculate_model_sizes(); npc_reload_all(); - func_800E98C4(); + status_menu_respond_to_changes(); set_time_freeze_mode(TIME_FREEZE_PARTIAL); } set_windows_visible(WINDOW_GROUP_ALL); diff --git a/src/state_pause.c b/src/state_pause.c index d62785364c..64ed913169 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -78,8 +78,8 @@ void state_step_pause(void) { clear_npcs(); clear_entity_data(0); clear_trigger_data(); - D_800A0924 = func_80149828(); - func_801497FC(0); + SavedReverbMode = sfx_get_reverb_mode(); + sfx_set_reverb_mode(0); bgm_quiet_max_volume(); nuPiReadRomOverlay(&D_8007795C); pause_init(); @@ -159,7 +159,7 @@ void state_step_unpause(void) { init_npc_list(); init_entity_data(); init_trigger_list(); - func_801497FC(D_800A0924); + sfx_set_reverb_mode(SavedReverbMode); bgm_reset_max_volume(); load_map_script_lib(); assetData = load_asset_by_name(wMapShapeName, &assetSize); @@ -183,7 +183,7 @@ void state_step_unpause(void) { calculate_model_sizes(); npc_reload_all(); set_windows_visible(WINDOW_GROUP_ALL); - func_800E98C4(); + status_menu_respond_to_changes(); set_time_freeze_mode(TIME_FREEZE_PARTIAL); D_800A0921 = 3; gPlayerStatus.alpha2 = gPlayerStatus.alpha1 - 1; diff --git a/src/state_title_screen.c b/src/state_title_screen.c index b642daaf5c..8701c10eb6 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -80,7 +80,7 @@ void state_init_title_screen(void) { D_8014C248[0] = 1; general_heap_create(); clear_printers(); - func_801497FC(0); + sfx_set_reverb_mode(0); gGameStatusPtr->introState = INTRO_STATE_0; gGameStatusPtr->introCounter = 0; gGameStatusPtr->isBattle = FALSE; diff --git a/src/world/action/idle.c b/src/world/action/idle.c index 39c6ccfd46..1cf300adb7 100644 --- a/src/world/action/idle.c +++ b/src/world/action/idle.c @@ -110,7 +110,7 @@ void action_update_idle_peach(void) { playerStatus->currentSpeed = 0.0f; playerStatus->flags &= ~PS_FLAGS_AIRBORNE; - if (!(playerStatus->animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { suggest_player_anim_clearUnkFlag(IdlePeachAnims[gGameStatusPtr->peachCookingIngredient]); } else { @@ -121,7 +121,7 @@ void action_update_idle_peach(void) { } } - if (!(playerStatus->animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { switch (playerStatus->actionSubstate) { case SUBSTATE_IDLE_DEFAULT: if (!(playerStatus->flags & (PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_INPUT_DISABLED)) diff --git a/src/world/action/misc.c b/src/world/action/misc.c index 194f24433c..d8e39c5703 100644 --- a/src/world/action/misc.c +++ b/src/world/action/misc.c @@ -229,7 +229,7 @@ void action_update_talk(void) { if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { suggest_player_anim_setUnkFlag(ANIM_Mario_80007); } else if (playerStatus->peachItemHeld == 0) { - if (!(playerStatus->animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { suggest_player_anim_setUnkFlag(ANIM_Peach_C0000); } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].talk); @@ -242,7 +242,7 @@ void action_update_talk(void) { if (playerStatus->currentStateTime != 0) { playerStatus->currentStateTime--; } else if (playerStatus->peachItemHeld == 0) { - if (!(playerStatus->animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { suggest_player_anim_setUnkFlag(ANIM_Peach_A0001); } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].idle); diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index 9f0245243a..6b305e12cd 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -96,7 +96,7 @@ void action_update_parasol(void) { } *tempUnk_1C = phi_f4; - if (!(playerStatus->animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { playerStatus->currentStateTime = 20; playerStatus->actionSubstate = SUBSTATE_DISGUISE_INIT; transformation->disguiseTime = 15; @@ -185,7 +185,7 @@ void action_update_parasol(void) { break; case SUBSTATE_DISGUISE_MAKE_NPC: gameStatus = gGameStatusPtr; - playerStatus->animFlags |= PA_FLAGS_IN_DISGUISE; + playerStatus->animFlags |= PA_FLAGS_INVISIBLE; gameStatus->peachFlags |= PEACH_STATUS_FLAG_DISGUISED; playerStatus->actionSubstate++; // SUBSTATE_DISGUISE_SPIN_DOWN case SUBSTATE_DISGUISE_SPIN_DOWN: @@ -261,7 +261,7 @@ void action_update_parasol(void) { playerStatus->currentStateTime = 2; playerStatus->actionSubstate++; // SUBSTATE_SPIN_DOWN gameStatus2 = gGameStatusPtr; - playerStatus->animFlags &= ~PA_FLAGS_IN_DISGUISE; + playerStatus->animFlags &= ~PA_FLAGS_INVISIBLE; gameStatus2->peachFlags &= ~PEACH_STATUS_FLAG_DISGUISED; playerStatus->peachDisguise = 0; free_npc_by_index(PeachDisguiseNpcIndex); diff --git a/src/world/action/step_up.c b/src/world/action/step_up.c index 53f8647836..78b32adb33 100644 --- a/src/world/action/step_up.c +++ b/src/world/action/step_up.c @@ -77,7 +77,7 @@ void action_update_step_up(void) { } void func_802B6198_E24768(void) { - if (!(gPlayerStatus.animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(gPlayerStatus.animFlags & PA_FLAGS_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { suggest_player_anim_clearUnkFlag((StepUpPeachAnims)[gGameStatusPtr->peachCookingIngredient]); } else { diff --git a/src/world/action/walk.c b/src/world/action/walk.c index 1595909721..4c40bc19e8 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -205,7 +205,7 @@ void action_update_run(void) { } void func_802B6550_E23C30(void) { - if (!(gPlayerStatus.animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(gPlayerStatus.animFlags & PA_FLAGS_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { suggest_player_anim_clearUnkFlag(WalkPeachAnims[gGameStatusPtr->peachCookingIngredient]); return; @@ -265,7 +265,7 @@ static void action_update_run_peach(void) { playerStatus->currentSpeed = playerStatus->runSpeed; } - if (!(playerStatus->animFlags & PA_FLAGS_IN_DISGUISE)) { + if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { gameStatus = gGameStatusPtr; if (!(gameStatus->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { if (!gameStatus->peachCookingIngredient) { diff --git a/src/world/area_arn/arn_02/arn_02.h b/src/world/area_arn/arn_02/arn_02.h index 5e3ea6f20a..83d0091f1d 100644 --- a/src/world/area_arn/arn_02/arn_02.h +++ b/src/world/area_arn/arn_02/arn_02.h @@ -13,9 +13,9 @@ #include "sprite/npc/Goomba.h" enum { - NPC_HyperCleft_01 = 0, - NPC_HyperCleft_02 = 1, - NPC_HyperGoomba = 2, + NPC_HyperCleft_01 = 0, + NPC_HyperCleft_02 = 1, + NPC_HyperGoomba = 2, }; #define NAMESPACE arn_02 diff --git a/src/world/area_arn/arn_03/arn_03.h b/src/world/area_arn/arn_03/arn_03.h index 1871945d78..f931416ba9 100644 --- a/src/world/area_arn/arn_03/arn_03.h +++ b/src/world/area_arn/arn_03/arn_03.h @@ -13,22 +13,22 @@ #include "sprite/npc/WorldBow.h" enum { - NPC_Boo_01 = 0, - NPC_Boo_02 = 1, - NPC_Boo_03 = 2, - NPC_Boo_04 = 3, - NPC_Boo_05 = 4, - NPC_Boo_06 = 5, - NPC_Boo_07 = 6, - NPC_Boo_08 = 7, - NPC_Boo_09 = 8, + NPC_Boo_01 = 0, + NPC_Boo_02 = 1, + NPC_Boo_03 = 2, + NPC_Boo_04 = 3, + NPC_Boo_05 = 4, + NPC_Boo_06 = 5, + NPC_Boo_07 = 6, + NPC_Boo_08 = 7, + NPC_Boo_09 = 8, }; enum { - MV_Unk_00 = MapVar(0), - MV_Unk_01 = MapVar(1), - MV_Unk_02 = MapVar(2), - MV_Unk_03 = MapVar(3), + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_Unk_02 = MapVar(2), + MV_Unk_03 = MapVar(3), }; #define NAMESPACE arn_03 diff --git a/src/world/area_arn/arn_04/arn_04.h b/src/world/area_arn/arn_04/arn_04.h index 717d145cd7..b3b455bf1d 100644 --- a/src/world/area_arn/arn_04/arn_04.h +++ b/src/world/area_arn/arn_04/arn_04.h @@ -14,10 +14,10 @@ #include "sprite/npc/Cleft.h" enum { - NPC_HyperParagoomba = 0, - NPC_HyperGoomba = 1, - NPC_HyperCleft_01 = 2, - NPC_HyperCleft_02 = 3, + NPC_HyperParagoomba = 0, + NPC_HyperGoomba = 1, + NPC_HyperCleft_01 = 2, + NPC_HyperCleft_02 = 3, }; #define NAMESPACE arn_04 diff --git a/src/world/area_arn/arn_05/arn_05.h b/src/world/area_arn/arn_05/arn_05.h index b9db13dbf2..74031a36c2 100644 --- a/src/world/area_arn/arn_05/arn_05.h +++ b/src/world/area_arn/arn_05/arn_05.h @@ -10,16 +10,16 @@ #include "mapfs/arn_05_hit.h" enum { - NPC_Boo_01 = 0, - NPC_Boo_02 = 1, - NPC_Boo_03 = 2, - NPC_Boo_04 = 3, - NPC_Boo_05 = 4, - NPC_Tubba = 5, - NPC_Boo_06 = 6, - NPC_Boo_07 = 7, - NPC_Boo_08 = 8, - NPC_Boo_09 = 9, + NPC_Boo_01 = 0, + NPC_Boo_02 = 1, + NPC_Boo_03 = 2, + NPC_Boo_04 = 3, + NPC_Boo_05 = 4, + NPC_Tubba = 5, + NPC_Boo_06 = 6, + NPC_Boo_07 = 7, + NPC_Boo_08 = 8, + NPC_Boo_09 = 9, }; enum { diff --git a/src/world/area_arn/arn_07/arn_07.h b/src/world/area_arn/arn_07/arn_07.h index 72e0f38479..d93d00857f 100644 --- a/src/world/area_arn/arn_07/arn_07.h +++ b/src/world/area_arn/arn_07/arn_07.h @@ -16,20 +16,20 @@ #include "sprite/npc/Bootler.h" enum { - NPC_TubbasHeart = 0, - NPC_Tubba = 1, - NPC_Boo_01 = 2, - NPC_Boo_02 = 3, - NPC_Boo_03 = 4, - NPC_Boo_04 = 5, - NPC_Boo_05 = 6, - NPC_Boo_06 = 7, - NPC_Bow = 8, - NPC_Bootler = 9, - NPC_HyperParagoomba_01 = 10, - NPC_HyperParagoomba_02 = 11, - NPC_HyperParagoomba_03 = 12, - NPC_Skolar = 13, + NPC_TubbasHeart = 0, + NPC_Tubba = 1, + NPC_Boo_01 = 2, + NPC_Boo_02 = 3, + NPC_Boo_03 = 4, + NPC_Boo_04 = 5, + NPC_Boo_05 = 6, + NPC_Boo_06 = 7, + NPC_Bow = 8, + NPC_Bootler = 9, + NPC_HyperParagoomba_01 = 10, + NPC_HyperParagoomba_02 = 11, + NPC_HyperParagoomba_03 = 12, + NPC_Skolar = 13, }; enum { diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c index 47351920e0..09bb0ea498 100644 --- a/src/world/area_arn/arn_07/arn_07_5_npc.c +++ b/src/world/area_arn/arn_07/arn_07_5_npc.c @@ -7,7 +7,7 @@ #include "world/common/npc/Boo.inc.c" #include "world/common/npc/StarSpirit.inc.c" -API_CALLABLE(N(UpgradeStarPower)) { +API_CALLABLE(N(UpgradeStarPowerCh3)) { set_max_SP(3); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; @@ -472,7 +472,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Idle) EVT_CALL(EnableNpcAI, NPC_Skolar, TRUE) - EVT_CALL(N(UpgradeStarPower)) + EVT_CALL(N(UpgradeStarPowerCh3)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0193, 160, 40) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2) diff --git a/src/world/area_arn/arn_08/arn_08.h b/src/world/area_arn/arn_08/arn_08.h index 2c244230df..66b89845eb 100644 --- a/src/world/area_arn/arn_08/arn_08.h +++ b/src/world/area_arn/arn_08/arn_08.h @@ -13,8 +13,8 @@ #include "sprite/npc/Yakkey.h" enum { - NPC_TubbasHeart = 0, - NPC_Yakkey = 1, + NPC_TubbasHeart = 0, + NPC_Yakkey = 1, }; #define NAMESPACE arn_08 diff --git a/src/world/area_arn/arn_09/arn_09.h b/src/world/area_arn/arn_09/arn_09.h index fd79ac1a69..c38937c8c9 100644 --- a/src/world/area_arn/arn_09/arn_09.h +++ b/src/world/area_arn/arn_09/arn_09.h @@ -12,7 +12,7 @@ #include "sprite/npc/TubbasHeart.h" enum { - NPC_TubbasHeart = 0, + NPC_TubbasHeart = 0, }; #define NAMESPACE arn_09 diff --git a/src/world/area_arn/arn_10/arn_10.h b/src/world/area_arn/arn_10/arn_10.h index 3548f51ed0..643195f07a 100644 --- a/src/world/area_arn/arn_10/arn_10.h +++ b/src/world/area_arn/arn_10/arn_10.h @@ -10,8 +10,8 @@ #include "mapfs/arn_10_hit.h" enum { - NPC_TubbasHeart = 0, - NPC_HyperGoomba = 1, + NPC_TubbasHeart = 0, + NPC_HyperGoomba = 1, }; #define NAMESPACE arn_10 diff --git a/src/world/area_arn/arn_11/arn_11.h b/src/world/area_arn/arn_11/arn_11.h index 108bbe99a8..c13f08285b 100644 --- a/src/world/area_arn/arn_11/arn_11.h +++ b/src/world/area_arn/arn_11/arn_11.h @@ -12,7 +12,7 @@ #include "sprite/npc/TubbasHeart.h" enum { - NPC_TubbasHeart = 0, + NPC_TubbasHeart = 0, }; #define NAMESPACE arn_11 diff --git a/src/world/area_arn/arn_11/events.c b/src/world/area_arn/arn_11/events.c deleted file mode 100644 index 3970ee327a..0000000000 --- a/src/world/area_arn/arn_11/events.c +++ /dev/null @@ -1,309 +0,0 @@ -#include "arn_11.h" -#include "sprite/npc/TubbasHeart.h" - -enum { - NPC_TUBBAS_HEART, -}; - -EvtScript N(802400F0) = { - EVT_CALL(SetCamType, 0, 6, 1) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(3.0)) - EVT_CALL(UseSettingsFrom, 0, 60, 30, 0) - EVT_CALL(SetPanTarget, 0, 60, 30, 0) - EVT_CALL(SetCamPitch, 0, EVT_FLOAT(20.0), EVT_FLOAT(-13.0)) - EVT_CALL(SetCamDistance, 0, 275) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(802401BC) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_WAIT(30) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) - EVT_CALL(PlayerMoveTo, 6, 0, 0) - EVT_CALL(SpeakToPlayer, 0, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00BF) - EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) - EVT_WAIT(40) - EVT_CALL(SpeakToPlayer, 0, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, 589824) - EVT_WAIT(30) - EVT_CALL(SpeakToPlayer, 0, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, 589824) - EVT_THREAD - EVT_CALL(SetNpcJumpscale, 0, EVT_FLOAT(2.5)) - EVT_CALL(GetNpcPos, 0, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, 0, 0x20C8, 0) - EVT_CALL(NpcJump0, 0, LVar0, LVar1, LVar2, 10) - EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, 0, 0x20C8, 0) - EVT_CALL(NpcJump0, 0, LVar0, LVar1, LVar2, 10) - EVT_END_THREAD - EVT_WAIT(40) - EVT_CALL(SpeakToPlayer, 0, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C2) - EVT_CALL(SetPlayerAnimation, 589824) - EVT_WAIT(10) - EVT_CALL(SetNpcVar, 0, 0, 1) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(exitSingleDoor_80240428) = { - EVT_SET_GROUP(EVT_GROUP_1B) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 2) - EVT_SET(LVar2, 0) - EVT_SET(LVar3, -1) - EVT_EXEC(ExitSingleDoor) - EVT_WAIT(17) - EVT_CALL(GotoMap, EVT_PTR("arn_13"), 1) - EVT_WAIT(100) - EVT_RETURN - EVT_END -}; - -EvtScript N(802404CC) = { - EVT_BIND_TRIGGER(N(exitSingleDoor_80240428), TRIGGER_WALL_PRESS_A, 2, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(enterSingleDoor_802404F8) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_SET(LVar2, 0) - EVT_SET(LVar3, -1) - EVT_EXEC_WAIT(EnterSingleDoor) - EVT_EXEC(N(802404CC)) - EVT_IF_LT(GB_StoryProgress, -22) - EVT_WAIT(10) - EVT_EXEC(N(802400F0)) - EVT_EXEC(N(802401BC)) - EVT_WAIT(1) - EVT_END_IF - EVT_CALL(DisablePlayerInput, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(main) = { - EVT_SET(GB_WorldLocation, 35) - EVT_CALL(SetSpriteShading, 524290) - EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) - EVT_CALL(SetCamBGColor, 0, 0, 0, 0) - EVT_CALL(SetCamLeadPlayer, 0, 0) - EVT_CALL(SetCamEnabled, 0, 1) - EVT_CALL(MakeNpcs, 0, EVT_PTR(N(npcGroupList_802410DC))) - EVT_EXEC(N(80240050)) - EVT_EXEC(N(enterSingleDoor_802404F8)) - EVT_WAIT(1) - EVT_RETURN - EVT_END -}; - -static s32 N(pad_674)[] = { - 0x00000000, 0x00000000, 0x00000000, -}; - -EvtScript N(80240680) = { - EVT_RETURN - EVT_END -}; - -EvtScript N(80240690) = { - EVT_RETURN - EVT_END -}; - -NpcSettings N(npcSettings_802406A0) = { - .height = 24, - .radius = 24, - .otherAI = &N(80240680), - .onDefeat = &N(80240690), - .level = 13, -}; - -EvtScript N(idle_802406CC) = { - EVT_LOOP(0) - EVT_CALL(GetSelfVar, 0, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_THREAD - EVT_CALL(SetCamType, 0, 6, 1) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(4.0)) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 50) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamDistance, 0, 3000) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_END_THREAD - EVT_CALL(StartBossBattle, 11) - EVT_RETURN - EVT_END -}; - -EvtScript N(8024081C) = { - EVT_WAIT(15) - EVT_CALL(PlaySoundAtCollider, 2, 449, 0) - EVT_CALL(MakeLerp, 0, 80, 10, 0) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 0, LVar0, 0, -1, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(802408D8) = { - EVT_CALL(MakeLerp, 80, 0, 10, 0) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(RotateModel, 0, LVar0, 0, -1, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, 2, 450, 0) - EVT_RETURN - EVT_END -}; - -s32 N(intTable_80240988)[] = { - 0x00000064, 0x0000001E, 0x00000046, 0x00000019, 0x0000001E, 0x00000050, 0xFFFFD8F0, 0x00000000, - 0x00000000, 0xFFFFFFBA, 0x0000000A, 0x00000014, 0xFFFFFF4C, 0x00000000, 0x00000000, 0xFFFFFED4, - 0x00000000, 0x00000000, 0xFFFFD8F0, 0x00000000, 0x00000000, -}; - -EvtScript N(defeat_802409DC) = { - EVT_THREAD - EVT_CALL(SetCamType, 0, 6, 1) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 50) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamDistance, 0, 450) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_END_THREAD - EVT_WAIT(10) - EVT_CALL(PlayerFaceNpc, 0, 1) - EVT_LOOP(2) - EVT_CALL(GetNpcPos, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcJumpscale, 0, EVT_FLOAT(2.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, 0x20C8, 0) - EVT_CALL(NpcJump0, 0, LVar0, LVar1, LVar2, 12) - EVT_WAIT(1) - EVT_END_LOOP - EVT_THREAD - EVT_WAIT(10) - EVT_CALL(SetCamType, 0, 4, 1) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(2.0)) - EVT_CALL(SetCamPitch, 0, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) - EVT_CALL(SetCamDistance, 0, 450) - EVT_CALL(SetCamPosA, 0, -56, 70) - EVT_CALL(SetCamPosB, 0, -90, 40) - EVT_CALL(SetCamPosC, 0, 0, 0) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_END_THREAD - EVT_CALL(PlayerFaceNpc, 0, 1) - EVT_USE_BUF(EVT_PTR(N(intTable_80240988))) - EVT_LOOP(0) - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, -10000) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, 0x20C8, 0) - EVT_CALL(NpcJump0, 0, LVar0, LVar1, LVar2, 12) - EVT_WAIT(1) - EVT_END_LOOP - EVT_EXEC(N(8024081C)) - EVT_LOOP(0) - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_IF_EQ(LVar0, -10000) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, 0x20C8, 0) - EVT_CALL(NpcJump0, 0, LVar0, LVar1, LVar2, 12) - EVT_WAIT(1) - EVT_END_LOOP - EVT_EXEC(N(802408D8)) - EVT_WAIT(30) - EVT_CALL(SetCamType, 0, 6, 1) - EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(90.0)) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(UseSettingsFrom, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) - EVT_CALL(SetCamDistance, 0, 450) - EVT_CALL(PanToTarget, 0, 0, 1) - EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) - EVT_CALL(PanToTarget, 0, 0, 0) - EVT_SET(GB_StoryProgress, -22) - EVT_RETURN - EVT_END -}; - -EvtScript N(init_80240E70) = { - EVT_IF_GE(GB_StoryProgress, -22) - EVT_CALL(RemoveNpc, NPC_SELF) - EVT_ELSE - EVT_CALL(SetSelfVar, 0, 0) - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_802406CC))) - EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_802409DC))) - EVT_END_IF - EVT_RETURN - EVT_END -}; - -StaticNpc N(npcGroup_80240EEC) = { - .id = NPC_TUBBAS_HEART, - .settings = &N(npcSettings_802406A0), - .pos = { 119.0f, 60.0f, 0.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, - .init = &N(init_80240E70), - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - ANIM_TubbasHeart_Anim01, - }, -}; - -NpcGroupList N(npcGroupList_802410DC) = { - NPC_GROUP(N(npcGroup_80240EEC), 0x0E0F, BTL_DEFAULT_STAGE), - {}, -}; diff --git a/src/world/area_arn/arn_12/arn_12.h b/src/world/area_arn/arn_12/arn_12.h index 00913e2544..1312fba930 100644 --- a/src/world/area_arn/arn_12/arn_12.h +++ b/src/world/area_arn/arn_12/arn_12.h @@ -10,8 +10,8 @@ #include "mapfs/arn_12_hit.h" enum { - NPC_TubbasHeart = 0, - NPC_HyperGoomba = 1, + NPC_TubbasHeart = 0, + NPC_HyperGoomba = 1, }; #define NAMESPACE arn_12 diff --git a/src/world/area_arn/arn_13/arn_13.h b/src/world/area_arn/arn_13/arn_13.h index 5f171242b2..fc1d09b05d 100644 --- a/src/world/area_arn/arn_13/arn_13.h +++ b/src/world/area_arn/arn_13/arn_13.h @@ -10,8 +10,8 @@ #include "mapfs/arn_13_hit.h" enum { - NPC_TubbasHeart = 0, - NPC_HyperGoomba = 1, + NPC_TubbasHeart = 0, + NPC_HyperGoomba = 1, }; #define NAMESPACE arn_13 diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index b0e51e53e1..2edbd17735 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -462,11 +462,11 @@ StaticNpc N(npcGroup_80241FE4) = { .init = &N(init_80241F70), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Boo_Tan_Idle, ANIM_Boo_Tan_Walk, ANIM_Boo_Tan_Run, @@ -495,11 +495,11 @@ StaticNpc N(npcGroup_802421D4) = { .init = &N(init_80241F94), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Boo_Tan_Idle, ANIM_Boo_Tan_Walk, ANIM_Boo_Tan_Run, @@ -527,11 +527,11 @@ StaticNpc N(npcGroup_802423C4) = { .init = &N(init_80241FA4), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Boo_Tan_Idle, ANIM_Boo_Tan_Walk, ANIM_Boo_Tan_Run, @@ -559,11 +559,11 @@ StaticNpc N(npcGroup_802425B4) = { .init = &N(init_80241FB4), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Boo_Tan_Idle, ANIM_Boo_Tan_Walk, ANIM_Boo_Tan_Run, @@ -591,11 +591,11 @@ StaticNpc N(npcGroup_802427A4) = { .init = &N(init_80241FC4), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Boo_Tan_Idle, ANIM_Boo_Tan_Walk, ANIM_Boo_Tan_Run, @@ -623,11 +623,11 @@ StaticNpc N(npcGroup_80242994) = { .init = &N(init_80241FD4), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Boo_Tan_Idle, ANIM_Boo_Tan_Walk, ANIM_Boo_Tan_Run, @@ -801,11 +801,11 @@ StaticNpc N(npcGroup_802434FC) = { .init = &N(init_802434EC), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, ANIM_Sentinel_Anim03, diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index ba63011d96..5305b89a17 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -896,11 +896,11 @@ StaticNpc N(npcGroup_80246090) = { .init = &N(init_80245D80), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { -180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }}, + .territory = { .temp = { -180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }}, .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, @@ -929,11 +929,11 @@ StaticNpc N(npcGroup_80246280) = { .init = &N(init_80245E44), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { 180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }}, + .territory = { .temp = { 180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }}, .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, @@ -962,11 +962,11 @@ StaticNpc N(npcGroup_80246470) = { .init = &N(init_80245F08), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { -180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }}, + .territory = { .temp = { -180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }}, .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, @@ -995,11 +995,11 @@ StaticNpc N(npcGroup_80246660) = { .init = &N(init_80245FCC), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { 180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }}, + .territory = { .temp = { 180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }}, .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, @@ -1043,11 +1043,11 @@ StaticNpc N(npcGroup_80246880) = { .init = &N(init_80245784), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldTubba_Anim06, ANIM_WorldTubba_Anim09, ANIM_WorldTubba_Anim0C, @@ -1076,7 +1076,7 @@ StaticNpc N(npcGroup_80246A70) = { .init = &N(init_80245814), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -1086,7 +1086,7 @@ StaticNpc N(npcGroup_80246A70) = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 2, 320, 210, 0, 370, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 350, 210, 0, 1000, 250, 1 }}, + .territory = { .temp = { 2, 320, 210, 0, 370, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 350, 210, 0, 1000, 250, 1 }}, .animations = { ANIM_WorldTubba_Anim07, ANIM_WorldTubba_Anim0A, @@ -1117,7 +1117,7 @@ StaticNpc N(npcGroup_80246C60) = { .init = &N(init_80245CF0), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -1127,7 +1127,7 @@ StaticNpc N(npcGroup_80246C60) = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 8, 156, 0, 187, -36, 0, 290, -159, 0, 50, -80, 0, -218, 66, 0, -362, 196, 0, -268, 280, 0, -124, 250, 0, 100, 0, 0, 0, 0, 0, 0, -32767, 250, 0, 100, 1000, 250, 1 }}, + .territory = { .temp = { 8, 156, 0, 187, -36, 0, 290, -159, 0, 50, -80, 0, -218, 66, 0, -362, 196, 0, -268, 280, 0, -124, 250, 0, 100, 0, 0, 0, 0, 0, 0, -32767, 250, 0, 100, 1000, 250, 1 }}, .animations = { ANIM_WorldTubba_Anim07, ANIM_WorldTubba_Anim0A, diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index cf73781c14..82464bcf26 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -287,7 +287,7 @@ StaticNpc N(npcGroup_80241E08)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -297,7 +297,7 @@ StaticNpc N(npcGroup_80241E08)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { -200, 0, 180, 40, 0, -32767, 0, -200, 0, 175, 250, 90, 1, 1 }}, + .territory = { .temp = { -200, 0, 180, 40, 0, -32767, 0, -200, 0, 175, 250, 90, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -326,11 +326,11 @@ StaticNpc N(npcGroup_80241E08)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -360,7 +360,7 @@ StaticNpc N(npcGroup_802421E8)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -370,7 +370,7 @@ StaticNpc N(npcGroup_802421E8)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 375, 0, 100, 40, 0, -32767, 0, 320, 0, 175, 250, 90, 0, 1 }}, + .territory = { .temp = { 375, 0, 100, 40, 0, -32767, 0, 320, 0, 175, 250, 90, 0, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -398,11 +398,11 @@ StaticNpc N(npcGroup_802421E8)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 5f5780394e..b5d5e79b4d 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -560,7 +560,7 @@ StaticNpc N(npcGroup_80243DE8)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -570,7 +570,7 @@ StaticNpc N(npcGroup_80243DE8)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 180, 0, -122, 40, 0, -32767, 0, 0, 0, 75, 355, 255, 1, 1 }}, + .territory = { .temp = { 180, 0, -122, 40, 0, -32767, 0, 0, 0, 75, 355, 255, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -598,11 +598,11 @@ StaticNpc N(npcGroup_80243DE8)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -632,7 +632,7 @@ StaticNpc N(npcGroup_802441C8)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -642,7 +642,7 @@ StaticNpc N(npcGroup_802441C8)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 2, -272, 0, -135, -171, 0, -135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 75, 355, 255, 1, 1 }}, + .territory = { .temp = { 2, -272, 0, -135, -171, 0, -135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 75, 355, 255, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -670,11 +670,11 @@ StaticNpc N(npcGroup_802441C8)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -705,7 +705,7 @@ StaticNpc N(npcGroup_802445A8)[] = { .init = &N(init_80243D94), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -715,7 +715,7 @@ StaticNpc N(npcGroup_802445A8)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { -326, 210, 80, 0, 0, -32767, 0, 0, 0, 75, 355, 255, 1, 1 }}, + .territory = { .temp = { -326, 210, 80, 0, 0, -32767, 0, 0, 0, 75, 355, 255, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -743,11 +743,11 @@ StaticNpc N(npcGroup_802445A8)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 5cecebcc96..f37bb4e8c5 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -241,11 +241,11 @@ StaticNpc N(npcGroup_80243B28) = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { 70, -220, 186, 15, 40, -32767, 1, 80, -220, 170, 80, 150, 1 }}, + .territory = { .temp = { 70, -220, 186, 15, 40, -32767, 1, 80, -220, 170, 80, 150, 1 }}, .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 70690cc32d..726cbce8bd 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -209,7 +209,7 @@ StaticNpc N(npcGroup_80241B4C)[] = { .flags = ENEMY_FLAGS_400, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -219,7 +219,7 @@ StaticNpc N(npcGroup_80241B4C)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 132, -110, 238, 0, 0, -32767, 0, 325, 0, 185, 200 }}, + .territory = { .temp = { 132, -110, 238, 0, 0, -32767, 0, 325, 0, 185, 200 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -247,11 +247,11 @@ StaticNpc N(npcGroup_80241B4C)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -281,7 +281,7 @@ StaticNpc N(npcGroup_80241F2C)[] = { .flags = ENEMY_FLAGS_400, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -291,7 +291,7 @@ StaticNpc N(npcGroup_80241F2C)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 503, -210, 225, 0, 0, -32767, 0, 503, -210, 290, 200, 150, 1 }}, + .territory = { .temp = { 503, -210, 225, 0, 0, -32767, 0, 503, -210, 290, 200, 150, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -319,11 +319,11 @@ StaticNpc N(npcGroup_80241F2C)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index b580bb08d9..cd689c3b17 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -138,11 +138,11 @@ StaticNpc N(npcGroup_80240954) = { .init = &N(init_802408FC), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Boo_Tan_Idle, ANIM_Boo_Tan_Walk, ANIM_Boo_Tan_Run, diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 9be6743c8b..72c49c6c9d 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -194,7 +194,7 @@ StaticNpc N(npcGroup_80241A7C)[] = { .flags = ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -204,7 +204,7 @@ StaticNpc N(npcGroup_80241A7C)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { -500, 0, -240, 40, 0, -32767, 0, -500, 0, -240, 200, 0, 0, 1 }}, + .territory = { .temp = { -500, 0, -240, 40, 0, -32767, 0, -500, 0, -240, 200, 0, 0, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -233,11 +233,11 @@ StaticNpc N(npcGroup_80241A7C)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 6b800b2a1e..fc59b638d8 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -518,7 +518,7 @@ StaticNpc N(npcGroup_802450A0) = { .init = &N(init_80244E94), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -528,7 +528,7 @@ StaticNpc N(npcGroup_802450A0) = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 10, -400, 210, 80, -100, 210, 80, 100, 210, 80, 400, 210, 80, 820, 100, 80, 820, 100, 260, 400, 0, 260, 100, 0, 200, -100, 0, 175, -450, 0, 175, -32767, 150, 0, 175, 1450, 200, 1 }}, + .territory = { .temp = { 10, -400, 210, 80, -100, 210, 80, 100, 210, 80, 400, 210, 80, 820, 100, 80, 820, 100, 260, 400, 0, 260, 100, 0, 200, -100, 0, 175, -450, 0, 175, -32767, 150, 0, 175, 1450, 200, 1 }}, .animations = { ANIM_WorldTubba_Anim07, ANIM_WorldTubba_Anim0A, @@ -558,7 +558,7 @@ StaticNpc N(npcGroup_80245290)[] = { .flags = ENEMY_FLAGS_400, .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -568,7 +568,7 @@ StaticNpc N(npcGroup_80245290)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { -250, 0, 135, 30, 0, -32767, 0, -250, 0, 135, 250, 0, 0, 1 }}, + .territory = { .temp = { -250, 0, 135, 30, 0, -32767, 0, -250, 0, 135, 250, 0, 0, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -597,11 +597,11 @@ StaticNpc N(npcGroup_80245290)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -631,7 +631,7 @@ StaticNpc N(npcGroup_80245670)[] = { .flags = ENEMY_FLAGS_400, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -641,7 +641,7 @@ StaticNpc N(npcGroup_80245670)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 220, 0, 155, 30, 0, -32767, 0, 220, 0, 155, 250, 0, 0, 1 }}, + .territory = { .temp = { 220, 0, 155, 30, 0, -32767, 0, 220, 0, 155, 250, 0, 0, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -670,11 +670,11 @@ StaticNpc N(npcGroup_80245670)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -704,7 +704,7 @@ StaticNpc N(npcGroup_80245A50)[] = { .flags = ENEMY_FLAGS_400, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -714,7 +714,7 @@ StaticNpc N(npcGroup_80245A50)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 825, 100, 200, 25, 0, -32767, 0, 825, 100, 200, 150, 0, 0, 1 }}, + .territory = { .temp = { 825, 100, 200, 25, 0, -32767, 0, 825, 100, 200, 150, 0, 0, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -743,11 +743,11 @@ StaticNpc N(npcGroup_80245A50)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -776,11 +776,11 @@ StaticNpc N(npcGroup_80245E30) = { .flags = ENEMY_FLAGS_400, .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { 75, 310, 85, 30, 0, -32767, 0, 75, 0, 85, 250, 55, 1, 1 }}, + .territory = { .temp = { 75, 310, 85, 30, 0, -32767, 0, 75, 0, 85, 250, 55, 1, 1 }}, .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, @@ -808,11 +808,11 @@ StaticNpc N(npcGroup_80246020) = { .flags = ENEMY_FLAGS_400, .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { -451, 310, 81, 30, 0, -32767, 0, -310, 0, 175, 250, 145, 1, 1 }}, + .territory = { .temp = { -451, 310, 81, 30, 0, -32767, 0, -310, 0, 175, 250, 145, 1, 1 }}, .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, @@ -901,11 +901,11 @@ StaticNpc N(npcGroup_80246528) = { .init = &N(init_802464C4), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, + .territory = { .temp = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -948,7 +948,7 @@ StaticNpc N(npcGroup_80246768) = { .init = &N(init_80246728), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -958,7 +958,7 @@ StaticNpc N(npcGroup_80246768) = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { -250, 0, 135, 30, 0, -32767, 0, -250, 0, 135, 250, 0, 0, 1 }}, + .territory = { .temp = { -250, 0, 135, 30, 0, -32767, 0, -250, 0, 135, 250, 0, 0, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index bac6d91b7b..78b3ebcbad 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -444,7 +444,7 @@ StaticNpc N(npcGroup_80244920)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -454,7 +454,7 @@ StaticNpc N(npcGroup_80244920)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { -350, 0, 180, 40, 0, -32767, 0, 0, 0, 50, 600, 250, 1, 1 }}, + .territory = { .temp = { -350, 0, 180, 40, 0, -32767, 0, 0, 0, 50, 600, 250, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -483,11 +483,11 @@ StaticNpc N(npcGroup_80244920)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -528,7 +528,7 @@ StaticNpc N(npcGroup_80244D6C)[] = { .init = &N(init_80244D00), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -538,7 +538,7 @@ StaticNpc N(npcGroup_80244D6C)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 310, 0, 88, 40, 0, -32767, 0, 0, 0, 50, 600, 250, 1, 1 }}, + .territory = { .temp = { 310, 0, 88, 40, 0, -32767, 0, 0, 0, 50, 600, 250, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -567,11 +567,11 @@ StaticNpc N(npcGroup_80244D6C)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -600,11 +600,11 @@ StaticNpc N(npcGroup_8024514C) = { .flags = ENEMY_FLAGS_400, .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { -20, 100, 180, 40, 0, -32767, 0, -20, 100, 180, 250, 0, 0, 1 }}, + .territory = { .temp = { -20, 100, 180, 40, 0, -32767, 0, -20, 100, 180, 250, 0, 0, 1 }}, .animations = { ANIM_Sentinel_Anim01, ANIM_Sentinel_Anim02, diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 789561e38c..440ecfccf6 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -381,7 +381,7 @@ StaticNpc N(npcGroup_802428C0) = { .init = &N(init_802427EC), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -391,7 +391,7 @@ StaticNpc N(npcGroup_802428C0) = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 7, -500, 0, 200, -700, 0, 200, -900, 0, 200, -1000, 0, 200, -800, 0, 200, -600, 0, 200, -400, 0, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -500, 0, 200, 1000, 250, 1, 1 }}, + .territory = { .temp = { 7, -500, 0, 200, -700, 0, 200, -900, 0, 200, -1000, 0, 200, -800, 0, 200, -600, 0, 200, -400, 0, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -500, 0, 200, 1000, 250, 1, 1 }}, .animations = { ANIM_WorldTubba_Anim06, ANIM_WorldTubba_Anim09, diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 8093395884..c2de8c0ea0 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -209,7 +209,7 @@ StaticNpc N(npcGroup_80241A4C)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -219,7 +219,7 @@ StaticNpc N(npcGroup_80241A4C)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { -70, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, + .territory = { .temp = { -70, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -248,11 +248,11 @@ StaticNpc N(npcGroup_80241A4C)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -282,7 +282,7 @@ StaticNpc N(npcGroup_80241E2C)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -292,7 +292,7 @@ StaticNpc N(npcGroup_80241E2C)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 0, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, + .territory = { .temp = { 0, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -320,11 +320,11 @@ StaticNpc N(npcGroup_80241E2C)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -354,7 +354,7 @@ StaticNpc N(npcGroup_8024220C)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -364,7 +364,7 @@ StaticNpc N(npcGroup_8024220C)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 70, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, + .territory = { .temp = { 70, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -392,11 +392,11 @@ StaticNpc N(npcGroup_8024220C)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -426,7 +426,7 @@ StaticNpc N(npcGroup_802425EC)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -436,7 +436,7 @@ StaticNpc N(npcGroup_802425EC)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 140, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, + .territory = { .temp = { 140, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -464,11 +464,11 @@ StaticNpc N(npcGroup_802425EC)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -498,7 +498,7 @@ StaticNpc N(npcGroup_802429CC)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -508,7 +508,7 @@ StaticNpc N(npcGroup_802429CC)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 210, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, + .territory = { .temp = { 210, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -536,11 +536,11 @@ StaticNpc N(npcGroup_802429CC)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, @@ -570,7 +570,7 @@ StaticNpc N(npcGroup_80242DAC)[] = { .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 10, 0 }, @@ -580,7 +580,7 @@ StaticNpc N(npcGroup_80242DAC)[] = { .minCoinBonus = 2, .maxCoinBonus = 3, }, - .territory = { .temp = { 280, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, + .territory = { .temp = { 280, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }}, .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, @@ -608,11 +608,11 @@ StaticNpc N(npcGroup_80242DAC)[] = { .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldClubba_Anim02, ANIM_WorldClubba_Anim03, ANIM_WorldClubba_Anim04, diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 3e696758e8..107229f9a5 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -589,11 +589,11 @@ StaticNpc N(npcGroup_802432D4) = { .init = &N(init_80242924), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { 5, 0, 0, 240, 175, 0, 240, 350, 0, 240, 525, 0, 240, 700, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 300, 0, 240, 1000, 250, 1, 1 }}, + .territory = { .temp = { 5, 0, 0, 240, 175, 0, 240, 350, 0, 240, 525, 0, 240, 700, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 300, 0, 240, 1000, 250, 1, 1 }}, .animations = { ANIM_WorldTubba_Anim07, ANIM_WorldTubba_Anim0A, @@ -622,11 +622,11 @@ StaticNpc N(npcGroup_802434C4) = { .init = &N(init_8024329C), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Yakkey_Idle, ANIM_Yakkey_Idle, ANIM_Yakkey_Idle, diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h index 1935c8b868..dac87f34ac 100644 --- a/src/world/area_dro/dro_01/dro_01.h +++ b/src/world/area_dro/dro_01/dro_01.h @@ -20,19 +20,19 @@ #include "sprite/npc/Toadette.h" enum { - NPC_Mouser_01 = 0, - NPC_Dryite_01 = 1, - NPC_Dryite_02 = 2, - NPC_Dryite_03 = 3, - NPC_Dryite_04 = 4, - NPC_ArtistToad = 5, - NPC_Mouser_ShopOwner = 6, - NPC_ThreeSisters_01 = 7, - NPC_ThreeSisters_02 = 8, - NPC_ThreeSisters_03 = 9, - NPC_ChuckQuizmo = 10, - NPC_Dryite_05 = 11, - NPC_Dryite_06 = 12, + NPC_Mouser_01 = 0, + NPC_Dryite_01 = 1, + NPC_Dryite_02 = 2, + NPC_Dryite_03 = 3, + NPC_Dryite_04 = 4, + NPC_ArtistToad = 5, + NPC_Mouser_ShopOwner = 6, + NPC_ThreeSisters_01 = 7, + NPC_ThreeSisters_02 = 8, + NPC_ThreeSisters_03 = 9, + NPC_ChuckQuizmo = 10, + NPC_Dryite_05 = 11, + NPC_Dryite_06 = 12, }; #define NAMESPACE dro_01 diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c index b0cff76b10..2cae1a0c0c 100644 --- a/src/world/area_dro/dro_01/dro_01_3_npc.c +++ b/src/world/area_dro/dro_01/dro_01_3_npc.c @@ -198,7 +198,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Mouser_01), .yaw = 90, .drops = MOUSER_DROPS, - .animations = MOUSER_BLUE_ANIMS, + .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_Greeter, }, { @@ -209,7 +209,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Dryite_01), .yaw = 90, .drops = DRYITE_DROPS, - .territory = { + .territory = { .wander = { .isFlying = TRUE, .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, @@ -232,7 +232,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Dryite_02), .yaw = 61, .drops = DRYITE_DROPS, - .animations = DRYITE_BLUE_ANIMS, + .animations = DRYITE_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteD, }, { @@ -243,7 +243,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_HintDryite), .yaw = 74, .drops = DRYITE_DROPS, - .animations = DRYITE_GREEN_ANIMS, + .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteB, }, { @@ -254,7 +254,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Dryite_04), .yaw = 257, .drops = DRYITE_DROPS, - .animations = DRYITE_GREEN_ANIMS, + .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteC, }, { @@ -265,11 +265,11 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Composer), .yaw = 271, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Musician_Composer_Idle, ANIM_Musician_Composer_Still, ANIM_Musician_Composer_Still, @@ -297,7 +297,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_ShopOwner), .yaw = 180, .drops = MOUSER_DROPS, - .animations = MOUSER_PURPLE_ANIMS, + .animations = MOUSER_PURPLE_ANIMS, .tattle = MSG_NpcTattle_DRO_ShopOwner, }, { @@ -392,7 +392,7 @@ StaticNpc N(ThreeSisterNPCs)[] = { .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 62, .drops = TOADETTE_DROPS, - .animations = TOADETTE_PINK_ANIMS, + .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, }, { @@ -403,7 +403,7 @@ StaticNpc N(ThreeSisterNPCs)[] = { .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 63, .drops = TOADETTE_DROPS, - .animations = TOADETTE_PINK_ANIMS, + .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, }, { @@ -414,7 +414,7 @@ StaticNpc N(ThreeSisterNPCs)[] = { .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 244, .drops = TOADETTE_DROPS, - .animations = TOADETTE_PINK_ANIMS, + .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, }, }; diff --git a/src/world/area_dro/dro_01/dro_01_4_shop.c b/src/world/area_dro/dro_01/dro_01_4_shop.c index e687cf6ef9..1b3d3d1b19 100644 --- a/src/world/area_dro/dro_01/dro_01_4_shop.c +++ b/src/world/area_dro/dro_01/dro_01_4_shop.c @@ -2,12 +2,29 @@ #define NAMESPACE dro_01_Shop s32 N(ShopMessages)[] = { - MSG_Shop_0049, MSG_Shop_004A, MSG_Shop_004B, MSG_Shop_004C, - MSG_Shop_004D, MSG_Shop_004E, MSG_Shop_004F, MSG_Shop_0050, - MSG_Shop_0051, MSG_Shop_0052, MSG_Shop_0053, MSG_Shop_0054, - MSG_Shop_0055, MSG_Shop_0056, MSG_Shop_0057, MSG_Shop_0058, - MSG_Shop_0059, MSG_Shop_005A, MSG_Shop_005B, MSG_Shop_005C, - MSG_Shop_005D, MSG_Shop_005E, MSG_Shop_005F, + MSG_Shop_0049, + MSG_Shop_004A, + MSG_Shop_004B, + MSG_Shop_004C, + MSG_Shop_004D, + MSG_Shop_004E, + MSG_Shop_004F, + MSG_Shop_0050, + MSG_Shop_0051, + MSG_Shop_0052, + MSG_Shop_0053, + MSG_Shop_0054, + MSG_Shop_0055, + MSG_Shop_0056, + MSG_Shop_0057, + MSG_Shop_0058, + MSG_Shop_0059, + MSG_Shop_005A, + MSG_Shop_005B, + MSG_Shop_005C, + MSG_Shop_005D, + MSG_Shop_005E, + MSG_Shop_005F, }; ShopItemData N(Inventory)[] = { diff --git a/src/world/area_dro/dro_02/dro_02.h b/src/world/area_dro/dro_02/dro_02.h index b12385434b..e71516e6c5 100644 --- a/src/world/area_dro/dro_02/dro_02.h +++ b/src/world/area_dro/dro_02/dro_02.h @@ -23,22 +23,22 @@ #include "sprite/npc/Moustafa.h" enum { - NPC_Archeologist = 0, - NPC_Dryite_01 = 1, - NPC_DisguisedMoustafa = 2, - NPC_Toad = 3, - NPC_Merlee = 4, - NPC_Moustafa = 5, - NPC_Dryite_02 = 6, - NPC_Mouser_01 = 7, - NPC_Mouser_02 = 8, - NPC_Mouser_03 = 9, - NPC_ChuckQuizmo = 10, - NPC_Dryite_03 = 11, + NPC_Archeologist = 0, + NPC_Dryite_01 = 1, + NPC_DisguisedMoustafa = 2, + NPC_Toad = 3, + NPC_Merlee = 4, + NPC_Moustafa = 5, + NPC_Dryite_02 = 6, + NPC_Mouser_01 = 7, + NPC_Mouser_02 = 8, + NPC_Mouser_03 = 9, + NPC_ChuckQuizmo = 10, + NPC_Dryite_03 = 11, }; enum { - MF_Unk_00 = MapFlag(0), + MF_Unk_00 = MapFlag(0), }; #define NAMESPACE dro_02 diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index 778729f382..40401ebad3 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -369,11 +369,11 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Archeologist), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .territory = { .temp = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 }}, + .territory = { .temp = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 }}, .animations = { ANIM_Archeologist_Idle, ANIM_Archeologist_Walk, @@ -402,7 +402,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_MrE), .yaw = 270, .drops = DRYITE_DROPS, - .territory = { .temp = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, + .territory = { .temp = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }}, .animations = DRYITE_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteE, }, @@ -414,11 +414,11 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_DisguisedMoustafa), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_DisguisedMoustafa_Idle, ANIM_DisguisedMoustafa_Idle, ANIM_DisguisedMoustafa_Idle, @@ -446,7 +446,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_ToadHouseKeeper), .yaw = 180, .drops = TOAD_DROPS, - .animations = TOAD_RED_ANIMS, + .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_DRO_ToadHouseToad, }, { @@ -457,11 +457,11 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcAuxAI_Merlee), .yaw = 180, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_WorldMerlee_Idle, ANIM_WorldMerlee_Walk, ANIM_WorldMerlee_Run, @@ -489,11 +489,11 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Moustafa), .yaw = 0, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { + .animations = { ANIM_Moustafa_Idle, ANIM_Moustafa_Idle, ANIM_Moustafa_Run, @@ -521,7 +521,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Dryite_02), .yaw = 270, .drops = DRYITE_DROPS, - .animations = DRYITE_GREEN_ANIMS, + .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteF, }, { @@ -532,7 +532,7 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Dryite_03), .yaw = 270, .drops = DRYITE_DROPS, - .animations = DRYITE_GREEN_ANIMS, + .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_VisitedShootingStarSummit, }, { @@ -543,11 +543,11 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Mouser_01), .yaw = 180, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = MOUSER_BLUE_ANIMS, + .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_CrushingOnMerlee, }, { @@ -558,11 +558,11 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Mouser_02), .yaw = 270, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = MOUSER_BLUE_ANIMS, + .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_TellsTales, }, { @@ -573,11 +573,11 @@ StaticNpc N(PassiveNPCs)[] = { .init = &N(EVS_NpcInit_Mouser_03), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = MOUSER_PURPLE_ANIMS, + .animations = MOUSER_PURPLE_ANIMS, }, { .id = NPC_ChuckQuizmo, @@ -588,7 +588,7 @@ StaticNpc N(PassiveNPCs)[] = { .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_02 } }, .yaw = 270, .drops = QUIZMO_DROPS, - .animations = QUIZMO_ANIMS, + .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, }, }; diff --git a/src/world/area_end/end_01/end_01.h b/src/world/area_end/end_01/end_01.h index e14551802a..0c345b5a33 100644 --- a/src/world/area_end/end_01/end_01.h +++ b/src/world/area_end/end_01/end_01.h @@ -113,7 +113,7 @@ enum { enum { PARADE_START = -3135, - PARADE_PHASE_SKATERS = -3000, + PARADE_PHASE_SKATERS = -3000, PARADE_PHASE_MAYOR = -2950, PARADE_PHASE_OPERA = -2945, PARADE_PHASE_WIZARDS = -2450, diff --git a/src/world/area_flo/flo_00/flo_00.h b/src/world/area_flo/flo_00/flo_00.h index 7e2c64c900..096292bc33 100644 --- a/src/world/area_flo/flo_00/flo_00.h +++ b/src/world/area_flo/flo_00/flo_00.h @@ -14,17 +14,17 @@ #include "sprite/npc/WorldParakarry.h" enum { - NPC_Dummy_Wisterwood = 0, - NPC_Bubulb_01 = 1, - NPC_Bubulb_02 = 2, - NPC_Bubulb_03 = 3, - NPC_Bubulb_04 = 4, - NPC_Tolielup = 5, - NPC_Klevar = 6, - NPC_Lakilulu = 7, - NPC_Lakilester_Epilogue = 0, - NPC_Lakilulu_Epilogue = 1, - NPC_Parakarry_Epilogue = 2, + NPC_Dummy_Wisterwood = 0, + NPC_Bubulb_01 = 1, + NPC_Bubulb_02 = 2, + NPC_Bubulb_03 = 3, + NPC_Bubulb_04 = 4, + NPC_Tolielup = 5, + NPC_Klevar = 6, + NPC_Lakilulu = 7, + NPC_Lakilester_Epilogue = 0, + NPC_Lakilulu_Epilogue = 1, + NPC_Parakarry_Epilogue = 2, }; enum { diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c b/src/world/area_flo/flo_00/flo_00_3_npc.c index d6a6cb0b59..db3f9b1ca9 100644 --- a/src/world/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/area_flo/flo_00/flo_00_3_npc.c @@ -10,7 +10,7 @@ NpcSettings N(NpcSettings_Dummy) = { #include "world/common/npc/Tolielup.inc.c" #include "world/common/npc/StarSpirit.inc.c" -API_CALLABLE(N(UpgradeStarPower)) { +API_CALLABLE(N(UpgradeStarPowerCh6)) { set_max_SP(6); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; @@ -498,7 +498,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Idle) EVT_CALL(EnableNpcAI, NPC_Klevar, TRUE) - EVT_CALL(N(UpgradeStarPower)) + EVT_CALL(N(UpgradeStarPowerCh6)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0196, 160, 40) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) diff --git a/src/world/area_flo/flo_03/flo_03.h b/src/world/area_flo/flo_03/flo_03.h index 5ab6c0b8f2..2bcb338adf 100644 --- a/src/world/area_flo/flo_03/flo_03.h +++ b/src/world/area_flo/flo_03/flo_03.h @@ -14,12 +14,12 @@ #include "sprite/npc/Dayzee.h" enum { - NPC_Petunia = 0, - NPC_Dayzee = 1, - NPC_MontyMole_01 = 2, - NPC_MontyMole_02 = 3, - NPC_MontyMole_03 = 4, - NPC_MontyMole_04 = 5, + NPC_Petunia = 0, + NPC_Dayzee = 1, + NPC_MontyMole_01 = 2, + NPC_MontyMole_02 = 3, + NPC_MontyMole_03 = 4, + NPC_MontyMole_04 = 5, }; enum { diff --git a/src/world/area_flo/flo_07/flo_07.h b/src/world/area_flo/flo_07/flo_07.h index e881456e31..b8609869b2 100644 --- a/src/world/area_flo/flo_07/flo_07.h +++ b/src/world/area_flo/flo_07/flo_07.h @@ -10,11 +10,11 @@ #include "mapfs/flo_07_hit.h" enum { - NPC_Posie = 0, + NPC_Posie = 0, }; enum { - MV_GroundShakingScript = MapVar(0), + MV_GroundShakingScript = MapVar(0), }; #define NAMESPACE flo_07 diff --git a/src/world/area_flo/flo_08/flo_08.h b/src/world/area_flo/flo_08/flo_08.h index 5099ab32ab..1b7fefef86 100644 --- a/src/world/area_flo/flo_08/flo_08.h +++ b/src/world/area_flo/flo_08/flo_08.h @@ -10,15 +10,15 @@ #include "mapfs/flo_08_hit.h" enum { - NPC_GateFlower = 0, - NPC_Dayzee_01 = 1, - NPC_Dayzee_02 = 2, - NPC_Dayzee_03 = 3, - NPC_Dayzee_04 = 4, - NPC_Dayzee_05 = 5, - NPC_Dayzee_06 = 6, - NPC_Dayzee_07 = 7, - NPC_AmazyDayzee = 8, + NPC_GateFlower = 0, + NPC_Dayzee_01 = 1, + NPC_Dayzee_02 = 2, + NPC_Dayzee_03 = 3, + NPC_Dayzee_04 = 4, + NPC_Dayzee_05 = 5, + NPC_Dayzee_06 = 6, + NPC_Dayzee_07 = 7, + NPC_AmazyDayzee = 8, }; enum { diff --git a/src/world/area_flo/flo_09/flo_09.h b/src/world/area_flo/flo_09/flo_09.h index fd606bdf26..74a15f32cd 100644 --- a/src/world/area_flo/flo_09/flo_09.h +++ b/src/world/area_flo/flo_09/flo_09.h @@ -13,10 +13,10 @@ #include "sprite/npc/Bzzap.h" enum { - NPC_Dayzee_01 = 0, - NPC_Dayzee_02 = 1, - NPC_Bzzap_01 = 2, - NPC_Bzzap_02 = 3, + NPC_Dayzee_01 = 0, + NPC_Dayzee_02 = 1, + NPC_Bzzap_01 = 2, + NPC_Bzzap_02 = 3, }; #define NAMESPACE flo_09 diff --git a/src/world/area_flo/flo_10/flo_10.h b/src/world/area_flo/flo_10/flo_10.h index 6fa0d71e8d..5e261dbc46 100644 --- a/src/world/area_flo/flo_10/flo_10.h +++ b/src/world/area_flo/flo_10/flo_10.h @@ -10,7 +10,7 @@ #include "mapfs/flo_10_hit.h" enum { - NPC_Lily = 0, + NPC_Lily = 0, }; #define NAMESPACE flo_10 diff --git a/src/world/area_flo/flo_11/flo_11.h b/src/world/area_flo/flo_11/flo_11.h index 1ecf48a574..795fc8bdb7 100644 --- a/src/world/area_flo/flo_11/flo_11.h +++ b/src/world/area_flo/flo_11/flo_11.h @@ -10,8 +10,8 @@ #include "mapfs/flo_11_hit.h" enum { - NPC_Lakitu_01 = 0, - NPC_Lakitu_02 = 1, + NPC_Lakitu_01 = 0, + NPC_Lakitu_02 = 1, }; enum { diff --git a/src/world/area_flo/flo_12/flo_12.h b/src/world/area_flo/flo_12/flo_12.h index 996d6eb8fd..c5a1528e78 100644 --- a/src/world/area_flo/flo_12/flo_12.h +++ b/src/world/area_flo/flo_12/flo_12.h @@ -10,8 +10,8 @@ #include "mapfs/flo_12_hit.h" enum { - NPC_Rosie = 0, - NPC_Dummy = 1, + NPC_Rosie = 0, + NPC_Dummy = 1, }; #define NAMESPACE flo_12 diff --git a/src/world/area_flo/flo_13/flo_13.h b/src/world/area_flo/flo_13/flo_13.h index c636f017cd..faa0db6ac1 100644 --- a/src/world/area_flo/flo_13/flo_13.h +++ b/src/world/area_flo/flo_13/flo_13.h @@ -15,21 +15,21 @@ #include "sprite/npc/Spiny.h" enum { - NPC_Lakilester = 0, - NPC_Lakilulu = 1, - NPC_Lakilulu_Spiny = 2, - NPC_Lakitu_01 = 3, - NPC_Lakitu_02 = 4, - NPC_Spiny_01 = 50, - NPC_Spiny_02 = 51, - NPC_Spiny_03 = 52, - NPC_Spiny_04 = 53, - NPC_Spiny_05 = 54, - NPC_Spiny_06 = 55, + NPC_Lakilester = 0, + NPC_Lakilulu = 1, + NPC_Lakilulu_Spiny = 2, + NPC_Lakitu_01 = 3, + NPC_Lakitu_02 = 4, + NPC_Spiny_01 = 50, + NPC_Spiny_02 = 51, + NPC_Spiny_03 = 52, + NPC_Spiny_04 = 53, + NPC_Spiny_05 = 54, + NPC_Spiny_06 = 55, }; enum { - MV_LakiluluSpinySceneState = MapVar(10), + MV_LakiluluSpinySceneState = MapVar(10), }; #define NAMESPACE flo_13 diff --git a/src/world/area_flo/flo_14/flo_14.h b/src/world/area_flo/flo_14/flo_14.h index 3834f26f6c..cab64f1c64 100644 --- a/src/world/area_flo/flo_14/flo_14.h +++ b/src/world/area_flo/flo_14/flo_14.h @@ -13,8 +13,8 @@ #include "sprite/npc/Bzzap.h" enum { - NPC_BubbleFlower = 0, - NPC_Bzzap = 1, + NPC_BubbleFlower = 0, + NPC_Bzzap = 1, }; enum { diff --git a/src/world/area_flo/flo_15/flo_15.h b/src/world/area_flo/flo_15/flo_15.h index 8503821fab..86bee3e7ff 100644 --- a/src/world/area_flo/flo_15/flo_15.h +++ b/src/world/area_flo/flo_15/flo_15.h @@ -12,8 +12,8 @@ #include "sprite/npc/Sun.h" enum { - NPC_Sun_01 = 10, - NPC_Sun_02 = 11, + NPC_Sun_01 = 10, + NPC_Sun_02 = 11, }; #define NAMESPACE flo_15 diff --git a/src/world/area_flo/flo_16/flo_16.h b/src/world/area_flo/flo_16/flo_16.h index 8b6ccd69a1..def88d9823 100644 --- a/src/world/area_flo/flo_16/flo_16.h +++ b/src/world/area_flo/flo_16/flo_16.h @@ -12,12 +12,12 @@ #include "sprite/npc/TuffPuff.h" enum { - NPC_TuffPuff_01 = 0, - NPC_TuffPuff_02 = 1, + NPC_TuffPuff_01 = 0, + NPC_TuffPuff_02 = 1, }; enum { - MV_SuperBlock = MapVar(0), + MV_SuperBlock = MapVar(0), }; #define NAMESPACE flo_16 diff --git a/src/world/area_flo/flo_17/flo_17.h b/src/world/area_flo/flo_17/flo_17.h index 959ef3570f..815c0e19e3 100644 --- a/src/world/area_flo/flo_17/flo_17.h +++ b/src/world/area_flo/flo_17/flo_17.h @@ -10,12 +10,12 @@ #include "mapfs/flo_17_hit.h" enum { - NPC_Lakitu_01 = 0, - NPC_Lakitu_02 = 1, - NPC_Spiny_01 = 50, - NPC_Spiny_02 = 51, - NPC_Spiny_03 = 52, - NPC_Spiny_04 = 53, + NPC_Lakitu_01 = 0, + NPC_Lakitu_02 = 1, + NPC_Spiny_01 = 50, + NPC_Spiny_02 = 51, + NPC_Spiny_03 = 52, + NPC_Spiny_04 = 53, }; enum { diff --git a/src/world/area_flo/flo_18/flo_18.h b/src/world/area_flo/flo_18/flo_18.h index a5b59777f9..f20ee48441 100644 --- a/src/world/area_flo/flo_18/flo_18.h +++ b/src/world/area_flo/flo_18/flo_18.h @@ -12,21 +12,21 @@ #include "sprite/npc/WorldLakilester.h" enum { - NPC_Lakitu_01 = 0, - NPC_Lakitu_02 = 1, - NPC_Lakitu_03 = 2, - NPC_Magikoopa = 3, - NPC_FlyingMagikoopa = 4, + NPC_Lakitu_01 = 0, + NPC_Lakitu_02 = 1, + NPC_Lakitu_03 = 2, + NPC_Magikoopa = 3, + NPC_FlyingMagikoopa = 4, }; enum { - MF_HitGuardedMachine = MapFlag(1), - MF_MachineShaking = MapFlag(2), - MF_MachineBeingDamaged = MapFlag(3), + MF_HitGuardedMachine = MapFlag(1), + MF_MachineShaking = MapFlag(2), + MF_MachineBeingDamaged = MapFlag(3), }; enum { - MV_ReactingNpc = MapVar(10), + MV_ReactingNpc = MapVar(10), }; #define NAMESPACE flo_18 diff --git a/src/world/area_flo/flo_21/flo_21.h b/src/world/area_flo/flo_21/flo_21.h index c6b173518d..7d372dbd1b 100644 --- a/src/world/area_flo/flo_21/flo_21.h +++ b/src/world/area_flo/flo_21/flo_21.h @@ -10,36 +10,36 @@ #include "mapfs/flo_21_hit.h" enum { - NPC_HuffNPuff_01 = 0, - NPC_HuffNPuff_02 = 1, - NPC_HuffNPuff_03 = 2, - NPC_TuffPuff_01 = 3, - NPC_TuffPuff_02 = 4, - NPC_TuffPuff_03 = 5, - NPC_TuffPuff_04 = 6, - NPC_TuffPuff_05 = 7, - NPC_TuffPuff_06 = 8, - NPC_TuffPuff_07 = 9, - NPC_TuffPuff_08 = 10, - NPC_TuffPuff_09 = 11, - NPC_TuffPuff_10 = 12, - NPC_TuffPuff_11 = 13, - NPC_TuffPuff_12 = 14, - NPC_TuffPuff_13 = 15, - NPC_TuffPuff_14 = 16, - NPC_TuffPuff_15 = 17, + NPC_HuffNPuff_01 = 0, + NPC_HuffNPuff_02 = 1, + NPC_HuffNPuff_03 = 2, + NPC_TuffPuff_01 = 3, + NPC_TuffPuff_02 = 4, + NPC_TuffPuff_03 = 5, + NPC_TuffPuff_04 = 6, + NPC_TuffPuff_05 = 7, + NPC_TuffPuff_06 = 8, + NPC_TuffPuff_07 = 9, + NPC_TuffPuff_08 = 10, + NPC_TuffPuff_09 = 11, + NPC_TuffPuff_10 = 12, + NPC_TuffPuff_11 = 13, + NPC_TuffPuff_12 = 14, + NPC_TuffPuff_13 = 15, + NPC_TuffPuff_14 = 16, + NPC_TuffPuff_15 = 17, }; enum { - MV_Unk_00 = MapVar(0), - MV_Unk_01 = MapVar(1), - MV_Unk_02 = MapVar(2), - MV_Unk_03 = MapVar(3), - MV_Unk_04 = MapVar(4), - MV_BossDefeated = MapVar(10), - MV_HuffScaleX = MapVar(11), - MV_HuffScaleY = MapVar(12), - MV_BossFightState = MapVar(13), + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_Unk_02 = MapVar(2), + MV_Unk_03 = MapVar(3), + MV_Unk_04 = MapVar(4), + MV_BossDefeated = MapVar(10), + MV_HuffScaleX = MapVar(11), + MV_HuffScaleY = MapVar(12), + MV_BossFightState = MapVar(13), }; #define NAMESPACE flo_21 diff --git a/src/world/area_flo/flo_22/flo_22.h b/src/world/area_flo/flo_22/flo_22.h index b75999576b..c602083fb8 100644 --- a/src/world/area_flo/flo_22/flo_22.h +++ b/src/world/area_flo/flo_22/flo_22.h @@ -13,9 +13,9 @@ #include "sprite/npc/Dayzee.h" enum { - NPC_Dummy = 0, // reused as a dummy for tossing badge out of the well - NPC_Bzzap = 0, - NPC_Dayzee = 1, + NPC_Dummy = 0, // reused as a dummy for tossing badge out of the well + NPC_Bzzap = 0, + NPC_Dayzee = 1, }; enum { diff --git a/src/world/area_flo/flo_23/flo_23.h b/src/world/area_flo/flo_23/flo_23.h index 2547d7895a..6dd18af471 100644 --- a/src/world/area_flo/flo_23/flo_23.h +++ b/src/world/area_flo/flo_23/flo_23.h @@ -10,9 +10,9 @@ #include "mapfs/flo_23_hit.h" enum { - NPC_Spiny_01 = 0, - NPC_Spiny_02 = 1, - NPC_GateFlower = 2, + NPC_Spiny_01 = 0, + NPC_Spiny_02 = 1, + NPC_GateFlower = 2, }; #define NAMESPACE flo_23 diff --git a/src/world/area_flo/flo_25/flo_25.h b/src/world/area_flo/flo_25/flo_25.h index b587970337..03473ae1ed 100644 --- a/src/world/area_flo/flo_25/flo_25.h +++ b/src/world/area_flo/flo_25/flo_25.h @@ -10,9 +10,9 @@ #include "mapfs/flo_25_hit.h" enum { - NPC_GateFlower = 0, - NPC_TuffPuff = 1, - NPC_Bzzap = 2, + NPC_GateFlower = 0, + NPC_TuffPuff = 1, + NPC_Bzzap = 2, }; #define NAMESPACE flo_25 diff --git a/src/world/area_hos/hos_00/A0BCF0.c b/src/world/area_hos/hos_00/A0BCF0.c index e63f3f7d55..f6155d3612 100644 --- a/src/world/area_hos/hos_00/A0BCF0.c +++ b/src/world/area_hos/hos_00/A0BCF0.c @@ -1,7 +1,5 @@ #include "hos_00.h" -extern char wMapBgName[]; - ApiStatus func_80240000_A0BCF0(Evt* script, s32 isInitialCall) { if (gGameStatusPtr->entryID == 3) { sprintf(wMapBgName, "hos_bg\0\0\0\0\0\0\0\0\0"); diff --git a/src/world/area_isk/StoneChompFX.inc.c b/src/world/area_isk/StoneChompFX.inc.c index ac6792a706..970c6da308 100644 --- a/src/world/area_isk/StoneChompFX.inc.c +++ b/src/world/area_isk/StoneChompFX.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "sprite/npc/StoneChomp.h" -ApiStatus N(StoneChompFXA)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StoneChompFXA)) { NpcBlueprint bp; NpcBlueprint* bpPtr = &bp; NpcChompBlur* blurData; @@ -34,7 +34,7 @@ ApiStatus N(StoneChompFXA)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(StoneChompFXB)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StoneChompFXB)) { NpcChompBlur* blurData; Npc* ownerNpc; Npc* childNpc; @@ -110,7 +110,7 @@ ApiStatus N(StoneChompFXB)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(StoneChompFXC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StoneChompFXC)) { NpcChompBlur* blurData = get_npc_safe(script->owner2.npcID)->blur.chomp; s32 i; diff --git a/src/world/area_isk/isk.h b/src/world/area_isk/isk.h index 2bdd8ce85e..6cf1c82bea 100644 --- a/src/world/area_isk/isk.h +++ b/src/world/area_isk/isk.h @@ -2,24 +2,62 @@ #define _WORLD_AREA_ISK_ISK_H_ enum { - AB_ISK_0 = AreaByte(0), - AB_ISK_1 = AreaByte(1), - AB_ISK_2 = AreaByte(2), - AB_ISK_3 = AreaByte(3), - AB_ISK_4 = AreaByte(4), - AB_ISK_5 = AreaByte(5), - AB_ISK_6 = AreaByte(6), - AB_ISK_7 = AreaByte(7), - AB_ISK_8 = AreaByte(8), - AB_ISK_9 = AreaByte(9), - AB_ISK_A = AreaByte(10), - AB_ISK_B = AreaByte(11), - AB_ISK_C = AreaByte(12), - AB_ISK_D = AreaByte(13), - AB_ISK_E = AreaByte(14), - AB_ISK_F = AreaByte(15), + AB_ISK_0 = AreaByte(0), + AB_ISK_1 = AreaByte(1), + AB_ISK_2 = AreaByte(2), + AB_ISK_3 = AreaByte(3), + AB_ISK_4 = AreaByte(4), + AB_ISK_5 = AreaByte(5), + AB_ISK_6 = AreaByte(6), + AB_ISK_7 = AreaByte(7), + AB_ISK_8 = AreaByte(8), + AB_ISK_9 = AreaByte(9), + AB_ISK_A = AreaByte(10), + AB_ISK_B = AreaByte(11), + AB_ISK_C = AreaByte(12), + AB_ISK_D = AreaByte(13), + AB_ISK_E = AreaByte(14), + AB_ISK_F = AreaByte(15), }; -#define AF_ISK(index) AreaFlag(index) +enum { + AF_ISK03_SandSwitchActivated = AreaFlag(1), + AF_ISK06_SandSwitchActivated = AreaFlag(2), + AF_ISK12_SandSwitchActivated = AreaFlag(3), + AF_ISK02_Sarcophagus1Opened = AreaFlag(4), + AF_ISK02_Sarcophagus2Opened = AreaFlag(5), + AF_ISK02_Sarcophagus3Opened = AreaFlag(6), + AF_ISK02_OpeningSarcophagus1 = AreaFlag(7), + AF_ISK02_OpeningSarcophagus2 = AreaFlag(8), + AF_ISK02_OpeningSarcophagus3 = AreaFlag(9), + AF_ISK07_OpeningSarcophagus1 = AreaFlag(10), + AF_ISK07_OpeningSarcophagus2 = AreaFlag(11), + AF_ISK07_OpeningSarcophagus3 = AreaFlag(12), + AF_ISK07_MummiesReleased = AreaFlag(13), + AF_ISK07_FlippingRedStairs = AreaFlag(14), + AF_ISK09_FlippingBlueStairs = AreaFlag(15), + AF_ISK09_FlippingRedStairs = AreaFlag(16), + AF_ISK05_StoneChompDefeated = AreaFlag(17), + AF_ISK12_StairSwitchActivated = AreaFlag(18), + AF_ISK14_StoneChompDefeated = AreaFlag(19), +}; + +extern MapSettings isk_01_settings; +extern MapSettings isk_02_settings; +extern MapSettings isk_03_settings; +extern MapSettings isk_04_settings; +extern MapSettings isk_05_settings; +extern MapSettings isk_06_settings; +extern MapSettings isk_07_settings; +extern MapSettings isk_08_settings; +extern MapSettings isk_09_settings; +extern MapSettings isk_10_settings; +extern MapSettings isk_11_settings; +extern MapSettings isk_12_settings; +extern MapSettings isk_13_settings; +extern MapSettings isk_14_settings; +extern MapSettings isk_16_settings; +extern MapSettings isk_18_settings; +extern MapSettings isk_19_settings; #endif diff --git a/src/world/area_isk/isk_01/978140.c b/src/world/area_isk/isk_01/978140.c deleted file mode 100644 index aff83e34a2..0000000000 --- a/src/world/area_isk/isk_01/978140.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "isk_01.h" - -static char* N(exit_str_0) = "sbk_02"; -static char* N(exit_str_1) = "isk_02"; - diff --git a/src/world/area_isk/isk_01/isk_01.h b/src/world/area_isk/isk_01/isk_01.h index dd078ff649..24b30486e8 100644 --- a/src/world/area_isk/isk_01/isk_01.h +++ b/src/world/area_isk/isk_01/isk_01.h @@ -2,8 +2,16 @@ /// @brief Dry Dry Ruins - Entrance #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_01_shape.h" +#include "mapfs/isk_01_hit.h" + #define NAMESPACE isk_01 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupHaze); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_isk/isk_01/isk_01_0_header.c b/src/world/area_isk/isk_01/isk_01_0_header.c new file mode 100644 index 0000000000..006acf9167 --- /dev/null +++ b/src/world/area_isk/isk_01/isk_01_0_header.c @@ -0,0 +1,14 @@ +#include "isk_01.h" + +EntryList N(Entrances) = { + [isk_01_ENTRY_0] { -576.0, 0.0, -71.0, 179.0 }, + [isk_01_ENTRY_1] { -555.0, 0.0, 170.0, 350.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_isk_01 }, +}; diff --git a/src/world/area_isk/isk_01/isk_01_1_music.c b/src/world/area_isk/isk_01/isk_01_1_music.c new file mode 100644 index 0000000000..0c2cce4377 --- /dev/null +++ b/src/world/area_isk/isk_01/isk_01_1_music.c @@ -0,0 +1,31 @@ +#include "isk_01.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GF_ISK01_FirstWarning, FALSE) + EVT_THREAD + EVT_CALL(FadeInMusic, 1, SONG_TUTANKOOPA_WARNING, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00DD, 160, 40) + EVT_SET(GF_ISK01_FirstWarning, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 1, 2000) + EVT_END_THREAD + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_01/isk_01_2_main.c b/src/world/area_isk/isk_01/isk_01_2_main.c new file mode 100644 index 0000000000..9a88873ae5 --- /dev/null +++ b/src/world/area_isk/isk_01/isk_01_2_main.c @@ -0,0 +1,38 @@ +#include "isk_01.h" + +EvtScript N(D_80240220_978360) = EVT_EXIT_WALK(40, isk_01_ENTRY_0, "sbk_02", sbk_02_ENTRY_4); +EvtScript N(D_8024027C_9783BC) = EVT_EXIT_WALK(40, isk_01_ENTRY_1, "isk_02", isk_02_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(D_80240220_978360)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(D_8024027C_9783BC)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_SET(GF_MAP_DryDryRuins, TRUE) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupHaze)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_01/isk_01_3_haze.c b/src/world/area_isk/isk_01/isk_01_3_haze.c new file mode 100644 index 0000000000..3a543e0f81 --- /dev/null +++ b/src/world/area_isk/isk_01/isk_01_3_haze.c @@ -0,0 +1,24 @@ +#include "isk_01.h" + +Gfx N(HazePreGfx)[] = { + gsDPSetAlphaDither(G_AD_NOISE), + gsSPEndDisplayList(), +}; + +EvtScript N(EVS_SetupHaze) = { + EVT_CALL(SetTexPanner, MODEL_o99, TEX_PANNER_2) + EVT_CALL(EnableTexPanning, MODEL_o99, TRUE) + EVT_SET(LVar0, 0) + EVT_CALL(SetCustomGfx, 0, EVT_PTR(N(HazePreGfx)), NULL) + EVT_CALL(SetModelFlags, MODEL_o99, MODEL_FLAGS_USES_CUSTOM_GFX, TRUE) + EVT_LABEL(0) + EVT_ADD(LVar0, 70) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar0, 0) + EVT_IF_GT(LVar0, 0x4000) + EVT_ADD(LVar0, -0x4000) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_01/isk_01_4_entity.c b/src/world/area_isk/isk_01/isk_01_4_entity.c new file mode 100644 index 0000000000..d8c3ea4f13 --- /dev/null +++ b/src/world/area_isk/isk_01/isk_01_4_entity.c @@ -0,0 +1,8 @@ +#include "isk_01.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -530, 60, 43, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_02/978710.c b/src/world/area_isk/isk_02/978710.c deleted file mode 100644 index 46e27d63dc..0000000000 --- a/src/world/area_isk/isk_02/978710.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "isk_02.h" - -static char* N(exit_str_0) = "isk_01"; -static char* N(exit_str_1) = "isk_03"; - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_isk/isk_02/978750.c b/src/world/area_isk/isk_02/978750.c deleted file mode 100644 index cd0043f764..0000000000 --- a/src/world/area_isk/isk_02/978750.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "isk_02.h" - -ApiStatus func_80240040_978750(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - f32 x = evt_get_variable(script, *args++); - f32 y = evt_get_variable(script, *args++); - - if (dist2D(x, y, gPlayerStatus.position.x, gPlayerStatus.position.z) > 250.0f) { - script->varTable[0] = FALSE; - } else { - script->varTable[0] = TRUE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_isk/isk_02/978800.c b/src/world/area_isk/isk_02/978800.c deleted file mode 100644 index 4363864fd2..0000000000 --- a/src/world/area_isk/isk_02/978800.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "isk_02.h" -#include "world/common/todo/SetNpcB5_3.inc.c" diff --git a/src/world/area_isk/isk_02/isk_02.h b/src/world/area_isk/isk_02/isk_02.h index e247330c5d..1c2c6f0b60 100644 --- a/src/world/area_isk/isk_02/isk_02.h +++ b/src/world/area_isk/isk_02/isk_02.h @@ -2,8 +2,29 @@ /// @brief Dry Dry Ruins - Sarcophagus Hall 1 #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_02_shape.h" +#include "mapfs/isk_02_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Pokey_03 = 2, +}; + +enum { + MV_EntityID_Padlock = MapVar(0), +}; + #define NAMESPACE isk_02 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupLock); +extern EvtScript N(EVS_SetupSarcophagi); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_02/isk_02_0_header.c b/src/world/area_isk/isk_02/isk_02_0_header.c new file mode 100644 index 0000000000..2b0fd3684c --- /dev/null +++ b/src/world/area_isk/isk_02/isk_02_0_header.c @@ -0,0 +1,15 @@ +#include "isk_02.h" + +EntryList N(Entrances) = { + [isk_02_ENTRY_0] { -484.0, 0.0, 302.0, 140.0 }, + [isk_02_ENTRY_1] { 258.0, 50.0, 486.0, 250.0 }, + [isk_02_ENTRY_2] { 283.0, -80.0, 530.0, 250.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_isk_02 }, +}; diff --git a/src/world/area_isk/isk_02/isk_02_1_main.c b/src/world/area_isk/isk_02/isk_02_1_main.c new file mode 100644 index 0000000000..a068a53526 --- /dev/null +++ b/src/world/area_isk/isk_02/isk_02_1_main.c @@ -0,0 +1,35 @@ +#include "isk_02.h" + +EvtScript N(EVS_ExitWalk_isk_01_1) = EVT_EXIT_WALK(40, isk_02_ENTRY_0, "isk_01", isk_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_isk_03_0) = EVT_EXIT_WALK(40, isk_02_ENTRY_1, "isk_03", isk_03_ENTRY_0); +EvtScript N(EVS_ExitWalk_isk_03_1) = EVT_EXIT_WALK(40, isk_02_ENTRY_2, "isk_03", isk_03_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_01_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_03_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_03_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupLock)) + EVT_EXEC(N(EVS_SetupSarcophagi)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_02/isk_02_2_lock.c b/src/world/area_isk/isk_02/isk_02_2_lock.c new file mode 100644 index 0000000000..3e1a22e97f --- /dev/null +++ b/src/world/area_isk/isk_02/isk_02_2_lock.c @@ -0,0 +1,54 @@ +#include "isk_02.h" + +#include "world/common/todo/RemovePadlock.inc.c" + +s32 N(KeyList)[] = { + ITEM_RUINS_KEY, + ITEM_NONE, +}; + +EvtScript N(EVS_UnlockDoor) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_269, 0, 272, 60, 486) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_ISK02_UnlockedDoor, TRUE) + EVT_SET(LVar0, MV_EntityID_Padlock) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_265, 0) + EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g304, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupLock) = { + EVT_IF_EQ(GF_ISK02_UnlockedDoor, FALSE) + EVT_CALL(MakeTransformGroup, MODEL_g304) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockDoor)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList)), 0, 1) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_g304, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAGS_SAFE_FLOOR | COLLIDER_FLAGS_IGNORE_SHELL | COLLIDER_FLAGS_IGNORE_PLAYER | COLLIDER_FLAGS_80000 | 0x7FF47E00) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_02/isk_02_3_ambush.c b/src/world/area_isk/isk_02/isk_02_3_ambush.c new file mode 100644 index 0000000000..11a968f778 --- /dev/null +++ b/src/world/area_isk/isk_02/isk_02_3_ambush.c @@ -0,0 +1,125 @@ +#include "isk_02.h" + +extern EvtScript N(EVS_ManageSarcophagus1); +extern EvtScript N(EVS_ManageSarcophagus2); +extern EvtScript N(EVS_ManageSarcophagus3); + +API_CALLABLE(N(AwaitPlayerMummyAmbush)) { + Bytecode* args = script->ptrReadPos; + f32 x = evt_get_variable(script, *args++); + f32 y = evt_get_variable(script, *args++); + + if (dist2D(x, y, gPlayerStatus.position.x, gPlayerStatus.position.z) > 250.0f) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupSarcophagi) = { + EVT_SET(AF_ISK02_OpeningSarcophagus1, FALSE) + EVT_SET(AF_ISK02_OpeningSarcophagus2, FALSE) + EVT_SET(AF_ISK02_OpeningSarcophagus3, FALSE) + EVT_EXEC(N(EVS_ManageSarcophagus1)) + EVT_EXEC(N(EVS_ManageSarcophagus2)) + EVT_EXEC(N(EVS_ManageSarcophagus3)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_h1o, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_h2o, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_h3o, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenSarcophagus) = { + EVT_IF_EQ(LVar0, 0) + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_1D1, 0) + EVT_CALL(TranslateModel, LVar3, 0, 0, 13) + EVT_WAIT(3) + EVT_CALL(MakeLerp, 0, 35, 9, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_MULF(LVar2, EVT_FLOAT(1.1)) + EVT_CALL(TranslateModel, LVar3, LVar2, 0, 13) + EVT_CALL(RotateModel, LVar3, LVar0, 0, 1, 0) + EVT_ADD(LVar0, 1) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(3) + EVT_ELSE + EVT_CALL(TranslateModel, LVar3, EVT_FLOAT(38.5), 0, 13) + EVT_CALL(RotateModel, LVar3, 35, 0, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageSarcophagus1) = { + EVT_IF_EQ(AF_ISK02_Sarcophagus1Opened, FALSE) + EVT_LABEL(5) + EVT_CALL(N(AwaitPlayerMummyAmbush), -210, 580) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(5) + EVT_END_IF + EVT_END_IF + EVT_SET(AF_ISK02_OpeningSarcophagus1, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_01, NPC_FLAG_2, FALSE) + EVT_SET(LVar0, AF_ISK02_Sarcophagus1Opened) + EVT_SET(LVar3, MODEL_g346) + EVT_EXEC_WAIT(N(EVS_OpenSarcophagus)) + EVT_SET(AF_ISK02_OpeningSarcophagus1, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_h1c, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_h1o, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(AF_ISK02_Sarcophagus1Opened, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageSarcophagus2) = { + EVT_IF_EQ(AF_ISK02_Sarcophagus2Opened, FALSE) + EVT_LABEL(5) + EVT_CALL(N(AwaitPlayerMummyAmbush), -30, 670) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(5) + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeItemEntity, ITEM_SPIKE_SHIELD, -133, 1, 500, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_ISK02_Item_SpikeShield) + EVT_SET(AF_ISK02_OpeningSarcophagus2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_02, NPC_FLAG_2, FALSE) + EVT_SET(LVar0, AF_ISK02_Sarcophagus2Opened) + EVT_SET(LVar3, MODEL_g348) + EVT_EXEC_WAIT(N(EVS_OpenSarcophagus)) + EVT_SET(AF_ISK02_OpeningSarcophagus2, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_h2c, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_h2o, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(AF_ISK02_Sarcophagus2Opened, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageSarcophagus3) = { + EVT_IF_EQ(AF_ISK02_Sarcophagus3Opened, FALSE) + EVT_LABEL(5) + EVT_CALL(N(AwaitPlayerMummyAmbush), 220, 600) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(5) + EVT_END_IF + EVT_END_IF + EVT_SET(AF_ISK02_OpeningSarcophagus3, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_03, NPC_FLAG_2, FALSE) + EVT_SET(LVar0, AF_ISK02_Sarcophagus3Opened) + EVT_SET(LVar3, MODEL_g350) + EVT_EXEC_WAIT(N(EVS_OpenSarcophagus)) + EVT_SET(AF_ISK02_OpeningSarcophagus3, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_h3c, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_h3o, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(AF_ISK02_Sarcophagus3Opened, TRUE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_02/isk_02_4_entity.c b/src/world/area_isk/isk_02/isk_02_4_entity.c new file mode 100644 index 0000000000..d0ff5d76d1 --- /dev/null +++ b/src/world/area_isk/isk_02/isk_02_4_entity.c @@ -0,0 +1,11 @@ +#include "isk_02.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_ISK02_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 272, 60, 486, 300, MAKE_ENTITY_END) + EVT_SET(MV_EntityID_Padlock, LVar0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_02/isk_02_5_npc.c b/src/world/area_isk/isk_02/isk_02_5_npc.c new file mode 100644 index 0000000000..5fe1d3a7a1 --- /dev/null +++ b/src/world/area_isk/isk_02/isk_02_5_npc.c @@ -0,0 +1,157 @@ +#include "isk_02.h" + +#include "world/common/enemy/complete/PokeyMummy.inc.c" + +EvtScript N(EVS_NpcIdle_Pokey_01) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_LABEL(1) + EVT_IF_EQ(AF_ISK02_OpeningSarcophagus1, FALSE) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_WAIT(15) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -315, 455, 10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Pokey_02) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_LABEL(1) + EVT_IF_EQ(AF_ISK02_OpeningSarcophagus2, FALSE) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_WAIT(15) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -145, 535, 10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Pokey_03) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_LABEL(1) + EVT_IF_EQ(AF_ISK02_OpeningSarcophagus3, FALSE) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_WAIT(15) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 50, 550, 10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Pokey_01) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_01))) + EVT_CALL(func_800457C4, 3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Pokey_02) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_02))) + EVT_CALL(func_800457C4, 3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Pokey_03) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_03))) + EVT_CALL(func_800457C4, 3) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_PokeyMummy), + .pos = { -296.0f, 0.0f, 421.0f }, + .yaw = 304, + .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Pokey_01), + .drops = POKEY_MUMMY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -301, 0, 427 }, + .wanderSize = { 200 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -301, 0, 427 }, + .detectSize = { 400 }, + } + }, + .animations = POKEY_MUMMY_ANIMS, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_PokeyMummy), + .pos = { -133.0f, 0.0f, 497.0f }, + .yaw = 284, + .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Pokey_02), + .drops = POKEY_MUMMY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -134, 0, 495 }, + .wanderSize = { 200 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -140, 0, 510 }, + .detectSize = { 400 }, + } + }, + .animations = POKEY_MUMMY_ANIMS, +}; + +StaticNpc N(NpcData_Pokey_03) = { + .id = NPC_Pokey_03, + .settings = &N(NpcSettings_PokeyMummy), + .pos = { 45.0f, 0.0f, 505.0f }, + .yaw = 264, + .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Pokey_03), + .drops = POKEY_MUMMY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 46, 0, 514 }, + .wanderSize = { 200 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 47, 0, 518 }, + .detectSize = { 400 }, + } + }, + .animations = POKEY_MUMMY_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_ISK_PART_1_FORMATION_00, BTL_ISK_PART_1_STAGE_05), + NPC_GROUP(N(NpcData_Pokey_02), BTL_ISK_PART_1_FORMATION_00, BTL_ISK_PART_1_STAGE_05), + NPC_GROUP(N(NpcData_Pokey_03), BTL_ISK_PART_1_FORMATION_01, BTL_ISK_PART_1_STAGE_05), + {} +}; diff --git a/src/world/area_isk/isk_03/979E50.c b/src/world/area_isk/isk_03/979E50.c deleted file mode 100644 index a75a3eec8f..0000000000 --- a/src/world/area_isk/isk_03/979E50.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "isk_03.h" - -static char* N(exit_str_0) = "isk_02"; -static char* N(exit_str_1) = "isk_04"; - diff --git a/src/world/area_isk/isk_03/isk_03.h b/src/world/area_isk/isk_03/isk_03.h index 1d5c5c4249..cca060c5d0 100644 --- a/src/world/area_isk/isk_03/isk_03.h +++ b/src/world/area_isk/isk_03/isk_03.h @@ -2,8 +2,16 @@ /// @brief Dry Dry Ruins - Sand Drainage Room 1 #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_03_shape.h" +#include "mapfs/isk_03_hit.h" + #define NAMESPACE isk_03 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupSand); +extern EvtScript N(EVS_SetupSwitch); diff --git a/src/world/area_isk/isk_03/isk_03_0_header.c b/src/world/area_isk/isk_03/isk_03_0_header.c new file mode 100644 index 0000000000..ef41a1bd84 --- /dev/null +++ b/src/world/area_isk/isk_03/isk_03_0_header.c @@ -0,0 +1,14 @@ +#include "isk_03.h" + +EntryList N(Entrances) = { + [isk_03_ENTRY_0] { 369.0, 50.0, 408.0, 59.0 }, + [isk_03_ENTRY_1] { 401.0, -140.0, 447.0, 59.0 }, + [isk_03_ENTRY_2] { 557.0, -155.0, 224.0, 209.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_03 }, +}; diff --git a/src/world/area_isk/isk_03/isk_03_1_main.c b/src/world/area_isk/isk_03/isk_03_1_main.c new file mode 100644 index 0000000000..99b805a116 --- /dev/null +++ b/src/world/area_isk/isk_03/isk_03_1_main.c @@ -0,0 +1,41 @@ +#include "isk_03.h" + +EvtScript N(EVS_ExitWalk_isk_02_1) = EVT_EXIT_WALK(40, isk_03_ENTRY_0, "isk_02", isk_02_ENTRY_1); +EvtScript N(EVS_ExitWalk_isk_02_2) = EVT_EXIT_WALK(40, isk_03_ENTRY_1, "isk_02", isk_02_ENTRY_2); +EvtScript N(EVS_ExitWalk_isk_04_0) = EVT_EXIT_WALK(40, isk_03_ENTRY_2, "isk_04", isk_04_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_02_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_02_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_04_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_03) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_FIRST_SAND_ROOM) + EVT_CALL(SetZoneEnabled, ZONE_o2023, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_03, FALSE) + EVT_ELSE + EVT_CALL(SetZoneEnabled, ZONE_o2023, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_o2008, FALSE) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupSand)) + EVT_EXEC(N(EVS_SetupSwitch)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_03/isk_03_2_sand.c b/src/world/area_isk/isk_03/isk_03_2_sand.c new file mode 100644 index 0000000000..83dfc415f7 --- /dev/null +++ b/src/world/area_isk/isk_03/isk_03_2_sand.c @@ -0,0 +1,294 @@ +#include "isk_03.h" + +EvtScript N(EVS_TexPan_DrippingSand) = { + EVT_CALL(SetTexPanner, MODEL_o6000, TEX_PANNER_4) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_LABEL(10) + EVT_ADD(LVar1, -1000) + EVT_ADD(LVar2, 200) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, 0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_AUX, LVar2, 0) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_FIRST_SAND_ROOM) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(EnableModel, MODEL_o6000, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_LookAtDrain) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 454, 35, 285) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 250, 40) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 566, -50) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(13.6), EVT_FLOAT(-1.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 429, 35, 278) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_LookBelow) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.4), EVT_FLOAT(-5.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 429, -153, 278) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_Reset) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 430, 35, 295) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_UpperSand) = { + EVT_CALL(SetTexPanner, MODEL_o1350, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1351, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1352, TEX_PANNER_0) + EVT_SET(LVar2, 0) + EVT_CALL(MakeLerp, 0, 500, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_ADD(LVar2, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_LABEL(20) + EVT_ADD(LVar2, 500) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, LVar2) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_FIRST_SAND_ROOM) + EVT_GOTO(20) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_LowerSand) = { + EVT_CALL(SetTexPanner, MODEL_o1341, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o1346, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1343, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o1344, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o1345, TEX_PANNER_3) + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 0) + EVT_LABEL(10) + EVT_ADD(LVar2, 0x1800) + EVT_ADD(LVar3, -500) + EVT_ADD(LVar4, -100) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar3) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, LVar4) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_FIRST_SAND_ROOM) + EVT_GOTO(10) + EVT_END_IF + EVT_SET(LVar5, 0x1800) + EVT_SET(LVar6, -500) + EVT_SET(LVar7, -100) + EVT_LOOP(10) + EVT_ADD(LVar5, -512) + EVT_ADD(LVar6, 50) + EVT_ADD(LVar7, 10) + EVT_ADD(LVar2, LVar5) + EVT_ADD(LVar3, LVar6) + EVT_ADD(LVar4, LVar7) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar3) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, LVar4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RescaleDrainingSand) = { + EVT_CALL(MakeLerp, 0, 100, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(ScaleModel, MODEL_o1351, EVT_FLOAT(1.0), LVar0, EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CollapseSandPile) = { + EVT_CALL(MakeLerp, 0, 50, 10, EASING_QUADRATIC_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 100) + EVT_SETF(LVar2, 1) + EVT_ADDF(LVar2, LVar0) + EVT_SETF(LVar3, 1) + EVT_SUBF(LVar3, LVar0) + EVT_CALL(ScaleModel, MODEL_o1346, LVar2, LVar3, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DrainUpperSand) = { + EVT_CALL(MakeLerp, 0, -100, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g206, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o1952, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, -100, -250, 30, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g206, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o1952, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FillLowerSand) = { + EVT_CALL(MakeTransformGroup, MODEL_g210) + EVT_CALL(MakeLerp, -200, 0, 120, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_CALL(TranslateGroup, MODEL_g210, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o1346, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LowerSandColumn) = { + EVT_CALL(MakeLerp, 0, -200, 10, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1341, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_DrainSand) = { + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 179, 0) + EVT_CALL(EnableModel, MODEL_o1343, TRUE) + EVT_CALL(EnableModel, MODEL_o1344, TRUE) + EVT_CALL(EnableModel, MODEL_o1345, TRUE) + EVT_CALL(EnableModel, MODEL_o1354, TRUE) + EVT_CALL(EnableModel, MODEL_o1355, TRUE) + EVT_CALL(EnableModel, MODEL_o1356, TRUE) + EVT_CALL(EnableModel, MODEL_o1341, TRUE) + EVT_CALL(EnableModel, MODEL_o1346, TRUE) + EVT_EXEC(N(EVS_Camera_LookAtDrain)) + EVT_WAIT(30) + EVT_EXEC(N(EVS_TexPan_UpperSand)) + EVT_EXEC(N(EVS_RescaleDrainingSand)) + EVT_EXEC(N(EVS_DrainUpperSand)) + EVT_CALL(PlaySound, SOUND_53) + EVT_WAIT(75) + EVT_EXEC(N(EVS_Camera_LookBelow)) + EVT_WAIT(30) + EVT_EXEC(N(EVS_TexPan_LowerSand)) + EVT_EXEC(N(EVS_FillLowerSand)) + EVT_CALL(PlaySound, SOUND_453) + EVT_WAIT(120) + EVT_EXEC(N(EVS_LowerSandColumn)) + EVT_WAIT(5) + EVT_EXEC(N(EVS_CollapseSandPile)) + EVT_CALL(PlaySound, SOUND_453) + EVT_WAIT(10) + EVT_CALL(EnableModel, MODEL_o1347, FALSE) + EVT_CALL(EnableModel, MODEL_o1348, FALSE) + EVT_CALL(EnableModel, MODEL_o1349, FALSE) + EVT_CALL(EnableModel, MODEL_o1350, FALSE) + EVT_CALL(EnableModel, MODEL_o1351, FALSE) + EVT_CALL(EnableModel, MODEL_o1352, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1350, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1351, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1352, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GB_StoryProgress, STORY_CH2_DRAINED_FIRST_SAND_ROOM) + EVT_CALL(SetZoneEnabled, ZONE_o2008, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_o2023, TRUE) + EVT_WAIT(20) + EVT_EXEC(N(EVS_Camera_Reset)) + EVT_WAIT(5) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupSand) = { + EVT_SET(AF_ISK03_SandSwitchActivated, FALSE) + EVT_CALL(MakeTransformGroup, MODEL_g206) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_FIRST_SAND_ROOM) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_DrainSand)), TRIGGER_AREA_FLAG_SET, AF_ISK03_SandSwitchActivated, 1, 0) + EVT_CALL(EnableModel, MODEL_o1343, FALSE) + EVT_CALL(EnableModel, MODEL_o1344, FALSE) + EVT_CALL(EnableModel, MODEL_o1345, FALSE) + EVT_CALL(EnableModel, MODEL_o1354, FALSE) + EVT_CALL(EnableModel, MODEL_o1355, FALSE) + EVT_CALL(EnableModel, MODEL_o1356, FALSE) + EVT_CALL(EnableModel, MODEL_o1341, FALSE) + EVT_CALL(EnableModel, MODEL_o1346, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1343, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1344, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1345, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_TexPan_DrippingSand)) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o1347, FALSE) + EVT_CALL(EnableModel, MODEL_o1348, FALSE) + EVT_CALL(EnableModel, MODEL_o1349, FALSE) + EVT_CALL(EnableModel, MODEL_o1350, FALSE) + EVT_CALL(EnableModel, MODEL_o1351, FALSE) + EVT_CALL(EnableModel, MODEL_o1352, FALSE) + EVT_CALL(EnableModel, MODEL_o1341, FALSE) + EVT_CALL(EnableModel, MODEL_o1346, FALSE) + EVT_CALL(EnableModel, MODEL_o6000, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1350, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1351, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1352, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_FIRST_SAND_ROOM) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o6000, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_03/isk_03_3_entity.c b/src/world/area_isk/isk_03/isk_03_3_entity.c new file mode 100644 index 0000000000..b132b032e6 --- /dev/null +++ b/src/world/area_isk/isk_03/isk_03_3_entity.c @@ -0,0 +1,10 @@ +#include "isk_03.h" +#include "effects.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_RUINS_KEY, 467, -170, 218, ITEM_SPAWN_MODE_KEY, GF_ISK03_Item_RuinsKey) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 358, -123, 358, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 457, -123, 214, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_03/isk_03_4_switch.c b/src/world/area_isk/isk_03/isk_03_4_switch.c new file mode 100644 index 0000000000..f612e37c0f --- /dev/null +++ b/src/world/area_isk/isk_03/isk_03_4_switch.c @@ -0,0 +1,57 @@ +#include "isk_03.h" + +extern EvtScript N(EVS_OnTouch_DrainSwitch); + +EvtScript N(EVS_SetupSwitch) = { + EVT_CALL(ParentColliderToModel, COLLIDER_o1989, MODEL_o1992) + EVT_CALL(ParentColliderToModel, COLLIDER_o1990, MODEL_o1992) + EVT_IF_EQ(AF_ISK03_SandSwitchActivated, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_DrainSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o1990, 1, 0) + EVT_ELSE + EVT_CALL(TranslateGroup, MODEL_g319, 0, -14, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1989) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1990) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnTouch_DrainSwitch) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LABEL(5) + EVT_WAIT(1) + EVT_CALL(PartnerCanUseAbility, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar1, 50) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(2.5)) + EVT_CALL(NpcJump0, NPC_PARTNER, 470, 50, 268, 10) + EVT_WAIT(10) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g319, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1989) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1990) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1990, SOUND_208B, 0) + EVT_SET(AF_ISK03_SandSwitchActivated, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_04/97B630.c b/src/world/area_isk/isk_04/97B630.c deleted file mode 100644 index 65ef79cc1c..0000000000 --- a/src/world/area_isk/isk_04/97B630.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "isk_04.h" - -static char* N(exit_str_0) = "isk_03"; -static char* N(exit_str_1) = "isk_07"; -static char* N(exit_str_2) = "isk_06"; -static char* N(exit_str_3) = "isk_05"; - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c deleted file mode 100644 index df1ea99b3c..0000000000 --- a/src/world/area_isk/isk_04/97B670.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "isk_04.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/todo/AwaitPlayerNearNpc.inc.c" - -static const f32 padding = 0.0f; - -static char* N(exit_str_0) = "isk_04"; diff --git a/src/world/area_isk/isk_04/97BF60.c b/src/world/area_isk/isk_04/97BF60.c deleted file mode 100644 index 61cde7674a..0000000000 --- a/src/world/area_isk/isk_04/97BF60.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "isk_04.h" - -#include "world/common/todo/SwitchToPartner.inc.c" - -#include "world/partners.h" -extern s32 D_80242288_97D8B8; - -// duplicate of SetupDemoScene from trd_09 -ApiStatus func_8024095C_97BF8C(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - - switch (D_80242288_97D8B8) { - case 0: - D_80242288_97D8B8 = 1; - return ApiStatus_BLOCK; - case 1: - case 2: - D_80242288_97D8B8++; - return ApiStatus_BLOCK; - case 3: - wPartnerNpc->pos.x = playerStatus->position.x - 30.0f; - wPartnerNpc->pos.z = playerStatus->position.z + 30.0f; - partner_clear_player_tracking(wPartnerNpc); - partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z); - func_800EF3D4(0); - set_npc_yaw(wPartnerNpc, 90.0f); - playerStatus->targetYaw = 90.0f; - playerStatus->currentYaw = 90.0f; - playerStatus->spriteFacingAngle = 0.0f; - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_isk/isk_04/isk_04.h b/src/world/area_isk/isk_04/isk_04.h index d812042da0..a1fb5ea4d6 100644 --- a/src/world/area_isk/isk_04/isk_04.h +++ b/src/world/area_isk/isk_04/isk_04.h @@ -2,8 +2,29 @@ /// @brief Dry Dry Ruins - Descending Stairs 1 #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_04_shape.h" +#include "mapfs/isk_04_hit.h" + +#include "sprite/npc/BuzzyBeetle.h" + +enum { + NPC_BuzzyBeetle_01 = 0, + NPC_BuzzyBeetle_02 = 1, +}; + +enum { + MV_RuinsLockEntityID = MapVar(0), +}; + #define NAMESPACE isk_04 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupObstructions); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupDemo); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_04/isk_04_0_header.c b/src/world/area_isk/isk_04/isk_04_0_header.c new file mode 100644 index 0000000000..d8931885d8 --- /dev/null +++ b/src/world/area_isk/isk_04/isk_04_0_header.c @@ -0,0 +1,18 @@ +#include "isk_04.h" + +EntryList N(Entrances) = { + [isk_04_ENTRY_0] { 594.0, -80.0, 84.0, 0.0 }, + [isk_04_ENTRY_1] { 594.0, -340.0, 84.0, 0.0 }, + [isk_04_ENTRY_2] { 524.0, 25.0, -169.0, 170.0 }, + [isk_04_ENTRY_3] { 571.0, -80.0, -186.0, 170.0 }, + [isk_04_ENTRY_4] { 524.0, -210.0, -169.0, 170.0 }, + [isk_04_ENTRY_5] { 543.0, 25.0, 5.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_isk_04 }, +}; diff --git a/src/world/area_isk/isk_04/isk_04_1_music.c b/src/world/area_isk/isk_04/isk_04_1_music.c new file mode 100644 index 0000000000..e131cd95b2 --- /dev/null +++ b/src/world/area_isk/isk_04/isk_04_1_music.c @@ -0,0 +1,31 @@ +#include "isk_04.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GF_ISK04_SecondWarning, FALSE) + EVT_THREAD + EVT_CALL(FadeInMusic, 1, SONG_TUTANKOOPA_WARNING, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00DE, 160, 40) + EVT_SET(GF_ISK04_SecondWarning, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 1, 2000) + EVT_END_THREAD + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_04/isk_04_2_main.c b/src/world/area_isk/isk_04/isk_04_2_main.c new file mode 100644 index 0000000000..ab11395d71 --- /dev/null +++ b/src/world/area_isk/isk_04/isk_04_2_main.c @@ -0,0 +1,44 @@ +#include "isk_04.h" + +EvtScript N(EVS_ExitWalk_isk_03_2) = EVT_EXIT_WALK(40, isk_04_ENTRY_0, "isk_03", isk_03_ENTRY_2); +EvtScript N(EVS_ExitWalk_isk_07_1) = EVT_EXIT_WALK(40, isk_04_ENTRY_1, "isk_07", isk_07_ENTRY_1); +EvtScript N(EVS_ExitWalk_isk_06_0) = EVT_EXIT_WALK(40, isk_04_ENTRY_2, "isk_06", isk_06_ENTRY_0); +EvtScript N(EVS_ExitWalk_isk_06_1) = EVT_EXIT_WALK(40, isk_04_ENTRY_3, "isk_06", isk_06_ENTRY_1); +EvtScript N(EVS_ExitWalk_isk_05_0) = EVT_EXIT_WALK(40, isk_04_ENTRY_4, "isk_05", isk_05_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_03_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_07_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_06_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_06_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_05_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_04) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(GetDemoState, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_EXEC_WAIT(N(EVS_SetupObstructions)) + EVT_EXEC_WAIT(N(EVS_SetupDemo)) + EVT_RETURN + EVT_END_IF + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupObstructions)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_04/isk_04_3_obstructions.c b/src/world/area_isk/isk_04/isk_04_3_obstructions.c new file mode 100644 index 0000000000..1ec1e3bc44 --- /dev/null +++ b/src/world/area_isk/isk_04/isk_04_3_obstructions.c @@ -0,0 +1,81 @@ +#include "isk_04.h" +#include "effects.h" + +#include "world/common/todo/RemovePadlock.inc.c" + +s32 N(ItemList_RuinsKey)[] = { + ITEM_RUINS_KEY, + ITEM_NONE +}; + +BombTrigger N(BombPos_Wall) = { + .pos = { 510.0f, 25.0f, -184.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_OnBlast_Wall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 63, 22, 1, 10, 30) + EVT_LOOP(10) + EVT_CALL(EnableModel, MODEL_g262, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_g262, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_ISK04_BombedWall, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UnlockDoorPrompt) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_269, 0, 600, -330, 100) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_ISK04_UnlockedDoor, TRUE) + EVT_SET(LVar0, MV_RuinsLockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittsw, SOUND_265, 0) + EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g304, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittsw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupObstructions) = { + EVT_IF_EQ(GF_ISK04_BombedWall, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnBlast_Wall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_g262, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_IF_EQ(GF_ISK04_UnlockedDoor, FALSE) + EVT_CALL(MakeTransformGroup, MODEL_g304) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockDoorPrompt)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(ItemList_RuinsKey)), 0, 1) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittsw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_g304, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_04/isk_04_4_entity.c b/src/world/area_isk/isk_04/isk_04_4_entity.c new file mode 100644 index 0000000000..348bbc7ba6 --- /dev/null +++ b/src/world/area_isk/isk_04/isk_04_4_entity.c @@ -0,0 +1,14 @@ +#include "isk_04.h" +#include "entity.h" +#include "effects.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_ISK04_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 600, -330, 100, 160, MAKE_ENTITY_END) + EVT_SET(MV_RuinsLockEntityID, LVar0) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 504, -193, 43, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 486, -193, -128, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_04/isk_04_5_npc.c b/src/world/area_isk/isk_04/isk_04_5_npc.c new file mode 100644 index 0000000000..ebbd93556d --- /dev/null +++ b/src/world/area_isk/isk_04/isk_04_5_npc.c @@ -0,0 +1,53 @@ +#include "isk_04.h" + +#include "world/common/enemy/complete/SpikeTop.inc.c" + +StaticNpc N(NpcData_BuzzyBeetle_01) = { + .id = NPC_BuzzyBeetle_01, + .settings = &N(NpcSettings_BuzzyBeetle), + .pos = { 561.0f, 25.0f, 47.0f }, + .yaw = 355, + .flags = ENEMY_FLAGS_400, + .drops = ISK_BUZZY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 561, 25, 47 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 606, 25, 94 }, + .detectSize = { 80 }, + } + }, + .animations = BUZZY_BEETLE_ANIMS, +}; + +StaticNpc N(NpcData_BuzzyBeetle_02) = { + .id = NPC_BuzzyBeetle_02, + .settings = &N(NpcSettings_BuzzyBeetle), + .pos = { 608.0f, -260.0f, -158.0f }, + .yaw = 175, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = ISK_BUZZY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 608, -260, -158 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 596, -260, -203 }, + .detectSize = { 80 }, + } + }, + .animations = BUZZY_BEETLE_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BuzzyBeetle_01), BTL_ISK_PART_1_FORMATION_09, BTL_ISK_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_BuzzyBeetle_02), BTL_ISK_PART_1_FORMATION_09, BTL_ISK_PART_1_STAGE_03), + {} +}; diff --git a/src/world/area_isk/isk_04/isk_04_6_demo.c b/src/world/area_isk/isk_04/isk_04_6_demo.c new file mode 100644 index 0000000000..0155aa2211 --- /dev/null +++ b/src/world/area_isk/isk_04/isk_04_6_demo.c @@ -0,0 +1,164 @@ +#include "isk_04.h" +#include "world/partners.h" + +#include "world/common/todo/SwitchToPartner.inc.c" + +EvtScript N(EVS_ProvideDemoInputs) = { + EVT_CALL(EnableStatusMenu, FALSE) + EVT_CALL(DemoSetButtons, BUTTON_C_DOWN) + EVT_WAIT(5) + EVT_CALL(DemoSetButtons, 0) + EVT_WAIT(93) + EVT_CALL(DemoJoystickXY, 2, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 15, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 45, 19) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 75, 11) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 76, 11) + EVT_WAIT(8) + EVT_CALL(DemoJoystickXY, 69, 11) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -2, 21) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -1, -1) + EVT_CALL(N(SwitchToPartner), PARTNER_BOMBETTE) + EVT_WAIT(57) + EVT_CALL(DemoSetButtons, BUTTON_C_DOWN) + EVT_WAIT(4) + EVT_CALL(DemoSetButtons, 0) + EVT_WAIT(34) + EVT_CALL(DemoJoystickXY, -1, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -4, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -23, 3) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -48, 4) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -67, 6) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -76, 7) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -78, 7) + EVT_WAIT(4) + EVT_CALL(DemoJoystickXY, -36, 6) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 1, -1) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 47, -6) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 74, -12) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 63, -9) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -1, 0) + EVT_WAIT(70) + EVT_CALL(DemoJoystickXY, 0, 0) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, 3, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 17, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 38, 0) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 64, -3) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 76, -6) + EVT_WAIT(8) + EVT_CALL(DemoJoystickXY, 77, -5) + EVT_WAIT(3) + EVT_CALL(DemoJoystickXY, 77, -4) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 77, -2) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, 77, -1) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 78, -1) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, 78, 0) + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("isk_04"), isk_04_ENTRY_5, TRANSITION_2) + EVT_WAIT(323) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MonitorDemoState) = { + EVT_WAIT(10) + EVT_LOOP(0) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_EQ(LVar0, DEMO_STATE_CHANGE_MAP) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("isk_04"), isk_04_ENTRY_2, TRANSITION_3) + EVT_WAIT(313) + EVT_RETURN + EVT_END +}; + +s32 N(DemoSceneState) = 0; + +// duplicate of SetupDemoScene from trd_09 +API_CALLABLE(N(SetupDemoScene)) { + PlayerStatus* playerStatus = &gPlayerStatus; + + switch (N(DemoSceneState)) { + case 0: + N(DemoSceneState) = 1; + return ApiStatus_BLOCK; + case 1: + case 2: + N(DemoSceneState)++; + return ApiStatus_BLOCK; + case 3: + wPartnerNpc->pos.x = playerStatus->position.x - 30.0f; + wPartnerNpc->pos.z = playerStatus->position.z + 30.0f; + partner_clear_player_tracking(wPartnerNpc); + partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z); + func_800EF3D4(0); + set_npc_yaw(wPartnerNpc, 90.0f); + playerStatus->targetYaw = 90.0f; + playerStatus->currentYaw = 90.0f; + playerStatus->spriteFacingAngle = 0.0f; + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + + +EvtScript N(EVS_SetupDemo) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 530, 25, -50) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 12, -3) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 25, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_WAIT(1) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 12, -3) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 25, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(N(SetupDemoScene)) + EVT_SET(GF_DemoSceneDone, FALSE) + EVT_EXEC(N(EVS_MonitorDemoState)) + EVT_EXEC(N(EVS_ProvideDemoInputs)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c deleted file mode 100644 index 0a46d4a9e5..0000000000 --- a/src/world/area_isk/isk_05/97DAD0.c +++ /dev/null @@ -1,161 +0,0 @@ -#include "isk_05.h" -#include "sprite.h" -#include "sprite/npc/StoneChomp.h" - -static char* N(exit_str_0) = "isk_04"; -static char* N(exit_str_1) = ""; - -#include "world/common/enemy/ai/StoneChompAI.inc.c" - -#include "world/area_isk/StoneChompFX.inc.c" - -typedef struct StoneChompAmbushIsk05 { - /* 0x00 */ s32 foldID; - /* 0x04 */ s32 workerID; - /* 0x08 */ s32 spriteIndex; - /* 0x0C */ s32 rasterIndex; - /* 0x10 */ Vec3f pos; - /* 0x1C */ Vec3f rot; - /* 0x28 */ Vec3f scale; - /* 0x34 */ f32 renderYaw; - /* 0x38 */ s32 alpha; - /* 0x3C */ f32 width; - /* 0x40 */ f32 height; -} StoneChompAmbushIsk05; // size = 0x44 - -extern StoneChompAmbushIsk05 N(ChompAmbush); - -void func_80241610_97F0E0(void) { - StoneChompAmbushIsk05* ambush = &N(ChompAmbush); - Camera* cam = &gCameras[gCurrentCameraID]; - FoldImageRecPart foldImg; - SpriteRasterInfo spriteRaster; - Matrix4f transformMtx, tempMtx; - - gSPViewport(gMasterGfxPos++, &cam->vp); - if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { - gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); - } - guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); - - gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING - | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - - guTranslateF(transformMtx, ambush->pos.x, ambush->pos.y, ambush->pos.z); - guRotateF(tempMtx, ambush->rot.y + gCameras[gCurrentCameraID].currentYaw + ambush->renderYaw, 0.0f, 1.0f, 0.0f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - guRotateF(tempMtx, ambush->rot.z, 0.0f, 0.0f, 1.0f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - guRotateF(tempMtx, ambush->rot.x, 1.0f, 0.0f, 0.0f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - guScaleF(tempMtx, ambush->scale.x, ambush->scale.y, ambush->scale.z); - guMtxCatF(tempMtx, transformMtx, transformMtx); - guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - spr_get_npc_raster_info(&spriteRaster, ambush->spriteIndex, ambush->rasterIndex); - foldImg.raster = spriteRaster.raster; - foldImg.palette = spriteRaster.defaultPal; - ambush->width = foldImg.width = spriteRaster.width; - ambush->height = foldImg.height = spriteRaster.height; - foldImg.xOffset = -(spriteRaster.width / 2); - foldImg.yOffset = (spriteRaster.height / 2); - foldImg.opacity = 255; - - fold_update(ambush->foldID, FOLD_TYPE_7, 255, 255, 255, ambush->alpha, 0); - fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -ApiStatus func_80241B28_97F5F8(Evt* script, s32 isInitialCall) { - StoneChompAmbushIsk05* ambush = &N(ChompAmbush); - SpriteRasterInfo rasterInfo; - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - ambush->spriteIndex = 53; //TODO get spriteID for this constant - ambush->rasterIndex = 0; - spr_get_npc_raster_info(&rasterInfo, ambush->spriteIndex, ambush->rasterIndex); - ambush->width = rasterInfo.width; - ambush->height = rasterInfo.height; - - ambush->pos.x = npc->pos.x; - ambush->pos.y = npc->pos.y + (ambush->height * SPRITE_WORLD_SCALE_D * 0.5); - ambush->pos.z = npc->pos.z; - ambush->rot.x = 0; - ambush->rot.y = 0; - ambush->rot.z = 0; - ambush->scale.x = SPRITE_WORLD_SCALE_F; - ambush->scale.y = SPRITE_WORLD_SCALE_F; - ambush->scale.z = SPRITE_WORLD_SCALE_F; - ambush->renderYaw = 85.0f; - ambush->alpha = 0.0f; - - ambush->foldID = 0; - ambush->workerID = create_worker_frontUI(NULL, func_80241610_97F0E0); - return ApiStatus_DONE2; -} - -ApiStatus func_80241C34_97F704(Evt* script, s32 isInitialCall) { - StoneChompAmbushIsk05* ambush = &N(ChompAmbush); - - free_worker(ambush->workerID); - return ApiStatus_DONE2; -} - -ApiStatus func_80241C5C_97F72C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 x = evt_get_float_variable(script, *args++); - s32 y = evt_get_float_variable(script, *args++); - s32 z = evt_get_float_variable(script, *args++); - StoneChompAmbushIsk05* ambush = &N(ChompAmbush); - - ambush->pos.x = x; - ambush->pos.y = y + (ambush->height * SPRITE_WORLD_SCALE_D * 0.5); - ambush->pos.z = z; - return ApiStatus_DONE2; -} - -ApiStatus func_80241D44_97F814(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 x = evt_get_float_variable(script, *args++); - s32 y = evt_get_float_variable(script, *args++); - s32 z = evt_get_float_variable(script, *args++); - StoneChompAmbushIsk05* ambush = &N(ChompAmbush); - - ambush->rot.x = x; - ambush->rot.y = y; - ambush->rot.z = z; - return ApiStatus_DONE2; -} - -ApiStatus func_80241DF8_97F8C8(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - StoneChompAmbushIsk05* ambush = &N(ChompAmbush); - - ambush->alpha = evt_get_variable(script, *args++); - return ApiStatus_DONE2; -} - -ApiStatus func_80241E24_97F8F4(Evt* script, s32 isInitialCall) { - f32 x = evt_get_variable(script, LVar2); - f32 y = evt_get_variable(script, LVar0); - f32 z = evt_get_variable(script, LVar4); - - fx_landing_dust(0, x, y, z, 0.0f); - return ApiStatus_DONE2; -} diff --git a/src/world/area_isk/isk_05/isk_05.h b/src/world/area_isk/isk_05/isk_05.h index 2f2adb430b..594c6cb4e1 100644 --- a/src/world/area_isk/isk_05/isk_05.h +++ b/src/world/area_isk/isk_05/isk_05.h @@ -2,8 +2,21 @@ /// @brief Dry Dry Ruins - Pyramid Stone Room #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_05_shape.h" +#include "mapfs/isk_05_hit.h" + +#include "sprite/npc/StoneChomp.h" + +enum { + NPC_StoneChomp = 1, +}; + #define NAMESPACE isk_05 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_05/isk_05_0_header.c b/src/world/area_isk/isk_05/isk_05_0_header.c new file mode 100644 index 0000000000..88b42e8e75 --- /dev/null +++ b/src/world/area_isk/isk_05/isk_05_0_header.c @@ -0,0 +1,12 @@ +#include "isk_05.h" + +EntryList N(Entrances) = { + [isk_05_ENTRY_0] { 463.0, 25.0, -279.0, 320.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_05 }, +}; diff --git a/src/world/area_isk/isk_05/isk_05_1_main.c b/src/world/area_isk/isk_05/isk_05_1_main.c new file mode 100644 index 0000000000..3265657c10 --- /dev/null +++ b/src/world/area_isk/isk_05/isk_05_1_main.c @@ -0,0 +1,48 @@ +#include "isk_05.h" + +EvtScript N(D_80241F10_97F9E0) = EVT_EXIT_WALK(40, isk_05_ENTRY_0, "isk_04", isk_04_ENTRY_4); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(D_80241F10_97F9E0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterWalk_80241F98) = { + EVT_CALL(TranslateGroup, MODEL_g304, 0, 65, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_05) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_CALL(TranslateGroup, MODEL_g304, 0, 65, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(GF_ISK05_Hammer2Block, FALSE) + EVT_CALL(SetGroupEnabled, MODEL_wan1, 1) + EVT_CALL(SetGroupEnabled, MODEL_wan2, 0) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_wan1, 0) + EVT_CALL(SetGroupEnabled, MODEL_wan2, 1) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_05/isk_05_2_entity.c b/src/world/area_isk/isk_05/isk_05_2_entity.c new file mode 100644 index 0000000000..068fafa354 --- /dev/null +++ b/src/world/area_isk/isk_05/isk_05_2_entity.c @@ -0,0 +1,22 @@ +#include "isk_05.h" +#include "effects.h" +#include "entity.h" + +EvtScript N(D_80242210_97FCE0) = { + EVT_SET(GF_ISK05_Hammer2Block, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_PYRAMID_STONE, 316, 82, -481, ITEM_SPAWN_MODE_KEY, GF_ISK05_Item_PyramidStone) + EVT_IF_EQ(GF_ISK05_Hammer2Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block_WideX), 431, 0, -478, 45, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(D_80242210_97FCE0))) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, 196, -290, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 290, 196, -411, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, 66, -290, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c new file mode 100644 index 0000000000..6460bd113d --- /dev/null +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -0,0 +1,298 @@ +#include "isk_05.h" +#include "sprite.h" + +#include "world/common/enemy/complete/StoneChomp.inc.c" + +typedef struct StoneChompAmbushIsk05 { + /* 0x00 */ s32 foldID; + /* 0x04 */ s32 workerID; + /* 0x08 */ s32 spriteIndex; + /* 0x0C */ s32 rasterIndex; + /* 0x10 */ Vec3f pos; + /* 0x1C */ Vec3f rot; + /* 0x28 */ Vec3f scale; + /* 0x34 */ f32 renderYaw; + /* 0x38 */ s32 alpha; + /* 0x3C */ f32 width; + /* 0x40 */ f32 height; +} StoneChompAmbushIsk05; // size = 0x44 + +StoneChompAmbushIsk05 N(ChompAmbush) = {}; + +void N(func_80241610_97F0E0)(void) { + StoneChompAmbushIsk05* ambush = &N(ChompAmbush); + Camera* cam = &gCameras[gCurrentCameraID]; + FoldImageRecPart foldImg; + SpriteRasterInfo spriteRaster; + Matrix4f transformMtx, tempMtx; + + gSPViewport(gMasterGfxPos++, &cam->vp); + if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { + gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); + } + guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING + | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + + guTranslateF(transformMtx, ambush->pos.x, ambush->pos.y, ambush->pos.z); + guRotateF(tempMtx, ambush->rot.y + gCameras[gCurrentCameraID].currentYaw + ambush->renderYaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guRotateF(tempMtx, ambush->rot.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guRotateF(tempMtx, ambush->rot.x, 1.0f, 0.0f, 0.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guScaleF(tempMtx, ambush->scale.x, ambush->scale.y, ambush->scale.z); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + spr_get_npc_raster_info(&spriteRaster, ambush->spriteIndex, ambush->rasterIndex); + foldImg.raster = spriteRaster.raster; + foldImg.palette = spriteRaster.defaultPal; + ambush->width = foldImg.width = spriteRaster.width; + ambush->height = foldImg.height = spriteRaster.height; + foldImg.xOffset = -(spriteRaster.width / 2); + foldImg.yOffset = (spriteRaster.height / 2); + foldImg.opacity = 255; + + fold_update(ambush->foldID, FOLD_TYPE_7, 255, 255, 255, ambush->alpha, 0); + fold_appendGfx_component(ambush->foldID, &foldImg, 0, transformMtx); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +API_CALLABLE(N(func_80241B28_97F5F8)) { + StoneChompAmbushIsk05* ambush = &N(ChompAmbush); + SpriteRasterInfo rasterInfo; + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + ambush->spriteIndex = SPR_StoneChomp; + ambush->rasterIndex = 0; + spr_get_npc_raster_info(&rasterInfo, ambush->spriteIndex, ambush->rasterIndex); + ambush->width = rasterInfo.width; + ambush->height = rasterInfo.height; + + ambush->pos.x = npc->pos.x; + ambush->pos.y = npc->pos.y + (ambush->height * SPRITE_WORLD_SCALE_D * 0.5); + ambush->pos.z = npc->pos.z; + ambush->rot.x = 0; + ambush->rot.y = 0; + ambush->rot.z = 0; + ambush->scale.x = SPRITE_WORLD_SCALE_F; + ambush->scale.y = SPRITE_WORLD_SCALE_F; + ambush->scale.z = SPRITE_WORLD_SCALE_F; + ambush->renderYaw = 85.0f; + ambush->alpha = 0.0f; + + ambush->foldID = 0; + ambush->workerID = create_worker_frontUI(NULL, N(func_80241610_97F0E0)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DestroyAmbushWorker)) { + StoneChompAmbushIsk05* ambush = &N(ChompAmbush); + + free_worker(ambush->workerID); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80241C5C_97F72C)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_float_variable(script, *args++); + s32 y = evt_get_float_variable(script, *args++); + s32 z = evt_get_float_variable(script, *args++); + StoneChompAmbushIsk05* ambush = &N(ChompAmbush); + + ambush->pos.x = x; + ambush->pos.y = y + (ambush->height * SPRITE_WORLD_SCALE_D * 0.5); + ambush->pos.z = z; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80241D44_97F814)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_float_variable(script, *args++); + s32 y = evt_get_float_variable(script, *args++); + s32 z = evt_get_float_variable(script, *args++); + StoneChompAmbushIsk05* ambush = &N(ChompAmbush); + + ambush->rot.x = x; + ambush->rot.y = y; + ambush->rot.z = z; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80241DF8_97F8C8)) { + Bytecode* args = script->ptrReadPos; + StoneChompAmbushIsk05* ambush = &N(ChompAmbush); + + ambush->alpha = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80241E24_97F8F4)) { + f32 x = evt_get_variable(script, LVar2); + f32 y = evt_get_variable(script, LVar0); + f32 z = evt_get_variable(script, LVar4); + + fx_landing_dust(0, x, y, z, 0.0f); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcIdle_StoneChomp) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 1) + EVT_LABEL(100) + EVT_IF_EQ(GF_ISK05_Hammer2Block, FALSE) + EVT_WAIT(1) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 0) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_266, 0) + EVT_CALL(MakeLerp, 65, 0, 15, EASING_QUADRATIC_IN) + EVT_LABEL(101) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g304, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(101) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_267, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_THREAD + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(5) + EVT_CALL(N(func_80241B28_97F5F8)) + EVT_CALL(MakeLerp, 0, 255, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(N(func_80241DF8_97F8C8), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetGroupEnabled, MODEL_wan1, 0) + EVT_CALL(SetGroupEnabled, MODEL_wan2, 1) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(MakeLerp, 0, 360, 15, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(N(func_80241D44_97F814), LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_CALL(N(func_80241C5C_97F72C), LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, LVar3, 0, 30, EASING_QUARTIC_IN) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar0, LVar4) + EVT_CALL(N(func_80241C5C_97F72C), LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(N(func_80241E24_97F8F4)) + EVT_WAIT(5) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_WAIT(1) + EVT_CALL(N(DestroyAmbushWorker)) + EVT_CALL(func_802CFD30, -1, 0, 0, 0, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_StoneChomp))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_StoneChomp_Override) = { + EVT_SET(GF_ISK05_Defeated_StoneChomp, TRUE) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_ISK05_Defeated_StoneChomp, TRUE) + EVT_SET(AF_ISK05_StoneChompDefeated, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_265, 0) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g304, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_THREAD + EVT_CALL(N(StoneChompFXC)) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_StoneChomp) = { + EVT_IF_EQ(GF_ISK05_Defeated_StoneChomp, TRUE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_StoneChomp))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_StoneChomp_Override))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_StoneChomp) = { + .id = NPC_StoneChomp, + .settings = &N(NpcSettings_StoneChomp), + .pos = { 385.0f, 71.0f, -330.0f }, + .yaw = 320, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .init = &N(EVS_NpcInit_StoneChomp), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = STONE_CHOMP_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 468, 0, -378 }, + .wanderSize = { 200 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 468, 0, -378 }, + .detectSize = { 400 }, + } + }, + .animations = STONE_CHOMP_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_PART_1_FORMATION_07, BTL_ISK_PART_1_STAGE_09), + {} +}; diff --git a/src/world/area_isk/isk_06/980A20.c b/src/world/area_isk/isk_06/980A20.c deleted file mode 100644 index 80c465b827..0000000000 --- a/src/world/area_isk/isk_06/980A20.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "isk_06.h" - -static char* N(exit_str_0) = "isk_04"; - diff --git a/src/world/area_isk/isk_06/isk_06.h b/src/world/area_isk/isk_06/isk_06.h index 74fd52eaa4..eec038875e 100644 --- a/src/world/area_isk/isk_06/isk_06.h +++ b/src/world/area_isk/isk_06/isk_06.h @@ -2,8 +2,16 @@ /// @brief Dry Dry Ruins - Sand Drainage Room 2 #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_06_shape.h" +#include "mapfs/isk_06_hit.h" + #define NAMESPACE isk_06 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupSand); +extern EvtScript N(EVS_SetupSwitch); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_isk/isk_06/isk_06_0_header.c b/src/world/area_isk/isk_06/isk_06_0_header.c new file mode 100644 index 0000000000..51e10ce942 --- /dev/null +++ b/src/world/area_isk/isk_06/isk_06_0_header.c @@ -0,0 +1,13 @@ +#include "isk_06.h" + +EntryList N(Entrances) = { + [isk_06_ENTRY_0] { 471.0, -80.0, -290.0, 320.0 }, + [isk_06_ENTRY_1] { 509.0, -270.0, -318.0, 320.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_06 }, +}; diff --git a/src/world/area_isk/isk_06/isk_06_1_main.c b/src/world/area_isk/isk_06/isk_06_1_main.c new file mode 100644 index 0000000000..8f46595fe4 --- /dev/null +++ b/src/world/area_isk/isk_06/isk_06_1_main.c @@ -0,0 +1,38 @@ +#include "isk_06.h" + +EvtScript N(EVS_ExitWalk_isk_04_2) = EVT_EXIT_WALK(40, isk_06_ENTRY_0, "isk_04", isk_04_ENTRY_2); +EvtScript N(EVS_ExitWalk_isk_04_3) = EVT_EXIT_WALK(40, isk_06_ENTRY_1, "isk_04", isk_04_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_04_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_04_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_06) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_SECOND_SAND_ROOM) + EVT_CALL(SetZoneEnabled, ZONE_o2016, FALSE) + EVT_ELSE + EVT_CALL(SetZoneEnabled, ZONE_C2, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_o2012, FALSE) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupSand)) + EVT_EXEC(N(EVS_SetupSwitch)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_06/isk_06_2_entity.c b/src/world/area_isk/isk_06/isk_06_2_entity.c new file mode 100644 index 0000000000..82ab554804 --- /dev/null +++ b/src/world/area_isk/isk_06/isk_06_2_entity.c @@ -0,0 +1,11 @@ +#include "isk_06.h" +#include "effects.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 335, -130, -550, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_ISK06_Item_StarPiece) + EVT_CALL(MakeItemEntity, ITEM_RUINS_KEY, 304, -270, -434, ITEM_SPAWN_MODE_KEY, GF_ISK06_Item_RuinsKey) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -253, -291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 291, -253, -415, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_06/isk_06_3_sand.c b/src/world/area_isk/isk_06/isk_06_3_sand.c new file mode 100644 index 0000000000..1dfb1cc801 --- /dev/null +++ b/src/world/area_isk/isk_06/isk_06_3_sand.c @@ -0,0 +1,326 @@ +#include "isk_06.h" + +EvtScript N(EVS_TexPan_DrippingSand) = { + EVT_CALL(SetTexPanner, MODEL_o2057, TEX_PANNER_4) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_LABEL(10) + EVT_ADD(LVar1, -1000) + EVT_ADD(LVar2, 200) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, 0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_AUX, LVar2, 0) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_SECOND_SAND_ROOM) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(EnableModel, MODEL_o2057, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_LookAtDrain) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 356, -95, -373) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 364) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -623, 192) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 566, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(13.6), EVT_FLOAT(-1.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 356, -95, -373) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_LookBelow) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.4), EVT_FLOAT(-5.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 356, -285, -373) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_Reset) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 356, -95, -373) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_UpperSand) = { + EVT_CALL(SetTexPanner, MODEL_o1689, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1690, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1691, TEX_PANNER_0) + EVT_SET(LVar2, 0) + EVT_CALL(MakeLerp, 0, 500, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_ADD(LVar2, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_LABEL(20) + EVT_ADD(LVar2, 500) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, LVar2) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_SECOND_SAND_ROOM) + EVT_GOTO(20) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_LowerSand) = { + EVT_CALL(SetTexPanner, MODEL_o1682, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o1681, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1675, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o1676, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o1677, TEX_PANNER_3) + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 0) + EVT_LABEL(10) + EVT_ADD(LVar2, 0x1800) + EVT_ADD(LVar3, -500) + EVT_ADD(LVar4, -100) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar3) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, LVar4) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_SECOND_SAND_ROOM) + EVT_GOTO(10) + EVT_END_IF + EVT_SET(LVar5, 0x00001800) + EVT_SET(LVar6, -500) + EVT_SET(LVar7, -100) + EVT_LOOP(10) + EVT_ADD(LVar5, -512) + EVT_ADD(LVar6, 50) + EVT_ADD(LVar7, 10) + EVT_ADD(LVar2, LVar5) + EVT_ADD(LVar3, LVar6) + EVT_ADD(LVar4, LVar7) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar3) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, LVar4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RescaleDrainingSand) = { + EVT_CALL(MakeLerp, 0, 100, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(ScaleModel, MODEL_o1690, EVT_FLOAT(1.0), LVar0, EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CollapseSandPile) = { + EVT_CALL(MakeLerp, 0, 50, 10, EASING_QUADRATIC_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 100) + EVT_SETF(LVar2, 1) + EVT_ADDF(LVar2, LVar0) + EVT_SETF(LVar3, 1) + EVT_SUBF(LVar3, LVar0) + EVT_CALL(ScaleModel, MODEL_o1681, LVar2, LVar3, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DrainUpperSand) = { + EVT_CALL(MakeLerp, 0, -100, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g279, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o1959, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o1960, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o1961, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, -100, -250, 30, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g279, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o1959, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o1960, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o1961, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FillLowerSand) = { + EVT_CALL(MakeTransformGroup, MODEL_g277) + EVT_CALL(MakeLerp, -200, 0, 120, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_CALL(TranslateGroup, MODEL_g277, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o1681, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LowerSandColumn) = { + EVT_CALL(MakeLerp, 0, -200, 10, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1682, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_DrainSand) = { + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 98, 0) + EVT_CALL(EnableModel, MODEL_o1675, TRUE) + EVT_CALL(EnableModel, MODEL_o1676, TRUE) + EVT_CALL(EnableModel, MODEL_o1677, TRUE) + EVT_CALL(EnableModel, MODEL_o1678, TRUE) + EVT_CALL(EnableModel, MODEL_o1679, TRUE) + EVT_CALL(EnableModel, MODEL_o1680, TRUE) + EVT_CALL(EnableModel, MODEL_o1681, TRUE) + EVT_CALL(EnableModel, MODEL_o1682, TRUE) + EVT_EXEC(N(EVS_Camera_LookAtDrain)) + EVT_WAIT(30) + EVT_EXEC(N(EVS_TexPan_UpperSand)) + EVT_EXEC(N(EVS_RescaleDrainingSand)) + EVT_EXEC(N(EVS_DrainUpperSand)) + EVT_CALL(PlaySound, SOUND_53) + EVT_WAIT(75) + EVT_EXEC(N(EVS_Camera_LookBelow)) + EVT_WAIT(30) + EVT_EXEC(N(EVS_TexPan_LowerSand)) + EVT_EXEC(N(EVS_FillLowerSand)) + EVT_CALL(PlaySound, SOUND_453) + EVT_WAIT(120) + EVT_EXEC(N(EVS_LowerSandColumn)) + EVT_WAIT(5) + EVT_EXEC(N(EVS_CollapseSandPile)) + EVT_CALL(PlaySound, SOUND_453) + EVT_WAIT(10) + EVT_CALL(EnableModel, MODEL_o1686, FALSE) + EVT_CALL(EnableModel, MODEL_o1687, FALSE) + EVT_CALL(EnableModel, MODEL_o1688, FALSE) + EVT_CALL(EnableModel, MODEL_o1689, FALSE) + EVT_CALL(EnableModel, MODEL_o1690, FALSE) + EVT_CALL(EnableModel, MODEL_o1691, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1689, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1690, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1691, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1675, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1676, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1677, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o2047, TRUE) + EVT_CALL(EnableModel, MODEL_o2048, TRUE) + EVT_CALL(EnableModel, MODEL_o2049, TRUE) + EVT_CALL(EnableModel, MODEL_o2050, TRUE) + EVT_CALL(EnableModel, MODEL_o2051, TRUE) + EVT_CALL(EnableModel, MODEL_o2052, FALSE) + EVT_CALL(EnableModel, MODEL_o2053, FALSE) + EVT_CALL(EnableModel, MODEL_o2054, FALSE) + EVT_CALL(EnableModel, MODEL_o2055, FALSE) + EVT_CALL(EnableModel, MODEL_o2056, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2077, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2078, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GB_StoryProgress, STORY_CH2_DRAINED_SECOND_SAND_ROOM) + EVT_CALL(SetZoneEnabled, ZONE_o2012, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_o2016, TRUE) + EVT_WAIT(20) + EVT_EXEC(N(EVS_Camera_Reset)) + EVT_WAIT(5) + EVT_CALL(EnableModel, MODEL_o1681, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupSand) = { + EVT_SET(AF_ISK06_SandSwitchActivated, FALSE) + EVT_CALL(MakeTransformGroup, MODEL_g279) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_SECOND_SAND_ROOM) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_DrainSand)), TRIGGER_AREA_FLAG_SET, AF_ISK06_SandSwitchActivated, 1, 0) + EVT_CALL(EnableModel, MODEL_o1675, FALSE) + EVT_CALL(EnableModel, MODEL_o1676, FALSE) + EVT_CALL(EnableModel, MODEL_o1677, FALSE) + EVT_CALL(EnableModel, MODEL_o1678, FALSE) + EVT_CALL(EnableModel, MODEL_o1679, FALSE) + EVT_CALL(EnableModel, MODEL_o1680, FALSE) + EVT_CALL(EnableModel, MODEL_o1681, FALSE) + EVT_CALL(EnableModel, MODEL_o1682, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1675, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1676, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1677, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o2047, FALSE) + EVT_CALL(EnableModel, MODEL_o2048, FALSE) + EVT_CALL(EnableModel, MODEL_o2049, FALSE) + EVT_CALL(EnableModel, MODEL_o2050, FALSE) + EVT_CALL(EnableModel, MODEL_o2051, FALSE) + EVT_EXEC(N(EVS_TexPan_DrippingSand)) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o1686, FALSE) + EVT_CALL(EnableModel, MODEL_o1687, FALSE) + EVT_CALL(EnableModel, MODEL_o1688, FALSE) + EVT_CALL(EnableModel, MODEL_o1689, FALSE) + EVT_CALL(EnableModel, MODEL_o1690, FALSE) + EVT_CALL(EnableModel, MODEL_o1691, FALSE) + EVT_CALL(EnableModel, MODEL_o1681, FALSE) + EVT_CALL(EnableModel, MODEL_o1682, FALSE) + EVT_CALL(EnableModel, MODEL_o2052, FALSE) + EVT_CALL(EnableModel, MODEL_o2053, FALSE) + EVT_CALL(EnableModel, MODEL_o2054, FALSE) + EVT_CALL(EnableModel, MODEL_o2055, FALSE) + EVT_CALL(EnableModel, MODEL_o2056, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2077, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2078, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o2057, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1689, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1690, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1691, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_SECOND_SAND_ROOM) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o2057, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_06/isk_06_4_switch.c b/src/world/area_isk/isk_06/isk_06_4_switch.c new file mode 100644 index 0000000000..f2a6d61eef --- /dev/null +++ b/src/world/area_isk/isk_06/isk_06_4_switch.c @@ -0,0 +1,57 @@ +#include "isk_06.h" + +extern EvtScript N(EVS_OnTouch_DrainSwitch); + +EvtScript N(EVS_SetupSwitch) = { + EVT_CALL(ParentColliderToModel, COLLIDER_o2090, MODEL_g336) + EVT_CALL(ParentColliderToModel, COLLIDER_o2091, MODEL_g336) + EVT_IF_EQ(AF_ISK06_SandSwitchActivated, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_DrainSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o2091, 1, 0) + EVT_ELSE + EVT_CALL(TranslateModel, MODEL_g336, 0, -14, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2090) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2091) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnTouch_DrainSwitch) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LABEL(5) + EVT_WAIT(1) + EVT_CALL(PartnerCanUseAbility, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar1, -80) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(2.5)) + EVT_CALL(NpcJump0, NPC_PARTNER, 343, -80, -421, 10) + EVT_WAIT(10) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g336, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2090) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2091) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_208B, 0) + EVT_SET(AF_ISK06_SandSwitchActivated, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_07/982440.c b/src/world/area_isk/isk_07/982440.c deleted file mode 100644 index 83b27a561b..0000000000 --- a/src/world/area_isk/isk_07/982440.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "isk_07.h" - -static char* N(exit_str_0) = "isk_08"; -static char* N(exit_str_1) = "isk_04"; - -#include "world/common/todo/SetNpcB5_3.inc.c" - -ApiStatus func_80240014_982454(Evt* script, s32 isInitialCall) { - EncounterStatus* encounterStatus = &gCurrentEncounter; - s32 i, j; - s32 count; - - script->varTable[1] = 0; - count = 0; - for (i = 0; i < encounterStatus->numEncounters; i++) { - Encounter* encounter = encounterStatus->encounterList[i]; - if (encounter != NULL) { - s32 hasEnemy = FALSE; - for (j = 0; j < encounter->count; j++) { - if (encounter->enemy[j] != NULL) { - hasEnemy = TRUE; - } - } - if (hasEnemy) { - count++; - } - } - } - - if (count != 1) { - return ApiStatus_DONE2; - } - script->varTable[1] = count; - return ApiStatus_DONE2; -} diff --git a/src/world/area_isk/isk_07/9824F0.c b/src/world/area_isk/isk_07/9824F0.c deleted file mode 100644 index 01e0fc3eaa..0000000000 --- a/src/world/area_isk/isk_07/9824F0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "isk_07.h" - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_isk/isk_07/982530.c b/src/world/area_isk/isk_07/982530.c deleted file mode 100644 index 58689fa344..0000000000 --- a/src/world/area_isk/isk_07/982530.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "isk_07.h" -#include "mapfs/isk_07_hit.h" - -ApiStatus func_802400F0_982530(Evt* script, s32 isInitialCall) { - if (gCollisionStatus.currentFloor == COLLIDER_o2022) { - return ApiStatus_BLOCK; - } else { - return ApiStatus_DONE2; - } -} - diff --git a/src/world/area_isk/isk_07/isk_07.h b/src/world/area_isk/isk_07/isk_07.h index 91877fb00c..038e597b32 100644 --- a/src/world/area_isk/isk_07/isk_07.h +++ b/src/world/area_isk/isk_07/isk_07.h @@ -2,8 +2,37 @@ /// @brief Dry Dry Ruins - Sarcophagus Hall 2 #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_07_shape.h" +#include "mapfs/isk_07_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Pokey_03 = 2, +}; + +enum { + MV_LockEntityID = MapVar(0), +}; + +enum { + MF_StairsFlipped = MapFlag(0), +}; + #define NAMESPACE isk_07 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupLock); +extern EvtScript N(EVS_SetupStairs); +extern EvtScript N(EVS_SetupSwitch); +extern EvtScript N(EVS_SetupSarcophagi); +extern EvtScript N(EVS_OpenEntryDoor); +extern EvtScript N(EVS_ShutEntryDoor); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_07/isk_07_0_header.c b/src/world/area_isk/isk_07/isk_07_0_header.c new file mode 100644 index 0000000000..3e9247699a --- /dev/null +++ b/src/world/area_isk/isk_07/isk_07_0_header.c @@ -0,0 +1,13 @@ +#include "isk_07.h" + +EntryList N(Entrances) = { + [isk_07_ENTRY_0] { -283.0, -390.0, 530.0, 110.0 }, + [isk_07_ENTRY_1] { 560.0, -340.0, 217.0, 210.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_07 }, +}; diff --git a/src/world/area_isk/isk_07/isk_07_1_main.c b/src/world/area_isk/isk_07/isk_07_1_main.c new file mode 100644 index 0000000000..219ace2d3b --- /dev/null +++ b/src/world/area_isk/isk_07/isk_07_1_main.c @@ -0,0 +1,37 @@ +#include "isk_07.h" + +EvtScript N(EVS_ExitWalk_isk_08_2) = EVT_EXIT_WALK(40, isk_07_ENTRY_0, "isk_08", isk_08_ENTRY_2); +EvtScript N(EVS_ExitWalk_isk_04_1) = EVT_EXIT_WALK(40, isk_07_ENTRY_1, "isk_04", isk_04_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_08_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_04_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_07) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupLock)) + EVT_EXEC(N(EVS_SetupStairs)) + EVT_EXEC(N(EVS_SetupSwitch)) + EVT_EXEC(N(EVS_SetupSarcophagi)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_07/isk_07_2_entity.c b/src/world/area_isk/isk_07/isk_07_2_entity.c new file mode 100644 index 0000000000..3b3c89878a --- /dev/null +++ b/src/world/area_isk/isk_07/isk_07_2_entity.c @@ -0,0 +1,46 @@ +#include "isk_07.h" +#include "entity.h" +#include "effects.h" + +EvtScript N(EVS_HitBlock_Trigger) = { + EVT_SET(GF_ISK07_OpenedSarcophagi, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SmashBlock_Stone) = { + EVT_SET(GF_ISK07_Hammer2Block, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_ISK07_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -300, -380, 530, 50, MAKE_ENTITY_END) + EVT_SET(MV_LockEntityID, LVar0) + EVT_END_IF + EVT_IF_EQ(GF_ISK07_Hammer2Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block_WideX), 470, -250, 270, 150, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_SmashBlock_Stone))) + EVT_END_IF + EVT_IF_EQ(GF_ISK07_OpenedSarcophagi, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_TriggerBlock), -250, -330, 545, -25, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_HitBlock_Trigger))) + EVT_END_IF + EVT_IF_EQ(GF_ISK07_Defeated_Mummies, TRUE) + EVT_CALL(MakeItemEntity, ITEM_RUINS_KEY, -250, -390, 545, ITEM_SPAWN_MODE_KEY, GF_ISK07_Item_RuinsKey) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -193, 291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 291, -193, 415, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 131, -193, 489, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -44, -193, 505, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -214, -193, 459, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -323, 291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 291, -323, 415, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 131, -323, 489, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -44, -323, 505, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -214, -323, 459, EVT_FLOAT(0.3), LVar0) + EVT_CALL(MakeItemEntity, ITEM_ARTIFACT, 490, -250, 215, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_ISK07_Item_Artifact) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_07/isk_07_3_npc.c b/src/world/area_isk/isk_07/isk_07_3_npc.c new file mode 100644 index 0000000000..aac20de490 --- /dev/null +++ b/src/world/area_isk/isk_07/isk_07_3_npc.c @@ -0,0 +1,249 @@ +#include "isk_07.h" + +#include "world/common/enemy/complete/PokeyMummy.inc.c" + +API_CALLABLE(N(IsLastEnemy)) { + EncounterStatus* encounterStatus = &gCurrentEncounter; + s32 livingEncounters; + s32 i, j; + + script->varTable[1] = FALSE; + livingEncounters = 0; + for (i = 0; i < encounterStatus->numEncounters; i++) { + Encounter* encounter = encounterStatus->encounterList[i]; + if (encounter != NULL) { + s32 hasEnemy = FALSE; + for (j = 0; j < encounter->count; j++) { + if (encounter->enemy[j] != NULL) { + hasEnemy = TRUE; + } + } + if (hasEnemy) { + livingEncounters++; + } + } + } + + if (livingEncounters != 1) { + return ApiStatus_DONE2; + } else { + script->varTable[1] = TRUE; + return ApiStatus_DONE2; + } +} + +EvtScript N(EVS_NpcDefeat_Pokey_01) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE) + EVT_THREAD + EVT_CALL(N(IsLastEnemy)) + EVT_IF_EQ(LVar1, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySound, SOUND_B) + EVT_WAIT(30) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -150, -390, 571) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -251, -390, 553) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -251, -390, 553) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(45) + EVT_CALL(MakeItemEntity, ITEM_RUINS_KEY, -250, -240, 545, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_ISK07_Item_RuinsKey) + EVT_SET(GF_ISK07_Defeated_Mummies, TRUE) + EVT_EXEC_WAIT(N(EVS_OpenEntryDoor)) + EVT_WAIT(60) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_END_THREAD + EVT_END_IF + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(OnPlayerFled, 0) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Pokey_01) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_LABEL(1) + EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(SetNpcYaw, NPC_SELF, 105) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -140, 528, 10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Pokey_02) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_LABEL(1) + EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_WAIT(15) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 47, 543, 10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Pokey_03) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_LABEL(1) + EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_WAIT(15) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 227, 489, 10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Pokey_01) = { + EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE) + EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAGS_800000) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_01))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01))) + EVT_CALL(InterpNpcYaw, NPC_SELF, 100, 0) + EVT_CALL(func_800457C4, 3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Pokey_02) = { + EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE) + EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAGS_800000) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_02))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01))) + EVT_CALL(func_800457C4, 3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Pokey_03) = { + EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE) + EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAGS_800000) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_03))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01))) + EVT_CALL(func_800457C4, 3) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_PokeyMummy), + .pos = { -132.0f, -390.0f, 492.0f }, + .yaw = 304, + .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Pokey_01), + .drops = POKEY_MUMMY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -301, 0, 427 }, + .wanderSize = { 200 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -301, 0, 427 }, + .detectSize = { 400 }, + } + }, + .animations = POKEY_MUMMY_ANIMS, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_PokeyMummy), + .pos = { 45.0f, -390.0f, 507.0f }, + .yaw = 263, + .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Pokey_02), + .drops = POKEY_MUMMY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 52, -390, 573 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 52, -390, 573 }, + .detectSize = { 150 }, + } + }, + .animations = POKEY_MUMMY_ANIMS, +}; + +StaticNpc N(NpcData_Pokey_03) = { + .id = NPC_Pokey_03, + .settings = &N(NpcSettings_PokeyMummy), + .pos = { 220.0f, -389.0f, 467.0f }, + .yaw = 244, + .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Pokey_03), + .drops = POKEY_MUMMY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 243, -390, 523 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 243, -390, 523 }, + .detectSize = { 150 }, + } + }, + .animations = POKEY_MUMMY_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_ISK_PART_1_FORMATION_00, BTL_ISK_PART_1_STAGE_0C), + NPC_GROUP(N(NpcData_Pokey_02), BTL_ISK_PART_1_FORMATION_02, BTL_ISK_PART_1_STAGE_0C), + NPC_GROUP(N(NpcData_Pokey_03), BTL_ISK_PART_1_FORMATION_03, BTL_ISK_PART_1_STAGE_0C), + {} +}; diff --git a/src/world/area_isk/isk_07/isk_07_4_stairs.c b/src/world/area_isk/isk_07/isk_07_4_stairs.c new file mode 100644 index 0000000000..8795f1a9b8 --- /dev/null +++ b/src/world/area_isk/isk_07/isk_07_4_stairs.c @@ -0,0 +1,70 @@ +#include "isk_07.h" + +EvtScript N(EVS_RedStairs_FlipCCW) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1994, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2000, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2000, SOUND_80000002, 0) + EVT_CALL(MakeLerp, 0, 90, 30, EASING_QUADRATIC_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_g311, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(StopSound, SOUND_80000002) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RedStairs_FlipCW) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1994, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2000, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o1994, SOUND_80000002, 0) + EVT_CALL(MakeLerp, 90, 0, 30, EASING_QUADRATIC_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_g311, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(StopSound, SOUND_80000002) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipRedStairs) = { + EVT_CALL(InterpCamTargetPos, 0, 1, 369, -349, 369, 20) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 369, -349, 369) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 369, -349, 369) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_IF_EQ(MF_StairsFlipped, FALSE) + EVT_EXEC_WAIT(N(EVS_RedStairs_FlipCCW)) + EVT_SET(MF_StairsFlipped, TRUE) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_RedStairs_FlipCW)) + EVT_SET(MF_StairsFlipped, FALSE) + EVT_END_IF + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(AF_ISK07_FlippingRedStairs, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStairs) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1994, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2000, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MF_StairsFlipped, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_FlipRedStairs)), TRIGGER_AREA_FLAG_SET, AF_ISK07_FlippingRedStairs, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_07/isk_07_5_lock.c b/src/world/area_isk/isk_07/isk_07_5_lock.c new file mode 100644 index 0000000000..d8c64df4e6 --- /dev/null +++ b/src/world/area_isk/isk_07/isk_07_5_lock.c @@ -0,0 +1,95 @@ +#include "isk_07.h" + +#include "world/common/todo/RemovePadlock.inc.c" + +s32 N(ItemList_RuinsKey)[] = { + ITEM_RUINS_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_RuinsDoor) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowKeyChoicePopup) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_CASE_EQ(-1) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_SWITCH + EVT_CALL(PlaySoundAt, SOUND_269, 0, -300, -380, 530) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_ISK07_UnlockedDoor, TRUE) + EVT_SET(LVar0, MV_LockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_265, 0) + EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g310, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupLock) = { + EVT_IF_EQ(GF_ISK07_UnlockedDoor, FALSE) + EVT_CALL(MakeTransformGroup, MODEL_g310) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_RuinsDoor)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(ItemList_RuinsKey)), 0, 1) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_g310, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_CALL(TranslateModel, MODEL_o2057, 0, 65, 0) + EVT_CALL(TranslateModel, MODEL_o2058, 0, 65, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShutEntryDoor) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_266, 0) + EVT_CALL(MakeLerp, 65, 0, 15, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o2057, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o2058, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_267, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.3)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenEntryDoor) = { + EVT_CALL(MakeLerp, 0, 65, 15, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o2057, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o2058, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_07/isk_07_6_switch.c b/src/world/area_isk/isk_07/isk_07_6_switch.c new file mode 100644 index 0000000000..e4670a8dfd --- /dev/null +++ b/src/world/area_isk/isk_07/isk_07_6_switch.c @@ -0,0 +1,55 @@ +#include "isk_07.h" + +extern EvtScript N(EVS_OnTouch_StairSwitch); + +API_CALLABLE(N(WaitForPlayerTouchingGround)) { + if (gCollisionStatus.currentFloor == COLLIDER_o2022) { + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE2; + } +} + +EvtScript N(EVS_SetupSwitch) = { + EVT_CALL(ParentColliderToModel, COLLIDER_o2022, MODEL_g313) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_StairSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o2022, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnTouch_StairSwitch) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g313, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2022) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2022, SOUND_208B, 0) + EVT_SET(AF_ISK07_FlippingRedStairs, TRUE) + EVT_LABEL(15) + EVT_WAIT(1) + EVT_IF_EQ(AF_ISK07_FlippingRedStairs, TRUE) + EVT_GOTO(15) + EVT_END_IF + EVT_CALL(MakeLerp, -14, 0, 5, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g313, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2022) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(N(WaitForPlayerTouchingGround)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_07/isk_07_7_ambush.c b/src/world/area_isk/isk_07/isk_07_7_ambush.c new file mode 100644 index 0000000000..696c880875 --- /dev/null +++ b/src/world/area_isk/isk_07/isk_07_7_ambush.c @@ -0,0 +1,139 @@ +#include "isk_07.h" + +extern EvtScript N(EVS_OpenSarcophagus1); +extern EvtScript N(EVS_OpenSarcophagus2); +extern EvtScript N(EVS_OpenSarcophagus3); + +EvtScript N(EVS_SetupSarcophagi) = { + EVT_IF_EQ(GF_ISK07_OpenedSarcophagi, FALSE) + EVT_SET(AF_ISK07_OpeningSarcophagus1, FALSE) + EVT_SET(AF_ISK07_OpeningSarcophagus2, FALSE) + EVT_SET(AF_ISK07_OpeningSarcophagus3, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2039, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2040, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2041, COLLIDER_FLAGS_UPPER_MASK) + EVT_LABEL(10) + EVT_IF_EQ(GF_ISK07_OpenedSarcophagi, FALSE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcYaw, NPC_Pokey_01, 105) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_01, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_02, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Pokey_03, NPC_FLAG_2, FALSE) + EVT_THREAD + EVT_WAIT(12) + EVT_CALL(InterpPlayerYaw, 109, 0) + EVT_WAIT(3) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 0, 1, 1, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_WAIT(20) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -151, -390, 576) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -151, -390, 576) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC(N(EVS_OpenSarcophagus1)) + EVT_WAIT(15) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 51, -390, 589) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC(N(EVS_OpenSarcophagus2)) + EVT_WAIT(15) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 239, -390, 515) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC(N(EVS_OpenSarcophagus3)) + EVT_WAIT(15) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 517, -390, 292) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC(N(EVS_ShutEntryDoor)) + EVT_WAIT(30) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_SET(AF_ISK07_MummiesReleased, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_SET(AF_ISK07_OpeningSarcophagus1, TRUE) + EVT_SET(AF_ISK07_OpeningSarcophagus2, TRUE) + EVT_SET(AF_ISK07_OpeningSarcophagus3, TRUE) + EVT_CALL(TranslateModel, MODEL_g323, 38, 0, 13) + EVT_CALL(RotateModel, MODEL_g323, 35, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_g327, 38, 0, 13) + EVT_CALL(RotateModel, MODEL_g327, 35, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_g331, 38, 0, 13) + EVT_CALL(RotateModel, MODEL_g331, 35, 0, 1, 0) + EVT_WAIT(5) + EVT_SET(AF_ISK07_OpeningSarcophagus1, FALSE) + EVT_SET(AF_ISK07_OpeningSarcophagus2, FALSE) + EVT_SET(AF_ISK07_OpeningSarcophagus3, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2036, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2037, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2038, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(AF_ISK07_MummiesReleased, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenSarcophagusAnim) = { + EVT_CALL(PlaySoundAtModel, LVar3, SOUND_1D1, 0) + EVT_CALL(TranslateModel, LVar3, 0, 0, 13) + EVT_WAIT(3) + EVT_CALL(MakeLerp, 0, 35, 9, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_MULF(LVar2, EVT_FLOAT(1.1)) + EVT_CALL(TranslateModel, LVar3, LVar2, 0, 13) + EVT_CALL(RotateModel, LVar3, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenSarcophagus1) = { + EVT_SET(AF_ISK07_OpeningSarcophagus1, TRUE) + EVT_SET(LVar3, MODEL_g323) + EVT_EXEC_WAIT(N(EVS_OpenSarcophagusAnim)) + EVT_SET(AF_ISK07_OpeningSarcophagus1, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2036, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2039, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenSarcophagus2) = { + EVT_SET(AF_ISK07_OpeningSarcophagus2, TRUE) + EVT_SET(LVar3, MODEL_g327) + EVT_EXEC_WAIT(N(EVS_OpenSarcophagusAnim)) + EVT_SET(AF_ISK07_OpeningSarcophagus2, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2037, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2040, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenSarcophagus3) = { + EVT_SET(AF_ISK07_OpeningSarcophagus3, TRUE) + EVT_SET(LVar3, MODEL_g331) + EVT_EXEC_WAIT(N(EVS_OpenSarcophagusAnim)) + EVT_SET(AF_ISK07_OpeningSarcophagus3, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2038, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2041, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c deleted file mode 100644 index b2e561aa59..0000000000 --- a/src/world/area_isk/isk_08/984E30.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "isk_08.h" - -static char* N(exit_str_0) = "isk_09"; -static char* N(exit_str_1) = "isk_10"; -static char* N(exit_str_2) = "isk_07"; -static char* N(exit_str_3) = "isk_11"; - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_isk/isk_08/isk_08.h b/src/world/area_isk/isk_08/isk_08.h index f98c5f2b15..3ac6592e3b 100644 --- a/src/world/area_isk/isk_08/isk_08.h +++ b/src/world/area_isk/isk_08/isk_08.h @@ -2,8 +2,22 @@ /// @brief Dry Dry Ruins - Descending Stairs 2 #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_08_shape.h" +#include "mapfs/isk_08_hit.h" + +#include "sprite/npc/BuzzyBeetle.h" + +enum { + NPC_BuzzyBeetle = 1, +}; + #define NAMESPACE isk_08 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFlames); +extern EvtScript N(EVS_SetupBombableWall); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_08/isk_08_0_header.c b/src/world/area_isk/isk_08/isk_08_0_header.c new file mode 100644 index 0000000000..747920a264 --- /dev/null +++ b/src/world/area_isk/isk_08/isk_08_0_header.c @@ -0,0 +1,15 @@ +#include "isk_08.h" + +EntryList N(Entrances) = { + [isk_08_ENTRY_0] { -510.0, -390.0, 207.0, 150.0 }, + [isk_08_ENTRY_1] { -557.0, -520.0, 224.0, 150.0 }, + [isk_08_ENTRY_2] { -401.0, -390.0, 447.0, 320.0 }, + [isk_08_ENTRY_3] { -401.0, -520.0, 447.0, 320.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_08 }, +}; diff --git a/src/world/area_isk/isk_08/isk_08_1_main.c b/src/world/area_isk/isk_08/isk_08_1_main.c new file mode 100644 index 0000000000..eb141aad5e --- /dev/null +++ b/src/world/area_isk/isk_08/isk_08_1_main.c @@ -0,0 +1,36 @@ +#include "isk_08.h" + +EvtScript N(EVS_ExitWalk_isk_09_0) = EVT_EXIT_WALK(40, isk_08_ENTRY_0, "isk_09", isk_09_ENTRY_0); +EvtScript N(EVS_ExitWalk_isk_10_0) = EVT_EXIT_WALK(40, isk_08_ENTRY_1, "isk_10", isk_10_ENTRY_0); +EvtScript N(EVS_ExitWalk_isk_07_0) = EVT_EXIT_WALK(40, isk_08_ENTRY_2, "isk_07", isk_07_ENTRY_0); +EvtScript N(EVS_ExitWalk_isk_11_0) = EVT_EXIT_WALK(40, isk_08_ENTRY_3, "isk_11", isk_11_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_09_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_10_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_07_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_11_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_08) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_SetupFlames)) + EVT_EXEC_WAIT(N(EVS_SetupBombableWall)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_08/isk_08_2_npc.c b/src/world/area_isk/isk_08/isk_08_2_npc.c new file mode 100644 index 0000000000..614737f086 --- /dev/null +++ b/src/world/area_isk/isk_08/isk_08_2_npc.c @@ -0,0 +1,31 @@ +#include "isk_08.h" + +#include "world/common/enemy/complete/SpikeTop.inc.c" + +StaticNpc N(NpcData_BuzzyBeetle) = { + .id = NPC_BuzzyBeetle, + .settings = &N(NpcSettings_BuzzyBeetle), + .pos = { -415.0f, -520.0f, 355.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = ISK_BUZZY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -432, -520, 390 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -450, -520, 386 }, + .detectSize = { 60 }, + } + }, + .animations = BUZZY_BEETLE_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BuzzyBeetle), BTL_ISK_PART_1_FORMATION_0A, BTL_ISK_PART_1_STAGE_03), + {} +}; diff --git a/src/world/area_isk/isk_08/isk_08_3_entity.c b/src/world/area_isk/isk_08/isk_08_3_entity.c new file mode 100644 index 0000000000..ecd3892bb3 --- /dev/null +++ b/src/world/area_isk/isk_08/isk_08_3_entity.c @@ -0,0 +1,64 @@ +#include "isk_08.h" +#include "effects.h" + +EvtScript N(EVS_SetupFlames) = { + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -358, -323, 358, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -459, -323, 214, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -358, -453, 358, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -459, -453, 214, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; + +BombTrigger N(BombPos_Wall) = { + .pos = { -569.0f, -520.0f, 207.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_OnBlast_Wall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 36, 12, 1, 10, 30) + EVT_LOOP(10) + EVT_CALL(EnableModel, MODEL_g293, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_g293, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_ISK_BombedWallFrom08, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HideDestroyedWall) = { + EVT_CALL(EnableModel, MODEL_o2012, FALSE) + EVT_CALL(EnableModel, MODEL_o2019, FALSE) + EVT_CALL(EnableModel, MODEL_o2021, FALSE) + EVT_CALL(EnableModel, MODEL_o2018, FALSE) + EVT_CALL(EnableModel, MODEL_o2020, FALSE) + EVT_CALL(EnableModel, MODEL_o2022, FALSE) + EVT_CALL(EnableModel, MODEL_o2023, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2029, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2030, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2032, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupBombableWall) = { + EVT_IF_EQ(GF_ISK_BombedWallFrom08, FALSE) + EVT_IF_EQ(GF_ISK_BombedWallFrom10, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnBlast_Wall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) + EVT_EXEC_WAIT(N(EVS_HideDestroyedWall)) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_g293, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_ELSE + EVT_CALL(EnableModel, MODEL_g293, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC_WAIT(N(EVS_HideDestroyedWall)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c deleted file mode 100644 index 0e1cce100a..0000000000 --- a/src/world/area_isk/isk_09/9864E0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "isk_09.h" -#include "entity.h" - -static char* N(exit_str_0) = "isk_08"; -static char* N(exit_str_1) = ""; - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" - -ApiStatus func_802402BC_98679C(Evt* script, s32 isInitialCall) { - Entity* bigChest = get_entity_by_index(script->varTable[0]); - bigChest->dataBuf.chest->gotItemDone = TRUE; - return ApiStatus_DONE2; -} diff --git a/src/world/area_isk/isk_09/9867D0.c b/src/world/area_isk/isk_09/9867D0.c deleted file mode 100644 index d587246e56..0000000000 --- a/src/world/area_isk/isk_09/9867D0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "isk_09.h" - -ApiStatus func_802402F0_9867D0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 colliderID = evt_get_variable(script, *args++); - if (gCollisionStatus.currentFloor != colliderID) { - return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; - } -} diff --git a/src/world/area_isk/isk_09/isk_09.h b/src/world/area_isk/isk_09/isk_09.h index d7bd1b898f..7f35893c76 100644 --- a/src/world/area_isk/isk_09/isk_09.h +++ b/src/world/area_isk/isk_09/isk_09.h @@ -2,8 +2,23 @@ /// @brief Dry Dry Ruins - Super Hammer Room #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_09_shape.h" +#include "mapfs/isk_09_hit.h" + +enum { + MF_BlueStairsFlipped = MapFlag(0), + MF_RedStairsFlipped = MapFlag(1), +}; + #define NAMESPACE isk_09 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupSwitches); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_PlayUpgradeSong); +extern EvtScript N(EVS_SetupStairs); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_isk/isk_09/isk_09_0_header.c b/src/world/area_isk/isk_09/isk_09_0_header.c new file mode 100644 index 0000000000..37ceb9bbb8 --- /dev/null +++ b/src/world/area_isk/isk_09/isk_09_0_header.c @@ -0,0 +1,12 @@ +#include "isk_09.h" + +EntryList N(Entrances) = { + [isk_09_ENTRY_0] { -575.0, -390.0, 81.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_09 }, +}; diff --git a/src/world/area_isk/isk_09/isk_09_1_music.c b/src/world/area_isk/isk_09/isk_09_1_music.c new file mode 100644 index 0000000000..2b1310816b --- /dev/null +++ b/src/world/area_isk/isk_09/isk_09_1_music.c @@ -0,0 +1,39 @@ +#include "isk_09.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GF_ISK09_ThirdWarning, FALSE) + EVT_THREAD + EVT_CALL(FadeInMusic, 1, SONG_TUTANKOOPA_WARNING, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00DF, 160, 40) + EVT_SET(GF_ISK09_ThirdWarning, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 1, 2000) + EVT_END_THREAD + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayUpgradeSong) = { + EVT_CALL(PushSong, SONG_ITEM_UPGRADE, 1) + EVT_WAIT(130) + EVT_CALL(PopSong) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_09/isk_09_2_main.c b/src/world/area_isk/isk_09/isk_09_2_main.c new file mode 100644 index 0000000000..3a0000182c --- /dev/null +++ b/src/world/area_isk/isk_09/isk_09_2_main.c @@ -0,0 +1,23 @@ +#include "isk_09.h" + +EvtScript N(EVS_ExitWalk_isk_08_0) = EVT_EXIT_WALK(40, isk_09_ENTRY_0, "isk_08", isk_08_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_08_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_09) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupSwitches)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupStairs)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_09/isk_09_3_entity.c b/src/world/area_isk/isk_09/isk_09_3_entity.c new file mode 100644 index 0000000000..fb781c3d87 --- /dev/null +++ b/src/world/area_isk/isk_09/isk_09_3_entity.c @@ -0,0 +1,101 @@ +#include "isk_09.h" +#include "entity.h" +#include "effects.h" + +#include "world/common/atomic/Chest.inc.c" + +API_CALLABLE(N(DismissGotItem)) { + Entity* bigChest = get_entity_by_index(script->varTable[0]); + bigChest->dataBuf.chest->gotItemDone = TRUE; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetChestCollisionClosed) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_takara00, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_takara01, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetChestCollisionOpened) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_takara00, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_takara01, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupGiantChest_SuperHammer) = { + EVT_IF_EQ(GF_ISK09_GiantChest, FALSE) + EVT_EXEC_WAIT(N(EVS_SetChestCollisionClosed)) + EVT_LOOP(0) + EVT_IF_EQ(GF_ISK09_GiantChest, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(NpcFlyTo, NPC_PARTNER, -222, -347, -531, 20, 0, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 70, 0) + EVT_LOOP(0) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_SUPER_HAMMER) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_END_IF + EVT_WAIT(60) + EVT_EXEC(N(EVS_PlayUpgradeSong)) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017D, 160, 40) + EVT_CALL(N(DismissGotItem)) + EVT_SET(GB_StoryProgress, STORY_CH2_GOT_SUPER_HAMMER) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_SetChestCollisionOpened)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenChest_SlowGo) = EVT_OPEN_CHEST_BADGE(ITEM_SLOW_GO, GF_ISK09_Chest_SlowGo); + +EvtScript N(EVS_SmashBlock_Stone) = { + EVT_SET(GF_ISK09_Hammer2Block, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_GiantChest), -158, -358, -562, 283, ITEM_SUPER_HAMMER, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_ISK09_GiantChest) + EVT_EXEC(N(EVS_SetupGiantChest_SuperHammer)) + EVT_IF_EQ(GF_ISK09_Hammer2Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block), -274, -390, -517, 115, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_SmashBlock_Stone))) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 50, -240, -535, 222, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_ISK09_Chest_SlowGo) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_SlowGo))) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -503, -323, -44, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -481, -323, -130, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -413, -323, -290, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -358, -323, -358, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -211, -323, -459, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -130, -323, -486, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -503, -193, -44, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -481, -193, -130, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -413, -193, -290, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -358, -193, -358, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -211, -193, -459, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -130, -193, -486, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -503, -63, -44, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -481, -63, -130, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -413, -63, -290, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -358, -63, -358, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -211, -63, -459, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -130, -63, -486, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_09/isk_09_4_stairs.c b/src/world/area_isk/isk_09/isk_09_4_stairs.c new file mode 100644 index 0000000000..09cca4f628 --- /dev/null +++ b/src/world/area_isk/isk_09/isk_09_4_stairs.c @@ -0,0 +1,251 @@ +#include "isk_09.h" + +EvtScript N(EVS_FlipStairsCCW) = { + EVT_WAIT(20) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, LVar4, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, LVar4, SOUND_80000002, 0) + EVT_CALL(MakeLerp, 0, 90, LVar5, EASING_COS_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, LVar2, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(StopSound, SOUND_80000002) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCW) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, LVar3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar4, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, LVar3, SOUND_80000002, 0) + EVT_CALL(MakeLerp, 90, 0, LVar5, EASING_COS_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, LVar2, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(StopSound, SOUND_80000002) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCCW_BottomBlue) = { + EVT_SET(LVar2, MODEL_g321) + EVT_SET(LVar3, COLLIDER_o2031) + EVT_SET(LVar4, COLLIDER_o2032) + EVT_SET(LVar5, 30) + EVT_EXEC_WAIT(N(EVS_FlipStairsCCW)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCW_BottomBlue) = { + EVT_SET(LVar2, MODEL_g321) + EVT_SET(LVar3, COLLIDER_o2031) + EVT_SET(LVar4, COLLIDER_o2032) + EVT_SET(LVar5, 30) + EVT_EXEC_WAIT(N(EVS_FlipStairsCW)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCCW_TopBlue) = { + EVT_SET(LVar2, MODEL_g327) + EVT_SET(LVar3, COLLIDER_o2034) + EVT_SET(LVar4, COLLIDER_o2033) + EVT_SET(LVar5, 30) + EVT_EXEC_WAIT(N(EVS_FlipStairsCCW)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCW_TopBlue) = { + EVT_SET(LVar2, MODEL_g327) + EVT_SET(LVar3, COLLIDER_o2034) + EVT_SET(LVar4, COLLIDER_o2033) + EVT_SET(LVar5, 30) + EVT_EXEC_WAIT(N(EVS_FlipStairsCW)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCCW_BottomRed) = { + EVT_SET(LVar2, MODEL_g328) + EVT_SET(LVar3, COLLIDER_o2036) + EVT_SET(LVar4, COLLIDER_o2035) + EVT_SET(LVar5, 30) + EVT_EXEC_WAIT(N(EVS_FlipStairsCCW)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCW_BottomRed) = { + EVT_SET(LVar2, MODEL_g328) + EVT_SET(LVar3, COLLIDER_o2036) + EVT_SET(LVar4, COLLIDER_o2035) + EVT_SET(LVar5, 30) + EVT_EXEC_WAIT(N(EVS_FlipStairsCW)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCCW_TopRed) = { + EVT_SET(LVar2, MODEL_g329) + EVT_SET(LVar3, COLLIDER_o2037) + EVT_SET(LVar4, COLLIDER_o2038) + EVT_SET(LVar5, 30) + EVT_EXEC_WAIT(N(EVS_FlipStairsCCW)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipStairsCW_TopRed) = { + EVT_SET(LVar2, MODEL_g329) + EVT_SET(LVar3, COLLIDER_o2037) + EVT_SET(LVar4, COLLIDER_o2038) + EVT_SET(LVar5, 30) + EVT_EXEC_WAIT(N(EVS_FlipStairsCW)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BlueStairs_FlipCCW) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -522, -310, -95) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -522, -377, -92) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FlipStairsCCW_BottomBlue)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -522, -222, -92) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FlipStairsCCW_TopBlue)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BlueStairs_FlipCW) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -522, -310, -95) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -522, -377, -92) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FlipStairsCW_BottomBlue)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -522, -222, -92) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FlipStairsCW_TopBlue)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RedStairs_FlipCCW) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -408, -310, -347) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -408, -377, -347) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FlipStairsCCW_BottomRed)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -408, -222, -347) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FlipStairsCCW_TopRed)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RedStairs_FlipCW) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -408, -310, -347) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -408, -377, -347) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FlipStairsCW_BottomRed)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -408, -222, -347) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_FlipStairsCW_TopRed)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipBlueStairs) = { + EVT_IF_EQ(MF_BlueStairsFlipped, FALSE) + EVT_EXEC_WAIT(N(EVS_BlueStairs_FlipCCW)) + EVT_SET(MF_BlueStairsFlipped, TRUE) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_BlueStairs_FlipCW)) + EVT_SET(MF_BlueStairsFlipped, FALSE) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(AF_ISK09_FlippingBlueStairs, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipRedStairs) = { + EVT_IF_EQ(MF_RedStairsFlipped, FALSE) + EVT_EXEC_WAIT(N(EVS_RedStairs_FlipCW)) + EVT_SET(MF_RedStairsFlipped, TRUE) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_RedStairs_FlipCCW)) + EVT_SET(MF_RedStairsFlipped, FALSE) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(AF_ISK09_FlippingRedStairs, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStairs) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2032, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2033, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(RotateModel, MODEL_g328, 90, 0, 0, 1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2036, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(RotateModel, MODEL_g329, 90, 0, 0, 1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2037, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MF_BlueStairsFlipped, FALSE) + EVT_SET(MF_RedStairsFlipped, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_FlipBlueStairs)), TRIGGER_AREA_FLAG_SET, AF_ISK09_FlippingBlueStairs, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_FlipRedStairs)), TRIGGER_AREA_FLAG_SET, AF_ISK09_FlippingRedStairs, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_09/isk_09_5_switch.c b/src/world/area_isk/isk_09/isk_09_5_switch.c new file mode 100644 index 0000000000..1566ae6056 --- /dev/null +++ b/src/world/area_isk/isk_09/isk_09_5_switch.c @@ -0,0 +1,177 @@ +#include "isk_09.h" + +extern EvtScript N(EVS_OnTouch_BlueSwitchCenter); +extern EvtScript N(EVS_OnTouch_BlueSwitchMidLeft); +extern EvtScript N(EVS_OnTouch_BlueSwitchTopLeft); +extern EvtScript N(EVS_OnTouch_RedSwitch); + +API_CALLABLE(N(WaitForPlayerTouchingGround)) { + Bytecode* args = script->ptrReadPos; + s32 colliderID = evt_get_variable(script, *args++); + if (gCollisionStatus.currentFloor != colliderID) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +EvtScript N(EVS_SetupSwitches) = { + EVT_CALL(ParentColliderToModel, COLLIDER_o2096, MODEL_g332) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_BlueSwitchCenter)), TRIGGER_FLOOR_TOUCH, COLLIDER_o2096, 1, 0) + EVT_CALL(ParentColliderToModel, COLLIDER_o2099, MODEL_g334) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_BlueSwitchMidLeft)), TRIGGER_FLOOR_TOUCH, COLLIDER_o2099, 1, 0) + EVT_CALL(ParentColliderToModel, COLLIDER_o2102, MODEL_g335) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_BlueSwitchTopLeft)), TRIGGER_FLOOR_TOUCH, COLLIDER_o2102, 1, 0) + EVT_CALL(ParentColliderToModel, COLLIDER_o2105, MODEL_g336) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_RedSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o2105, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnTouch_BlueSwitchCenter) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g332, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2096) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2096, SOUND_208B, 0) + EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) + EVT_LABEL(15) + EVT_WAIT(1) + EVT_IF_EQ(AF_ISK09_FlippingBlueStairs, TRUE) + EVT_GOTO(15) + EVT_END_IF + EVT_CALL(MakeLerp, -14, 0, 5, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g332, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2096) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(N(WaitForPlayerTouchingGround), COLLIDER_o2096) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnTouch_BlueSwitchMidLeft) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g334, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2099) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2099, SOUND_208B, 0) + EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) + EVT_LABEL(15) + EVT_WAIT(1) + EVT_IF_EQ(AF_ISK09_FlippingBlueStairs, TRUE) + EVT_GOTO(15) + EVT_END_IF + EVT_CALL(MakeLerp, -14, 0, 5, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g334, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2099) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(N(WaitForPlayerTouchingGround), COLLIDER_o2099) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnTouch_BlueSwitchTopLeft) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g335, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2102) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2102, SOUND_208B, 0) + EVT_SET(AF_ISK09_FlippingBlueStairs, TRUE) + EVT_LABEL(15) + EVT_WAIT(1) + EVT_IF_EQ(AF_ISK09_FlippingBlueStairs, TRUE) + EVT_GOTO(15) + EVT_END_IF + EVT_CALL(MakeLerp, -14, 0, 5, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g335, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2102) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(N(WaitForPlayerTouchingGround), COLLIDER_o2102) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnTouch_RedSwitch) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g336, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2105) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2105, SOUND_208B, 0) + EVT_SET(AF_ISK09_FlippingRedStairs, TRUE) + EVT_LABEL(15) + EVT_WAIT(1) + EVT_IF_EQ(AF_ISK09_FlippingRedStairs, TRUE) + EVT_GOTO(15) + EVT_END_IF + EVT_CALL(MakeLerp, -14, 0, 5, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g336, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2105) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(N(WaitForPlayerTouchingGround), COLLIDER_o2105) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c deleted file mode 100644 index ad4829f271..0000000000 --- a/src/world/area_isk/isk_10/988B60.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "isk_10.h" - -static char* N(exit_str_0) = "isk_08"; -static char* N(exit_str_1) = "isk_14"; -static char* N(exit_str_2) = "isk_18"; -static char* N(exit_str_3) = ""; - -#include "world/common/entity/SuperBlock.inc.c" - -ApiStatus func_80240D38_989898(Evt* script, s32 isInitialCall) { - s32 status = -1; - - if (gPlayerStatus.lastGoodPosition.y > -600.0) { - status = 0; - } - if (gPlayerStatus.lastGoodPosition.y < -770.0) { - status = 1; - } - if (status >= 0) { - evt_set_variable(script, MapVar(9), status); - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_isk/isk_10/isk_10.h b/src/world/area_isk/isk_10/isk_10.h index 7c28b60d2a..2e50cdd3a8 100644 --- a/src/world/area_isk/isk_10/isk_10.h +++ b/src/world/area_isk/isk_10/isk_10.h @@ -2,8 +2,20 @@ /// @brief Dry Dry Ruins - Vertical Shaft #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_10_shape.h" +#include "mapfs/isk_10_hit.h" + +enum { + MV_SuperBlock = MapVar(0), + MV_LastFloorLevel = MapVar(9), +}; + #define NAMESPACE isk_10 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupBombableWall); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_isk/isk_10/isk_10_0_header.c b/src/world/area_isk/isk_10/isk_10_0_header.c new file mode 100644 index 0000000000..664c9e2c1d --- /dev/null +++ b/src/world/area_isk/isk_10/isk_10_0_header.c @@ -0,0 +1,14 @@ +#include "isk_10.h" + +EntryList N(Entrances) = { + [isk_10_ENTRY_0] { -594.0, -520.0, 84.0, 0.0 }, + [isk_10_ENTRY_1] { -575.0, -780.0, -81.0, 180.0 }, + [isk_10_ENTRY_2] { -577.0, -780.0, 81.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_10 }, +}; diff --git a/src/world/area_isk/isk_10/isk_10_1_main.c b/src/world/area_isk/isk_10/isk_10_1_main.c new file mode 100644 index 0000000000..a8ae1b1549 --- /dev/null +++ b/src/world/area_isk/isk_10/isk_10_1_main.c @@ -0,0 +1,35 @@ +#include "isk_10.h" + +EvtScript N(EVS_ExitWalk_isk_08_1) = EVT_EXIT_WALK(40, isk_10_ENTRY_0, "isk_08", isk_08_ENTRY_1); +EvtScript N(EVS_ExitWalk_isk_14_0) = EVT_EXIT_WALK(40, isk_10_ENTRY_1, "isk_14", isk_14_ENTRY_0); +EvtScript N(EVS_ExitWalk_isk_18_0) = EVT_EXIT_WALK(40, isk_10_ENTRY_2, "isk_18", isk_18_ENTRY_0); +MAP_RODATA_PAD(1,unk); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_08_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_14_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_18_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_10) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.8)) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupBombableWall)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_10/isk_10_2_entity.c b/src/world/area_isk/isk_10/isk_10_2_entity.c new file mode 100644 index 0000000000..901bacb2c1 --- /dev/null +++ b/src/world/area_isk/isk_10/isk_10_2_entity.c @@ -0,0 +1,61 @@ +#include "isk_10.h" +#include "entity.h" + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_ISK10_SuperBlock +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" + +API_CALLABLE(N(MonitorPlayerLastFloor)) { + s32 level = -1; + + if (gPlayerStatus.lastGoodPosition.y > -600.0) { + level = 0; + } + if (gPlayerStatus.lastGoodPosition.y < -770.0) { + level = 1; + } + if (level >= 0) { + evt_set_variable(script, MV_LastFloorLevel, level); + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_UseSpring) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_WAIT(1) + EVT_IF_EQ(MV_LastFloorLevel, 0) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.4)) + EVT_CALL(PlayerJump, -577, -780, -75, 15) + EVT_ELSE + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.8)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, -520) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.4)) + EVT_CALL(PlayerJump, -561, -520, 23, 30) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.8)) + EVT_END_IF + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_MAKE_SUPER_BLOCK(-550, -720, 0, 0) + EVT_THREAD + EVT_CALL(N(MonitorPlayerLastFloor)) + EVT_END_THREAD + EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), -516, -780, -71, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring))) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -510, -453, 43, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -510, -713, 43, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_10/isk_10_3_bombable.c b/src/world/area_isk/isk_10/isk_10_3_bombable.c new file mode 100644 index 0000000000..3c1131e16c --- /dev/null +++ b/src/world/area_isk/isk_10/isk_10_3_bombable.c @@ -0,0 +1,87 @@ +#include "isk_10.h" +#include "effects.h" + +BombTrigger N(BombPos_UpperWall) = { + .pos = { -593.0f, -520.0f, 104.0f }, + .radius = 0.0f +}; + +BombTrigger N(BombPos_LowerWall) = { + .pos = { -569.0f, -780.0f, -99.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_OnBlast_UpperWall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 30, 14, 1, 10, 30) + EVT_LOOP(10) + EVT_CALL(EnableModel, MODEL_g328, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_g328, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_ISK_BombedWallFrom10, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBlast_LowerWall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 27, 19, 1, 10, 30) + EVT_LOOP(10) + EVT_CALL(EnableModel, MODEL_g327, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_g327, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_ISK10_BombedWall, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HideDestroyedWall) = { + EVT_CALL(EnableModel, MODEL_o2029, FALSE) + EVT_CALL(EnableModel, MODEL_o2030, FALSE) + EVT_CALL(EnableModel, MODEL_o2031, FALSE) + EVT_CALL(EnableModel, MODEL_o2032, FALSE) + EVT_CALL(EnableModel, MODEL_o2033, FALSE) + EVT_CALL(EnableModel, MODEL_o2034, FALSE) + EVT_CALL(EnableModel, MODEL_o2035, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2031, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2032, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2034, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupBombableWall) = { + EVT_IF_EQ(GF_ISK_BombedWallFrom08, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnBlast_UpperWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_UpperWall)), 1, 0) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_g328, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_IF_EQ(GF_ISK_BombedWallFrom10, FALSE) + EVT_IF_EQ(GF_ISK_BombedWallFrom08, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnBlast_UpperWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_UpperWall)), 1, 0) + EVT_EXEC_WAIT(N(EVS_HideDestroyedWall)) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_g328, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_ELSE + EVT_CALL(EnableModel, MODEL_g328, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC_WAIT(N(EVS_HideDestroyedWall)) + EVT_END_IF + EVT_IF_EQ(GF_ISK10_BombedWall, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnBlast_LowerWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_LowerWall)), 1, 0) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_g327, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_11/98AA10.c b/src/world/area_isk/isk_11/98AA10.c deleted file mode 100644 index 9f5eff722c..0000000000 --- a/src/world/area_isk/isk_11/98AA10.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "isk_11.h" -#include "effects.h" - -static char* N(exit_str_0) = "isk_08"; -static char* N(exit_str_1) = "isk_12"; -static char* N(exit_str_2) = "isk_19"; -static char* N(exit_str_3) = ""; - -ApiStatus func_80240000_98AA10(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - f32 posX = evt_get_float_variable(script, *args++); - f32 posY = evt_get_float_variable(script, *args++); - f32 posZ = evt_get_float_variable(script, *args++); - s32 duration = evt_get_variable(script, *args++); - - fx_lens_flare(0, posX, posY, posZ, duration); - return ApiStatus_DONE2; -} diff --git a/src/world/area_isk/isk_11/98AAC0.c b/src/world/area_isk/isk_11/98AAC0.c deleted file mode 100644 index 58f8a543ac..0000000000 --- a/src/world/area_isk/isk_11/98AAC0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "isk_11.h" - -ApiStatus func_802400B0_98AAC0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 itemID = evt_get_variable(script, *args++); - - evt_set_variable(script, *args++, gItemTable[itemID & 0xFFF0FFFF].nameMsg); - return ApiStatus_DONE2; -} diff --git a/src/world/area_isk/isk_11/98AB30.c b/src/world/area_isk/isk_11/98AB30.c deleted file mode 100644 index 365b71c300..0000000000 --- a/src/world/area_isk/isk_11/98AB30.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "isk_11.h" - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_isk/isk_11/isk_11.h b/src/world/area_isk/isk_11/isk_11.h index a6bd4c2da6..67e087f6b9 100644 --- a/src/world/area_isk/isk_11/isk_11.h +++ b/src/world/area_isk/isk_11/isk_11.h @@ -2,8 +2,29 @@ /// @brief Dry Dry Ruins - Stone Puzzle Room #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_11_shape.h" +#include "mapfs/isk_11_hit.h" + #define NAMESPACE isk_11 + +enum { + MV_LockEntityID = MapVar(0), + MV_HiddenStairsRevealed = MapVar(0), + MV_PlayerPanicDone = MapVar(1), + MV_Socket1_ItemEntity = MapVar(10), + MV_Socket2_ItemEntity = MapVar(11), + MV_Socket3_ItemEntity = MapVar(12), + MV_Socket4_ItemEntity = MapVar(13), + MV_Socket5_ItemEntity = MapVar(14), +}; + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupPuzzle); +extern EvtScript N(EVS_ManageSecretPassage); +extern EvtScript N(EVS_SetupLock); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_isk/isk_11/isk_11_0_header.c b/src/world/area_isk/isk_11/isk_11_0_header.c new file mode 100644 index 0000000000..7ff2052f07 --- /dev/null +++ b/src/world/area_isk/isk_11/isk_11_0_header.c @@ -0,0 +1,15 @@ +#include "isk_11.h" + +EntryList N(Entrances) = { + [isk_11_ENTRY_0] { -277.0, -520.0, 529.0, 105.0 }, + [isk_11_ENTRY_1] { 338.0, -470.0, 434.0, 240.0 }, + [isk_11_ENTRY_2] { 370.0, -600.0, 472.0, 240.0 }, + [isk_11_ENTRY_3] { 180.0, -910.0, 552.0, 260.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_11 }, +}; diff --git a/src/world/area_isk/isk_11/isk_11_1_music.c b/src/world/area_isk/isk_11/isk_11_1_music.c new file mode 100644 index 0000000000..5f5768243d --- /dev/null +++ b/src/world/area_isk/isk_11/isk_11_1_music.c @@ -0,0 +1,31 @@ +#include "isk_11.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GF_ISK11_FourthWarning, FALSE) + EVT_THREAD + EVT_CALL(FadeInMusic, 1, SONG_TUTANKOOPA_WARNING, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00E0, 160, 40) + EVT_SET(GF_ISK11_FourthWarning, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 1, 2000) + EVT_END_THREAD + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_11/isk_11_2_main.c b/src/world/area_isk/isk_11/isk_11_2_main.c new file mode 100644 index 0000000000..0724197405 --- /dev/null +++ b/src/world/area_isk/isk_11/isk_11_2_main.c @@ -0,0 +1,59 @@ +#include "isk_11.h" + +EvtScript N(EVS_ExitWalk_isk_08_3) = EVT_EXIT_WALK(40, isk_11_ENTRY_0, "isk_08", isk_08_ENTRY_3); +EvtScript N(EVS_ExitWalk_isk_12_0) = EVT_EXIT_WALK(40, isk_11_ENTRY_1, "isk_12", isk_12_ENTRY_0); +EvtScript N(EVS_ExitWalk_isk_12_1) = EVT_EXIT_WALK(40, isk_11_ENTRY_2, "isk_12", isk_12_ENTRY_1); +EvtScript N(EVS_ExitWalk_isk_19_0) = EVT_EXIT_WALK(40, isk_11_ENTRY_3, "isk_19", isk_19_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_08_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_12_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_12_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_19_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_11) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.8)) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupPuzzle)) + EVT_EXEC_WAIT(N(EVS_SetupLock)) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_EXEC(N(EVS_ManageSecretPassage)) + EVT_CALL(EnableGroup, MODEL_15, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2222, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2223, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2224, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2225, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2226, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2226, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2227, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_g377, FALSE) + EVT_CALL(EnableModel, MODEL_o2205, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2087, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2088, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2089, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2090, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2091, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2092, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2186, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(TranslateModel, MODEL_o2155, 0, -30, 0) + EVT_CALL(TranslateModel, MODEL_o2156, 0, -30, 0) + EVT_CALL(TranslateModel, MODEL_o2198, 0, -55, 0) + EVT_CALL(TranslateModel, MODEL_o2199, 0, -55, 0) + EVT_CALL(TranslateModel, MODEL_o2200, 0, -80, 0) + EVT_CALL(TranslateModel, MODEL_o2201, 0, -80, 0) + EVT_CALL(TranslateModel, MODEL_o2202, 0, -105, 0) + EVT_CALL(TranslateModel, MODEL_o2203, 0, -105, 0) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_11/isk_11_3_entity.c b/src/world/area_isk/isk_11/isk_11_3_entity.c new file mode 100644 index 0000000000..ce28b6a388 --- /dev/null +++ b/src/world/area_isk/isk_11/isk_11_3_entity.c @@ -0,0 +1,22 @@ +#include "isk_11.h" +#include "entity.h" +#include "effects.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_ISK11_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 355, -460, 430, -40, MAKE_ENTITY_END) + EVT_SET(MV_LockEntityID, LVar0) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -131, -453, 489, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 131, -453, 489, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 291, -453, 415, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -44, -583, 505, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 131, -583, 489, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -44, -713, 505, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 131, -713, 489, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -44, -843, 505, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 131, -843, 489, EVT_FLOAT(0.3), LVar0) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -75, -720, 625, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_11/isk_11_4_scene.c b/src/world/area_isk/isk_11/isk_11_4_scene.c new file mode 100644 index 0000000000..b458134583 --- /dev/null +++ b/src/world/area_isk/isk_11/isk_11_4_scene.c @@ -0,0 +1,200 @@ +#include "isk_11.h" +#include "effects.h" + +API_CALLABLE(N(SpawnLensFlare)) { + Bytecode* args = script->ptrReadPos; + f32 posX = evt_get_float_variable(script, *args++); + f32 posY = evt_get_float_variable(script, *args++); + f32 posZ = evt_get_float_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); + + fx_lens_flare(0, posX, posY, posZ, duration); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_DropHiddenStairs) = { + EVT_CALL(MakeLerp, 0, -300, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_DIVF(LVar2, 10) + EVT_CALL(TranslateModel, MODEL_o2155, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2156, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2198, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2199, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2200, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2201, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2202, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2203, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_57, 0, 16, -562, 621) + EVT_CALL(MakeLerp, LVar0, -550, 25, EASING_LINEAR) + EVT_CALL(UpdateLerp) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_DIVF(LVar2, 10) + EVT_CALL(TranslateModel, MODEL_o2198, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2199, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2200, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2201, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2202, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2203, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_57, 0, 41, -587, 618) + EVT_CALL(MakeLerp, LVar0, -800, 25, EASING_LINEAR) + EVT_CALL(UpdateLerp) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_DIVF(LVar2, 10) + EVT_CALL(TranslateModel, MODEL_o2200, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2201, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2202, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2203, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_57, 0, 66, -612, 616) + EVT_CALL(MakeLerp, LVar0, 0xFFFFFBE6, 25, EASING_LINEAR) + EVT_CALL(UpdateLerp) + EVT_LABEL(40) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_DIVF(LVar2, 10) + EVT_CALL(TranslateModel, MODEL_o2202, 0, LVar2, 0) + EVT_CALL(TranslateModel, MODEL_o2203, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(40) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_57, 0, 95, -637, 614) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageSecretPassage) = { + EVT_WAIT(1) + EVT_LABEL(10) + EVT_WAIT(1) + EVT_IF_NE(GB_ISK11_ItemSocket1, 22) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_NE(GB_ISK11_ItemSocket3, 23) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_NE(GB_ISK11_ItemSocket5, 21) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2087, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2088, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2089, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2090, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2091, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2092, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2222, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2223, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2224, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2225, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2226, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2226, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2227, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2092, SOUND_55, 0) + EVT_CALL(N(SpawnLensFlare), -16, -438, 510, 240) + EVT_CALL(N(SpawnLensFlare), 16, -438, 510, 240) + EVT_WAIT(5) + EVT_CALL(N(SpawnLensFlare), -27, -438, 508, 240) + EVT_CALL(N(SpawnLensFlare), -64, -438, 505, 240) + EVT_CALL(N(SpawnLensFlare), 27, -438, 508, 240) + EVT_CALL(N(SpawnLensFlare), 64, -438, 505, 240) + EVT_WAIT(5) + EVT_CALL(N(SpawnLensFlare), -74, -438, 504, 240) + EVT_CALL(N(SpawnLensFlare), -104, -438, 499, 240) + EVT_CALL(N(SpawnLensFlare), 74, -438, 504, 240) + EVT_CALL(N(SpawnLensFlare), 104, -438, 499, 240) + EVT_END_THREAD + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(PlaySound, SOUND_80000003) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 330, EVT_FLOAT(0.5)) + EVT_CALL(StopSound, SOUND_80000003) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(12) + EVT_PLAY_EFFECT(EFFECT_DUST, 0, 0, -390, 550, 30) + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(10) + EVT_SET(MV_HiddenStairsRevealed, FALSE) + EVT_SET(MV_PlayerPanicDone, FALSE) + EVT_THREAD + EVT_WAIT(20) + EVT_LABEL(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_60002) + EVT_WAIT(8) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_60003) + EVT_WAIT(8) + EVT_IF_FALSE(MV_PlayerPanicDone) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetPlayerSpeed, 4) + EVT_LABEL(30) + EVT_CALL(PlayerMoveTo, 66, 555, 0) + EVT_CALL(PlayerMoveTo, -66, 555, 0) + EVT_IF_FALSE(MV_HiddenStairsRevealed) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(PlayerMoveTo, 0, 555, 0) + EVT_SET(MV_PlayerPanicDone, TRUE) + EVT_END_THREAD + EVT_WAIT(40) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -520, 530) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 140) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(22.7), EVT_FLOAT(-22.7)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -520, 530) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(EnableGroup, MODEL_15, TRUE) + EVT_CALL(EnableGroup, MODEL_g377, FALSE) + EVT_CALL(EnableModel, MODEL_o2205, FALSE) + EVT_WAIT(60) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, -520, 530) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -520, 530) + EVT_WAIT(10) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(10.0), EVT_FLOAT(12.0)) + EVT_WAIT(90) + EVT_EXEC(N(EVS_DropHiddenStairs)) + EVT_WAIT(60) + EVT_SET(MV_HiddenStairsRevealed, TRUE) + EVT_WAIT(100) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_SET(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2186, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_11/isk_11_5_puzzle.c b/src/world/area_isk/isk_11/isk_11_5_puzzle.c new file mode 100644 index 0000000000..15e066f88d --- /dev/null +++ b/src/world/area_isk/isk_11/isk_11_5_puzzle.c @@ -0,0 +1,314 @@ +#include "isk_11.h" + +extern EvtScript N(EVS_ItemPrompt_Socket1); +extern EvtScript N(EVS_ItemPrompt_Socket2); +extern EvtScript N(EVS_ItemPrompt_Socket3); +extern EvtScript N(EVS_ItemPrompt_Socket4); +extern EvtScript N(EVS_ItemPrompt_Socket5); + +API_CALLABLE(N(GetItemNameInSocket)) { + Bytecode* args = script->ptrReadPos; + s32 itemID = evt_get_variable(script, *args++); + + evt_set_variable(script, *args++, gItemTable[itemID & 0xFFF0FFFF].nameMsg); + return ApiStatus_DONE2; +} + +s32 N(ItemList_Artifacts)[] = { + ITEM_LUNAR_STONE, + ITEM_PYRAMID_STONE, + ITEM_DIAMOND_STONE, + ITEM_NONE +}; + +EvtScript N(EVS_SetupPuzzle) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_Socket1)), TRIGGER_WALL_PRESS_A, COLLIDER_o2087, EVT_PTR(N(ItemList_Artifacts)), 0, 1) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_Socket2)), TRIGGER_WALL_PRESS_A, COLLIDER_o2091, EVT_PTR(N(ItemList_Artifacts)), 0, 1) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_Socket3)), TRIGGER_WALL_PRESS_A, COLLIDER_o2090, EVT_PTR(N(ItemList_Artifacts)), 0, 1) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_Socket4)), TRIGGER_WALL_PRESS_A, COLLIDER_o2089, EVT_PTR(N(ItemList_Artifacts)), 0, 1) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_Socket5)), TRIGGER_WALL_PRESS_A, COLLIDER_o2088, EVT_PTR(N(ItemList_Artifacts)), 0, 1) + EVT_END_IF + EVT_SET(MV_Socket1_ItemEntity, -1) + EVT_SET(MV_Socket2_ItemEntity, -1) + EVT_SET(MV_Socket3_ItemEntity, -1) + EVT_SET(MV_Socket4_ItemEntity, -1) + EVT_SET(MV_Socket5_ItemEntity, -1) + EVT_IF_NE(GB_ISK11_ItemSocket1, 0) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket1, -88, -508, 502, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket1_ItemEntity, LVar0) + EVT_END_IF + EVT_IF_NE(GB_ISK11_ItemSocket2, 0) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket2, -44, -508, 508, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket2_ItemEntity, LVar0) + EVT_END_IF + EVT_IF_NE(GB_ISK11_ItemSocket3, 0) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket3, 0, -508, 510, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket3_ItemEntity, LVar0) + EVT_END_IF + EVT_IF_NE(GB_ISK11_ItemSocket4, 0) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket4, 44, -508, 508, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket4_ItemEntity, LVar0) + EVT_END_IF + EVT_IF_NE(GB_ISK11_ItemSocket5, 0) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket5, 88, -508, 502, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket5_ItemEntity, LVar0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ItemPrompt_Socket1) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_UNBIND + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_IF_NE(GB_ISK11_ItemSocket1, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetItemNameInSocket), GB_ISK11_ItemSocket1, LVar0) + EVT_CALL(SetMessageMsg, LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_ISK11_TakeItemPrompt, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_CALL(CloseMessage) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_261, 0) + EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket1) + EVT_SET(LVar0, GB_ISK11_ItemSocket1) + EVT_SET(GB_ISK11_ItemSocket1, 0) + EVT_CALL(RemoveItemEntity, MV_Socket1_ItemEntity) + EVT_SET(MV_Socket1_ItemEntity, -1) + EVT_CALL(ShowGotItem, LVar0, FALSE, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_IF + EVT_CALL(ShowKeyChoicePopup) + EVT_SET(LVar2, LVar0) + EVT_SWITCH(LVar2) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_CASE_EQ(-1) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_SWITCH + EVT_SET(GB_ISK11_ItemSocket1, LVar2) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket1, -88, -508, 502, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket1_ItemEntity, LVar0) + EVT_CALL(CloseChoicePopup) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_261, 0) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ItemPrompt_Socket2) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_UNBIND + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_IF_NE(GB_ISK11_ItemSocket2, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetItemNameInSocket), GB_ISK11_ItemSocket2, LVar0) + EVT_CALL(SetMessageMsg, LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_ISK11_TakeItemPrompt, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_CALL(CloseMessage) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_261, 0) + EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket2) + EVT_SET(LVar0, GB_ISK11_ItemSocket2) + EVT_SET(GB_ISK11_ItemSocket2, 0) + EVT_CALL(RemoveItemEntity, MV_Socket2_ItemEntity) + EVT_SET(MV_Socket2_ItemEntity, -1) + EVT_CALL(ShowGotItem, LVar0, FALSE, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_IF + EVT_CALL(ShowKeyChoicePopup) + EVT_SET(LVar2, LVar0) + EVT_SWITCH(LVar2) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_CASE_EQ(-1) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_SWITCH + EVT_SET(GB_ISK11_ItemSocket2, LVar2) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket2, -44, -508, 508, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket2_ItemEntity, LVar0) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_261, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ItemPrompt_Socket3) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_UNBIND + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_IF_NE(GB_ISK11_ItemSocket3, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetItemNameInSocket), GB_ISK11_ItemSocket3, LVar0) + EVT_CALL(SetMessageMsg, LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_ISK11_TakeItemPrompt, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_CALL(CloseMessage) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_261, 0) + EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket3) + EVT_SET(LVar0, GB_ISK11_ItemSocket3) + EVT_SET(GB_ISK11_ItemSocket3, 0) + EVT_CALL(RemoveItemEntity, MV_Socket3_ItemEntity) + EVT_SET(MV_Socket3_ItemEntity, -1) + EVT_CALL(ShowGotItem, LVar0, FALSE, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_IF + EVT_CALL(ShowKeyChoicePopup) + EVT_SET(LVar2, LVar0) + EVT_SWITCH(LVar2) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_CASE_EQ(-1) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_SWITCH + EVT_SET(GB_ISK11_ItemSocket3, LVar2) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket3, 0, -508, 510, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket3_ItemEntity, LVar0) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_261, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ItemPrompt_Socket4) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_UNBIND + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_IF_NE(GB_ISK11_ItemSocket4, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetItemNameInSocket), GB_ISK11_ItemSocket4, LVar0) + EVT_CALL(SetMessageMsg, LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_ISK11_TakeItemPrompt, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_CALL(CloseMessage) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_261, 0) + EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket4) + EVT_SET(LVar0, GB_ISK11_ItemSocket4) + EVT_SET(GB_ISK11_ItemSocket4, 0) + EVT_CALL(RemoveItemEntity, MV_Socket4_ItemEntity) + EVT_SET(MV_Socket4_ItemEntity, -1) + EVT_CALL(ShowGotItem, LVar0, FALSE, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_IF + EVT_CALL(ShowKeyChoicePopup) + EVT_SET(LVar2, LVar0) + EVT_SWITCH(LVar2) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_CASE_EQ(-1) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_SWITCH + EVT_SET(GB_ISK11_ItemSocket4, LVar2) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket4, 44, -508, 508, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket4_ItemEntity, LVar0) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_261, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ItemPrompt_Socket5) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_UNBIND + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_IF_NE(GB_ISK11_ItemSocket5, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetItemNameInSocket), GB_ISK11_ItemSocket5, LVar0) + EVT_CALL(SetMessageMsg, LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_ISK11_TakeItemPrompt, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_CALL(CloseMessage) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_261, 0) + EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket5) + EVT_SET(LVar0, GB_ISK11_ItemSocket5) + EVT_SET(GB_ISK11_ItemSocket5, 0) + EVT_CALL(RemoveItemEntity, MV_Socket5_ItemEntity) + EVT_SET(MV_Socket5_ItemEntity, -1) + EVT_CALL(ShowGotItem, LVar0, FALSE, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_IF + EVT_CALL(ShowKeyChoicePopup) + EVT_SET(LVar2, LVar0) + EVT_SWITCH(LVar2) + EVT_CASE_EQ(0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_CASE_EQ(-1) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_SWITCH + EVT_SET(GB_ISK11_ItemSocket5, LVar2) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket5, 88, -508, 502, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_Socket5_ItemEntity, LVar0) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_261, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_11/isk_11_6_lock.c b/src/world/area_isk/isk_11/isk_11_6_lock.c new file mode 100644 index 0000000000..518d1f9bba --- /dev/null +++ b/src/world/area_isk/isk_11/isk_11_6_lock.c @@ -0,0 +1,54 @@ +#include "isk_11.h" + +#include "world/common/todo/RemovePadlock.inc.c" + +s32 N(ItemList_RuinsKey)[] = { + ITEM_RUINS_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_RuinsKey) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_269, 0, 355, -460, 430) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_ISK11_UnlockedDoor, TRUE) + EVT_SET(LVar0, MV_LockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_265, 0) + EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g374, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupLock) = { + EVT_IF_EQ(GF_ISK11_UnlockedDoor, FALSE) + EVT_CALL(MakeTransformGroup, MODEL_g374) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_RuinsKey)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(ItemList_RuinsKey)), 0, 1) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_g374, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAGS_SAFE_FLOOR | COLLIDER_FLAGS_IGNORE_SHELL | COLLIDER_FLAGS_IGNORE_PLAYER | COLLIDER_FLAGS_80000 | 0x7FF47E00) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_12/98D640.c b/src/world/area_isk/isk_12/98D640.c deleted file mode 100644 index 7292728157..0000000000 --- a/src/world/area_isk/isk_12/98D640.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "isk_12.h" - -static char* N(exit_str_0) = "isk_11"; -static char* N(exit_str_1) = "isk_18"; -static char* N(exit_str_2) = "isk_13"; - diff --git a/src/world/area_isk/isk_12/isk_12.h b/src/world/area_isk/isk_12/isk_12.h index f03c9eee3d..e0085cb61f 100644 --- a/src/world/area_isk/isk_12/isk_12.h +++ b/src/world/area_isk/isk_12/isk_12.h @@ -2,8 +2,16 @@ /// @brief Dry Dry Ruins - Sand Drainage Room 3 #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_12_shape.h" +#include "mapfs/isk_12_hit.h" + #define NAMESPACE isk_12 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupSand); +extern EvtScript N(EVS_SetupSwitches); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_isk/isk_12/isk_12_0_header.c b/src/world/area_isk/isk_12/isk_12_0_header.c new file mode 100644 index 0000000000..d3147158f7 --- /dev/null +++ b/src/world/area_isk/isk_12/isk_12_0_header.c @@ -0,0 +1,15 @@ +#include "isk_12.h" + +EntryList N(Entrances) = { + [isk_12_ENTRY_0] { 434.0, -470.0, 338.0, 29.0 }, + [isk_12_ENTRY_1] { 472.0, -660.0, 370.0, 29.0 }, + [isk_12_ENTRY_2] { 512.0, -840.0, 273.0, 27.0 }, + [isk_12_ENTRY_3] { 580.0, -710.0, 20.0, 191.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_12 }, +}; diff --git a/src/world/area_isk/isk_12/isk_12_1_main.c b/src/world/area_isk/isk_12/isk_12_1_main.c new file mode 100644 index 0000000000..abbfed2e1e --- /dev/null +++ b/src/world/area_isk/isk_12/isk_12_1_main.c @@ -0,0 +1,42 @@ +#include "isk_12.h" + +EvtScript N(EVS_ExitWalk_isk_11_1) = EVT_EXIT_WALK(40, isk_12_ENTRY_0, "isk_11", isk_11_ENTRY_1); +EvtScript N(EVS_ExitWalk_isk_11_2) = EVT_EXIT_WALK(40, isk_12_ENTRY_1, "isk_11", isk_11_ENTRY_2); +EvtScript N(EVS_ExitWalk_isk_18_1) = EVT_EXIT_WALK(40, isk_12_ENTRY_2, "isk_18", isk_18_ENTRY_1); +EvtScript N(EVS_ExitWalk_isk_13_0) = EVT_EXIT_WALK(40, isk_12_ENTRY_3, "isk_13", isk_13_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_11_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_11_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_18_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_13_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_12) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) + EVT_CALL(SetZoneEnabled, ZONE_deiliw, FALSE) + EVT_ELSE + EVT_CALL(SetZoneEnabled, ZONE_deiliw, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_on, FALSE) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupSand)) + EVT_EXEC(N(EVS_SetupSwitches)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_12/isk_12_2_entity.c b/src/world/area_isk/isk_12/isk_12_2_entity.c new file mode 100644 index 0000000000..408ed6d0bd --- /dev/null +++ b/src/world/area_isk/isk_12/isk_12_2_entity.c @@ -0,0 +1,25 @@ +#include "isk_12.h" +#include "entity.h" +#include "effects.h" + +EvtScript N(EVS_SmashBlock_Stone) = { + EVT_SET(GF_ISK12_Hammer2Block, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_ISK12_Hammer2Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block), 627, -840, 135, 75, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_SmashBlock_Stone))) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -453, 291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 505, -453, 44, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -643, 291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 505, -643, 44, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 417, -643, 196, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 444, -643, 120, EVT_FLOAT(0.3), LVar0) + EVT_CALL(MakeItemEntity, ITEM_RUINS_KEY, 461, -760, 109, ITEM_SPAWN_MODE_KEY, GF_ISK12_Item_RuinsKey) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_12/isk_12_3_sand.c b/src/world/area_isk/isk_12/isk_12_3_sand.c new file mode 100644 index 0000000000..12730be759 --- /dev/null +++ b/src/world/area_isk/isk_12/isk_12_3_sand.c @@ -0,0 +1,293 @@ +#include "isk_12.h" + +EvtScript N(EVS_TexPan_DrippingSand) = { + EVT_CALL(SetTexPanner, MODEL_o6000, TEX_PANNER_4) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_LABEL(10) + EVT_ADD(LVar1, -1000) + EVT_ADD(LVar2, 200) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, 0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_AUX, LVar2, 0) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(EnableModel, MODEL_o6000, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_LookAtDrain) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 500, -485, 178) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 50, -202) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 566, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(13.6), EVT_FLOAT(-1.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 525, -485, 152) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_LookBelow) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.4), EVT_FLOAT(-3.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 525, -720, 152) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Camera_Reset) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 525, -485, 152) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_UpperSand) = { + EVT_CALL(SetTexPanner, MODEL_o1706, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1707, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1708, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o1939, TEX_PANNER_0) + EVT_SET(LVar2, 0) + EVT_CALL(MakeLerp, 0, 500, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_ADD(LVar2, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_LABEL(20) + EVT_ADD(LVar2, 500) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, LVar2) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) + EVT_GOTO(20) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_LowerSand) = { + EVT_CALL(SetTexPanner, MODEL_o1699, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o1698, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o1692, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o1693, TEX_PANNER_3) + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 0) + EVT_LABEL(10) + EVT_ADD(LVar2, 0x1800) + EVT_ADD(LVar3, -500) + EVT_ADD(LVar4, -100) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar3) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, LVar4) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) + EVT_GOTO(10) + EVT_END_IF + EVT_SET(LVar5, 0x1800) + EVT_SET(LVar6, -500) + EVT_SET(LVar7, -100) + EVT_LOOP(10) + EVT_ADD(LVar5, -512) + EVT_ADD(LVar6, 50) + EVT_ADD(LVar7, 10) + EVT_ADD(LVar2, LVar5) + EVT_ADD(LVar3, LVar6) + EVT_ADD(LVar4, LVar7) + EVT_CALL(SetTexPanOffset, 1, 0, 0, LVar2) + EVT_CALL(SetTexPanOffset, 2, 0, 0, LVar3) + EVT_CALL(SetTexPanOffset, 3, 0, 0, LVar4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RescaleDrainingSand) = { + EVT_CALL(MakeLerp, 0, 100, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(ScaleModel, MODEL_o1707, EVT_FLOAT(1.0), LVar0, EVT_FLOAT(1.0)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CollapseSandPile) = { + EVT_CALL(MakeLerp, 0, 50, 10, EASING_QUADRATIC_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 100) + EVT_SETF(LVar2, 1) + EVT_ADDF(LVar2, LVar0) + EVT_SETF(LVar3, 1) + EVT_SUBF(LVar3, LVar0) + EVT_CALL(ScaleModel, MODEL_o1698, LVar2, LVar3, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DrainUpperSand) = { + EVT_CALL(MakeLerp, 0, -100, 60, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g285, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o2007, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, -100, -250, 30, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g285, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o2007, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FillLowerSand) = { + EVT_CALL(MakeTransformGroup, MODEL_g283) + EVT_CALL(MakeLerp, -200, 0, 120, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, 10) + EVT_CALL(TranslateGroup, MODEL_g283, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o1698, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LowerSandColumn) = { + EVT_CALL(MakeLerp, 0, -200, 10, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o1699, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_DrainSand) = { + EVT_WAIT(5) + EVT_CALL(EnableModel, MODEL_o1692, TRUE) + EVT_CALL(EnableModel, MODEL_o1693, TRUE) + EVT_CALL(EnableModel, MODEL_o1696, TRUE) + EVT_CALL(EnableModel, MODEL_o1697, TRUE) + EVT_CALL(EnableModel, MODEL_o1698, TRUE) + EVT_CALL(EnableModel, MODEL_o1699, TRUE) + EVT_EXEC(N(EVS_Camera_LookAtDrain)) + EVT_WAIT(30) + EVT_EXEC(N(EVS_TexPan_UpperSand)) + EVT_EXEC(N(EVS_RescaleDrainingSand)) + EVT_EXEC(N(EVS_DrainUpperSand)) + EVT_CALL(PlaySound, SOUND_53) + EVT_WAIT(75) + EVT_EXEC(N(EVS_Camera_LookBelow)) + EVT_WAIT(30) + EVT_EXEC(N(EVS_TexPan_LowerSand)) + EVT_EXEC(N(EVS_FillLowerSand)) + EVT_CALL(PlaySound, SOUND_453) + EVT_WAIT(120) + EVT_EXEC(N(EVS_LowerSandColumn)) + EVT_WAIT(5) + EVT_EXEC(N(EVS_CollapseSandPile)) + EVT_CALL(PlaySound, SOUND_453) + EVT_WAIT(10) + EVT_CALL(EnableModel, MODEL_o1703, FALSE) + EVT_CALL(EnableModel, MODEL_o1704, FALSE) + EVT_CALL(EnableModel, MODEL_o1705, FALSE) + EVT_CALL(EnableModel, MODEL_o1706, FALSE) + EVT_CALL(EnableModel, MODEL_o1707, FALSE) + EVT_CALL(EnableModel, MODEL_o1708, FALSE) + EVT_CALL(EnableModel, MODEL_o1938, FALSE) + EVT_CALL(EnableModel, MODEL_o1939, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2040, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2041, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2042, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2043, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2044, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2045, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) + EVT_CALL(SetZoneEnabled, ZONE_on, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_deiliw, TRUE) + EVT_WAIT(20) + EVT_EXEC(N(EVS_Camera_Reset)) + EVT_WAIT(5) + EVT_CALL(EnableModel, MODEL_o1698, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupSand) = { + EVT_SET(AF_ISK12_SandSwitchActivated, FALSE) + EVT_CALL(MakeTransformGroup, MODEL_g285) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_DrainSand)), TRIGGER_AREA_FLAG_SET, AF_ISK12_SandSwitchActivated, 1, 0) + EVT_CALL(EnableModel, MODEL_o1692, FALSE) + EVT_CALL(EnableModel, MODEL_o1693, FALSE) + EVT_CALL(EnableModel, MODEL_o1696, FALSE) + EVT_CALL(EnableModel, MODEL_o1697, FALSE) + EVT_CALL(EnableModel, MODEL_o1698, FALSE) + EVT_CALL(EnableModel, MODEL_o1699, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2044, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2045, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_TexPan_DrippingSand)) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o1703, FALSE) + EVT_CALL(EnableModel, MODEL_o1704, FALSE) + EVT_CALL(EnableModel, MODEL_o1705, FALSE) + EVT_CALL(EnableModel, MODEL_o1706, FALSE) + EVT_CALL(EnableModel, MODEL_o1707, FALSE) + EVT_CALL(EnableModel, MODEL_o1708, FALSE) + EVT_CALL(EnableModel, MODEL_o1938, FALSE) + EVT_CALL(EnableModel, MODEL_o1939, FALSE) + EVT_CALL(EnableModel, MODEL_o1698, FALSE) + EVT_CALL(EnableModel, MODEL_o1699, FALSE) + EVT_CALL(EnableModel, MODEL_o6000, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2040, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2041, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2042, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2043, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_12/isk_12_4_switch.c b/src/world/area_isk/isk_12/isk_12_4_switch.c new file mode 100644 index 0000000000..e0abac8ba0 --- /dev/null +++ b/src/world/area_isk/isk_12/isk_12_4_switch.c @@ -0,0 +1,175 @@ +#include "isk_12.h" + +// switch for draining the sand into the lower chamber +EvtScript N(EVS_OnTouch_DrainSwitch) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LABEL(5) + EVT_WAIT(1) + EVT_CALL(PartnerCanUseAbility, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar1, -470) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(2.5)) + EVT_CALL(NpcJump0, NPC_PARTNER, 529, -470, 82, 10) + EVT_WAIT(10) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_g367, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2056) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2059) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2059, SOUND_208B, 0) + EVT_SET(AF_ISK12_SandSwitchActivated, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +// switch for creating a staircase of bricks emerging from the wall +EvtScript N(EVS_OnTouch_StaircaseSwitch) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_208A, 0) + EVT_CALL(MakeLerp, 0, -14, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_B2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2090) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_208B, 0) + EVT_CALL(InterpPlayerYaw, 260, 0) + EVT_SET(AF_ISK12_StairSwitchActivated, TRUE) + EVT_THREAD + EVT_CALL(PlaySoundAt, SOUND_58, 0, 449, -822, 148) + EVT_CALL(MakeLerp, -50, 0, 60, EASING_QUADRATIC_IN) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g378, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_59, 0, 449, -822, 148) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_END_THREAD + EVT_WAIT(50) + EVT_THREAD + EVT_CALL(PlaySoundAt, SOUND_58, 0, 460, -806, 108) + EVT_CALL(MakeLerp, -50, 0, 60, EASING_QUADRATIC_IN) + EVT_LABEL(22) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g379, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(22) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_59, 0, 460, -806, 108) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_END_THREAD + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(PlaySoundAt, SOUND_58, 0, 432, -825, 189) + EVT_CALL(MakeLerp, -50, 0, 60, EASING_QUADRATIC_IN) + EVT_LABEL(24) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g376, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(24) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_59, 0, 432, -825, 189) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.1)) + EVT_END_THREAD + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(PlaySoundAt, SOUND_58, 0, 451, -812, 137) + EVT_CALL(MakeLerp, -50, 0, 50, EASING_QUADRATIC_IN) + EVT_LABEL(26) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g373, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(26) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_59, 0, 451, -812, 137) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.3)) + EVT_END_THREAD + EVT_WAIT(50) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o2080, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(3) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupSwitches) = { + EVT_CALL(ParentColliderToModel, COLLIDER_o2056, MODEL_g367) + EVT_CALL(ParentColliderToModel, COLLIDER_o2059, MODEL_g367) + EVT_CALL(ParentColliderToModel, COLLIDER_o2090, MODEL_B2) + EVT_IF_EQ(AF_ISK12_SandSwitchActivated, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_DrainSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o2059, 1, 0) + EVT_ELSE + EVT_CALL(TranslateModel, MODEL_g367, 0, -14, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2056) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2059) + EVT_END_IF + EVT_IF_EQ(AF_ISK12_StairSwitchActivated, TRUE) + EVT_CALL(TranslateModel, MODEL_B2, 0, -14, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2090) + EVT_ELSE + EVT_THREAD + EVT_CALL(TranslateGroup, MODEL_g378, -52, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g379, -52, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g376, -52, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g373, -52, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o2080, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(GF_ISK12_Hammer2Block, FALSE) + EVT_CALL(TranslateModel, MODEL_B2, 0, -14, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2090) + EVT_LABEL(10) + EVT_IF_EQ(GF_ISK12_Hammer2Block, FALSE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, -14, 0, 30, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_B2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o2090) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_WAIT(3) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouch_StaircaseSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o2090, 1, 0) + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_13/isk_13.h b/src/world/area_isk/isk_13/isk_13.h index e320eaefef..68df526794 100644 --- a/src/world/area_isk/isk_13/isk_13.h +++ b/src/world/area_isk/isk_13/isk_13.h @@ -2,8 +2,25 @@ /// @brief Dry Dry Ruins - Lunar Stone Room #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_13_shape.h" +#include "mapfs/isk_13_hit.h" + +#include "sprite/npc/StoneChomp.h" + +enum { + NPC_StoneChomp = 1, +}; + +enum { + MV_AmbushPtr = MapVar(10), +}; + #define NAMESPACE isk_13 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_13/isk_13_0_header.c b/src/world/area_isk/isk_13/isk_13_0_header.c new file mode 100644 index 0000000000..bbefcb1466 --- /dev/null +++ b/src/world/area_isk/isk_13/isk_13_0_header.c @@ -0,0 +1,12 @@ +#include "isk_13.h" + +EntryList N(Entrances) = { + [isk_13_ENTRY_0] { 568.0, -650.0, -120.0, 340.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_13 }, +}; diff --git a/src/world/area_isk/isk_13/isk_13_1_main.c b/src/world/area_isk/isk_13/isk_13_1_main.c new file mode 100644 index 0000000000..85f105d2b4 --- /dev/null +++ b/src/world/area_isk/isk_13/isk_13_1_main.c @@ -0,0 +1,29 @@ +#include "isk_13.h" + +EvtScript N(EVS_ExitWalk_isk_12_3) = EVT_EXIT_WALK(40, isk_13_ENTRY_0, "isk_12", isk_12_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_12_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_13) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_13/isk_13_2_entity.c b/src/world/area_isk/isk_13/isk_13_2_entity.c new file mode 100644 index 0000000000..3402f719ea --- /dev/null +++ b/src/world/area_isk/isk_13/isk_13_2_entity.c @@ -0,0 +1,23 @@ +#include "isk_13.h" +#include "entity.h" +#include "effects.h" + +EvtScript N(EVS_OnSmash_Block) = { + EVT_SET(GF_ISK13_Hammer2Block, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_LUNAR_STONE, 460, -568, -342, ITEM_SPAWN_MODE_KEY, GF_ISK13_Item_LunarStone) + EVT_IF_EQ(GF_ISK13_Hammer2Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block_WideX), 568, -650, -302, 25, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmash_Block))) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -453, -291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -583, -291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 489, -453, -131, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 489, -583, -131, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/isk_13_3_npc.c similarity index 55% rename from src/world/area_isk/isk_13/98F7E0.c rename to src/world/area_isk/isk_13/isk_13_3_npc.c index 2371600457..07b31d1db2 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -1,13 +1,7 @@ #include "isk_13.h" #include "sprite.h" -#include "sprite/npc/StoneChomp.h" -static char* N(exit_str_0) = "isk_12"; -static char* N(exit_str_1) = ""; - -#include "world/common/enemy/ai/StoneChompAI.inc.c" - -#include "world/area_isk/StoneChompFX.inc.c" +#include "world/common/enemy/complete/StoneChomp.inc.c" typedef struct StoneChompAmbushIsk13 { /* 0x00 */ s32 useBitingAnim; @@ -24,8 +18,8 @@ typedef struct StoneChompAmbushIsk13 { /* 0x50 */ f32 height; } StoneChompAmbushIsk13; // size = 0x54 -void func_80241610_990DF0(void) { - StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(NULL, MapVar(10)); +void N(func_80241610_990DF0)(void) { + StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(NULL, MV_AmbushPtr); Camera* cam = &gCameras[gCurrentCameraID]; FoldImageRecPart foldImg; SpriteRasterInfo spriteRaster; @@ -88,14 +82,14 @@ void func_80241610_990DF0(void) { gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } -ApiStatus func_80241BA8_991388(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80241BA8_991388)) { StoneChompAmbushIsk13* ambush; SpriteRasterInfo rasterInfo; Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); ambush = heap_malloc(sizeof(*ambush)); ambush->useBitingAnim = FALSE; - ambush->spriteIndex = 0x35; //TODO get spriteID for this constant + ambush->spriteIndex = SPR_StoneChomp; ambush->rasterIndex = 0; spr_get_npc_raster_info(&rasterInfo, ambush->spriteIndex, ambush->rasterIndex); ambush->width = rasterInfo.width; @@ -117,23 +111,23 @@ ApiStatus func_80241BA8_991388(Evt* script, s32 isInitialCall) { ambush->color.a = 0.0f; ambush->foldID = 0; - ambush->workerID = create_worker_frontUI(NULL, func_80241610_990DF0); - evt_set_variable(script, MapVar(10), (s32) ambush); + ambush->workerID = create_worker_frontUI(NULL, N(func_80241610_990DF0)); + evt_set_variable(script, MV_AmbushPtr, (s32) ambush); return ApiStatus_DONE2; } -ApiStatus func_80241D08_9914E8(Evt* script, s32 isInitialCall) { - StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MapVar(10)); +API_CALLABLE(N(DestroyAmbushWorker)) { + StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MV_AmbushPtr); free_worker(ambush->workerID); return ApiStatus_DONE2; } -ApiStatus func_80241D38_991518(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80241D38_991518)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_float_variable(script, *args++); s32 y = evt_get_float_variable(script, *args++); s32 z = evt_get_float_variable(script, *args++); - StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MapVar(10)); + StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MV_AmbushPtr); ambush->pos.x = x; ambush->pos.y = y + ambush->height * SPRITE_WORLD_SCALE_D * 0.5; @@ -141,12 +135,12 @@ ApiStatus func_80241D38_991518(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80241E34_991614(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80241E34_991614)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_float_variable(script, *args++); s32 y = evt_get_float_variable(script, *args++); s32 z = evt_get_float_variable(script, *args++); - StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MapVar(10)); + StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MV_AmbushPtr); ambush->rot.x = x; ambush->rot.y = y; @@ -154,9 +148,9 @@ ApiStatus func_80241E34_991614(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80241EF8_9916D8(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80241EF8_9916D8)) { Bytecode* args = script->ptrReadPos; - StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MapVar(10)); + StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MV_AmbushPtr); f32 r = evt_get_float_variable(script, *args++); f32 g = evt_get_float_variable(script, *args++); f32 b = evt_get_float_variable(script, *args++); @@ -193,8 +187,140 @@ ApiStatus func_80241EF8_9916D8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80242044_991824(Evt* script, s32 isInitialCall) { - StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MapVar(10)); +API_CALLABLE(N(func_80242044_991824)) { + StoneChompAmbushIsk13* ambush = (StoneChompAmbushIsk13*) evt_get_variable(script, MV_AmbushPtr); ambush->useBitingAnim = TRUE; return ApiStatus_DONE2; } + +EvtScript N(EVS_NpcIdle_StoneChomp) = { + EVT_LABEL(0) + EVT_WAIT(1) + EVT_IF_EQ(GF_ISK13_Item_LunarStone, FALSE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(func_80241BA8_991388)) + EVT_CALL(N(func_80241EF8_9916D8), 255, 128, 255, 0) + EVT_THREAD + EVT_SETF(LVar0, 0) + EVT_LOOP(10) + EVT_ADDF(LVar0, EVT_FLOAT(12.796875)) + EVT_CALL(N(func_80241EF8_9916D8), 255, 128, 255, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(N(func_80241EF8_9916D8), 255, 128, 255, 128) + EVT_SETF(LVar0, 128) + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(6.34375)) + EVT_CALL(N(func_80241EF8_9916D8), 255, LVar0, 255, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(N(func_80241EF8_9916D8), 255, 255, 255, 255) + EVT_END_THREAD + EVT_WAIT(30) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(MakeLerp, 0, 360, 10, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(N(func_80241E34_991614), LVar0, 0, EVT_FLOAT(90.0)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_CALL(GetPlayerPos, LVar5, LVar6, LVar7) + EVT_CALL(N(func_80241D38_991518), LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, LVar3, LVar6, 20, EASING_CUBIC_IN) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar0, LVar4) + EVT_CALL(N(func_80241D38_991518), LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(N(func_80242044_991824)) + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 180, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 20) + EVT_LOOP(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80013) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_LOOP(20) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(N(func_80241D38_991518), LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_StoneChomp_Override) = { + EVT_SET(GF_ISK13_Defeated_StoneChomp, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_CALL(func_802CFD30, -1, 0, 0, 0, 0, 0) + EVT_CALL(N(DestroyAmbushWorker)) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(N(StoneChompFXC)) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_StoneChomp) = { + EVT_IF_EQ(GF_ISK13_Defeated_StoneChomp, TRUE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_StoneChomp))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_StoneChomp_Override))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_StoneChomp) = { + .id = NPC_StoneChomp, + .settings = &N(NpcSettings_StoneChomp), + .pos = { 440.0f, -470.0f, -300.0f }, + .yaw = 320, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000, + .init = &N(EVS_NpcInit_StoneChomp), + .initVarCount = 1, + .initVar = { .value = -650 }, + .drops = STONE_CHOMP_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 468, 0, -378 }, + .wanderSize = { 200 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 468, 0, -378 }, + .detectSize = { 400 }, + } + }, + .animations = STONE_CHOMP_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_PART_1_FORMATION_07, BTL_ISK_PART_1_STAGE_0A), + {} +}; diff --git a/src/world/area_isk/isk_14/isk_14.h b/src/world/area_isk/isk_14/isk_14.h index 7798aa703e..cbe69e2155 100644 --- a/src/world/area_isk/isk_14/isk_14.h +++ b/src/world/area_isk/isk_14/isk_14.h @@ -2,8 +2,21 @@ /// @brief Dry Dry Ruins - Diamond Stone Room #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_14_shape.h" +#include "mapfs/isk_14_hit.h" + +#include "sprite/npc/StoneChomp.h" + +enum { + NPC_StoneChomp = 1, +}; + #define NAMESPACE isk_14 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_14/isk_14_0_header.c b/src/world/area_isk/isk_14/isk_14_0_header.c new file mode 100644 index 0000000000..cb1bee97d6 --- /dev/null +++ b/src/world/area_isk/isk_14/isk_14_0_header.c @@ -0,0 +1,12 @@ +#include "isk_14.h" + +EntryList N(Entrances) = { + [isk_14_ENTRY_0] { -538.0, -780.0, -217.0, 29.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_14 }, +}; diff --git a/src/world/area_isk/isk_14/isk_14_1_main.c b/src/world/area_isk/isk_14/isk_14_1_main.c new file mode 100644 index 0000000000..91bd1efcac --- /dev/null +++ b/src/world/area_isk/isk_14/isk_14_1_main.c @@ -0,0 +1,29 @@ +#include "isk_14.h" + +EvtScript N(D_80241DB0_9944E0) = EVT_EXIT_WALK(40, isk_14_ENTRY_0, "isk_10", isk_10_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(D_80241DB0_9944E0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_14) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_14/isk_14_2_entity.c b/src/world/area_isk/isk_14/isk_14_2_entity.c new file mode 100644 index 0000000000..74c771140a --- /dev/null +++ b/src/world/area_isk/isk_14/isk_14_2_entity.c @@ -0,0 +1,23 @@ +#include "isk_14.h" +#include "entity.h" +#include "effects.h" + +EvtScript N(EVS_OnSmash_Block) = { + EVT_SET(GF_ISK14_Hammer2Block, TRUE) + EVT_CALL(SetNpcVar, NPC_StoneChomp, 1, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_DIAMOND_STONE, -389, -698, -424, ITEM_SPAWN_MODE_KEY, GF_ISK14_Item_DiamondStone) + EVT_IF_EQ(GF_ISK14_Hammer2Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block_WideX), -507, -780, -396, 143, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmash_Block))) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -459, -583, -214, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -358, -583, -358, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -459, -713, -214, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/isk_14_3_npc.c similarity index 54% rename from src/world/area_isk/isk_14/992730.c rename to src/world/area_isk/isk_14/isk_14_3_npc.c index a8397908e9..0204deb1e9 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -1,13 +1,7 @@ #include "isk_14.h" #include "sprite.h" -#include "sprite/npc/StoneChomp.h" -static char* N(exit_str_0) = "isk_10"; -static char* N(exit_str_1) = ""; - -#include "world/common/enemy/ai/StoneChompAI.inc.c" - -#include "world/area_isk/StoneChompFX.inc.c" +#include "world/common/enemy/complete/StoneChomp.inc.c" typedef struct StoneChompAmbushIsk14 { /* 0x00 */ s32 foldID; @@ -24,7 +18,7 @@ typedef struct StoneChompAmbushIsk14 { static StoneChompAmbushIsk14 N(ChompAmbush); -void func_80241610_993D40(void) { +void N(func_80241610_993D40)(void) { StoneChompAmbushIsk14* ambush = &N(ChompAmbush); Camera* cam = &gCameras[gCurrentCameraID]; FoldImageRecPart foldImg; @@ -80,12 +74,12 @@ void func_80241610_993D40(void) { gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } -ApiStatus func_80241AF0_994220(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80241AF0_994220)) { StoneChompAmbushIsk14* ambush = &N(ChompAmbush); SpriteRasterInfo rasterInfo; Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - ambush->spriteIndex = 53; //TODO get spriteID for this constant + ambush->spriteIndex = SPR_StoneChomp; ambush->rasterIndex = 0; spr_get_npc_raster_info(&rasterInfo, ambush->spriteIndex, ambush->rasterIndex); ambush->width = rasterInfo.width; @@ -103,18 +97,18 @@ ApiStatus func_80241AF0_994220(Evt* script, s32 isInitialCall) { ambush->renderYaw = 270.0f; ambush->foldID = 0; - ambush->workerID = create_worker_frontUI(NULL, func_80241610_993D40); + ambush->workerID = create_worker_frontUI(NULL, N(func_80241610_993D40)); return ApiStatus_DONE2; } -ApiStatus func_80241BC4_9942F4(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DestroyAmbushWorker)) { StoneChompAmbushIsk14* ambush = &N(ChompAmbush); free_worker(ambush->workerID); return ApiStatus_DONE2; } -ApiStatus func_80241BEC_99431C(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80241BEC_99431C)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_float_variable(script, *args++); s32 y = evt_get_float_variable(script, *args++); @@ -127,7 +121,7 @@ ApiStatus func_80241BEC_99431C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80241CA0_9943D0(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80241CA0_9943D0)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_float_variable(script, *args++); s32 y = evt_get_float_variable(script, *args++); @@ -139,3 +133,114 @@ ApiStatus func_80241CA0_9943D0(Evt* script, s32 isInitialCall) { ambush->rot.z = z; return ApiStatus_DONE2; } + +EvtScript N(EVS_NpcIdle_StoneChomp) = { + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(5) + EVT_CALL(SetNpcPos, NPC_SELF, -517, -780, -402) + EVT_CALL(N(func_80241AF0_994220)) + EVT_CALL(N(func_80241BEC_99431C), -517, -780, -402) + EVT_CALL(N(func_80241CA0_9943D0), 85, 20, 0) + EVT_WAIT(5) + EVT_CALL(MakeLerp, 85, 0, 20, EASING_COS_FAST_OVERSHOOT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(N(func_80241CA0_9943D0), LVar0, 20, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(N(DestroyAmbushWorker)) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_StoneChomp_Anim04) + EVT_WAIT(18) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_WAIT(1) + EVT_CALL(N(DestroyAmbushWorker)) + EVT_CALL(func_802CFD30, -1, 0, 0, 0, 0, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_4 | ENEMY_FLAGS_100000, 0) + EVT_WAIT(3) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_SELF, 1) + EVT_ADD(LVar1, 20) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) + EVT_THREAD + EVT_LOOP(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_WAIT(15) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_StoneChomp))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_StoneChomp_Override) = { + EVT_SET(GF_ISK14_Defeated_StoneChomp, TRUE) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(AF_ISK14_StoneChompDefeated, TRUE) + EVT_CALL(N(StoneChompFXC)) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_StoneChomp) = { + EVT_IF_EQ(GF_ISK14_Defeated_StoneChomp, TRUE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetSelfVar, 1, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_StoneChomp))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_StoneChomp_Override))) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_StoneChomp) = { + .id = NPC_StoneChomp, + .settings = &N(NpcSettings_StoneChomp), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 218, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .init = &N(EVS_NpcInit_StoneChomp), + .initVarCount = 1, + .initVar = { .value = -780 }, + .drops = STONE_CHOMP_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 468, 0, -378 }, + .wanderSize = { 200 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 468, 0, -378 }, + .detectSize = { 400 }, + } + }, + .animations = STONE_CHOMP_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_PART_1_FORMATION_07, BTL_ISK_PART_1_STAGE_0B), + {} +}; diff --git a/src/world/area_isk/isk_16/9951F0.c b/src/world/area_isk/isk_16/9951F0.c deleted file mode 100644 index cad9c4ff06..0000000000 --- a/src/world/area_isk/isk_16/9951F0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "isk_16.h" - -#include "world/common/todo/StarSpiritEffectFunc.inc.c" - -static char* N(exit_str_0) = "kmr_23"; -static char* N(exit_str_1) = "isk_19"; diff --git a/src/world/area_isk/isk_16/9959F0.c b/src/world/area_isk/isk_16/9959F0.c deleted file mode 100644 index f096bfddbd..0000000000 --- a/src/world/area_isk/isk_16/9959F0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "isk_16.h" - -#include "world/common/atomic/UnkFunc27.inc.c" diff --git a/src/world/area_isk/isk_16/isk_16.h b/src/world/area_isk/isk_16/isk_16.h index 422ee5deb9..f041fd64b3 100644 --- a/src/world/area_isk/isk_16/isk_16.h +++ b/src/world/area_isk/isk_16/isk_16.h @@ -2,8 +2,28 @@ /// @brief Dry Dry Ruins - Tutankoopa Room #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_16_shape.h" +#include "mapfs/isk_16_hit.h" + +#include "sprite/npc/Tutankoopa.h" +#include "sprite/npc/ChainChomp.h" + +enum { + NPC_Tutankoopa_01 = 0, + NPC_Tutankoopa_02 = 1, + NPC_ChainChomp = 2, +}; + #define NAMESPACE isk_16 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFlames); +extern EvtScript N(EVS_SpawnStarCard); +extern EvtScript N(EVS_Scene_TutankoopaDefeated); +extern EvtScript N(EVS_Scene_TutankoopaAppears); +extern EvtScript N(EVS_BindExitTriggers); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_16/isk_16_0_header.c b/src/world/area_isk/isk_16/isk_16_0_header.c new file mode 100644 index 0000000000..fbedeeed7e --- /dev/null +++ b/src/world/area_isk/isk_16/isk_16_0_header.c @@ -0,0 +1,13 @@ +#include "isk_16.h" + +EntryList N(Entrances) = { + [isk_16_ENTRY_0] { 307.0, -910.0, 492.0, 50.0 }, + [isk_16_ENTRY_1] { 492.0, -910.0, 307.0, 220.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_16 }, +}; diff --git a/src/world/area_isk/isk_16/isk_16_1_main.c b/src/world/area_isk/isk_16/isk_16_1_main.c new file mode 100644 index 0000000000..e3cf2b633d --- /dev/null +++ b/src/world/area_isk/isk_16/isk_16_1_main.c @@ -0,0 +1,108 @@ +#include "isk_16.h" + +#include "world/common/todo/StarSpiritEffectFunc.inc.c" + +EvtScript N(EVS_SpawnStarCard) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_SET(LVar0, 0) + EVT_SET(GB_StoryProgress, STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CASE_EQ(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_SET(LVar0, 1) + EVT_CASE_DEFAULT + EVT_RETURN + EVT_END_SWITCH + EVT_IF_EQ(LVar0, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 408, -825, 414) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 408, -880, 414) + EVT_SPIRIT_ADJUST_CAM(10000) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(StarSpiritEffectFunc2), 1, 180, 408, -900, 414, 408, -825, 414, -880, -910) + EVT_THREAD + EVT_CALL(N(StarSpiritEffectFunc3)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(1) + EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(N(StarSpiritEffectFunc1)) + EVT_CALL(StopSound, SOUND_80000067) + EVT_CALL(PlaySoundAt, SOUND_B2, 0, 408, -825, 414) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(45) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(180) + EVT_WAIT(115) + EVT_CALL(PlaySoundAt, SOUND_137, 0, 408, -825, 414) + EVT_END_THREAD + EVT_CALL(N(StarSpiritEffectFunc4), 1) + EVT_THREAD + EVT_WAIT(80) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_ADD(LVar1, 100) + EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 408, -910, 414) + EVT_CALL(N(StarSpiritEffectFunc4), 2) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar2, LVar3, LVar4) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_CALL(N(StarSpiritEffectFunc5), 1, 408, -880, 414, -910) + EVT_THREAD + EVT_CALL(N(StarSpiritEffectFunc6)) + EVT_END_THREAD + EVT_WAIT(1) + EVT_END_IF + EVT_CALL(N(StarSpiritEffectFunc4), 3) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GB_StoryProgress, STORY_CH2_STAR_SPIRIT_RESCUED) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_1, TRANSITION_14) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_isk_19_1) = EVT_EXIT_WALK(40, isk_16_ENTRY_0, "isk_19", isk_19_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_19_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_16) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_SetupFlames)) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_EXEC(N(EVS_SpawnStarCard)) + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_TUTANKOOPA_REVEALED, 0, 8) + EVT_CASE_EQ(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CASE_GT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_END_SWITCH + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_EXEC(N(EVS_Scene_TutankoopaAppears)) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_16/isk_16_2_npc.c b/src/world/area_isk/isk_16/isk_16_2_npc.c new file mode 100644 index 0000000000..425d648739 --- /dev/null +++ b/src/world/area_isk/isk_16/isk_16_2_npc.c @@ -0,0 +1,168 @@ +#include "isk_16.h" + +EvtScript N(EVS_NpcIdle_Tutankoopa_01) = { + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(StartBossBattle, SONG_TUTANKOOPA_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Tutankoopa_01) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetEncounterStatusFlags, 1, TRUE) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_EXEC_WAIT(N(EVS_Scene_TutankoopaDefeated)) + EVT_EXEC(N(EVS_SpawnStarCard)) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Tutankoopa_01) = { + EVT_CALL(InterpNpcYaw, NPC_Tutankoopa_01, 150, 1) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Tutankoopa_01))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Tutankoopa_01))) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetNpcPos, NPC_Tutankoopa_01, 0, -1500, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ChainChomp) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Tutankoopa_01) = { + .defaultAnim = ANIM_Tutankoopa_Anim01, + .height = 40, + .radius = 36, +}; + +NpcSettings N(NpcSettings_ChainChomp) = { + .defaultAnim = ANIM_ChainChomp_Anim03, + .height = 32, + .radius = 32, +}; + +NpcSettings N(NpcSettings_Tutankoopa_02) = { + .defaultAnim = ANIM_Tutankoopa_Anim00, + .height = 40, + .radius = 36, +}; + +StaticNpc N(NpcData_Tutankoopa)[] = { + { + .id = NPC_Tutankoopa_01, + .settings = &N(NpcSettings_Tutankoopa_01), + .pos = { 457.0f, -1300.0f, 316.0f }, + .yaw = 230, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Tutankoopa_01), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Tutankoopa_Anim01, + .walk = ANIM_Tutankoopa_Anim01, + .run = ANIM_Tutankoopa_Anim01, + .chase = ANIM_Tutankoopa_Anim01, + .anim_4 = ANIM_Tutankoopa_Anim01, + .anim_5 = ANIM_Tutankoopa_Anim01, + .death = ANIM_Tutankoopa_Anim06, + .hit = ANIM_Tutankoopa_Anim06, + .anim_8 = ANIM_Tutankoopa_Anim01, + .anim_9 = ANIM_Tutankoopa_Anim01, + .anim_A = ANIM_Tutankoopa_Anim01, + .anim_B = ANIM_Tutankoopa_Anim01, + .anim_C = ANIM_Tutankoopa_Anim01, + .anim_D = ANIM_Tutankoopa_Anim01, + .anim_E = ANIM_Tutankoopa_Anim01, + .anim_F = ANIM_Tutankoopa_Anim01, + }, + }, + { + .id = NPC_Tutankoopa_02, + .settings = &N(NpcSettings_Tutankoopa_02), + .pos = { 500.0f, -1300.0f, 316.0f }, + .yaw = 230, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Tutankoopa_Anim01, + .walk = ANIM_Tutankoopa_Anim01, + .run = ANIM_Tutankoopa_Anim01, + .chase = ANIM_Tutankoopa_Anim01, + .anim_4 = ANIM_Tutankoopa_Anim01, + .anim_5 = ANIM_Tutankoopa_Anim01, + .death = ANIM_Tutankoopa_Anim06, + .hit = ANIM_Tutankoopa_Anim06, + .anim_8 = ANIM_Tutankoopa_Anim01, + .anim_9 = ANIM_Tutankoopa_Anim01, + .anim_A = ANIM_Tutankoopa_Anim01, + .anim_B = ANIM_Tutankoopa_Anim01, + .anim_C = ANIM_Tutankoopa_Anim01, + .anim_D = ANIM_Tutankoopa_Anim01, + .anim_E = ANIM_Tutankoopa_Anim01, + .anim_F = ANIM_Tutankoopa_Anim01, + }, + }, +}; + +StaticNpc N(NpcData_ChainChomp) = { + .id = NPC_ChainChomp, + .settings = &N(NpcSettings_ChainChomp), + .pos = { 457.0f, -1300.0f, 316.0f }, + .yaw = 230, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_ChainChomp), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ChainChomp_Anim00, + .walk = ANIM_ChainChomp_Anim00, + .run = ANIM_ChainChomp_Anim00, + .chase = ANIM_ChainChomp_Anim00, + .anim_4 = ANIM_ChainChomp_Anim00, + .anim_5 = ANIM_ChainChomp_Anim00, + .death = ANIM_ChainChomp_Anim00, + .hit = ANIM_ChainChomp_Anim00, + .anim_8 = ANIM_ChainChomp_Anim00, + .anim_9 = ANIM_ChainChomp_Anim00, + .anim_A = ANIM_ChainChomp_Anim00, + .anim_B = ANIM_ChainChomp_Anim00, + .anim_C = ANIM_ChainChomp_Anim00, + .anim_D = ANIM_ChainChomp_Anim00, + .anim_E = ANIM_ChainChomp_Anim00, + .anim_F = ANIM_ChainChomp_Anim00, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Tutankoopa), BTL_ISK_PART_2_FORMATION_00, BTL_ISK_PART_2_STAGE_01), + NPC_GROUP(N(NpcData_ChainChomp)), + {} +}; diff --git a/src/world/area_isk/isk_16/isk_16_3_boss.c b/src/world/area_isk/isk_16/isk_16_3_boss.c new file mode 100644 index 0000000000..f0d9f66f93 --- /dev/null +++ b/src/world/area_isk/isk_16/isk_16_3_boss.c @@ -0,0 +1,247 @@ +#include "isk_16.h" + +#include "world/common/atomic/UnkFunc27.inc.c" + +EvtScript N(EVS_Scene_TutankoopaAppears) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(N(UnkFunc27), 0, -1, 1) + EVT_CALL(N(UnkFunc27), 2, 0, 1) + EVT_CALL(N(UnkFunc26), 1, 0, 0, 0, 255, 0, 0, 0, 0, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 410, -910, 410) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 336, -910, 467) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetPlayerPos, 279, -910, 520) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_PARAKARRY) + EVT_SET(LVar1, -899) + EVT_ELSE + EVT_SET(LVar1, -910) + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_PARTNER, 243, LVar1, 535) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 45) + EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000102) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 311, 487, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000106) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(PlayerMoveTo, 343, 460, 0) + EVT_EXEC_WAIT(N(EVS_BindExitTriggers)) + EVT_WAIT(20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 410, -910, 410) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00E2, 160, 40) + EVT_WAIT(30) + EVT_CALL(SetNpcPos, NPC_Tutankoopa_01, 410, -1300, 410) + EVT_THREAD + EVT_WAIT(50) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_CALL(func_802CFD30, 1, 7, 0, 0, 0, 0) + EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, 410, -905, 410) + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_02, ANIM_Tutankoopa_Anim10) + EVT_CALL(MakeLerp, 0, 255, 100, EASING_QUADRATIC_IN) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CFD30, 1, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(func_802CFD30, 1, 0, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_SET(LVar0, 255) + EVT_LOOP(60) + EVT_ADD(LVar0, -4) + EVT_CALL(N(UnkFunc26), 1, 0, 0, 0, LVar0, 0, 0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(N(UnkFunc26), 1, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(530.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_Tutankoopa_02, LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, 0, 110, 100, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_ADD(LVar0, LVar3) + EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_Tutankoopa_02, LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, 0, 100, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar5, EVT_FLOAT(0.47)) + EVT_SETF(LVar6, EVT_FLOAT(-0.94)) + EVT_MULF(LVar5, LVar0) + EVT_MULF(LVar6, LVar0) + EVT_ADDF(LVar5, LVar2) + EVT_ADDF(LVar6, LVar4) + EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, LVar5, LVar3, LVar6) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_Tutankoopa_01, 457, -800, 316) + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim01) + EVT_THREAD + EVT_WAIT(59) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_3EF, 0) + EVT_END_THREAD + EVT_CALL(func_802CFD30, 0, 7, 255, 0, 0, 0) + EVT_CALL(func_802CFE2C, 0, 0x00000800) + EVT_CALL(func_802CFD30, 0, 5, 14, 2, 1, 0) + EVT_WAIT(39) + EVT_CALL(func_802CFE2C, 0, 0x00000800) + EVT_CALL(func_802CFD30, 0, 5, 13, 2, 1, 0) + EVT_WAIT(39) + EVT_CALL(func_802CFE2C, 0, 0x00000800) + EVT_CALL(func_802CFD30, 0, 5, 12, 2, 1, 0) + EVT_WAIT(55) + EVT_CALL(func_802CFD30, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, 457, -1300, 316) + EVT_WAIT(10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 438, -800, 332) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(225.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-7.5), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim0B, ANIM_Tutankoopa_Anim01, 0, MSG_CH2_00E3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SetNpcVar, NPC_Tutankoopa_01, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayChompSounds) = { + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_ChainChomp, SOUND_2061, 0) + EVT_WAIT(5) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_TutankoopaDefeated) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_THREAD + EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00E8, 160, 40) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim06) + EVT_CALL(SetNpcJumpscale, NPC_Tutankoopa_01, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_20E3, 0) + EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 442, -910, 393, 30) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, 0) + EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 416, -910, 420, 20) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, 0) + EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 395, -910, 440, 10) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim01) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 410, -910, 410) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 490, -910, 327) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(200.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(EnableModel, MODEL_o2359, FALSE) + EVT_EXEC_GET_TID(N(EVS_PlayChompSounds), LVarA) + EVT_CALL(SetNpcPos, NPC_ChainChomp, 516, -910, 263) + EVT_CALL(SetNpcSpeed, NPC_ChainChomp, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_ChainChomp, 493, 292, 0) + EVT_WAIT(30) + EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(EnableModel, MODEL_o2359, TRUE) + EVT_CALL(NpcFaceNpc, NPC_Tutankoopa_01, NPC_ChainChomp, 0) + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim06) + EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_JUMP_3E2, 0) + EVT_CALL(NpcJump0, NPC_Tutankoopa_01, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim01) + EVT_CALL(SpeakToPlayer, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim0B, ANIM_Tutankoopa_Anim01, 5, MSG_CH2_00E9) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_ChainChomp, ANIM_ChainChomp_Anim03) + EVT_CALL(SetNpcSpeed, NPC_ChainChomp, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcPos, NPC_ChainChomp, 486, -910, 340) + EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar0, LVar1, LVar2) + EVT_CALL(NpcMoveTo, NPC_ChainChomp, LVar0, LVar2, 0) + EVT_LOOP(2) + EVT_CALL(NpcMoveTo, NPC_ChainChomp, 304, 434, 0) + EVT_CALL(NpcMoveTo, NPC_ChainChomp, 444, 316, 0) + EVT_CALL(NpcMoveTo, NPC_ChainChomp, 473, 337, 0) + EVT_CALL(NpcMoveTo, NPC_ChainChomp, 318, 460, 0) + EVT_END_LOOP + EVT_CALL(NpcMoveTo, NPC_ChainChomp, 259, 522, 0) + EVT_CALL(SetNpcPos, NPC_ChainChomp, 0, -1500, 0) + EVT_KILL_THREAD(LVarA) + EVT_END_THREAD + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_ChainChomp, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Tutankoopa_01, LVar3, LVar4, LVar5) + EVT_CALL(GetDist2D, LVar6, LVar0, LVar2, LVar3, LVar5) + EVT_IF_LT(LVar6, 50) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetSelfVar, 1, 1) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim02) + EVT_CALL(SetNpcSpeed, NPC_Tutankoopa_01, EVT_FLOAT(8.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80022) + EVT_LOOP(2) + EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 304, 434, 0) + EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 444, 316, 0) + EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 473, 337, 0) + EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 318, 460, 0) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 259, 522, 0) + EVT_CALL(SetNpcPos, NPC_Tutankoopa_01, 0, -1500, 0) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetSelfVar, 1, 0) + EVT_END_THREAD + EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00EA, 160, 40) + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + EVT_SET(GF_ISK16_Defeated_Tutankoopa, TRUE) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_16/isk_16_4_entity.c b/src/world/area_isk/isk_16/isk_16_4_entity.c new file mode 100644 index 0000000000..e0e76d4bad --- /dev/null +++ b/src/world/area_isk/isk_16/isk_16_4_entity.c @@ -0,0 +1,11 @@ +#include "isk_16.h" +#include "effects.h" + +EvtScript N(EVS_SetupFlames) = { + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -713, 291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 291, -713, 415, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 415, -843, 291, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 291, -843, 415, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c deleted file mode 100644 index 09c00a7f71..0000000000 --- a/src/world/area_isk/isk_18/997F70.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "isk_18.h" - -static char* N(exit_str_0) = "isk_10"; -static char* N(exit_str_1) = "isk_12"; - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_isk/isk_18/isk_18.h b/src/world/area_isk/isk_18/isk_18.h index 9ba0a741c7..cbde4ae565 100644 --- a/src/world/area_isk/isk_18/isk_18.h +++ b/src/world/area_isk/isk_18/isk_18.h @@ -2,8 +2,23 @@ /// @brief Dry Dry Ruins - Deep Tunnel #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_18_shape.h" +#include "mapfs/isk_18_hit.h" + +#include "sprite/npc/BuzzyBeetle.h" + +enum { + NPC_BuzzyBeetle_01 = 0, + NPC_BuzzyBeetle_02 = 1, + NPC_BuzzyBeetle_03 = 2, +}; + #define NAMESPACE isk_18 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFlames); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_isk/isk_18/isk_18_0_header.c b/src/world/area_isk/isk_18/isk_18_0_header.c new file mode 100644 index 0000000000..e9c62ea9d3 --- /dev/null +++ b/src/world/area_isk/isk_18/isk_18_0_header.c @@ -0,0 +1,13 @@ +#include "isk_18.h" + +EntryList N(Entrances) = { + [isk_18_ENTRY_0] { -528.0, -780.0, 217.0, 150.0 }, + [isk_18_ENTRY_1] { 431.0, -780.0, 388.0, 230.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_18 }, +}; diff --git a/src/world/area_isk/isk_18/isk_18_1_main.c b/src/world/area_isk/isk_18/isk_18_1_main.c new file mode 100644 index 0000000000..84728fe40d --- /dev/null +++ b/src/world/area_isk/isk_18/isk_18_1_main.c @@ -0,0 +1,37 @@ +#include "isk_18.h" + +EvtScript N(EVS_ExitWalk_isk_10_2) = EVT_EXIT_WALK(40, isk_18_ENTRY_0, "isk_10", isk_10_ENTRY_2); +EvtScript N(EVS_ExitWalk_isk_12_2) = EVT_EXIT_WALK(40, isk_18_ENTRY_1, "isk_12", isk_12_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_10_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_12_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_18) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_SetupFlames)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_IF_LT(GB_StoryProgress, STORY_CH2_DRAINED_THIRD_SAND_ROOM) + EVT_CALL(EnableModel, MODEL_o1956, FALSE) + EVT_CALL(EnableModel, MODEL_o1957, FALSE) + EVT_CALL(EnableModel, MODEL_o1958, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_18/isk_18_2_npc.c b/src/world/area_isk/isk_18/isk_18_2_npc.c new file mode 100644 index 0000000000..614f3ac5de --- /dev/null +++ b/src/world/area_isk/isk_18/isk_18_2_npc.c @@ -0,0 +1,80 @@ +#include "isk_18.h" + +#include "world/common/enemy/complete/SpikeTop.inc.c" + +StaticNpc N(NpcData_BuzzyBeetle_01) = { + .id = NPC_BuzzyBeetle_01, + .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), + .pos = { -372.0f, -700.0f, 439.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_400, + .initVarCount = 1, + .initVar = { .value = BTL_ISK_PART_1_FORMATION_0E }, + .drops = ISK_BUZZY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -372, -700, 439 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -372, -700, 439 }, + .detectSize = { 200 }, + } + }, + .animations = BUZZY_BEETLE_ANIMS, +}; + +StaticNpc N(NpcData_BuzzyBeetle_02) = { + .id = NPC_BuzzyBeetle_02, + .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), + .pos = { -58.0f, -700.0f, 591.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_400, + .initVarCount = 1, + .initVar = { .value = BTL_ISK_PART_1_FORMATION_0B }, + .drops = ISK_BUZZY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -58, -700, 591 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -58, -700, 591 }, + .detectSize = { 200 }, + } + }, + .animations = BUZZY_BEETLE_ANIMS, +}; + +StaticNpc N(NpcData_BuzzyBeetle_03) = { + .id = NPC_BuzzyBeetle_03, + .settings = &N(NpcSettings_BuzzyBeetle), + .pos = { 292.0f, -780.0f, 488.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_400, + .drops = ISK_BUZZY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 292, -780, 488 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 292, -780, 488 }, + .detectSize = { 200 }, + } + }, + .animations = BUZZY_BEETLE_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BuzzyBeetle_01), BTL_ISK_PART_1_FORMATION_0F, BTL_ISK_PART_1_STAGE_08), + NPC_GROUP(N(NpcData_BuzzyBeetle_02), BTL_ISK_PART_1_FORMATION_13, BTL_ISK_PART_1_STAGE_08), + NPC_GROUP(N(NpcData_BuzzyBeetle_03), BTL_ISK_PART_1_FORMATION_0C, BTL_ISK_PART_1_STAGE_08), + {} +}; diff --git a/src/world/area_isk/isk_18/isk_18_3_entity.c b/src/world/area_isk/isk_18/isk_18_3_entity.c new file mode 100644 index 0000000000..781235ed18 --- /dev/null +++ b/src/world/area_isk/isk_18/isk_18_3_entity.c @@ -0,0 +1,13 @@ +#include "isk_18.h" +#include "effects.h" + +EvtScript N(EVS_SetupFlames) = { + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 305, -738, 435, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 138, -738, 514, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -46, -738, 530, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -225, -738, 482, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -376, -738, 376, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, -482, -738, 225, EVT_FLOAT(0.3), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_19/999740.c b/src/world/area_isk/isk_19/999740.c deleted file mode 100644 index eccc868622..0000000000 --- a/src/world/area_isk/isk_19/999740.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "isk_19.h" - -static char* N(exit_str_0) = "isk_11"; -static char* N(exit_str_1) = "isk_16"; - diff --git a/src/world/area_isk/isk_19/isk_19.h b/src/world/area_isk/isk_19/isk_19.h index 972c962731..a51157a976 100644 --- a/src/world/area_isk/isk_19/isk_19.h +++ b/src/world/area_isk/isk_19/isk_19.h @@ -2,8 +2,15 @@ /// @brief Dry Dry Ruins - Boss Antechamber #include "common.h" -#include "../isk.h" #include "message_ids.h" #include "map.h" +#include "../isk.h" +#include "mapfs/isk_19_shape.h" +#include "mapfs/isk_19_hit.h" + #define NAMESPACE isk_19 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_isk/isk_19/isk_19_0_header.c b/src/world/area_isk/isk_19/isk_19_0_header.c new file mode 100644 index 0000000000..9ec8d8cfc1 --- /dev/null +++ b/src/world/area_isk/isk_19/isk_19_0_header.c @@ -0,0 +1,13 @@ +#include "isk_19.h" + +EntryList N(Entrances) = { + [isk_19_ENTRY_0] { 548.0, -910.0, 182.0, 21.0 }, + [isk_19_ENTRY_1] { 573.0, -910.0, 21.0, 186.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_isk_19 }, +}; diff --git a/src/world/area_isk/isk_19/isk_19_1_music.c b/src/world/area_isk/isk_19/isk_19_1_music.c new file mode 100644 index 0000000000..5e166f7184 --- /dev/null +++ b/src/world/area_isk/isk_19/isk_19_1_music.c @@ -0,0 +1,31 @@ +#include "isk_19.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GF_ISK19_FinalWarning, FALSE) + EVT_THREAD + EVT_CALL(FadeInMusic, 1, SONG_TUTANKOOPA_WARNING, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00E1, 160, 40) + EVT_SET(GF_ISK19_FinalWarning, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(FadeInMusic, 0, SONG_RUINS_BASEMENT, 0, 2000, 0, 127) + EVT_CALL(FadeOutMusic, 1, 2000) + EVT_END_THREAD + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_SOLVED_ARTIFACT_PUZZLE) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_CASE_LT(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_RUINS_BASEMENT, 0, 8) + EVT_CASE_GE(STORY_CH2_DEFEATED_TUTANKOOPA) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS, 0, 8) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_19/isk_19_2_main.c b/src/world/area_isk/isk_19/isk_19_2_main.c new file mode 100644 index 0000000000..6a2a783749 --- /dev/null +++ b/src/world/area_isk/isk_19/isk_19_2_main.c @@ -0,0 +1,36 @@ +#include "isk_19.h" + +EvtScript N(EVS_ExitWalk_isk_11_3) = EVT_EXIT_WALK(40, isk_19_ENTRY_0, "isk_11", isk_11_ENTRY_3); +EvtScript N(EVS_ExitWalk_isk_16_0) = EVT_EXIT_WALK(40, isk_19_ENTRY_1, "isk_16", isk_16_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_11_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_16_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_RUINS) + EVT_CALL(SetSpriteShading, SHADING_ISK_19) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_19/isk_19_3_entity.c b/src/world/area_isk/isk_19/isk_19_3_entity.c new file mode 100644 index 0000000000..572fc2137d --- /dev/null +++ b/src/world/area_isk/isk_19/isk_19_3_entity.c @@ -0,0 +1,11 @@ +#include "isk_19.h" +#include "entity.h" +#include "effects.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 486, -845, 130, EVT_FLOAT(0.3), LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, 499, -845, 42, EVT_FLOAT(0.3), LVar0) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 560, -850, 100, -10, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_iwa/iwa_00/iwa_00.h b/src/world/area_iwa/iwa_00/iwa_00.h index 3878d02134..7091185c30 100644 --- a/src/world/area_iwa/iwa_00/iwa_00.h +++ b/src/world/area_iwa/iwa_00/iwa_00.h @@ -10,12 +10,12 @@ #include "mapfs/iwa_00_hit.h" enum { - NPC_MontyMole_01 = 0, - NPC_MontyMole_01_Hole = 1, - NPC_MontyMole_02 = 2, - NPC_MontyMole_02_Hole = 3, - NPC_Whacka_01 = 4, - NPC_Whacka_02 = 5, + NPC_MontyMole_01 = 0, + NPC_MontyMole_01_Hole = 1, + NPC_MontyMole_02 = 2, + NPC_MontyMole_02_Hole = 3, + NPC_Whacka_01 = 4, + NPC_Whacka_02 = 5, }; #define NAMESPACE iwa_00 diff --git a/src/world/area_iwa/iwa_01/iwa_01.h b/src/world/area_iwa/iwa_01/iwa_01.h index 5632a24e64..8a59f236dc 100644 --- a/src/world/area_iwa/iwa_01/iwa_01.h +++ b/src/world/area_iwa/iwa_01/iwa_01.h @@ -10,19 +10,19 @@ #include "mapfs/iwa_01_hit.h" enum { - NPC_MontyMole_01 = 0, - NPC_MontyMole_01_Hole = 1, - NPC_MontyMole_02 = 2, - NPC_MontyMole_02_Stone = 3, - NPC_MontyMole_03 = 4, - NPC_MontyMole_03_Stone = 5, - NPC_MontyMole_04 = 6, - NPC_MontyMole_04_Stone = 7, - NPC_Cleft = 8, + NPC_MontyMole_01 = 0, + NPC_MontyMole_01_Hole = 1, + NPC_MontyMole_02 = 2, + NPC_MontyMole_02_Stone = 3, + NPC_MontyMole_03 = 4, + NPC_MontyMole_03_Stone = 5, + NPC_MontyMole_04 = 6, + NPC_MontyMole_04_Stone = 7, + NPC_Cleft = 8, }; enum { - MV_SplashState = MapVar(15), + MV_SplashState = MapVar(15), }; #define NAMESPACE iwa_01 diff --git a/src/world/area_iwa/iwa_02/iwa_02.h b/src/world/area_iwa/iwa_02/iwa_02.h index a9e84ef23d..792049ece1 100644 --- a/src/world/area_iwa/iwa_02/iwa_02.h +++ b/src/world/area_iwa/iwa_02/iwa_02.h @@ -10,12 +10,12 @@ #include "mapfs/iwa_02_hit.h" enum { - NPC_Cleft_01 = 0, - NPC_Cleft_02 = 1, - NPC_Cleft_03 = 2, - NPC_MontyMole = 3, - NPC_MontyMole_Hole = 4, - NPC_Bubulb = 5, + NPC_Cleft_01 = 0, + NPC_Cleft_02 = 1, + NPC_Cleft_03 = 2, + NPC_MontyMole = 3, + NPC_MontyMole_Hole = 4, + NPC_Bubulb = 5, }; #define NAMESPACE iwa_02 diff --git a/src/world/area_iwa/iwa_03/iwa_03.h b/src/world/area_iwa/iwa_03/iwa_03.h index f2dfe9b766..2de9a58a7c 100644 --- a/src/world/area_iwa/iwa_03/iwa_03.h +++ b/src/world/area_iwa/iwa_03/iwa_03.h @@ -10,15 +10,15 @@ #include "mapfs/iwa_03_hit.h" enum { - NPC_Cleft_01 = 0, - NPC_Cleft_02 = 1, - NPC_Cleft_03 = 2, - NPC_MontyMole = 3, - NPC_MontyMole_Hole = 4, + NPC_Cleft_01 = 0, + NPC_Cleft_02 = 1, + NPC_Cleft_03 = 2, + NPC_MontyMole = 3, + NPC_MontyMole_Hole = 4, }; enum { - MV_PlayerCliffLevel = MapVar(9), + MV_PlayerCliffLevel = MapVar(9), }; #define NAMESPACE iwa_03 diff --git a/src/world/area_iwa/iwa_04/iwa_04.h b/src/world/area_iwa/iwa_04/iwa_04.h index 08f756b688..47d83f78a8 100644 --- a/src/world/area_iwa/iwa_04/iwa_04.h +++ b/src/world/area_iwa/iwa_04/iwa_04.h @@ -12,12 +12,12 @@ #include "sprite/npc/Buzzar.h" enum { - NPC_Cleft = 0, - NPC_Buzzar = 1, + NPC_Cleft = 0, + NPC_Buzzar = 1, }; enum { - MV_PlayerCliffLevel = MapVar(9), + MV_PlayerCliffLevel = MapVar(9), }; #define NAMESPACE iwa_04 diff --git a/src/world/area_iwa/iwa_10/iwa_10.h b/src/world/area_iwa/iwa_10/iwa_10.h index 52640d4c70..2de256d7f3 100644 --- a/src/world/area_iwa/iwa_10/iwa_10.h +++ b/src/world/area_iwa/iwa_10/iwa_10.h @@ -13,15 +13,15 @@ #include "sprite/npc/WorldParakarry.h" enum { - NPC_TrainStationToad_01 = 0, - NPC_TrainStationToad_02 = 1, - NPC_Dryite = 2, - NPC_ThreeSisters_01 = 3, - NPC_Parakarry = 4, - NPC_Toad = 5, - NPC_ThreeSisters_02 = 6, - NPC_ThreeSisters_03 = 7, - NPC_ThreeSisters_04 = 8, + NPC_TrainStationToad_01 = 0, + NPC_TrainStationToad_02 = 1, + NPC_Dryite = 2, + NPC_ThreeSisters_01 = 3, + NPC_Parakarry = 4, + NPC_Toad = 5, + NPC_ThreeSisters_02 = 6, + NPC_ThreeSisters_03 = 7, + NPC_ThreeSisters_04 = 8, }; enum { diff --git a/src/world/area_iwa/iwa_11/iwa_11.h b/src/world/area_iwa/iwa_11/iwa_11.h index 617222d0be..b561a4e8b8 100644 --- a/src/world/area_iwa/iwa_11/iwa_11.h +++ b/src/world/area_iwa/iwa_11/iwa_11.h @@ -10,7 +10,7 @@ #include "mapfs/iwa_11_hit.h" enum { - NPC_TrainConductorToad = 0, + NPC_TrainConductorToad = 0, }; enum { diff --git a/src/world/area_jan/jan_00/jan_00.h b/src/world/area_jan/jan_00/jan_00.h index 809d4414cc..6fe8976a58 100644 --- a/src/world/area_jan/jan_00/jan_00.h +++ b/src/world/area_jan/jan_00/jan_00.h @@ -15,14 +15,14 @@ #include "sprite/npc/JrTroopa.h" enum { - NPC_Kolorado_01 = 0, - NPC_Kolorado_02 = 1, - NPC_JrTroopa = 2, - NPC_HeartPlant_01 = 3, - NPC_HeartPlant_02 = 4, - NPC_HeartPlant_03 = 5, - NPC_HeartPlant_04 = 6, - NPC_HeartPlant_05 = 7, + NPC_Kolorado_01 = 0, + NPC_Kolorado_02 = 1, + NPC_JrTroopa = 2, + NPC_HeartPlant_01 = 3, + NPC_HeartPlant_02 = 4, + NPC_HeartPlant_03 = 5, + NPC_HeartPlant_04 = 6, + NPC_HeartPlant_05 = 7, }; #define NAMESPACE jan_00 diff --git a/src/world/area_jan/jan_00/jan_00_4_whale.c b/src/world/area_jan/jan_00/jan_00_4_whale.c index 546e26ed8e..abfffce4a5 100644 --- a/src/world/area_jan/jan_00/jan_00_4_whale.c +++ b/src/world/area_jan/jan_00/jan_00_4_whale.c @@ -20,7 +20,6 @@ ApiStatus jan_00_UnkPlayerPosFunc(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - EvtScript N(D_8024595C_B25E9C) = { EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) diff --git a/src/world/area_kgr/kgr_02/kgr_02.h b/src/world/area_kgr/kgr_02/kgr_02.h index d894b05a36..fb642d109f 100644 --- a/src/world/area_kgr/kgr_02/kgr_02.h +++ b/src/world/area_kgr/kgr_02/kgr_02.h @@ -12,7 +12,7 @@ #include "sprite/npc/Fuzzipede.h" enum { - NPC_Fuzzipede = 0, + NPC_Fuzzipede = 0, }; #define NAMESPACE kgr_02 diff --git a/src/world/area_kkj/kkj_14/ADAEA0.c b/src/world/area_kkj/kkj_14/ADAEA0.c index 17c8a4e61c..37d6d544ec 100644 --- a/src/world/area_kkj/kkj_14/ADAEA0.c +++ b/src/world/area_kkj/kkj_14/ADAEA0.c @@ -1,7 +1,5 @@ #include "kkj_14.h" -extern char wMapBgName[]; - ApiStatus func_80240000_ADAEA0(Evt* script, s32 isInitialCall) { if (evt_get_variable(NULL, GB_StoryProgress) == -128) { sprintf(wMapBgName, "nok_bg"); diff --git a/src/world/area_kmr/kmr_00/kmr_00.h b/src/world/area_kmr/kmr_00/kmr_00.h index 33653af906..2d4d6ce1e1 100644 --- a/src/world/area_kmr/kmr_00/kmr_00.h +++ b/src/world/area_kmr/kmr_00/kmr_00.h @@ -19,14 +19,14 @@ #include "sprite/npc/Goombaria.h" enum { - NPC_Goombaria = 0, - NPC_Eldstar = 1, - NPC_Mamar = 2, - NPC_Skolar = 3, - NPC_Muskular = 4, - NPC_Misstar = 5, - NPC_Klevar = 6, - NPC_Kalmar = 7, + NPC_Goombaria = 0, + NPC_Eldstar = 1, + NPC_Mamar = 2, + NPC_Skolar = 3, + NPC_Muskular = 4, + NPC_Misstar = 5, + NPC_Klevar = 6, + NPC_Kalmar = 7, }; enum { diff --git a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c index f6a9bc602a..2318e05c88 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c +++ b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c @@ -5,13 +5,13 @@ // initial delay to start bobbing, ensuring star spirits motions are desync'd from one another s16 N(StarSpiritBobDelays)[] = { - [NPC_Eldstar - 1] 1, - [NPC_Mamar - 1] 3, - [NPC_Skolar - 1] 5, - [NPC_Muskular - 1] 7, - [NPC_Misstar - 1] 7, - [NPC_Klevar - 1] 5, - [NPC_Kalmar - 1] 3, + [NPC_Eldstar - 1] 1, + [NPC_Mamar - 1] 3, + [NPC_Skolar - 1] 5, + [NPC_Muskular - 1] 7, + [NPC_Misstar - 1] 7, + [NPC_Klevar - 1] 5, + [NPC_Kalmar - 1] 3, }; API_CALLABLE(N(UpdateStarSpiritBobbing)) { diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index 772e42b4cb..f2433da755 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -12,7 +12,7 @@ #include "sprite/npc/Goompa.h" enum { - NPC_Goompa = 0, + NPC_Goompa = 0, }; enum { diff --git a/src/world/area_kmr/kmr_04/kmr_04.h b/src/world/area_kmr/kmr_04/kmr_04.h index 1fc1dedfbf..be48901955 100644 --- a/src/world/area_kmr/kmr_04/kmr_04.h +++ b/src/world/area_kmr/kmr_04/kmr_04.h @@ -13,8 +13,8 @@ #include "sprite/npc/JrTroopa.h" enum { - NPC_JrTroopa = 0, - NPC_Goompa = 1, + NPC_JrTroopa = 0, + NPC_Goompa = 1, }; enum { diff --git a/src/world/area_kmr/kmr_05/kmr_05.h b/src/world/area_kmr/kmr_05/kmr_05.h index 5ee1d36dd6..e2be2a32ad 100644 --- a/src/world/area_kmr/kmr_05/kmr_05.h +++ b/src/world/area_kmr/kmr_05/kmr_05.h @@ -15,11 +15,11 @@ #include "sprite/npc/Paragoomba.h" enum { - NPC_Goomba_01 = 0, - NPC_Goomba_02 = 2, - NPC_SpikedGoomba = 3, - NPC_Paragoomba = 4, - NPC_06 = 6, + NPC_Goomba_01 = 0, + NPC_Goomba_02 = 2, + NPC_SpikedGoomba = 3, + NPC_Paragoomba = 4, + NPC_06 = 6, }; enum { diff --git a/src/world/area_kmr/kmr_06/kmr_06.h b/src/world/area_kmr/kmr_06/kmr_06.h index 9cd1c3db53..09fde2cd21 100644 --- a/src/world/area_kmr/kmr_06/kmr_06.h +++ b/src/world/area_kmr/kmr_06/kmr_06.h @@ -13,8 +13,8 @@ #include "sprite/npc/Paragoomba.h" enum { - NPC_SpikedGoomba = 0, - NPC_Paragoomba = 1, + NPC_SpikedGoomba = 0, + NPC_Paragoomba = 1, }; enum { @@ -22,9 +22,9 @@ enum { }; enum { - MV_StickerData = MapVar(10), - MV_StickerImage = MapVar(11), - MV_StickerPalette = MapVar(12), + MV_StickerData = MapVar(10), + MV_StickerImage = MapVar(11), + MV_StickerPalette = MapVar(12), }; #define NAMESPACE kmr_06 diff --git a/src/world/area_kmr/kmr_07/kmr_07.h b/src/world/area_kmr/kmr_07/kmr_07.h index f9f1e84a41..86f97b5c94 100644 --- a/src/world/area_kmr/kmr_07/kmr_07.h +++ b/src/world/area_kmr/kmr_07/kmr_07.h @@ -10,8 +10,8 @@ #include "mapfs/kmr_07_hit.h" enum { - NPC_GoombaBros_Red = 0, - NPC_GoombaBros_Blue = 1, + NPC_GoombaBros_Red = 0, + NPC_GoombaBros_Blue = 1, }; enum { diff --git a/src/world/area_kmr/kmr_09/kmr_09.h b/src/world/area_kmr/kmr_09/kmr_09.h index 04a0503431..b82428daf6 100644 --- a/src/world/area_kmr/kmr_09/kmr_09.h +++ b/src/world/area_kmr/kmr_09/kmr_09.h @@ -10,10 +10,10 @@ #include "mapfs/kmr_09_hit.h" enum { - NPC_Goomba_01 = 0, - NPC_Goomba_02 = 1, - NPC_Goomba_Ambush = 2, - NPC_Paragoomba = 3, + NPC_Goomba_01 = 0, + NPC_Goomba_02 = 1, + NPC_Goomba_Ambush = 2, + NPC_Paragoomba = 3, }; #define NAMESPACE kmr_09 diff --git a/src/world/area_kmr/kmr_10/kmr_10.h b/src/world/area_kmr/kmr_10/kmr_10.h index 93ef4c3b06..c66359aa89 100644 --- a/src/world/area_kmr/kmr_10/kmr_10.h +++ b/src/world/area_kmr/kmr_10/kmr_10.h @@ -12,7 +12,7 @@ #include "sprite/npc/Toad.h" enum { - NPC_Dummy = 0, // for controlling the spring as it falls from the tree + NPC_Dummy = 0, // for controlling the spring as it falls from the tree }; enum { diff --git a/src/world/area_kmr/kmr_12/kmr_12.h b/src/world/area_kmr/kmr_12/kmr_12.h index 26b935e573..5936412999 100644 --- a/src/world/area_kmr/kmr_12/kmr_12.h +++ b/src/world/area_kmr/kmr_12/kmr_12.h @@ -12,7 +12,7 @@ #include "sprite/npc/Goomba.h" enum { - NPC_Goomba_Ambush = 0, + NPC_Goomba_Ambush = 0, }; #define NAMESPACE kmr_12 diff --git a/src/world/area_kmr/kmr_23/kmr_23.h b/src/world/area_kmr/kmr_23/kmr_23.h index 8f0b81034d..015a364f13 100644 --- a/src/world/area_kmr/kmr_23/kmr_23.h +++ b/src/world/area_kmr/kmr_23/kmr_23.h @@ -18,8 +18,8 @@ #include "sprite/npc/WorldKalmar.h" enum { - NPC_StarSpirit = 0, - NPC_AuxSpirit = 1, + NPC_StarSpirit = 0, + NPC_AuxSpirit = 1, }; enum { diff --git a/src/world/area_kmr/kmr_30/kmr_30.h b/src/world/area_kmr/kmr_30/kmr_30.h index 5bd5ab3b98..f92a50a5ba 100644 --- a/src/world/area_kmr/kmr_30/kmr_30.h +++ b/src/world/area_kmr/kmr_30/kmr_30.h @@ -12,7 +12,7 @@ #include "sprite/npc/ParadePeach.h" enum { - NPC_ParadePeach = 0, + NPC_ParadePeach = 0, }; #define NAMESPACE kmr_30 diff --git a/src/world/area_mac/mac.h b/src/world/area_mac/mac.h index 030b56b66a..eed474ee97 100644 --- a/src/world/area_mac/mac.h +++ b/src/world/area_mac/mac.h @@ -2,31 +2,52 @@ #define _WORLD_AREA_MAC_MAC_H_ enum { - AB_MAC_0 = AreaByte(0), - AB_MAC_1 = AreaByte(1), - AB_MAC_2 = AreaByte(2), - AB_MAC_3 = AreaByte(3), - AB_MAC_4 = AreaByte(4), - AB_MAC_5 = AreaByte(5), - AB_MAC_6 = AreaByte(6), - AB_MAC_7 = AreaByte(7), - AB_MAC_8 = AreaByte(8), - AB_MAC_9 = AreaByte(9), - AB_MAC_A = AreaByte(10), - AB_MAC_B = AreaByte(11), - AB_MAC_C = AreaByte(12), - AB_MAC_D = AreaByte(13), - AB_MAC_E = AreaByte(14), - AB_MAC_F = AreaByte(15), + AB_MAC_0 = AreaByte(0), + AB_MAC_1 = AreaByte(1), + AB_MAC_2 = AreaByte(2), + AB_MAC_3 = AreaByte(3), + AB_MAC_4 = AreaByte(4), + AB_MAC_5 = AreaByte(5), + AB_MAC_6 = AreaByte(6), + AB_MAC_7 = AreaByte(7), + AB_MAC_8 = AreaByte(8), + AB_MAC_9 = AreaByte(9), + AB_MAC_A = AreaByte(10), + AB_MAC_B = AreaByte(11), + AB_MAC_C = AreaByte(12), + AB_MAC_D = AreaByte(13), + AB_MAC_E = AreaByte(14), + AB_MAC_F = AreaByte(15), }; enum { - AF_MAC_20 = AreaFlag(32), - AF_MAC_21 = AreaFlag(33), - AF_MAC_22 = AreaFlag(34), - AF_MAC_23 = AreaFlag(35), - AF_MAC_24 = AreaFlag(36), - AF_MAC_25 = AreaFlag(37), + AF_MAC_01 = AreaFlag(1), + AF_ExitingToybox = AreaFlag(2), + AF_MAC_16 = AreaFlag(22), + AF_MAC_17 = AreaFlag(23), + AF_MAC_18 = AreaFlag(24), + AF_MAC_19 = AreaFlag(25), + AF_MAC_1A = AreaFlag(26), + AF_MAC_1B = AreaFlag(27), + AF_MAC_1C = AreaFlag(28), + AF_MAC_1D = AreaFlag(29), + AF_MAC_1E = AreaFlag(30), + AF_MAC_20 = AreaFlag(32), + AF_MAC_21 = AreaFlag(33), + AF_MAC_22 = AreaFlag(34), + AF_MAC_23 = AreaFlag(35), + AF_MAC_24 = AreaFlag(36), + AF_MAC_25 = AreaFlag(37), + AF_MAC_2D = AreaFlag(45), + AF_MAC_2E = AreaFlag(46), + AF_MAC_30 = AreaFlag(48), + AF_MAC_31 = AreaFlag(49), + AF_MAC_32 = AreaFlag(50), + AF_MAC_38 = AreaFlag(56), + AF_MAC_3D = AreaFlag(61), + AF_MAC_3E = AreaFlag(62), + AF_MAC_3F = AreaFlag(63), + AF_MAC_44 = AreaFlag(68), }; extern MapSettings machi_settings; @@ -38,4 +59,6 @@ extern MapSettings mac_04_settings; extern MapSettings mac_05_settings; extern MapSettings mac_06_settings; +s32 mac_04_map_init(void); + #endif diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 9a0bb48d90..7cd5320b34 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -566,7 +566,7 @@ ApiStatus func_80245028_8058A8(Evt* script, s32 isInitialCall) { menu->numEntries = numEntries; menu->initialPos = D_80262F68; create_popup_menu(menu); - func_800E98C4(); + status_menu_respond_to_changes(); close_status_menu(); script->functionTemp[0] = 0; } @@ -632,7 +632,7 @@ ApiStatus func_8024522C_805AAC(Evt* script, s32 isInitialCall) { menu->numEntries = numEntries; menu->initialPos = 0; create_popup_menu(menu); - func_800E98C4(); + status_menu_respond_to_changes(); close_status_menu(); script->functionTemp[0] = 0; } diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c deleted file mode 100644 index c8ac4b30ff..0000000000 --- a/src/world/area_mac/mac_02/8232C0.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "mac_02.h" - -static char* N(exit_str_0) = "mac_04"; -static char* N(exit_str_1) = "mim_10"; -static char* N(exit_str_2) = "mac_01"; -static char* N(exit_str_3) = "mac_03"; -static char* N(exit_str_4) = "tik_06"; -static char* N(exit_str_5) = "tik_15"; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_mac/mac_02/8238B0.c b/src/world/area_mac/mac_02/8238B0.c deleted file mode 100644 index 32a28f9fc7..0000000000 --- a/src/world/area_mac/mac_02/8238B0.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "mac_02.h" -#include "model.h" - -ApiStatus func_802405F0_8238B0(Evt* script, s32 isInitialCall) { - Npc* npc; - s32 i; - - func_8011B950(71, -1, 1, 1); - set_background_color_blend(0, 0, 0, 255); - gCameras[CAM_DEFAULT].bgColor[0] = 0; - gCameras[CAM_DEFAULT].bgColor[1] = 0; - gCameras[CAM_DEFAULT].bgColor[2] = 0; - - for (i = 0; i < MAX_NPCS; i++) { - npc = get_npc_by_index(i); - if (npc != NULL) { - if (npc->flags != 0 && npc->npcID != NPC_PARTNER) { - npc->flags |= NPC_FLAG_NO_DROPS; - } - } - } - - return ApiStatus_DONE2; -} diff --git a/src/world/area_mac/mac_02/823970.c b/src/world/area_mac/mac_02/823970.c deleted file mode 100644 index 392ca5dcb9..0000000000 --- a/src/world/area_mac/mac_02/823970.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "mac_02.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_mac/mac_02/823BB0.c b/src/world/area_mac/mac_02/823BB0.c deleted file mode 100644 index 81f74e4289..0000000000 --- a/src/world/area_mac/mac_02/823BB0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "mac_02.h" - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c deleted file mode 100644 index 10eda81126..0000000000 --- a/src/world/area_mac/mac_02/823BF0.c +++ /dev/null @@ -1,130 +0,0 @@ -#include "mac_02.h" - -#define CHUCK_QUIZMO_NPC_ID 12 - -#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" - -extern s32 N(Quizmo_Worker); -extern s32 N(Quizmo_AnswerResult); -extern EffectInstance* N(Quizmo_StageEffect); -extern EffectInstance* N(Quizmo_AudienceEffect); -extern EffectInstance* N(Quizmo_VannaTEffect); -extern s32 N(ItemChoice_HasSelectedItem); -extern s32 N(ItemChoice_SelectedItemID); -extern s32 D_8024EA10; -extern s32 D_8024EA14; - -#include "world/common/atomic/Quizmo.inc.c" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -// needs data migration, matching otherwise -#ifdef NON_MATCHING -s32 mac_02_ItemChoice_SelectedItemID = 0; - -ApiStatus func_80242A80_825D40(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - if (isInitialCall) { - mac_02_ItemChoice_HasSelectedItem = 0; - } - if (mac_02_ItemChoice_HasSelectedItem != 0) { - mac_02_ItemChoice_HasSelectedItem = 0; - evt_set_variable(script, args[0], mac_02_ItemChoice_SelectedItemID); - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} -#else -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40); -#endif - -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++); - N(ItemChoice_HasSelectedItem) = TRUE; - return ApiStatus_DONE2; -} - -extern s32 mac_02_D_8024E570[]; - -ApiStatus func_80242B0C_825DCC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (ptr != NULL) { - for (i = 0; ptr[i] != 0; i++) { - mac_02_D_8024E570[i] = ptr[i]; - } - mac_02_D_8024E570[i] = 0; - } else { - for (i = 0; i < 112; i++) { - mac_02_D_8024E570[i] = i + 16; - mac_02_D_8024E570[112] = 0; - } - } - return ApiStatus_DONE2; -} - -extern s32 mac_02_D_8024E738[]; -extern s32 mac_02_D_8024E8A8[]; - -ApiStatus func_80242BA8_825E68(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (ptr != NULL) { - for (i = 0; ptr[i] != 0; i++) { - mac_02_D_8024E738[i] = ptr[i]; - } - mac_02_D_8024E738[i] = 0; - } else { - for (i = 0; i < 91; i++) { - mac_02_D_8024E738[i] = i + 128; - mac_02_D_8024E738[91] = 0; - } - } - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242C44_825F04); - -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242DBC_82607C); - -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242F60_826220); - -ApiStatus func_80243040_826300(Evt* script, s32 isInitialCall) { - Bytecode args = *script->ptrReadPos; - - evt_set_variable(script, args++, get_item_count()); - - return ApiStatus_DONE2; -} - -ApiStatus func_80243088_826348(Evt* script, s32 isInitialCall) { - Bytecode args = *script->ptrReadPos; - - evt_set_variable(script, args++, get_item_empty_count()); - - return ApiStatus_DONE2; -} - -ApiStatus func_802430D0_826390(Evt* script, s32 isInitialCall) { - s32 i; - - for (i = 0; i < 91; i++) { - mac_02_D_8024E8A8[i] = i + 128; - } - mac_02_D_8024E8A8[i] = 0; - - return ApiStatus_DONE2; -} - -extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/todo/LetterDelivery.inc.c" - -#include "world/common/atomic/MonitorMusicProximityTrigger.inc.c" diff --git a/src/world/area_mac/mac_02/mac_02.h b/src/world/area_mac/mac_02/mac_02.h index ea7b1379f0..219fd51e80 100644 --- a/src/world/area_mac/mac_02/mac_02.h +++ b/src/world/area_mac/mac_02/mac_02.h @@ -2,8 +2,51 @@ /// @brief Toad Town - Southern District #include "common.h" -#include "../mac.h" #include "message_ids.h" #include "map.h" +#include "../mac.h" +#include "mapfs/mac_02_shape.h" +#include "mapfs/mac_02_hit.h" + +#include "sprite/npc/TayceT.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/FiceT.h" +#include "sprite/npc/ShyGuy.h" + +enum { + NPC_TayceT = 0, + NPC_FiceT = 1, + NPC_Bubulb = 2, + NPC_Toad_01 = 3, + NPC_CookingApprentice = 4, + NPC_Toad_02 = 5, + NPC_ToadKid = 6, + NPC_Toad_03 = 7, + NPC_Toad_04 = 8, + NPC_Bootler = 9, + NPC_ShyGuy = 11, + NPC_ChuckQuizmo = 12, +}; + +enum { + MV_BlueHouseLockEntityID = MapVar(0), +}; + +enum { + MF_MusicMixTrigger1 = MapFlag(10), + MF_MusicMixTrigger2 = MapFlag(11), +}; + #define NAMESPACE mac_02 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupMusicTriggers); +extern EvtScript N(EVS_SetupRooms); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(NpcGroup1); +extern NpcGroupList N(NpcGroup3); +extern NpcGroupList N(NpcGroup4); diff --git a/src/world/area_mac/mac_02/mac_02_0_header.c b/src/world/area_mac/mac_02/mac_02_0_header.c new file mode 100644 index 0000000000..3255d2f8ff --- /dev/null +++ b/src/world/area_mac/mac_02/mac_02_0_header.c @@ -0,0 +1,18 @@ +#include "mac_02.h" + +EntryList N(Entrances) = { + [mac_02_ENTRY_0] { -600.0, 0.0, 0.0, 90.0 }, + [mac_02_ENTRY_1] { 600.0, 0.0, 0.0, 270.0 }, + [mac_02_ENTRY_2] { 0.0, 0.0, -600.0, 180.0 }, + [mac_02_ENTRY_3] { 0.0, 0.0, 600.0, 0.0 }, + [mac_02_ENTRY_4] { -450.0, 30.0, 245.0, 90.0 }, + [mac_02_ENTRY_5] { -460.0, 50.0, -270.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mac_02 }, +}; diff --git a/src/world/area_mac/mac_02/mac_02_1_music.c b/src/world/area_mac/mac_02/mac_02_1_music.c new file mode 100644 index 0000000000..a2bf0f172e --- /dev/null +++ b/src/world/area_mac/mac_02/mac_02_1_music.c @@ -0,0 +1,12 @@ +#include "mac_02.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_INVASION, 0, 8) + EVT_CASE_DEFAULT + EVT_EXEC(N(EVS_SetupMusicTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/mac_02_2_main.c b/src/world/area_mac/mac_02/mac_02_2_main.c new file mode 100644 index 0000000000..6a82c77dd0 --- /dev/null +++ b/src/world/area_mac/mac_02/mac_02_2_main.c @@ -0,0 +1,117 @@ +#include "mac_02.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_mac_04_0) = EVT_EXIT_WALK(60, mac_02_ENTRY_0, "mac_04", mac_04_ENTRY_0); +EvtScript N(EVS_ExitWalk_mim_10_0) = EVT_EXIT_WALK(60, mac_02_ENTRY_1, "mim_10", mim_10_ENTRY_0); +EvtScript N(EVS_ExitWalk_mac_01_3) = EVT_EXIT_WALK(60, mac_02_ENTRY_2, "mac_01", mac_01_ENTRY_3); +EvtScript N(EVS_ExitWalk_mac_03_0) = EVT_EXIT_WALK(60, mac_02_ENTRY_3, "mac_03", mac_03_ENTRY_0); + +EvtScript N(EVS_GotoMap_tik_06_3) = { + EVT_CALL(GotoMap, EVT_PTR("tik_06"), tik_06_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_tik_15_1) = { + EVT_CALL(GotoMap, EVT_PTR("tik_15"), tik_15_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupPipe) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_SET(LVarA, LVar0) + EVT_SET(LVarB, LVar1) + EVT_SET(LVarC, LVar2) + EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mac_04_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mim_10_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mac_01_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mac_03_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_SET(LVar0, mac_02_ENTRY_4) + EVT_SET(LVar1, COLLIDER_deilip) + EVT_SET(LVar2, EVT_PTR(N(EVS_GotoMap_tik_06_3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SetupPipe)), TRIGGER_FLOOR_TOUCH, LVar1, 1, 0) + EVT_SET(LVar0, mac_02_ENTRY_5) + EVT_SET(LVar1, COLLIDER_deilid) + EVT_SET(LVar2, EVT_PTR(N(EVS_GotoMap_tik_15_1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SetupPipe)), TRIGGER_FLOOR_TOUCH, LVar1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_SET(GB_StoryProgress, STORY_CH5_RETURNED_TO_TOAD_TOWN) + EVT_END_IF + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SET(AF_MAC_16, FALSE) + EVT_SET(AF_MAC_17, FALSE) + EVT_SET(AF_MAC_18, FALSE) + EVT_SET(AF_MAC_19, FALSE) + EVT_SET(AF_MAC_1A, FALSE) + EVT_SET(AF_MAC_1B, FALSE) + EVT_SET(AF_MAC_1C, FALSE) + EVT_SET(AF_MAC_1D, FALSE) + EVT_SET(AF_MAC_1E, FALSE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(NpcGroup4))) + EVT_CASE_LT(STORY_CH3_SAW_BOO_ENTER_FOREST) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(NpcGroup1))) + EVT_CASE_LT(STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(NpcGroup4))) + EVT_CASE_LT(STORY_CH4_RETURNED_TOY_TRAIN) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(NpcGroup3))) + EVT_CASE_DEFAULT + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(NpcGroup4))) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CALL(EnableGroup, MODEL_st2, FALSE) + EVT_CALL(EnableGroup, MODEL_st3, FALSE) + EVT_CASE_LT(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CALL(EnableGroup, MODEL_st1, FALSE) + EVT_CALL(EnableGroup, MODEL_st3, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_st1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CASE_DEFAULT + EVT_CALL(EnableGroup, MODEL_st1, FALSE) + EVT_CALL(EnableGroup, MODEL_st2, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g47, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_SWITCH + EVT_CALL(EnableTexPanning, MODEL_hori, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 100, 40, 200, -40) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_EXEC(N(EVS_SetupRooms)) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_LE(LVar0, mac_02_ENTRY_3) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_ELSE + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/mac_02_3_rooms.c b/src/world/area_mac/mac_02/mac_02_3_rooms.c new file mode 100644 index 0000000000..ab87f8e728 --- /dev/null +++ b/src/world/area_mac/mac_02/mac_02_3_rooms.c @@ -0,0 +1,141 @@ +#include "mac_02.h" +#include "model.h" + +API_CALLABLE(N(InitEntryFromTunnels)) { + Npc* npc; + s32 i; + + func_8011B950(MODEL_souko, -1, 1, 1); + set_background_color_blend(0, 0, 0, 255); + gCameras[CAM_DEFAULT].bgColor[0] = 0; + gCameras[CAM_DEFAULT].bgColor[1] = 0; + gCameras[CAM_DEFAULT].bgColor[2] = 0; + + for (i = 0; i < MAX_NPCS; i++) { + npc = get_npc_by_index(i); + if (npc != NULL) { + if (npc->flags != 0 && npc->npcID != NPC_PARTNER) { + npc->flags |= NPC_FLAG_NO_DROPS; + } + } + } + + return ApiStatus_DONE2; +} + + +EvtScript N(EVS_SetDoorRot_TayceT) = { + EVT_CALL(RotateModel, MODEL_c_door, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_TayceT) = { + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_ck1, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_ck2, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_ck3, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_cy1, LVar1, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_cy2, LVar1, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_cy3, LVar1, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_TayceT) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_cook_in, 1) + EVT_SET(MF_MusicMixTrigger1, TRUE) + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_cook_in, 0) + EVT_SET(MF_MusicMixTrigger1, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetDoorRot_BlueHouse) = { + EVT_CALL(RotateModel, MODEL_sk_door, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_BlueHouse) = { + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_sk1, LVar1, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_sk2, LVar1, 0, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_BlueHouse) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_IF_EQ(GF_MAC02_UnlockedHouse, FALSE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_LockedFromInside, 160, 40) + EVT_SET(LVar0, -1) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetGroupEnabled, MODEL_souko_in, 1) + EVT_CASE_EQ(2) + EVT_IF_EQ(GF_MAC02_UnlockedHouse, FALSE) + EVT_SET(LVar0, -1) + EVT_RETURN + EVT_END_IF + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_souko_in, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +s32 N(InsideNPCs_TayceT)[] = { + NPC_TayceT, + -1 +}; + +s32 N(InsideNPCs_BlueHouse)[] = { + -1 +}; + +EvtScript N(EVS_SetupRooms) = { + // tayce T's house on the right + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_2), + EVT_PTR(N(EVS_SetDoorRot_TayceT)), + EVT_PTR(N(EVS_MoveWalls_TayceT)), + NULL, + EVT_PTR(N(EVS_ToggleVis_TayceT)), + COLLIDER_deilit1u, + COLLIDER_deilit1, + MODEL_cooking, + EVT_PTR(N(InsideNPCs_TayceT))) + // blue house on the left + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_2), + EVT_PTR(N(EVS_SetDoorRot_BlueHouse)), + EVT_PTR(N(EVS_MoveWalls_BlueHouse)), + NULL, + EVT_PTR(N(EVS_ToggleVis_BlueHouse)), + COLLIDER_deilit2, + COLLIDER_deilit2u, + MODEL_souko, + EVT_PTR(N(InsideNPCs_BlueHouse))) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_02_ENTRY_5) + EVT_SET(LVar0, 3) + EVT_EXEC(N(EVS_ToggleVis_TayceT)) + EVT_CALL(SetGroupEnabled, MODEL_souko_in, 1) + EVT_CALL(N(InitEntryFromTunnels)) + EVT_SET(LVar0, 90) + EVT_CALL(RotateModel, MODEL_sk1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_sk2, LVar0, 0, 0, 1) + EVT_ELSE + EVT_SET(LVar0, 3) + EVT_EXEC(N(EVS_ToggleVis_TayceT)) + EVT_EXEC(N(EVS_ToggleVis_BlueHouse)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/mac_02_4_foliage.c b/src/world/area_mac/mac_02/mac_02_4_foliage.c new file mode 100644 index 0000000000..d66f344e36 --- /dev/null +++ b/src/world/area_mac/mac_02/mac_02_4_foliage.c @@ -0,0 +1,130 @@ +#include "mac_02.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o417); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o213); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { 83.0f, 130.0f, -541.0f }, + { 123.0f, 130.0f, -551.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 98.0f, 20.0f, -531.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o115); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o423); + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { -337.0f, 104.0f, -198.0f }, + { -297.0f, 104.0f, -208.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -323.0f, 20.0f, -190.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o415); +FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o420); + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { 584.0f, 125.0f, -70.0f }, + { 624.0f, 125.0f, -80.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .vectors = &N(Tree3_Effects), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 598.0f, 0.0f, -67.0f }, + .radius = 0.0f +}; + +FoliageModelList N(UnusedTree_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o419); +FoliageModelList N(UnusedTree_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o116); + +FoliageVectorList N(UnusedTree_Effects) = { + .count = 2, + .vectors = { + { -624.0f, 80.0f, -166.0f }, + { -584.0f, 80.0f, -176.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_UnusedTree) = { + .leaves = &N(UnusedTree_LeafModels), + .trunk = &N(UnusedTree_TrunkModels), + .vectors = &N(UnusedTree_Effects), +}; + +BombTrigger N(BombPos_UnusedTree) = { + .pos = { -608.0f, 20.0f, -156.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree4_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o414); +FoliageModelList N(Tree4_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o421); + +FoliageVectorList N(Tree4_Effects) = { + .count = 2, + .vectors = { + { 235.0f, 80.0f, 543.0f }, + { 275.0f, 80.0f, 533.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree4) = { + .leaves = &N(Tree4_LeafModels), + .trunk = &N(Tree4_TrunkModels), + .vectors = &N(Tree4_Effects), +}; + +BombTrigger N(BombPos_Tree4) = { + .pos = { 351.0f, 20.0f, 555.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o409, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o361, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o370, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree4))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o378, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree4)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/mac_02_5_entity.c b/src/world/area_mac/mac_02/mac_02_5_entity.c new file mode 100644 index 0000000000..31c644a32c --- /dev/null +++ b/src/world/area_mac/mac_02/mac_02_5_entity.c @@ -0,0 +1,67 @@ +#include "mac_02.h" +#include "entity.h" + +#include "world/common/todo/RemovePadlock.inc.c" + +s32 N(ItemList_OddKey)[] = { + ITEM_ODD_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_ChooseItem_OddKey) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_269, 0, -470, 30, -155) + EVT_SET(LVar0, MV_BlueHouseLockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_WAIT(5) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_MAC02_UnlockedHouse, TRUE) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ReadSign) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_016B, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnInspect_StreetSign) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0171, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_02_ENTRY_5) + EVT_IF_EQ(GF_MAC02_UnlockedHouse, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -470, 30, -155, 180, MAKE_ENTITY_END) + EVT_SET(MV_BlueHouseLockEntityID, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ChooseItem_OddKey)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(ItemList_OddKey)), 0, 1) + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeItemEntity, ITEM_ODD_KEY, -412, 20, -320, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_MAC02_Item_OddKey) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 400, 0, 100, 0, MODEL_o236, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_MAC02_HiddenPanel) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), -375, 0, 190, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_ReadSign))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspect_StreetSign)), TRIGGER_WALL_PRESS_A, COLLIDER_sign, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/mac_02_6_npc.c b/src/world/area_mac/mac_02/mac_02_6_npc.c new file mode 100644 index 0000000000..a41e57492d --- /dev/null +++ b/src/world/area_mac/mac_02/mac_02_6_npc.c @@ -0,0 +1,273 @@ +#include "mac_02.h" + +#include "world/common/npc/Toad_Wander.inc.c" +#include "world/common/npc/Toad_Patrol.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" +#include "world/common/npc/Bootler.inc.c" +#include "world/common/npc/Bubulb.inc.c" + +#define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo +#include "world/common/complete/Quizmo.inc.c" + +MAP_STATIC_PAD(1,key_choice); +#include "world/common/complete/KeyItemChoice.inc.c" +MAP_STATIC_PAD(1,item_choice); +#include "world/common/complete/NormalItemChoice.inc.c" + +#include "npc/tayce_t.inc.c" + +#include "world/common/complete/LetterDelivery.inc.c" + +#include "npc/fice_t.inc.c" +#include "npc/bootler.inc.c" +#include "npc/shyguy_thief.inc.c" +#include "npc/toad_1.inc.c" +#include "npc/cooking_apprentice.inc.c" +#include "npc/toad_2.inc.c" +#include "npc/toad_kid.inc.c" +#include "npc/toad_3.inc.c" +#include "npc/toad_4.inc.c" +#include "npc/bubulb.inc.c" + +s32 N(D_8024CB04_82FDC4)[] = { + ANIM_TayceT_Still, + ANIM_TayceT_Idle, + ANIM_TayceT_Walk, + ANIM_TayceT_Idle, + ANIM_TayceT_Talk, + ANIM_TayceT_TalkHappy, + ANIM_TayceT_IdleSad, + ANIM_TayceT_Cooking, + ANIM_TayceT_TurnBack, + -1 +}; + +s32 N(D_8024CB2C_82FDEC)[] = { + ANIM_Bubulb_Pink_Still, + ANIM_Bubulb_Pink_BuriedStill, + ANIM_Bubulb_Pink_Idle, + ANIM_Bubulb_Pink_Talk, + ANIM_Bubulb_Pink_PopUp, + ANIM_Bubulb_Pink_BuriedIdle, + -1 +}; + +StaticNpc N(NpcData_TayceT)[] = { + { + .id = NPC_TayceT, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -217.0f, 20.0f, -434.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_TayceT), + .drops = TOAD_DROPS, + .animations = { + .idle = ANIM_TayceT_Idle, + }, + .extraAnimations = N(D_8024CB04_82FDC4), + .tattle = MSG_NpcTattle_TayceT, + }, + { + .id = NPC_FiceT, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 389.0f, 0.0f, -90.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_FiceT), + .drops = TOAD_DROPS, + .animations = { + .idle = ANIM_FiceT_Idle, + }, + .tattle = MSG_NpcTattle_FiceT, + }, + { + .id = NPC_Bubulb, + .settings = &N(NpcSettings_Bubulb), + .pos = { 150.0f, 20.0f, 500.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Bubulb), + .drops = BUBULB_DROPS, + .animations = BUBULB_PINK_ANIMS, + .extraAnimations = N(D_8024CB2C_82FDEC), + .tattle = MSG_NpcTattle_MAC_Bubulb_Revealed, + }, + { + .id = NPC_Toad_01, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { 40.0f, 0.0f, -60.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_01), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -50, 0, 0 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 10 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + .tattle = MSG_NpcTattle_MAC_HardWorker, + }, + { + .id = NPC_CookingApprentice, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -26.0f, 0.0f, -220.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_CookingApprentice), + .drops = TOADETTE_DROPS, + .animations = TOADETTE_PURPLE_ANIMS, + .tattle = MSG_NpcTattle_MAC_CookingApprentice, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -350.0f, 20.0f, -140.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_02), + .drops = TOAD_DROPS, + .animations = TOAD_GREEN_ANIMS, + .tattle = MSG_NpcTattle_MAC_CantKeepQuiet, + }, + { + .id = NPC_ToadKid, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { 180.0f, 20.0f, -435.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ToadKid), + .drops = TOAD_KID_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 180, 20, -435 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 180, 20, -435 }, + .detectSize = { 10 }, + } + }, + .animations = TOAD_KID_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_MAC_FickleDreamer, + }, + { + .id = NPC_Toad_03, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { -160.0f, 0.0f, 25.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_03), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -50, 0, 0 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 10 }, + } + }, + .animations = TOAD_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_MAC_PrettySmart, + }, + { + .id = NPC_Toad_04, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -80.0f, 0.0f, 300.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_MAC_PetBoaster, + }, +}; + +StaticNpc N(NpcData_Bootler) = { + .id = NPC_Bootler, + .settings = &N(NpcSettings_Bootler), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Bootler), + .drops = BOOTLER_DROPS, + .animations = BOOTLER_ANIMS, +}; + +s32 N(D_8024DEA8_831168)[] = { + ANIM_ShyGuy_Red_Anim00, + ANIM_ShyGuy_Red_Anim01, + ANIM_ShyGuy_Red_Anim02, + ANIM_ShyGuy_Red_Anim03, + ANIM_ShyGuy_Red_Anim11, + ANIM_ShyGuy_Red_Anim02, + ANIM_ShyGuy_Red_Anim04, + -1 +}; + +StaticNpc N(NpcData_ShyGuy) = { + .id = NPC_ShyGuy, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Red_Anim01, + .walk = ANIM_ShyGuy_Red_Anim02, + .run = ANIM_ShyGuy_Red_Anim03, + .chase = ANIM_ShyGuy_Red_Anim03, + .anim_4 = ANIM_ShyGuy_Red_Anim01, + .anim_5 = ANIM_ShyGuy_Red_Anim01, + .death = ANIM_ShyGuy_Red_Anim0C, + .hit = ANIM_ShyGuy_Red_Anim0C, + .anim_8 = ANIM_ShyGuy_Red_Anim15, + .anim_9 = ANIM_ShyGuy_Red_Anim12, + .anim_A = ANIM_ShyGuy_Red_Anim11, + .anim_B = ANIM_ShyGuy_Red_Anim10, + .anim_C = ANIM_ShyGuy_Red_Anim05, + .anim_D = ANIM_ShyGuy_Red_Anim01, + .anim_E = ANIM_ShyGuy_Red_Anim01, + .anim_F = ANIM_ShyGuy_Red_Anim01, + }, + .extraAnimations = N(D_8024DEA8_831168), +}; + +NpcGroupList N(NpcGroup4) = { + NPC_GROUP(N(NpcData_TayceT)), + {} +}; + +NpcGroupList N(NpcGroup1) = { + NPC_GROUP(N(NpcData_TayceT)), + NPC_GROUP(N(NpcData_Bootler)), + {} +}; + +NpcGroupList N(NpcGroup3) = { + NPC_GROUP(N(NpcData_ShyGuy)), + NPC_GROUP(N(NpcData_TayceT)), + {} +}; diff --git a/src/world/area_mac/mac_02/mac_02_7_music_mix.c b/src/world/area_mac/mac_02/mac_02_7_music_mix.c new file mode 100644 index 0000000000..a616738dfe --- /dev/null +++ b/src/world/area_mac/mac_02/mac_02_7_music_mix.c @@ -0,0 +1,32 @@ +#include "mac_02.h" + +#include "world/common/atomic/MonitorMusicProximityTrigger.inc.c" + +MusicProximityTrigger N(MusicMixTrigger1) = { + .pos = { -150.0f, -205.0f }, + .innerDist = 120.0f, + .outerDist = 150.0f, + .unk = 1, + .manualActivationFlag = MF_MusicMixTrigger1, +}; + +MusicProximityTrigger N(MusicMixTrigger2) = { + .pos = { -400.0f, 250.0f }, + .innerDist = 110.0f, + .outerDist = 130.0f, + .unk = 4, + .manualActivationFlag = MF_MusicMixTrigger2, +}; + +EvtScript N(EVS_SetupMusicTriggers) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN, 0, 8) + EVT_CALL(EnableMusicProximityMix, 0) + EVT_THREAD + EVT_CALL(N(MonitorMusicProximityTrigger), EVT_PTR(N(MusicMixTrigger1))) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(MonitorMusicProximityTrigger), EVT_PTR(N(MusicMixTrigger2))) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/bootler.inc.c b/src/world/area_mac/mac_02/npc/bootler.inc.c new file mode 100644 index 0000000000..9eb1c4a75d --- /dev/null +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -0,0 +1,130 @@ +EvtScript N(D_8024ACA4_82DF64) = { + EVT_IF_EQ(LVar0, EVT_FLOAT(0.0)) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, 0) + EVT_SETF(LVar1, EVT_FLOAT(24.0)) + EVT_ELSE + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, 0) + EVT_SETF(LVar1, EVT_FLOAT(-24.0)) + EVT_END_IF + EVT_LOOP(10) + EVT_ADDF(LVar0, LVar1) + EVT_CALL(func_802CFD30, 9, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Bootler) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_SET(LVar0, 0) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_SWITCH(LVar3) + EVT_CASE_RANGE(-52, 47) + EVT_ADD(LVar0, 1) + EVT_END_SWITCH + EVT_IF_GT(LVar1, 140) + EVT_ADD(LVar0, 1) + EVT_END_IF + EVT_IF_EQ(LVar0, 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Bridge_0022, 400, 100) + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_SELF, 430, 60, -40) + EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 580, -40, 0) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_END_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 430, 1, 35) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 430, 1, 35) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-10.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(PlayerMoveTo, 430, -40, 0) + EVT_CALL(InterpPlayerYaw, 315, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 455, -40, 20) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 315, 0) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0, MSG_MAC_Bridge_0023) + EVT_CALL(ShowChoice, MSG_Choice_0036) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar1, MSG_MAC_Bridge_0024) + EVT_ELSE + EVT_SET(LVar1, MSG_MAC_Bridge_0025) + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0, LVar1) + EVT_WAIT(20) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Spook) + EVT_CALL(func_802CFD30, -1, 7, 0, 0, 0, 0) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_CALL(SetNpcPos, NPC_SELF, 500, 50, 30) + EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 5, MSG_MAC_Bridge_0026) + EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_WAIT(25) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(2.0), EVT_FLOAT(2.0), EVT_FLOAT(2.0)) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_CALL(SetNpcPos, NPC_SELF, 360, 20, 30) + EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 5, MSG_MAC_Bridge_0027) + EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_WAIT(25) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) + EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetNpcPos, NPC_SELF, 480, 70, 10) + EVT_EXEC_WAIT(N(D_8024ACA4_82DF64)) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_293, 0) + EVT_CALL(NpcFlyTo, NPC_SELF, 550, 40, 10, 40, 10, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 5, MSG_MAC_Bridge_0028) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_WAIT(25) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_WAIT(40) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0, MSG_MAC_Bridge_0029) + EVT_EXEC(N(EVS_SetupMusicTriggers)) + EVT_SET(GB_StoryProgress, STORY_CH3_SAW_BOO_ENTER_FOREST) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bootler) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Bootler))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/bubulb.inc.c b/src/world/area_mac/mac_02/npc/bubulb.inc.c new file mode 100644 index 0000000000..bbc2afbddc --- /dev/null +++ b/src/world/area_mac/mac_02/npc/bubulb.inc.c @@ -0,0 +1,50 @@ +EvtScript N(EVS_NpcInteract_Bubulb) = { + EVT_IF_EQ(GF_MAC02_Gift_MagicalSeed1, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Bubulb_Pink_BuriedIdle, ANIM_Bubulb_Pink_BuriedIdle, 0, MSG_MAC_Bridge_0085) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Pink_PopUp) + EVT_WAIT(45) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Pink_Idle) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 45, 26) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Bubulb_Pink_Talk, ANIM_Bubulb_Pink_Idle, 0, MSG_MAC_Bridge_0086) + EVT_GIVE_KEY_REWARD(ITEM_MAGICAL_SEED1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Bubulb_Pink_Talk, ANIM_Bubulb_Pink_Idle, 0, MSG_MAC_Bridge_0087) + EVT_SET(GF_MAC02_Gift_MagicalSeed1, TRUE) + EVT_CALL(SetTattleMessage, NPC_Bubulb, MSG_NpcTattle_MAC_Bubulb_Revealed) + EVT_ELSE + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_STAR_SPRIT_DEPARTED) + EVT_CASE_LT(STORY_CH2_BEGAN_PEACH_MISSION) + EVT_SET(LVar0, MSG_MAC_Bridge_0088) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0089) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_008A) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_008B) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_008C) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_008D) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Bridge_008E) + EVT_CASE_DEFAULT + EVT_SET(LVar0, MSG_MAC_Bridge_008E) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_Bubulb, ANIM_Bubulb_Pink_Talk, ANIM_Bubulb_Pink_Idle, 0, LVar0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bubulb) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bubulb))) + EVT_IF_EQ(GF_MAC02_Gift_MagicalSeed1, FALSE) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 25, 25) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Pink_BuriedIdle) + EVT_CALL(SetTattleMessage, NPC_Bubulb, MSG_NpcTattle_MAC_Bubulb_Hidden) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/cooking_apprentice.inc.c b/src/world/area_mac/mac_02/npc/cooking_apprentice.inc.c new file mode 100644 index 0000000000..342b3a0b20 --- /dev/null +++ b/src/world/area_mac/mac_02/npc/cooking_apprentice.inc.c @@ -0,0 +1,46 @@ +EvtScript N(EVS_NpcInteract_CookingApprentice) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_004A) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Bridge_004B) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_004C) + EVT_CASE_LT(STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_SET(LVar0, MSG_MAC_Bridge_004D) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_004E) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC02_TayceT_HasCookbook, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_004F) + EVT_ELSE + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Bridge_0050) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0051) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Bridge_0052) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0053) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Bridge_0054) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0055) + EVT_END_SWITCH + EVT_END_IF + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Bridge_0056) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_CookingApprentice, ANIM_Toadette_Purple_Talk, ANIM_Toadette_Purple_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_CookingApprentice) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_CookingApprentice))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/fice_t.inc.c b/src/world/area_mac/mac_02/npc/fice_t.inc.c new file mode 100644 index 0000000000..cd5b606f2b --- /dev/null +++ b/src/world/area_mac/mac_02/npc/fice_t.inc.c @@ -0,0 +1,82 @@ +s32 N(LetterList_FiceT)[] = { + ITEM_LETTER07, + ITEM_NONE +}; + +EvtScript N(D_8024A8C8_82DB88) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_FiceT, ANIM_FiceT_Talk, ANIM_FiceT_Idle, + ITEM_LETTER07, ITEM_NONE, + MSG_MAC_Bridge_0036, MSG_MAC_Bridge_0037, MSG_MAC_Bridge_0038, 0, + EVT_PTR(N(LetterList_FiceT))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024A918_82DBD8) = { + EVT_IF_EQ(LVarC, 2) + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Talk, ANIM_FiceT_Idle, 0, MSG_MAC_Bridge_0039) + EVT_CALL(SetNpcAnimation, NPC_FiceT, ANIM_FiceT_Afraid) + EVT_CALL(EndSpeech, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0) + EVT_GIVE_STAR_PIECE() + EVT_CALL(SetNpcAnimation, NPC_FiceT, ANIM_FiceT_Idle) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_FiceT) = { + EVT_SET(LVar3, 0) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0021) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar3, 1) + EVT_SET(LVar0, MSG_MAC_Bridge_002A) + EVT_SET(LVar1, MSG_MAC_Bridge_002B) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_002C) + EVT_SET(LVar1, MSG_MAC_Bridge_002D) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_002E) + EVT_SET(LVar1, MSG_MAC_Bridge_002F) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0030) + EVT_SET(LVar1, MSG_MAC_Bridge_0031) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0032) + EVT_SET(LVar1, MSG_MAC_Bridge_0033) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Bridge_0034) + EVT_SET(LVar1, MSG_MAC_Bridge_0035) + EVT_END_SWITCH + EVT_CALL(GetCurrentPartnerID, LVar2) + EVT_IF_EQ(LVar2, PARTNER_BOW) + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0, LVar1) + EVT_ELSE + EVT_IF_EQ(LVar3, 0) + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Talk, ANIM_FiceT_Idle, 0, LVar0) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_FiceT, ANIM_FiceT_Afraid, ANIM_FiceT_Afraid, 0, LVar0) + EVT_END_IF + EVT_END_IF + EVT_EXEC_WAIT(N(D_8024A8C8_82DB88)) + EVT_EXEC_WAIT(N(D_8024A918_82DBD8)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_FiceT) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_FiceT_Afraid) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 390, 0, -50) + EVT_END_IF + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_FiceT))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c b/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c new file mode 100644 index 0000000000..9273fb46ac --- /dev/null +++ b/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c @@ -0,0 +1,87 @@ +EvtScript N(D_8024B5AC_82E86C) = { + EVT_CALL(GetNpcPos, NPC_ShyGuy, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 20) + EVT_CALL(MakeItemEntity, ITEM_FRYING_PAN, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(LVar9, LVar0) + EVT_WAIT(1) + EVT_LOOP(70) + EVT_CALL(GetNpcPos, NPC_ShyGuy, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 20) + EVT_CALL(SetItemPos, LVar9, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(RemoveItemEntity, LVar9) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024B6A0_82E960) = { + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_B0000021, 0) + EVT_WAIT(2) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024B6E8_82E9A8) = { + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 40) + EVT_IF_LT(LVar2, 180) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Bridge_0016, 160, 40) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(3.0), -140, 20, -140, 400, 15, -6) + EVT_CALL(SetNpcPos, NPC_ShyGuy, -200, 20, -260) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy, ANIM_ShyGuy_Red_Anim04) + EVT_WAIT(10) + EVT_EXEC(N(D_8024B5AC_82E86C)) + EVT_THREAD + EVT_CALL(EnableGroup, MODEL_cook_in, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit1u, SOUND_BASIC_DOOR_OPEN, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 8) + EVT_CALL(RotateModel, MODEL_c_door, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(5) + EVT_LOOP(10) + EVT_ADD(LVar0, -8) + EVT_CALL(RotateModel, MODEL_c_door, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit1u, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(EnableGroup, MODEL_cook_in, FALSE) + EVT_END_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_203F, 0) + EVT_EXEC_GET_TID(N(D_8024B6A0_82E960), LVarA) + EVT_CALL(SetNpcSpeed, NPC_ShyGuy, 8) + EVT_CALL(NpcMoveTo, NPC_ShyGuy, -140, -240, 0) + EVT_CALL(NpcMoveTo, NPC_ShyGuy, -140, -140, 0) + EVT_CALL(NpcJump0, NPC_ShyGuy, -140, 0, -100, 0) + EVT_CALL(NpcMoveTo, NPC_ShyGuy, -190, -20, 0) + EVT_CALL(NpcMoveTo, NPC_ShyGuy, -350, -20, 0) + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetNpcPos, NPC_ShyGuy, 0, -1000, 0) + EVT_SET(GB_StoryProgress, STORY_CH4_FRYING_PAN_STOLEN) + EVT_WAIT(10) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShyGuy) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_FRYING_PAN_STOLEN) + EVT_EXEC(N(D_8024B6E8_82E9A8)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/tayce_t.inc.c b/src/world/area_mac/mac_02/npc/tayce_t.inc.c new file mode 100644 index 0000000000..896d401ede --- /dev/null +++ b/src/world/area_mac/mac_02/npc/tayce_t.inc.c @@ -0,0 +1,836 @@ +// enum mapping itemIDs -> index in single recipe arrays and column/rows in double recipe matrix +enum CookingIngredientID { + iRSH = 0, // ITEM_MUSHROOM + iSSH = 1, // ITEM_SUPER_SHROOM + iUSH = 2, // ITEM_ULTRA_SHROOM + iLSH = 3, // ITEM_LIFE_SHROOM + iVSH = 4, // ITEM_VOLT_SHROOM + iFFL = 5, // ITEM_FIRE_FLOWER + iCOC = 6, // ITEM_COCONUT + iLIM = 7, // ITEM_LIME + iLEM = 8, // ITEM_LEMON + iHSY = 9, // ITEM_HONEY_SYRUP + iMSY = 10, // ITEM_MAPLE_SYRUP + iJAM = 11, // ITEM_JAMMIN_JELLY + iAPP = 12, // ITEM_APPLE + iRBY = 13, // ITEM_RED_BERRY + iBBY = 14, // ITEM_BLUE_BERRY + iYBY = 15, // ITEM_YELLOW_BERRY + iGMN = 16, // ITEM_GOOMNUT + iKLF = 17, // ITEM_KOOPA_LEAF + iDRP = 18, // ITEM_DRIED_PASTA + iDRF = 19, // ITEM_DRIED_FRUIT + iSLF = 20, // ITEM_STRANGE_LEAF + iMIX = 21, // ITEM_CAKE_MIX + iEGG = 22, // ITEM_EGG + iMEL = 23, // ITEM_MELON + iSTK = 24, // ITEM_STINKY_HERB + iPOT = 25, // ITEM_ICED_POTATO + iDSH = 26, // ITEM_DRIED_SHROOM + iBUB = 27, // ITEM_BUBBLE_BERRY + iBMP = 28, // ITEM_WHACKAS_BUMP + INPUT_END = 29, +}; + +// enum mapping cooking result to itemID/quality rating +enum CookingResultID { + rXXX = 0, // ITEM_MISTAKE + rFRS = 1, // ITEM_FRIED_SHROOM + rSPS = 2, // ITEM_SPICY_SOUP + rTTN = 3, // ITEM_TASTY_TONIC + rNUT = 4, // ITEM_NUTTY_CAKE + rTEA = 5, // ITEM_KOOPA_TEA + rSPG = 6, // ITEM_SPAGHETTI + rDZD = 7, // ITEM_DIZZY_DIAL + rBCK = 8, // ITEM_BIG_COOKIE + rCAK = 9, // ITEM_CAKE + rFEG = 10, // ITEM_FRIED_EGG + rBEG = 11, // ITEM_BOILED_EGG + rSOD = 12, // ITEM_SUPER_SODA + rYCK = 13, // ITEM_YOSHI_COOKIE + rDLX = 14, // ITEM_DELUXE_FEAST + rFZF = 15, // ITEM_FROZEN_FRIES + rPOT = 16, // ITEM_POTATO_SALAD + rHOT = 17, // ITEM_HOT_SHROOM + rBLN = 18, // ITEM_BLAND_MEAL + rHSH = 19, // ITEM_HONEY_SHROOM + rMSH = 20, // ITEM_MAPLE_SHROOM + rJSH = 21, // ITEM_JELLY_SHROOM1 + rLSH = 22, // ITEM_LIFE_SHROOM + rVSH = 23, // ITEM_VOLT_SHROOM + rSLS = 24, // ITEM_SLEEPY_SHEEP + rSHC = 25, // ITEM_SHROOM_CAKE + rSHS = 26, // ITEM_SHROOM_STEAK + rHSU = 27, // ITEM_HONEY_SUPER + rMSU = 28, // ITEM_MAPLE_SUPER + rJSU = 29, // ITEM_JELLY_SUPER + rYUM = 30, // ITEM_YUMMY_MEAL + rHUL = 31, // ITEM_HONEY_ULTRA + rMUL = 32, // ITEM_MAPLE_ULTRA + rJUL = 33, // ITEM_JELLY_ULTRA + rSWS = 34, // ITEM_SWEET_SHROOM + rELP = 35, // ITEM_ELECTRO_POP + rTHR = 36, // ITEM_THUNDER_RAGE + rFIP = 37, // ITEM_FIRE_POP + rEGM = 38, // ITEM_EGG_MISSILE + rSSH = 39, // ITEM_SPECIAL_SHAKE + rCOP = 40, // ITEM_COCO_POP + rJUI = 41, // ITEM_HEALTHY_JUICE + rLIC = 42, // ITEM_LIME_CANDY + rLEC = 43, // ITEM_LEMON_CANDY + rHNC = 44, // ITEM_HONEY_CANDY + rJLP = 45, // ITEM_JELLY_POP + rPIE = 46, // ITEM_APPLE_PIE + rKOO = 47, // ITEM_KOOPASTA + rKCK = 48, // ITEM_KOOKY_COOKIE + rFFL = 49, // ITEM_FIRE_FLOWER + rSTR = 50, // ITEM_STRANGE_CAKE + RESULT_END = 51, +}; + +enum CookingResultQuality { + QUALITY_BAD = 0, + QUALITY_OK = 1, + QUALITY_GOOD = 2, + QUALITY_GREAT = 3, + QUALITY_ODD = 4, +}; + +s32 CookingIngredients[] = { + [iRSH] ITEM_MUSHROOM, + [iSSH] ITEM_SUPER_SHROOM, + [iUSH] ITEM_ULTRA_SHROOM, + [iLSH] ITEM_LIFE_SHROOM, + [iVSH] ITEM_VOLT_SHROOM, + [iFFL] ITEM_FIRE_FLOWER, + [iCOC] ITEM_COCONUT, + [iLIM] ITEM_LIME, + [iLEM] ITEM_LEMON, + [iHSY] ITEM_HONEY_SYRUP, + [iMSY] ITEM_MAPLE_SYRUP, + [iJAM] ITEM_JAMMIN_JELLY, + [iAPP] ITEM_APPLE, + [iRBY] ITEM_RED_BERRY, + [iBBY] ITEM_BLUE_BERRY, + [iYBY] ITEM_YELLOW_BERRY, + [iGMN] ITEM_GOOMNUT, + [iKLF] ITEM_KOOPA_LEAF, + [iDRP] ITEM_DRIED_PASTA, + [iDRF] ITEM_DRIED_FRUIT, + [iSLF] ITEM_STRANGE_LEAF, + [iMIX] ITEM_CAKE_MIX, + [iEGG] ITEM_EGG, + [iMEL] ITEM_MELON, + [iSTK] ITEM_STINKY_HERB, + [iPOT] ITEM_ICED_POTATO, + [iDSH] ITEM_DRIED_SHROOM, + [iBUB] ITEM_BUBBLE_BERRY, + [iBMP] ITEM_WHACKAS_BUMP, + [INPUT_END] -1 +}; + +typedef struct CookingResult { + /* 00 */ s32 quality; + /* 04 */ s32 itemID; +} CookingResult; // size = 0x8 + +CookingResult CookingResults[] = { + [rXXX] { QUALITY_BAD, ITEM_MISTAKE }, + [rFRS] { QUALITY_OK, ITEM_FRIED_SHROOM }, + [rSPS] { QUALITY_OK, ITEM_SPICY_SOUP }, + [rTTN] { QUALITY_OK, ITEM_TASTY_TONIC }, + [rNUT] { QUALITY_OK, ITEM_NUTTY_CAKE }, + [rTEA] { QUALITY_OK, ITEM_KOOPA_TEA }, + [rSPG] { QUALITY_OK, ITEM_SPAGHETTI }, + [rDZD] { QUALITY_ODD, ITEM_DIZZY_DIAL }, + [rBCK] { QUALITY_GOOD, ITEM_BIG_COOKIE }, + [rCAK] { QUALITY_OK, ITEM_CAKE }, + [rFEG] { QUALITY_OK, ITEM_FRIED_EGG }, + [rBEG] { QUALITY_OK, ITEM_BOILED_EGG }, + [rSOD] { QUALITY_OK, ITEM_SUPER_SODA }, + [rYCK] { QUALITY_OK, ITEM_YOSHI_COOKIE }, + [rDLX] { QUALITY_GREAT, ITEM_DELUXE_FEAST }, + [rFZF] { QUALITY_OK, ITEM_FROZEN_FRIES }, + [rPOT] { QUALITY_OK, ITEM_POTATO_SALAD }, + [rHOT] { QUALITY_OK, ITEM_HOT_SHROOM }, + [rBLN] { QUALITY_GOOD, ITEM_BLAND_MEAL }, + [rHSH] { QUALITY_OK, ITEM_HONEY_SHROOM }, + [rMSH] { QUALITY_OK, ITEM_MAPLE_SHROOM }, + [rJSH] { QUALITY_OK, ITEM_JELLY_SHROOM1 }, + [rLSH] { QUALITY_OK, ITEM_LIFE_SHROOM }, + [rVSH] { QUALITY_OK, ITEM_VOLT_SHROOM }, + [rSLS] { QUALITY_ODD, ITEM_SLEEPY_SHEEP }, + [rSHC] { QUALITY_OK, ITEM_SHROOM_CAKE }, + [rSHS] { QUALITY_OK, ITEM_SHROOM_STEAK }, + [rHSU] { QUALITY_OK, ITEM_HONEY_SUPER }, + [rMSU] { QUALITY_OK, ITEM_MAPLE_SUPER }, + [rJSU] { QUALITY_OK, ITEM_JELLY_SUPER }, + [rYUM] { QUALITY_GOOD, ITEM_YUMMY_MEAL }, + [rHUL] { QUALITY_OK, ITEM_HONEY_ULTRA }, + [rMUL] { QUALITY_OK, ITEM_MAPLE_ULTRA }, + [rJUL] { QUALITY_OK, ITEM_JELLY_ULTRA }, + [rSWS] { QUALITY_OK, ITEM_SWEET_SHROOM }, + [rELP] { QUALITY_OK, ITEM_ELECTRO_POP }, + [rTHR] { QUALITY_ODD, ITEM_THUNDER_RAGE }, + [rFIP] { QUALITY_OK, ITEM_FIRE_POP }, + [rEGM] { QUALITY_OK, ITEM_EGG_MISSILE }, + [rSSH] { QUALITY_GOOD, ITEM_SPECIAL_SHAKE }, + [rCOP] { QUALITY_OK, ITEM_COCO_POP }, + [rJUI] { QUALITY_GREAT, ITEM_HEALTHY_JUICE }, + [rLIC] { QUALITY_OK, ITEM_LIME_CANDY }, + [rLEC] { QUALITY_OK, ITEM_LEMON_CANDY }, + [rHNC] { QUALITY_OK, ITEM_HONEY_CANDY }, + [rJLP] { QUALITY_OK, ITEM_JELLY_POP }, + [rPIE] { QUALITY_OK, ITEM_APPLE_PIE }, + [rKOO] { QUALITY_OK, ITEM_KOOPASTA }, + [rKCK] { QUALITY_OK, ITEM_KOOKY_COOKIE }, + [rFFL] { QUALITY_ODD, ITEM_FIRE_FLOWER }, + [rSTR] { QUALITY_GOOD, ITEM_STRANGE_CAKE }, + [RESULT_END] { -1, -1 }, +}; + +s8 SingleRecipesWithoutCookbook[] = { + [iRSH] rFRS, // ITEM_MUSHROOM --> ITEM_FRIED_SHROOM + [iSSH] rFRS, // ITEM_SUPER_SHROOM --> ITEM_FRIED_SHROOM + [iUSH] rSHS, // ITEM_ULTRA_SHROOM --> ITEM_SHROOM_STEAK + [iLSH] rHOT, // ITEM_LIFE_SHROOM --> ITEM_HOT_SHROOM + [iVSH] rHOT, // ITEM_VOLT_SHROOM --> ITEM_HOT_SHROOM + [iFFL] rSPS, // ITEM_FIRE_FLOWER --> ITEM_SPICY_SOUP + [iCOC] rTTN, // ITEM_COCONUT --> ITEM_TASTY_TONIC + [iLIM] rTTN, // ITEM_LIME --> ITEM_TASTY_TONIC + [iLEM] rTTN, // ITEM_LEMON --> ITEM_TASTY_TONIC + [iHSY] rSOD, // ITEM_HONEY_SYRUP --> ITEM_SUPER_SODA + [iMSY] rSOD, // ITEM_MAPLE_SYRUP --> ITEM_SUPER_SODA + [iJAM] rSOD, // ITEM_JAMMIN_JELLY --> ITEM_SUPER_SODA + [iAPP] rSOD, // ITEM_APPLE --> ITEM_SUPER_SODA + [iRBY] rXXX, // ITEM_RED_BERRY --> ITEM_MISTAKE + [iBBY] rXXX, // ITEM_BLUE_BERRY --> ITEM_MISTAKE + [iYBY] rXXX, // ITEM_YELLOW_BERRY --> ITEM_MISTAKE + [iGMN] rNUT, // ITEM_GOOMNUT --> ITEM_NUTTY_CAKE + [iKLF] rTEA, // ITEM_KOOPA_LEAF --> ITEM_KOOPA_TEA + [iDRP] rSPG, // ITEM_DRIED_PASTA --> ITEM_SPAGHETTI + [iDRF] rXXX, // ITEM_DRIED_FRUIT --> ITEM_MISTAKE + [iSLF] rXXX, // ITEM_STRANGE_LEAF --> ITEM_MISTAKE + [iMIX] rCAK, // ITEM_CAKE_MIX --> ITEM_CAKE + [iEGG] rFEG, // ITEM_EGG --> ITEM_FRIED_EGG + [iMEL] rSSH, // ITEM_MELON --> ITEM_SPECIAL_SHAKE + [iSTK] rXXX, // ITEM_STINKY_HERB --> ITEM_MISTAKE + [iPOT] rPOT, // ITEM_ICED_POTATO --> ITEM_POTATO_SALAD + [iDSH] rXXX, // ITEM_DRIED_SHROOM --> ITEM_MISTAKE + [iBUB] rXXX, // ITEM_BUBBLE_BERRY --> ITEM_MISTAKE + [iBMP] rXXX, // ITEM_WHACKAS_BUMP --> ITEM_MISTAKE +}; + +// items with (*) are upgraded from ITEM_MISTAKE when using the cookbook +s8 SingleRecipesWithCookbook[] = { + [iRSH] rFRS, // ITEM_MUSHROOM --> ITEM_FRIED_SHROOM + [iSSH] rFRS, // ITEM_SUPER_SHROOM --> ITEM_FRIED_SHROOM + [iUSH] rSHS, // ITEM_ULTRA_SHROOM --> ITEM_SHROOM_STEAK + [iLSH] rHOT, // ITEM_LIFE_SHROOM --> ITEM_HOT_SHROOM + [iVSH] rHOT, // ITEM_VOLT_SHROOM --> ITEM_HOT_SHROOM + [iFFL] rSPS, // ITEM_FIRE_FLOWER --> ITEM_SPICY_SOUP + [iCOC] rTTN, // ITEM_COCONUT --> ITEM_TASTY_TONIC + [iLIM] rTTN, // ITEM_LIME --> ITEM_TASTY_TONIC + [iLEM] rTTN, // ITEM_LEMON --> ITEM_TASTY_TONIC + [iHSY] rSOD, // ITEM_HONEY_SYRUP --> ITEM_SUPER_SODA + [iMSY] rSOD, // ITEM_MAPLE_SYRUP --> ITEM_SUPER_SODA + [iJAM] rSOD, // ITEM_JAMMIN_JELLY --> ITEM_SUPER_SODA + [iAPP] rSOD, // ITEM_APPLE --> ITEM_SUPER_SODA + [iRBY] rSOD, // ITEM_RED_BERRY --> ITEM_SUPER_SODA (*) + [iBBY] rSOD, // ITEM_BLUE_BERRY --> ITEM_SUPER_SODA (*) + [iYBY] rSOD, // ITEM_YELLOW_BERRY --> ITEM_SUPER_SODA (*) + [iGMN] rNUT, // ITEM_GOOMNUT --> ITEM_NUTTY_CAKE + [iKLF] rTEA, // ITEM_KOOPA_LEAF --> ITEM_KOOPA_TEA + [iDRP] rSPG, // ITEM_DRIED_PASTA --> ITEM_SPAGHETTI + [iDRF] rXXX, // ITEM_DRIED_FRUIT --> ITEM_MISTAKE + [iSLF] rDZD, // ITEM_STRANGE_LEAF --> ITEM_DIZZY_DIAL (*) + [iMIX] rCAK, // ITEM_CAKE_MIX --> ITEM_CAKE + [iEGG] rFEG, // ITEM_EGG --> ITEM_FRIED_EGG + [iMEL] rSSH, // ITEM_MELON --> ITEM_SPECIAL_SHAKE + [iSTK] rXXX, // ITEM_STINKY_HERB --> ITEM_MISTAKE + [iPOT] rPOT, // ITEM_ICED_POTATO --> ITEM_POTATO_SALAD + [iDSH] rFRS, // ITEM_DRIED_SHROOM --> ITEM_FRIED_SHROOM (*) + [iBUB] rTTN, // ITEM_BUBBLE_BERRY --> ITEM_TASTY_TONIC (*) + [iBMP] rYUM, // ITEM_WHACKAS_BUMP --> ITEM_YUMMY_MEAL (*) +}; + +s8 DoubleRecipesMatrix[] = { +/* iRSH iSSH iUSH iLSH iVSH iFFL iCOC iLIM iLEM iHSY iMSY iJAM iAPP iRBY iBBY iYBY iGMN iKLF iDRP iDRF iSLF iMIX iEGG iMEL iSTK iPOT iDSH iBUB iBMP */ +/* iRSH */ rXXX, rHOT, rSHS, rSHS, rHOT, rHOT, rXXX, rXXX, rXXX, rHSH, rMSH, rJSH, rXXX, rXXX, rXXX, rXXX, rVSH, rVSH, rBLN, rVSH, rVSH, rSHC, rBLN, rXXX, rXXX, rBLN, rFRS, rXXX, rXXX, +/* iSSH */ -1, rXXX, rSHS, rSHS, rHOT, rBLN, rXXX, rXXX, rXXX, rHSU, rMSU, rJSU, rXXX, rXXX, rXXX, rXXX, rLSH, rLSH, rBLN, rVSH, rLSH, rSHC, rBLN, rXXX, rXXX, rBLN, rHOT, rXXX, rXXX, +/* iUSH */ -1, -1, rXXX, rSHS, rSHS, rYUM, rXXX, rXXX, rXXX, rHUL, rMUL, rJUL, rXXX, rXXX, rXXX, rXXX, rLSH, rLSH, rYUM, rVSH, rLSH, rSWS, rYUM, rXXX, rXXX, rYUM, rSHS, rXXX, rXXX, +/* iLSH */ -1, -1, -1, rXXX, rXXX, rBLN, rXXX, rXXX, rXXX, rHSU, rMSU, rJSU, rXXX, rXXX, rXXX, rXXX, rLSH, rLSH, rBLN, rVSH, rLSH, rSWS, rBLN, rXXX, rXXX, rBLN, rSHS, rXXX, rXXX, +/* iVSH */ -1, -1, -1, -1, rXXX, rBLN, rXXX, rXXX, rXXX, rHSU, rMSU, rJSU, rXXX, rXXX, rXXX, rXXX, rLSH, rLSH, rBLN, rTHR, rDZD, rELP, rBLN, rXXX, rXXX, rBLN, rHOT, rXXX, rXXX, +/* iFFL */ -1, -1, -1, -1, -1, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, rBLN, rXXX, rXXX, rXXX, rXXX, rFIP, rEGM, rXXX, rXXX, rFZF, rFRS, rXXX, rXXX, +/* iCOC */ -1, -1, -1, -1, -1, -1, rXXX, rXXX, rXXX, rTTN, rSOD, rSSH, rSOD, rSOD, rSOD, rSOD, rXXX, rSOD, rBLN, rXXX, rXXX, rCOP, rXXX, rSOD, rXXX, rBLN, rXXX, rXXX, rXXX, +/* iLIM */ -1, -1, -1, -1, -1, -1, -1, rXXX, rSOD, rTTN, rSOD, rSSH, rSOD, rSOD, rSOD, rSOD, rXXX, rSOD, rXXX, rXXX, rXXX, rLIC, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iLEM */ -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rTTN, rSOD, rSSH, rSOD, rSOD, rSOD, rSOD, rXXX, rSOD, rXXX, rXXX, rXXX, rLEC, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iHSY */ -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rSOD, rSSH, rTTN, rTTN, rTTN, rTTN, rXXX, rSOD, rXXX, rXXX, rXXX, rHNC, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iMSY */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rSSH, rSOD, rSOD, rSOD, rSOD, rXXX, rSOD, rXXX, rXXX, rXXX, rKCK, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iJAM */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rSSH, rSSH, rSSH, rSSH, rXXX, rSOD, rXXX, rXXX, rXXX, rJLP, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iAPP */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rSOD, rSOD, rSOD, rXXX, rXXX, rXXX, rXXX, rXXX, rPIE, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iRBY */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rSOD, rSOD, rXXX, rBLN, rBLN, rXXX, rSLS, rBCK, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iBBY */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rSOD, rXXX, rBLN, rBLN, rXXX, rSLS, rBCK, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iYBY */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rXXX, rBLN, rBLN, rXXX, rSLS, rBCK, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iGMN */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rBLN, rBLN, rXXX, rBLN, rBCK, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iKLF */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rKOO, rXXX, rXXX, rKCK, rXXX, rSSH, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iDRP */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rYUM, rBLN, rXXX, rBLN, rXXX, rXXX, rBLN, rXXX, rXXX, rXXX, +/* iDRF */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rFFL, rXXX, rXXX, rXXX, rXXX, rYUM, rXXX, rXXX, rXXX, +/* iSLF */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rSTR, rBEG, rSSH, rDZD, rYUM, rXXX, rXXX, rXXX, +/* iMIX */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rBCK, rYCK, rKCK, rBLN, rXXX, rXXX, rXXX, +/* iEGG */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rXXX, rBEG, rBLN, rXXX, rXXX, rXXX, +/* iMEL */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iSTK */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rXXX, rXXX, rXXX, rXXX, +/* iPOT */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rXXX, rXXX, rXXX, +/* iDSH */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rXXX, rXXX, +/* iBUB */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, rXXX, +/* iBMP */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, rXXX, +}; + +typedef struct ExtraCookingPair { + /* 00 */ s32 inputA; + /* 04 */ s32 inputB; + /* 04 */ s32 output; +} ExtraCookingPair; // size = 0x8 + +// additional recipes checked for inputs not included in the matrix +ExtraCookingPair ExtraDoubleRecipes[] = { + { ITEM_SPECIAL_SHAKE, ITEM_DRIED_SHROOM, rJUI }, // --> ITEM_HEALTHY_JUICE + { ITEM_SPECIAL_SHAKE, ITEM_STRANGE_LEAF, rJUI }, // --> ITEM_HEALTHY_JUICE + { ITEM_SPECIAL_SHAKE, ITEM_STINKY_HERB, rJUI }, // --> ITEM_HEALTHY_JUICE + { ITEM_POTATO_SALAD, ITEM_SPAGHETTI, rYUM }, // --> ITEM_YUMMY_MEAL + { ITEM_POTATO_SALAD, ITEM_FRIED_SHROOM, rBLN }, // --> ITEM_BLAND_MEAL + { ITEM_POTATO_SALAD, ITEM_HOT_SHROOM, rYUM }, // --> ITEM_YUMMY_MEAL + { ITEM_POTATO_SALAD, ITEM_SHROOM_STEAK, rDLX }, // --> ITEM_DELUXE_FEAST + { ITEM_STRANGE_LEAF, ITEM_WHACKAS_BUMP, rDLX }, // --> ITEM_DELUXE_FEAST +}; + +// when cooking a mystery, theres is a 50% chance to create ITEM_MISTAKE, and a 50% chance to select +// any one of these outcomes with equal probability +s32 MysteryResultOptions[] = { + ITEM_FIRE_FLOWER, + ITEM_TASTY_TONIC, + ITEM_SUPER_SODA, + ITEM_SLEEPY_SHEEP, + ITEM_LIFE_SHROOM, + ITEM_DIZZY_DIAL, + ITEM_VOLT_SHROOM, + ITEM_FRIED_SHROOM, + ITEM_KOOPASTA, + ITEM_SPICY_SOUP, + ITEM_KOOPA_TEA, + ITEM_SPAGHETTI, + ITEM_FRIED_EGG, + ITEM_BOILED_EGG, + ITEM_POTATO_SALAD, + ITEM_HONEY_SHROOM, + ITEM_BLAND_MEAL, + ITEM_THUNDER_RAGE, + ITEM_EGG_MISSILE, + ITEM_APPLE_PIE, + ITEM_KOOKY_COOKIE, + ITEM_BIG_COOKIE, + ITEM_SPECIAL_SHAKE, +}; + +API_CALLABLE(N(GetCookResultForSingleRecipe)) { + Bytecode* args = script->ptrReadPos; + s32 hasCookbook; + s32 inputItem; + s32 outVarItemID; + s32 outVarQuality; + s32 resultItemID; + s32 resultQuality; + s32 i; + + outVarItemID = *args++; + outVarQuality = *args++; + inputItem = evt_get_variable(script, *args++); + hasCookbook = evt_get_variable(script, *args++); + + if (inputItem == ITEM_MYSTERY) { + if (rand_int(1000) < 500) { + resultItemID = ITEM_MISTAKE; + resultQuality = 0; + } else { + i = rand_int(10000) % ARRAY_COUNT(MysteryResultOptions); + resultItemID = MysteryResultOptions[i]; + resultQuality = 4; + } + } else { + for (i = 0; i < INPUT_END; i++) { + if (CookingIngredients[i] == inputItem) { + break; + } + } + if (i < INPUT_END) { + if (hasCookbook) { + i = SingleRecipesWithCookbook[i]; + } else { + i = SingleRecipesWithoutCookbook[i]; + } + } else { + i = 0; + } + resultQuality = CookingResults[i].quality; + resultItemID = CookingResults[i].itemID; + } + evt_set_variable(script, outVarItemID, resultItemID); + evt_set_variable(script, outVarQuality, resultQuality); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetCookResultForDoubleRecipe)) { + Bytecode* args = script->ptrReadPos; + s32 outVarItemID = *args++; + s32 outVarQuality = *args++; + s32 inputItemA = evt_get_variable(script, *args++); + s32 inputItemB = evt_get_variable(script, *args++); + ExtraCookingPair* extraList; + s32 resultItemID, resultQuality; + s32 inputIdxA, inputIdxB; + s32 recipeIdx; + s32 resultIdx; + s32 i; + + // get ingredient enum values + for (inputIdxA = 0; inputIdxA < INPUT_END; inputIdxA++) { + if (CookingIngredients[inputIdxA] == inputItemA) { + break; + } + } + for (inputIdxB = 0; inputIdxB < INPUT_END; inputIdxB++) { + if (CookingIngredients[inputIdxB] == inputItemB) { + break; + } + } + // check the recipe matrix + resultIdx = 0; + if ((inputIdxA < INPUT_END) && (inputIdxB < INPUT_END)) { + if (inputIdxA < inputIdxB) { + recipeIdx = inputIdxB + (inputIdxA * INPUT_END); + } else { + recipeIdx = inputIdxA + (inputIdxB * INPUT_END); + } + resultIdx = DoubleRecipesMatrix[recipeIdx]; + } + if (resultIdx < 0) { + resultIdx = 0; + } + // if the matrix was mistake or not in range, check the extra recipes + if (resultIdx == 0) { + for (i = 0; i < 8; i++) { + if (((ExtraDoubleRecipes[i].inputA == inputItemA) && (ExtraDoubleRecipes[i].inputB == inputItemB)) + || ((ExtraDoubleRecipes[i].inputA == inputItemB) && (ExtraDoubleRecipes[i].inputB == inputItemA))) { + resultIdx = ExtraDoubleRecipes[i].output; + } + } + } + resultItemID = CookingResults[resultIdx].itemID; + resultQuality = CookingResults[resultIdx].quality; + evt_set_variable(script, outVarItemID, resultItemID); + evt_set_variable(script, outVarQuality, resultQuality); + return ApiStatus_DONE2; +} + +const s32 CookableItemIDs[] = { + ITEM_SPICY_SOUP, + ITEM_APPLE_PIE, + ITEM_HONEY_ULTRA, + ITEM_MAPLE_ULTRA, + ITEM_JELLY_ULTRA, + ITEM_KOOPASTA, + ITEM_FRIED_SHROOM, + ITEM_SHROOM_CAKE, + ITEM_SHROOM_STEAK, + ITEM_HOT_SHROOM, + ITEM_SWEET_SHROOM, + ITEM_BLAND_MEAL, + ITEM_YUMMY_MEAL, + ITEM_DELUXE_FEAST, + ITEM_SPECIAL_SHAKE, + ITEM_HEALTHY_JUICE, + ITEM_BIG_COOKIE, + ITEM_CAKE, + ITEM_MISTAKE, + ITEM_KOOPA_TEA, + ITEM_HONEY_SUPER, + ITEM_MAPLE_SUPER, + ITEM_JELLY_SUPER, + ITEM_SPAGHETTI, + ITEM_EGG_MISSILE, + ITEM_FRIED_EGG, + ITEM_HONEY_SHROOM, + ITEM_HONEY_CANDY, + ITEM_ELECTRO_POP, + ITEM_FIRE_POP, + ITEM_LIME_CANDY, + ITEM_COCO_POP, + ITEM_LEMON_CANDY, + ITEM_JELLY_POP, + ITEM_STRANGE_CAKE, + ITEM_KOOKY_COOKIE, + ITEM_FROZEN_FRIES, + ITEM_POTATO_SALAD, + ITEM_NUTTY_CAKE, + ITEM_MAPLE_SHROOM, + ITEM_BOILED_EGG, + ITEM_YOSHI_COOKIE, + ITEM_JELLY_SHROOM1, + ITEM_TASTY_TONIC, + ITEM_DIZZY_DIAL, + ITEM_SUPER_SODA, + ITEM_REPEL_GEL, + ITEM_LIFE_SHROOM, + ITEM_VOLT_SHROOM, + ITEM_SLEEPY_SHEEP, + ITEM_THUNDER_RAGE, + ITEM_FIRE_FLOWER, +}; + +const s32 CookableDiscoveredFlags[] = { + GF_MAC02_DiscoveredRecipe_00, GF_MAC02_DiscoveredRecipe_01, GF_MAC02_DiscoveredRecipe_02, GF_MAC02_DiscoveredRecipe_03, GF_MAC02_DiscoveredRecipe_04, GF_MAC02_DiscoveredRecipe_05, GF_MAC02_DiscoveredRecipe_06, GF_MAC02_DiscoveredRecipe_07, + GF_MAC02_DiscoveredRecipe_08, GF_MAC02_DiscoveredRecipe_09, GF_MAC02_DiscoveredRecipe_0A, GF_MAC02_DiscoveredRecipe_0B, GF_MAC02_DiscoveredRecipe_0C, GF_MAC02_DiscoveredRecipe_0D, GF_MAC02_DiscoveredRecipe_0E, GF_MAC02_DiscoveredRecipe_0F, + GF_MAC02_DiscoveredRecipe_10, GF_MAC02_DiscoveredRecipe_11, GF_MAC02_DiscoveredRecipe_12, GF_MAC02_DiscoveredRecipe_13, GF_MAC02_DiscoveredRecipe_14, GF_MAC02_DiscoveredRecipe_15, GF_MAC02_DiscoveredRecipe_16, GF_MAC02_DiscoveredRecipe_17, + GF_MAC02_DiscoveredRecipe_18, GF_MAC02_DiscoveredRecipe_19, GF_MAC02_DiscoveredRecipe_1A, GF_MAC02_DiscoveredRecipe_1B, GF_MAC02_DiscoveredRecipe_1C, GF_MAC02_DiscoveredRecipe_1D, GF_MAC02_DiscoveredRecipe_1E, GF_MAC02_DiscoveredRecipe_1F, + GF_MAC02_DiscoveredRecipe_20, GF_MAC02_DiscoveredRecipe_21, GF_MAC02_DiscoveredRecipe_22, GF_MAC02_DiscoveredRecipe_23, GF_MAC02_DiscoveredRecipe_24, GF_MAC02_DiscoveredRecipe_25, GF_MAC02_DiscoveredRecipe_26, GF_MAC02_DiscoveredRecipe_27, + GF_MAC02_DiscoveredRecipe_28, GF_MAC02_DiscoveredRecipe_29, GF_MAC02_DiscoveredRecipe_2A, GF_MAC02_DiscoveredRecipe_2B, GF_MAC02_DiscoveredRecipe_2C, GF_MAC02_DiscoveredRecipe_2D, GF_MAC02_DiscoveredRecipe_2E, GF_MAC02_DiscoveredRecipe_2F, + GF_MAC02_DiscoveredRecipe_30, GF_MAC02_DiscoveredRecipe_31, GF_MAC02_DiscoveredRecipe_32, GF_MAC02_DiscoveredRecipe_33 +}; + +API_CALLABLE(N(SetRecipeDiscovered)) { + s32 cookedItems[ARRAY_COUNT(CookableItemIDs)]; + s32 cookedFlags[ARRAY_COUNT(CookableDiscoveredFlags)]; + s32 cookedItemID; + s32 i; + + cookedItemID = evt_get_variable(script, *script->ptrReadPos); + memcpy(cookedItems, CookableItemIDs, sizeof(CookableItemIDs)); + memcpy(cookedFlags, CookableDiscoveredFlags, sizeof(CookableDiscoveredFlags)); + + for (i = 0; i < ARRAY_COUNT(CookableItemIDs); i++) { + if (cookedItemID == cookedItems[i]) { + evt_set_variable(NULL, cookedFlags[i], TRUE); + break; + } + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetItemCount)) { + Bytecode args = *script->ptrReadPos; + + evt_set_variable(script, args++, get_item_count()); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(CheckItemsHasRoom)) { + Bytecode args = *script->ptrReadPos; + + evt_set_variable(script, args++, get_item_empty_count()); + return ApiStatus_DONE2; +} + +static s32 N(TayceT_ItemChoiceList)[ITEM_NUM_CONSUMABLES + 1]; + +API_CALLABLE(N(TayceT_MakeItemList)) { + s32 i; + + for (i = 0; i < ITEM_NUM_CONSUMABLES; i++) { + N(TayceT_ItemChoiceList)[i] = i + ITEM_FIRST_CONSUMABLE; + } + N(TayceT_ItemChoiceList)[i] = ITEM_NONE; + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Scene_TayceTCooking) = { + EVT_CALL(SetNpcFlagBits, NPC_TayceT, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Walk) + EVT_CALL(NpcMoveTo, NPC_TayceT, -186, -381, 20) + EVT_CALL(NpcMoveTo, NPC_TayceT, -220, -425, 30) + EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Cooking) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Cooking, ANIM_TayceT_Cooking, 5, MSG_MAC_Bridge_000E) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_TurnBack) + EVT_WAIT(30) + EVT_CALL(SetNpcYaw, NPC_TayceT, 90) + EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Walk) + EVT_CALL(NpcMoveTo, NPC_TayceT, -186, -381, 20) + EVT_CALL(NpcMoveTo, NPC_TayceT, -236, -318, 20) + EVT_CALL(SetNpcAnimation, NPC_TayceT, ANIM_TayceT_Idle) + EVT_CALL(SetNpcFlagBits, NPC_TayceT, NPC_FLAG_100, FALSE) + EVT_RETURN + EVT_END +}; + +s32 N(ItemList_FryingPan)[] = { + ITEM_FRYING_PAN, + ITEM_NONE +}; + +EvtScript N(EVS_TayceT_FryingPanAndCake) = { + EVT_IF_EQ(GF_MAC02_TayceT_HoldingCake, TRUE) + EVT_CALL(N(CheckItemsHasRoom), LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001A) + EVT_GIVE_CONSUMABLE_REWARD_ALT(ITEM_CAKE) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001B) + EVT_SET(GB_StoryProgress, STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001C) + EVT_SET(GF_MAC02_TayceT_HoldingCake, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_IdleSad, 0, MSG_MAC_Bridge_0017) + EVT_CHOOSE_KEY_ITEM_FROM(N(ItemList_FryingPan)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_EQ(-1) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_IdleSad, 0, MSG_MAC_Bridge_0018) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_TalkHappy, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0019) + EVT_EXEC_WAIT(N(EVS_Scene_TayceTCooking)) + EVT_CALL(N(CheckItemsHasRoom), LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001A) + EVT_GIVE_CONSUMABLE_REWARD_ALT(ITEM_CAKE) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001B) + EVT_SET(GB_StoryProgress, STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001C) + EVT_SET(GF_MAC02_TayceT_HoldingCake, TRUE) + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +s32 N(ItemList_Cookbook)[] = { + ITEM_COOKBOOK, + ITEM_NONE +}; + +EvtScript N(EVS_TayceT_RequestCookbook) = { + EVT_IF_EQ(AF_MAC_01, FALSE) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001D) + EVT_SET(AF_MAC_01, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001E) + EVT_SET(AF_MAC_01, FALSE) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(ItemList_Cookbook))) + EVT_SET(LVar1, 0) + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_001F) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0020) + EVT_SET(GF_MAC02_TayceT_HasCookbook, TRUE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TayceT_Cook) = { + #define LABEL_CHOOSE_FIRST 1 + #define LABEL_CHOOSE_SECOND 2 + #define LABEL_CONFIRM_ONE 5 + #define LABEL_COOK 6 + #define LABEL_DONE 9 + + // greeting and opening choice + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_EQ(GF_MAC02_Met_TayceT, FALSE) + EVT_SET(GF_MAC02_Met_TayceT, TRUE) + EVT_SET(AF_MAC_01, TRUE) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0000) + EVT_ELSE + EVT_IF_EQ(AF_MAC_01, FALSE) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0001) + EVT_SET(AF_MAC_01, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0002) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetItemCount), LVar0) + EVT_IF_LE(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0003) + EVT_GOTO(LABEL_DONE) + EVT_END_IF + EVT_CALL(ShowChoice, MSG_Choice_0010) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0004) + EVT_GOTO(LABEL_DONE) + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0005) + + // choose the first ingredient + EVT_LABEL(LABEL_CHOOSE_FIRST) + EVT_SET(LVar3, 0) + EVT_CALL(N(TayceT_MakeItemList)) + EVT_CHOOSE_CONSUMABLE_FROM(N(TayceT_ItemChoiceList), 0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_EQ(-1) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0006) + EVT_CALL(ShowChoice, MSG_Choice_0009) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0004) + EVT_GOTO(LABEL_DONE) + EVT_END_IF + EVT_CALL(CloseMessage) + EVT_SET(LVar3, 1) + EVT_CASE_DEFAULT + EVT_SET(LVar8, LVar0) + EVT_CALL(AddItem, LVar0, LVar1) + EVT_END_SWITCH + EVT_IF_EQ(LVar3, 1) + EVT_GOTO(LABEL_CHOOSE_FIRST) + EVT_END_IF + EVT_IF_EQ(GF_MAC02_TayceT_HasCookbook, FALSE) + EVT_GOTO(LABEL_CONFIRM_ONE) + EVT_END_IF + EVT_CALL(N(GetItemCount), LVar0) + EVT_IF_LT(LVar0, 2) + EVT_GOTO(LABEL_CONFIRM_ONE) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0007) + EVT_CALL(ShowChoice, MSG_Choice_0010) + EVT_CALL(CloseMessage) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(LABEL_CONFIRM_ONE) + EVT_END_IF + + // choose the second ingredient + EVT_LABEL(LABEL_CHOOSE_SECOND) + EVT_CALL(RemoveItem, LVar8, LVar0) + EVT_SET(LVar3, 0) + EVT_CALL(N(TayceT_MakeItemList)) + EVT_CHOOSE_CONSUMABLE_FROM(N(TayceT_ItemChoiceList), 0) + EVT_CALL(AddItem, LVar8, LVar1) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_EQ(-1) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0008) + EVT_CALL(ShowChoice, MSG_Choice_0008) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(CloseMessage) + EVT_GOTO(LABEL_CONFIRM_ONE) + EVT_END_IF + EVT_IF_EQ(LVar0, 2) + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0004) + EVT_GOTO(LABEL_DONE) + EVT_END_IF + EVT_CALL(CloseMessage) + EVT_SET(LVar3, 1) + EVT_CASE_DEFAULT + EVT_SET(LVar9, LVar0) + EVT_CALL(AddItem, LVar0, LVar1) + EVT_IF_EQ(LVar8, LVar9) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0009) + EVT_SET(LVar3, 1) + EVT_END_IF + EVT_END_SWITCH + EVT_IF_EQ(LVar3, 1) + EVT_GOTO(LABEL_CHOOSE_SECOND) + EVT_END_IF + + // confirm cooking with two ingredients + // no label here, but this position would be LABEL_CONFIRM_TWO + EVT_SET(LVar0, LVar8) + EVT_CALL(N(GetItemName), LVar0) + EVT_CALL(SetMessageMsg, LVar0, 0) + EVT_SET(LVar1, LVar9) + EVT_CALL(N(GetItemName), LVar1) + EVT_CALL(SetMessageMsg, LVar1, 1) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_000B) + EVT_CALL(ShowChoice, MSG_Choice_0010) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_000C) + EVT_GOTO(LABEL_DONE) + EVT_END_IF + EVT_CALL(N(GetCookResultForDoubleRecipe), LVar6, LVar7, LVar8, LVar9) + EVT_CALL(RemoveItem, LVar8, LVar0) + EVT_CALL(RemoveItem, LVar9, LVar0) + EVT_GOTO(LABEL_COOK) + + // confirm cooking with one ingredient + EVT_LABEL(LABEL_CONFIRM_ONE) + EVT_SET(LVar0, LVar8) + EVT_CALL(N(GetItemName), LVar0) + EVT_CALL(SetMessageMsg, LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_000A) + EVT_CALL(ShowChoice, MSG_Choice_0010) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_000C) + EVT_GOTO(LABEL_DONE) + EVT_END_IF + EVT_CALL(N(GetCookResultForSingleRecipe), LVar6, LVar7, LVar8, GF_MAC02_TayceT_HasCookbook) + EVT_CALL(RemoveItem, LVar8, LVar0) + + // the actual cooking animation and reaction message + EVT_LABEL(LABEL_COOK) + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_000D) + EVT_EXEC_WAIT(N(EVS_Scene_TayceTCooking)) + EVT_SWITCH(LVar7) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0012) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_000F) + EVT_CASE_EQ(3) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0010) + EVT_CASE_EQ(4) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0013) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0011) + EVT_END_SWITCH + EVT_CALL(ContinueSpeech, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0014) + EVT_CALL(N(SetRecipeDiscovered), LVar6) + EVT_GIVE_CONSUMABLE_REWARD_ALT(LVar6) + EVT_CALL(SpeakToPlayer, NPC_TayceT, ANIM_TayceT_Talk, ANIM_TayceT_Idle, 0, MSG_MAC_Bridge_0015) + + // end the script + EVT_LABEL(LABEL_DONE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_TayceT) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_EXEC_WAIT(N(EVS_TayceT_FryingPanAndCake)) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(FindKeyItem, ITEM_COOKBOOK, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_EXEC_WAIT(N(EVS_TayceT_Cook)) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_TayceT_RequestCookbook)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TayceT) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TayceT))) + EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 0) + EVT_CALL(SetNpcPos, NPC_SELF, -236, 20, -318) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TayceT_Idle) + EVT_IF_GE(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_IF_NE(GF_MAC02_TayceT_HoldingCake, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TayceT_IdleSad) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_SET(AF_MAC_01, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/toad_1.inc.c b/src/world/area_mac/mac_02/npc/toad_1.inc.c new file mode 100644 index 0000000000..ba8d507016 --- /dev/null +++ b/src/world/area_mac/mac_02/npc/toad_1.inc.c @@ -0,0 +1,77 @@ +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_MET_STAR_SPIRITS) + EVT_SET(LVar0, MSG_MAC_Bridge_003A) + EVT_CASE_LT(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + EVT_SET(LVar0, MSG_MAC_Bridge_003B) + EVT_CASE_LT(STORY_CH1_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_003C) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_003D) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Bridge_003E) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_003F) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC01_MailbagStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_0040) + EVT_ELSE + EVT_IF_EQ(GF_MAC01_MailbagReturned, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_0041) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Bridge_0042) + EVT_END_IF + EVT_END_IF + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Bridge_0043) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0044) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Bridge_0045) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0046) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Bridge_0047) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0048) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Bridge_0049) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_Toad_01, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Toad_01) = { + EVT_CALL(SetNpcPos, NPC_SELF, 20, 0, -550) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Toad_Blue_Walk) + EVT_CALL(NpcMoveTo, NPC_SELF, -20, -550, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Toad_Blue_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 7) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 7) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Toad_Blue_Walk) + EVT_CALL(NpcMoveTo, NPC_SELF, 20, -550, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Toad_Blue_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 7) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 7) + EVT_WAIT(30) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Toad_01))) + EVT_END_IF + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/toad_2.inc.c b/src/world/area_mac/mac_02/npc/toad_2.inc.c new file mode 100644 index 0000000000..6c02261dcc --- /dev/null +++ b/src/world/area_mac/mac_02/npc/toad_2.inc.c @@ -0,0 +1,41 @@ +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_0057) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Bridge_0058) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0059) + EVT_CASE_LT(STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_005A) + EVT_CASE_LT(STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_SET(LVar0, MSG_MAC_Bridge_005B) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_005C) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Bridge_005D) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_005E) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Bridge_005F) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0060) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Bridge_0061) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0062) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Bridge_0063) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_Toad_02, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/toad_3.inc.c b/src/world/area_mac/mac_02/npc/toad_3.inc.c new file mode 100644 index 0000000000..339065799d --- /dev/null +++ b/src/world/area_mac/mac_02/npc/toad_3.inc.c @@ -0,0 +1,46 @@ +EvtScript N(EVS_NpcInteract_Toad_03) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_006B) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Bridge_006C) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_006D) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_ShyGuyBlockingTracks, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_006E) + EVT_ELSE + EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_006F) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Bridge_0070) + EVT_END_IF + EVT_END_IF + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Bridge_0071) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0072) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Bridge_0073) + EVT_SET(GF_MAC02_HeardAboutMinhT, TRUE) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0074) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Bridge_0075) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0076) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Bridge_0077) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_Toad_03, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_03) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_03))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/toad_4.inc.c b/src/world/area_mac/mac_02/npc/toad_4.inc.c new file mode 100644 index 0000000000..35267bc2a6 --- /dev/null +++ b/src/world/area_mac/mac_02/npc/toad_4.inc.c @@ -0,0 +1,41 @@ +EvtScript N(EVS_NpcInteract_Toad_04) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Bridge_0078) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Bridge_0079) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_007A) + EVT_CASE_LT(STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_007B) + EVT_CASE_LT(STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_SET(LVar0, MSG_MAC_Bridge_007C) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_007D) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Bridge_007E) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_007F) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Bridge_0080) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0081) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Bridge_0082) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0083) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Bridge_0084) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_Toad_04, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_04) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_04))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_02/npc/toad_kid.inc.c b/src/world/area_mac/mac_02/npc/toad_kid.inc.c new file mode 100644 index 0000000000..7966066ade --- /dev/null +++ b/src/world/area_mac/mac_02/npc/toad_kid.inc.c @@ -0,0 +1,31 @@ +EvtScript N(EVS_NpcInteract_ToadKid) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0064) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0065) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0066) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0067) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Bridge_0068) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Bridge_0069) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Bridge_006A) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_ToadKid, ANIM_ToadKid_Yellow_Talk, ANIM_ToadKid_Yellow_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadKid) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH1_STAR_SPRIT_DEPARTED) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_ELSE + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadKid))) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_03/mac_03.h b/src/world/area_mac/mac_03/mac_03.h index 9d68af9af1..9e8ff3531e 100644 --- a/src/world/area_mac/mac_03/mac_03.h +++ b/src/world/area_mac/mac_03/mac_03.h @@ -14,48 +14,48 @@ #include "sprite/npc/ShyGuy.h" enum { - NPC_TrainStationToad_01 = 0, - NPC_TrainStationToad_02 = 1, - NPC_Toad_01 = 2, - NPC_ThreeSisters_01 = 3, - NPC_Toad_02 = 4, - NPC_ToadKid_01 = 5, - NPC_ToadKid_02 = 6, - NPC_ThreeSisters_02 = 7, - NPC_ThreeSisters_03 = 8, - NPC_ThreeSisters_04 = 9, - NPC_Toad_03 = 10, - NPC_ShyGuy = 11, - NPC_LilOink_01 = 12, - NPC_LilOink_02 = 13, - NPC_LilOink_03 = 14, - NPC_LilOink_04 = 15, - NPC_LilOink_05 = 16, - NPC_LilOink_06 = 17, - NPC_LilOink_07 = 18, - NPC_LilOink_08 = 19, - NPC_LilOink_09 = 20, - NPC_LilOink_10 = 21, - NPC_Capsule = 22, - NPC_ChuckQuizmo = 23, + NPC_TrainStationToad_01 = 0, + NPC_TrainStationToad_02 = 1, + NPC_Toad_01 = 2, + NPC_ThreeSisters_01 = 3, + NPC_Toad_02 = 4, + NPC_ToadKid_01 = 5, + NPC_ToadKid_02 = 6, + NPC_ThreeSisters_02 = 7, + NPC_ThreeSisters_03 = 8, + NPC_ThreeSisters_04 = 9, + NPC_Toad_03 = 10, + NPC_ShyGuy = 11, + NPC_LilOink_01 = 12, + NPC_LilOink_02 = 13, + NPC_LilOink_03 = 14, + NPC_LilOink_04 = 15, + NPC_LilOink_05 = 16, + NPC_LilOink_06 = 17, + NPC_LilOink_07 = 18, + NPC_LilOink_08 = 19, + NPC_LilOink_09 = 20, + NPC_LilOink_10 = 21, + NPC_Capsule = 22, + NPC_ChuckQuizmo = 23, }; enum { MF_TrainDepartDoorOpen = MapFlag(0), MF_TrainDepartPlayerBoard = MapFlag(1), - MF_TrainArriveDoorOpen = MapFlag(2), - MF_TrainArrivePlayerDisembark = MapFlag(3), - MF_TrainMoving = MapFlag(4), - MF_TrainReverseDir = MapFlag(5), - MF_Unk_06 = MapFlag(6), - MF_Unk_07 = MapFlag(7), - MF_Unk_08 = MapFlag(8), + MF_TrainArriveDoorOpen = MapFlag(2), + MF_TrainArrivePlayerDisembark = MapFlag(3), + MF_TrainMoving = MapFlag(4), + MF_TrainReverseDir = MapFlag(5), + MF_Unk_06 = MapFlag(6), + MF_Unk_07 = MapFlag(7), + MF_Unk_08 = MapFlag(8), }; enum { - MV_TrainMoveDist = MapVar(0), - MV_TrainMoveSpeed = MapVar(1), - MV_LilOinkEffect = MapVar(2), + MV_TrainMoveDist = MapVar(0), + MV_TrainMoveSpeed = MapVar(1), + MV_LilOinkEffect = MapVar(2), }; #define NAMESPACE mac_03 diff --git a/src/world/area_mac/mac_03/mac_03_5_entity.c b/src/world/area_mac/mac_03/mac_03_5_entity.c index 8600d43a52..b225a4cb02 100644 --- a/src/world/area_mac/mac_03/mac_03_5_entity.c +++ b/src/world/area_mac/mac_03/mac_03_5_entity.c @@ -7,7 +7,7 @@ EvtScript N(EVS_OnBlast_RailRock) = { EVT_END }; -EvtScript N(EVS_ReadSign) = { +EvtScript N(EVS_ReadSign_LilOInks) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0175, 160, 40) EVT_CALL(DisablePlayerInput, FALSE) @@ -15,7 +15,7 @@ EvtScript N(EVS_ReadSign) = { EVT_END }; -EvtScript N(EVS_OnInspect_SignPost) = { +EvtScript N(EVS_OnInspect_StreetSign) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0172, 160, 40) EVT_CALL(DisablePlayerInput, FALSE) @@ -34,8 +34,8 @@ EvtScript N(EVS_MakeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 525, 0, 175, 0, MODEL_o11, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, GF_MAC03_HiddenPanel) EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), 185, 20, -350, 0, MAKE_ENTITY_END) - EVT_CALL(AssignScript, EVT_PTR(N(EVS_ReadSign))) - EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspect_SignPost)), TRIGGER_WALL_PRESS_A, COLLIDER_sign, 1, 0) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_ReadSign_LilOInks))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspect_StreetSign)), TRIGGER_WALL_PRESS_A, COLLIDER_sign, 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_04/842BD0.c b/src/world/area_mac/mac_04/842BD0.c deleted file mode 100644 index 5b0c81aa9b..0000000000 --- a/src/world/area_mac/mac_04/842BD0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "mac_04.h" - -extern char wMapBgName[]; - -ApiStatus func_80240000_842BD0(Evt* script, s32 isInitialCall) { - if (gGameStatusPtr->entryID == 4) { - sprintf(wMapBgName, "hos_bg"); - } - return ApiStatus_BLOCK; -} - -const char N(exit_str_0)[] = "mac_05"; -const char N(exit_str_1)[] = "mac_02"; -const char N(exit_str_2)[] = "omo_03"; -const char N(exit_str_3)[] = "hos_20\0\0"; // todo remove padding after these are moved diff --git a/src/world/area_mac/mac_04/842C20.c b/src/world/area_mac/mac_04/842C20.c deleted file mode 100644 index 417c386a5a..0000000000 --- a/src/world/area_mac/mac_04/842C20.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "mac_04.h" -#include "model.h" - -ApiStatus func_80240050_842C20(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 primR = evt_get_variable(script, *args++); - s32 primG = evt_get_variable(script, *args++); - s32 primB = evt_get_variable(script, *args++); - s32 primA = evt_get_variable(script, *args++); - s32 fogR = evt_get_variable(script, *args++); - s32 fogG = evt_get_variable(script, *args++); - s32 fogB = evt_get_variable(script, *args++); - s32 fogStart = evt_get_variable(script, *args++); - s32 fogEnd = evt_get_variable(script, *args++); - - set_model_fog_color_parameters(primR, primG, primB, primA, fogR, fogG, fogB, fogStart, fogEnd); - return ApiStatus_DONE2; -} - -ApiStatus func_80240194_842D64(Evt* script, s32 isInitialCall) { - mdl_set_all_fog_mode(3); - return ApiStatus_DONE2; -} diff --git a/src/world/area_mac/mac_04/842D90.c b/src/world/area_mac/mac_04/842D90.c deleted file mode 100644 index 9257e82542..0000000000 --- a/src/world/area_mac/mac_04/842D90.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "mac_04.h" - -s32 set_background_color_blend(s32, s32, s32, s32); - -ApiStatus func_802401C0_842D90(Evt* script, s32 isInitialCall) { - func_8011B950(0x9E, -1, 1, 1); - set_background_color_blend(0, 0, 0, 255); - gCameras[CAM_DEFAULT].bgColor[0] = 0; - gCameras[CAM_DEFAULT].bgColor[1] = 0; - gCameras[CAM_DEFAULT].bgColor[2] = 0; - return ApiStatus_DONE2; -} diff --git a/src/world/area_mac/mac_04/842DF0.c b/src/world/area_mac/mac_04/842DF0.c deleted file mode 100644 index b17cf1be9e..0000000000 --- a/src/world/area_mac/mac_04/842DF0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "mac_04.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c deleted file mode 100644 index a3e2eecd5a..0000000000 --- a/src/world/area_mac/mac_04/843030.c +++ /dev/null @@ -1,203 +0,0 @@ -#include "mac_04.h" -#include "effects.h" - -#define CHUCK_QUIZMO_NPC_ID 20 - -extern s32 N(Quizmo_Worker); -extern s32 N(Quizmo_AnswerResult); -extern EffectInstance* N(Quizmo_StageEffect); -extern EffectInstance* N(Quizmo_AudienceEffect); -extern EffectInstance* N(Quizmo_VannaTEffect); - -#include "world/common/atomic/Quizmo.inc.c" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0); - -extern s32 N(ItemChoice_HasSelectedItem); -extern s32 N(ItemChoice_SelectedItemID); - -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++); - N(ItemChoice_HasSelectedItem) = TRUE; - return ApiStatus_DONE2; -} - -extern s32 mac_04_D_8024F5D0[]; - -ApiStatus func_802417AC_84437C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (ptr != NULL) { - for (i = 0; ptr[i] != 0; i++) { - mac_04_D_8024F5D0[i] = ptr[i]; - } - mac_04_D_8024F5D0[i] = 0; - } else { - for (i = 0; i < 112; i++) { - mac_04_D_8024F5D0[i] = i + 16; - mac_04_D_8024F5D0[112] = 0; - } - } - return ApiStatus_DONE2; -} - -s32 func_80241848_844418(void) { - s32 bpCost = 0; - s32 i = 0; - ItemData* itemTable = gItemTable; - - for (; i < ARRAY_COUNT(gPlayerData.equippedBadges); i++) { - s16 badge = gPlayerData.equippedBadges[i]; - - if (badge != 0) { - bpCost += gMoveTable[itemTable[badge].moveID].costBP; - } - } - return bpCost; -} - -ApiStatus func_802418AC_84447C(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - Bytecode* args = script->ptrReadPos; - s32 outVar = *args++; - s32 bpCost = func_80241848_844418(); - s32 i; - - if (gPlayerData.maxBP >= bpCost) { - evt_set_variable(script, outVar, FALSE); - return ApiStatus_DONE2; - } else { - s16* badges = gPlayerData.equippedBadges; - - for (i = 0; i < ARRAY_COUNT(gPlayerData.equippedBadges); i++) { - badges[i] = 0; - } - enforce_hpfp_limits(); - evt_set_variable(script, outVar, TRUE); - return ApiStatus_DONE2; - } -} - -ApiStatus PostChapter4StatUpdate(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - - set_max_SP(4); - playerData->curHP = playerData->curMaxHP; - playerData->curFP = playerData->curMaxFP; - sync_status_menu(); - return ApiStatus_DONE2; -} - -#include "world/common/todo/GetFloorCollider.inc.c" - -ApiStatus N(IsPartnerBow)(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { - script->varTable[0] = TRUE; - } else { - script->varTable[0] = FALSE; - } - return ApiStatus_DONE2; -} - -#include "world/common/todo/GetPlayerCoins.inc.c" - -ApiStatus func_802419E4_8445B4(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 out1 = *args++; - s32 out2 = *args++; - s32 out3 = *args++; - - evt_set_variable(script, out1, gPlayerData.hardMaxHP); - evt_set_variable(script, out2, gPlayerData.hardMaxFP); - evt_set_variable(script, out3, gPlayerData.maxBP); - return ApiStatus_DONE2; -} - -ApiStatus func_80241A64_844634(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - s32 bp = 0; - s32 fp = 0; - s32 hp = 0; - - switch (script->varTable[10]) { - case 0: - hp = 10; - fp = -5; - bp = -3; - break; - case 1: - hp = -5; - fp = 10; - bp = -3; - break; - case 2: - hp = -5; - fp = -5; - bp = 6; - break; - } - - playerData->hardMaxHP += hp; - playerData->curMaxHP += hp; - if (playerData->curMaxHP > 75) { - playerData->curMaxHP = 75; - } - if (playerData->curHP > playerData->curMaxHP) { - playerData->curHP = playerData->curMaxHP; - } - playerData->hardMaxFP += fp; - playerData->curMaxFP += fp; - if (playerData->curMaxFP > 75) { - playerData->curMaxFP = 75; - } - if (playerData->curFP > playerData->curMaxFP) { - playerData->curFP = playerData->curMaxFP; - } - playerData->maxBP += bp; - if (playerData->maxBP > 30) { - playerData->maxBP = 30; - } - return ApiStatus_DONE2; -} - -ApiStatus func_80241B90_844760(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - - script->varTable[0] = playerData->curMaxHP; - script->varTable[1] = playerData->curMaxFP; - script->varTable[2] = playerData->maxBP; - return ApiStatus_DONE2; -} - -ApiStatus N(SetNpcShadowScale)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - f32 newShadowScale = evt_get_float_variable(script, *args++); - - resolve_npc(script, npcID)->shadowScale = newShadowScale; - return ApiStatus_DONE2; -} - -ApiStatus N(80241C20_8447F0)(Evt* script, s32 isInitialCall) { - func_800E9894(); - return ApiStatus_DONE2; -} - -ApiStatus func_80241C40_844810(Evt* script, s32 isInitialCall) { - func_800E98C4(); - return ApiStatus_DONE2; -} - -ApiStatus func_80241C60_844830(Evt* script, s32 isInitialCall) { - func_800E98C4(); - open_status_menu_long(); - return ApiStatus_DONE2; -} diff --git a/src/world/area_mac/mac_04/844860.c b/src/world/area_mac/mac_04/844860.c deleted file mode 100644 index 669d0207b5..0000000000 --- a/src/world/area_mac/mac_04/844860.c +++ /dev/null @@ -1,54 +0,0 @@ -#include "mac_04.h" -#include "sprite.h" - -void func_80241D30_844900(void); -void func_80241DAC_84497C(void*); - -ApiStatus func_80241C90_844860(Evt* script, s32 isInitialCall) { - gPlayerStatus.animFlags |= PA_FLAGS_IN_DISGUISE; - evt_set_variable(script, MapVar(11), create_worker_world(NULL, func_80241D30_844900)); - - return ApiStatus_DONE2; -} - -ApiStatus func_80241CEC_8448BC(Evt* script, s32 isInitialCall) { - s32 index = evt_get_variable(script, MapVar(11)); - gPlayerStatus.animFlags &= ~PA_FLAGS_IN_DISGUISE; - free_worker(index); - - return ApiStatus_DONE2; -} - -void func_80241D30_844900(void) { - RenderTask renderTask; - s32 screenX, screenY, screenZ; - - get_screen_coords(gCurrentCamID, gPlayerStatus.position.x, gPlayerStatus.position.y, gPlayerStatus.position.z, &screenX, &screenY, &screenZ); - - renderTask.appendGfxArg = &gPlayerStatus; - renderTask.appendGfx = func_80241DAC_84497C; - renderTask.renderMode = gPlayerStatus.renderMode; - renderTask.distance = screenZ; - - queue_render_task(&renderTask); -} - -void func_80241DAC_84497C(void* data) { - PlayerStatus* playerStatus = data; - f32 scale = evt_get_float_variable(NULL, MapVar(10)); - Matrix4f transformMtx; - Matrix4f tempMtx; - - guRotateF(transformMtx, playerStatus->spriteFacingAngle, 0.0f, 1.0f, 0.0f); - guScaleF(tempMtx, scale * SPRITE_WORLD_SCALE_D, scale * SPRITE_WORLD_SCALE_D, scale * SPRITE_WORLD_SCALE_D); - guMtxCatF(transformMtx, tempMtx, transformMtx); - guTranslateF(tempMtx, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); - guMtxCatF(transformMtx, tempMtx, transformMtx); - playerStatus->animNotifyValue = spr_update_player_sprite(0, playerStatus->trueAnimation, 1.0f); - spr_draw_player_sprite(0, 0, 0, NULL, transformMtx); -} - -const char* N(exit_str_4) = "omo_03"; -const char* N(exit_str_5) = "kmr_22"; - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_mac/mac_04/844AC0.c b/src/world/area_mac/mac_04/844AC0.c deleted file mode 100644 index da9cf60dab..0000000000 --- a/src/world/area_mac/mac_04/844AC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "mac_04.h" - -#include "world/common/atomic/MonitorMusicProximityTrigger.inc.c" diff --git a/src/world/area_mac/mac_04/mac_04.h b/src/world/area_mac/mac_04/mac_04.h index aaa720f9f9..a33f601378 100644 --- a/src/world/area_mac/mac_04/mac_04.h +++ b/src/world/area_mac/mac_04/mac_04.h @@ -2,8 +2,75 @@ /// @brief Toad Town - Residental District #include "common.h" -#include "../mac.h" #include "message_ids.h" #include "map.h" +#include "../mac.h" +#include "mapfs/mac_04_shape.h" +#include "mapfs/mac_04_hit.h" + +#include "sprite/npc/ShyGuy.h" +#include "sprite/npc/HarryT.h" +#include "sprite/npc/ChetRippo.h" +#include "sprite/npc/WorldGoombario.h" + +enum { + NPC_HarryT = 0, + NPC_NewResident1 = 1, + NPC_NewResident2 = 2, + NPC_Toad_01 = 3, + NPC_Toad_02 = 4, + NPC_ToadKid_01 = 5, + NPC_ToadKid_02 = 6, + NPC_ToadKid_03 = 7, + NPC_Toadette_03 = 8, + NPC_Toad_03 = 9, + NPC_GossipTrio1 = 10, + NPC_GossipTrio2 = 11, + NPC_GossipTrio3 = 12, + NPC_ChetRippo = 13, + NPC_ShyGuy_01 = 14, + NPC_ShyGuy_02 = 15, + NPC_Twink = 16, + NPC_Muskular = 17, + NPC_Goomama = 18, + NPC_Goombaria = 19, + NPC_ChuckQuizmo = 20, + NPC_WishingToadKid = 21, +}; + +enum { + MV_StoreroomLockEntityID = MapVar(0), + MV_PlayerShrinkScale = MapVar(10), + MV_DrawShinkingPlayerWorker = MapVar(11), +}; + +enum { + MF_MusicMixTrigger = MapFlag(10), +}; + #define NAMESPACE mac_04 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupMusicTriggers); +extern EvtScript N(EVS_SetupShop); +extern EvtScript N(EVS_SetupRooms); +extern EvtScript N(EVS_MakeStoreroom); +extern EvtScript N(EVS_MakeHiddenRoom); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); + +extern EvtScript N(EVS_80248B08); +extern EvtScript N(D_80248798_84B368); +extern EvtScript N(EVS_ExitToybox); +extern EvtScript N(EVS_Toybox_SetupTrainPrompt); +extern EvtScript N(D_8024697C_84954C); +extern EvtScript N(EVS_ForceStoreroomUnlock); +extern EvtScript N(EVS_Scene_WishingToadKid); + +extern NpcGroupList N(DefaultNPCs); +extern NpcGroupList N(Chapter4NPCs); +extern NpcGroupList N(PostChapter4NPCs); +extern NpcGroupList N(Chapter7NPCs); +extern NpcGroupList N(WishSceneNPCs); diff --git a/src/world/area_mac/mac_04/mac_04_0_header.c b/src/world/area_mac/mac_04/mac_04_0_header.c new file mode 100644 index 0000000000..cee4a8357c --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_0_header.c @@ -0,0 +1,25 @@ +#include "mac_04.h" + +EntryList N(Entrances) = { + [mac_04_ENTRY_0] { 610.0, 0.0, 0.0, 280.0 }, + [mac_04_ENTRY_1] { -420.0, 0.0, 430.0, 35.0 }, + [mac_04_ENTRY_2] { -490.0, 20.0, -150.0, 180.0 }, + [mac_04_ENTRY_3] { -420.0, 20.0, -95.0, 0.0 }, + [mac_04_ENTRY_4] { 0.0, -100.0, 0.0, 0.0 }, + [mac_04_ENTRY_5] { -420.0, 20.0, 235.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mac_04 }, +}; + +s32 N(map_init)(void) { + if (gGameStatusPtr->entryID == mac_04_ENTRY_4) { + sprintf(wMapBgName, "hos_bg"); + } + return FALSE; +} diff --git a/src/world/area_mac/mac_04/mac_04_1_music.c b/src/world/area_mac/mac_04/mac_04_1_music.c new file mode 100644 index 0000000000..3e8c1d218f --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_1_music.c @@ -0,0 +1,19 @@ +#include "mac_04.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, mac_04_ENTRY_4) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_INVASION, 0, 8) + EVT_CASE_DEFAULT + EVT_EXEC(N(EVS_SetupMusicTriggers)) + EVT_END_SWITCH + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(StopSound, SOUND_80000017) + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/mac_04_2_main.c b/src/world/area_mac/mac_04/mac_04_2_main.c new file mode 100644 index 0000000000..f064f79daf --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_2_main.c @@ -0,0 +1,111 @@ +#include "mac_04.h" +#include "model.h" + +API_CALLABLE(N(SetNightFogParams)) { + Bytecode* args = script->ptrReadPos; + s32 primR = evt_get_variable(script, *args++); + s32 primG = evt_get_variable(script, *args++); + s32 primB = evt_get_variable(script, *args++); + s32 primA = evt_get_variable(script, *args++); + s32 fogR = evt_get_variable(script, *args++); + s32 fogG = evt_get_variable(script, *args++); + s32 fogB = evt_get_variable(script, *args++); + s32 fogStart = evt_get_variable(script, *args++); + s32 fogEnd = evt_get_variable(script, *args++); + + set_model_fog_color_parameters(primR, primG, primB, primA, fogR, fogG, fogB, fogStart, fogEnd); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetNightFogMode)) { + mdl_set_all_fog_mode(3); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitWalk_mac_05_0) = EVT_EXIT_WALK(60, mac_04_ENTRY_1, "mac_05", mac_05_ENTRY_0); +EvtScript N(EVS_ExitWalk_mac_02_0) = EVT_EXIT_WALK(60, mac_04_ENTRY_0, "mac_02", mac_02_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mac_05_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mac_02_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(mac_04_ENTRY_2) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_ExitToybox)) + EVT_THREAD + EVT_WAIT(20) + EVT_SET(MF_MusicMixTrigger, TRUE) + EVT_END_THREAD + EVT_CASE_EQ(mac_04_ENTRY_3) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CALL(SetPlayerPos, -420, 20, -95) + EVT_CALL(SetNpcPos, NPC_PARTNER, -420, 20, -65) + EVT_THREAD + EVT_WAIT(20) + EVT_SET(MF_MusicMixTrigger, TRUE) + EVT_END_THREAD + EVT_CASE_EQ(mac_04_ENTRY_4) + EVT_CALL(N(SetNightFogMode)) + EVT_CALL(N(SetNightFogParams), 0, 0, 0, 0, 0, 0, 0, 950, 1000) + EVT_EXEC(N(EVS_Scene_WishingToadKid)) + EVT_CASE_EQ(mac_04_ENTRY_5) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_04_ENTRY_4) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(WishSceneNPCs))) + EVT_ELSE + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CASE_LT(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter4NPCs))) + EVT_CASE_EQ(STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(PostChapter4NPCs))) + EVT_CASE_LT(STORY_CH5_RETURNED_TO_TOAD_TOWN) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CASE_LT(STORY_CH7_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(Chapter7NPCs))) + EVT_CASE_DEFAULT + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_END_SWITCH + EVT_END_IF + EVT_SET(AF_MAC_31, FALSE) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupRooms)) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_EXEC(N(EVS_SetupShop)) + EVT_EXEC_WAIT(N(EVS_Toybox_SetupTrainPrompt)) + EVT_IF_EQ(GB_StoryProgress, STORY_CH4_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 1, 8) + EVT_ELSE + EVT_EXEC(N(EVS_SetupMusic)) + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_04_ENTRY_5) + EVT_WAIT(65) + EVT_ELSE + EVT_WAIT(1) + EVT_END_IF + EVT_SET(GF_MAC01_RowfBadgesChosen, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/mac_04_3_rooms.c b/src/world/area_mac/mac_04/mac_04_3_rooms.c new file mode 100644 index 0000000000..db644992c7 --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_3_rooms.c @@ -0,0 +1,274 @@ +#include "mac_04.h" + +s32 set_background_color_blend(s32, s32, s32, s32); + +API_CALLABLE(N(InitEntryFromToybox)) { + func_8011B950(MODEL_heiho_house, -1, 1, 1); + set_background_color_blend(0, 0, 0, 255); + gCameras[CAM_DEFAULT].bgColor[0] = 0; + gCameras[CAM_DEFAULT].bgColor[1] = 0; + gCameras[CAM_DEFAULT].bgColor[2] = 0; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetDoorRot_Shop) = { + EVT_CALL(RotateModel, MODEL_msdoor, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_Shop) = { + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_my1, LVar1, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_my2, LVar1, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_my3, LVar1, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_my4, LVar1, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_my5, LVar1, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_mk1, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_mk2, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_mk3, LVar1, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_Shop) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(EnableGroup, MODEL_mise_in, TRUE) + EVT_EXEC(N(EVS_80248B08)) + EVT_CASE_EQ(3) + EVT_CALL(EnableGroup, MODEL_mise_in, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetDoorRot_NiceHouse) = { + EVT_CALL(RotateModel, MODEL_rndoor, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_NiceHouse) = { + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_rnk1, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_rnk2, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_rnk3, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_rnk4, LVar1, 1, 0, 0) + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_rnk5, LVar1, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_rnk6, LVar1, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DropDoor_NiceHouse) = { + EVT_CALL(RotateModel, MODEL_rndoor, LVar0, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_NiceHouse) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(EnableGroup, MODEL_rin_in, TRUE) + EVT_CASE_EQ(3) + EVT_CALL(EnableGroup, MODEL_rin_in, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetDoorRot_Storeroom) = { + EVT_CALL(RotateModel, MODEL_skd, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_Storeroom) = { + EVT_SET(LVar1, LVar0) + EVT_MULF(LVar1, EVT_FLOAT(2.78125)) + EVT_CALL(TranslateModel, MODEL_skk1, 0, 0, LVar1) + EVT_CALL(TranslateModel, MODEL_skk2, 0, 0, LVar1) + EVT_CALL(TranslateModel, MODEL_skk3, 0, 0, LVar1) + EVT_CALL(TranslateModel, MODEL_skk4, 0, 0, LVar1) + EVT_CALL(TranslateModel, MODEL_skk5, 0, 0, LVar1) + EVT_CALL(TranslateModel, MODEL_skk6, 0, 0, LVar1) + EVT_CALL(TranslateModel, MODEL_skk7, 0, 0, LVar1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DropDoor_Storeroom) = { + EVT_CALL(RotateModel, MODEL_skd, LVar0, 0, 0, -1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_Storeroom) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetDoorRot_Warehouse) = { + EVT_CALL(RotateModel, MODEL_hh_door, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_Warehouse) = { + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_hk1, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk2, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk3, LVar1, 0, 0, -1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_Warehouse) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(EnableGroup, MODEL_heiho_in, TRUE) + EVT_SET(MF_MusicMixTrigger, TRUE) + EVT_CASE_EQ(1) + EVT_EXEC(N(D_80248798_84B368)) + EVT_CASE_EQ(3) + EVT_CALL(EnableGroup, MODEL_heiho_in, FALSE) + EVT_CALL(EnableGroup, MODEL_hi_soto, TRUE) + EVT_SET(MF_MusicMixTrigger, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetDoorRot_HiddenRoom) = { + EVT_CALL(RotateModel, MODEL_hkai1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_hkai2, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_HiddenRoom) = { + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_hk4, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk5, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk6, LVar1, 0, 0, -1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_HiddenRoom) = { + EVT_RETURN + EVT_END +}; + +s32 N(InsideNPCs_Shop)[] = { + NPC_HarryT, + NPC_ShyGuy_02, + -1 +}; + +s32 N(InsideNPCs_NiceHouse)[] = { + NPC_NewResident1, + NPC_NewResident2, + -1 +}; + +s32 N(InsideNPCs_Warehouse)[] = { + NPC_ShyGuy_01, + -1 +}; + +EvtScript N(EVS_MakeHiddenRoom) = { + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_2), + EVT_PTR(N(EVS_SetDoorRot_HiddenRoom)), + EVT_PTR(N(EVS_MoveWalls_HiddenRoom)), + NULL, + EVT_PTR(N(EVS_ToggleVis_HiddenRoom)), + COLLIDER_deilit_hk, + COLLIDER_deilit_hku, + MODEL_o13, + NULL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeStoreroom) = { + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_2, VIS_GROUP_2), + EVT_PTR(N(EVS_SetDoorRot_Storeroom)), + EVT_PTR(N(EVS_MoveWalls_Storeroom)), + EVT_PTR(N(EVS_DropDoor_Storeroom)), + EVT_PTR(N(EVS_ToggleVis_Storeroom)), + COLLIDER_deilit_sku, + COLLIDER_deilit_sk, + MODEL_o13, + NULL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupRooms) = { + // harry's shop on the right + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_1, VIS_GROUP_2), + EVT_PTR(N(EVS_SetDoorRot_Shop)), + EVT_PTR(N(EVS_MoveWalls_Shop)), + NULL, + EVT_PTR(N(EVS_ToggleVis_Shop)), + COLLIDER_deilit_m, + COLLIDER_deilit_mu, + MODEL_mise, + EVT_PTR(N(InsideNPCs_Shop))) + // nice house in the middle + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_2), + EVT_PTR(N(EVS_SetDoorRot_NiceHouse)), + EVT_PTR(N(EVS_MoveWalls_NiceHouse)), + EVT_PTR(N(EVS_DropDoor_NiceHouse)), + EVT_PTR(N(EVS_ToggleVis_NiceHouse)), + COLLIDER_deilit_r, + COLLIDER_deilit_ru, + MODEL_rinjin, + EVT_PTR(N(InsideNPCs_NiceHouse))) + // warehouse on the left + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_2), + EVT_PTR(N(EVS_SetDoorRot_Warehouse)), + EVT_PTR(N(EVS_MoveWalls_Warehouse)), + NULL, + EVT_PTR(N(EVS_ToggleVis_Warehouse)), + COLLIDER_deilit_h, + COLLIDER_deilit_hu, + MODEL_heiho_house, + EVT_PTR(N(InsideNPCs_Warehouse))) + EVT_IF_GE(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_EXEC_WAIT(N(EVS_MakeStoreroom)) + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH4_FOUND_HIDDEN_DOOR) + EVT_EXEC_WAIT(N(EVS_MakeHiddenRoom)) + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(mac_04_ENTRY_2, mac_04_ENTRY_3) + EVT_CALL(SetGroupEnabled, MODEL_heiho_in, 1) + EVT_CALL(N(InitEntryFromToybox)) + EVT_SET(LVar0, 90) + EVT_CALL(RotateModel, MODEL_hk1, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk2, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk3, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk4, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk5, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_hk6, LVar0, 0, 0, -1) + EVT_CASE_DEFAULT + EVT_SET(LVar0, 3) + EVT_EXEC(N(EVS_ToggleVis_Shop)) + EVT_EXEC(N(EVS_ToggleVis_NiceHouse)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/mac_04_4_foliage.c b/src/world/area_mac/mac_04/mac_04_4_foliage.c new file mode 100644 index 0000000000..722c8abcdb --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_4_foliage.c @@ -0,0 +1,83 @@ +#include "mac_04.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o287); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o286); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { 436.0f, 135.0f, -246.0f }, + { 476.0f, 135.0f, -256.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 470.0f, 20.0f, -242.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o290); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o291); + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { 41.0f, 110.0f, -149.0f }, + { 81.0f, 110.0f, -159.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 50.0f, 20.0f, -141.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o288); +FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o289); + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { -313.0f, 133.0f, 80.0f }, + { -273.0f, 133.0f, 70.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .vectors = &N(Tree3_Effects), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { -293.0f, 20.0f, 86.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o452, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o446, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o435, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/mac_04_5_shop.c b/src/world/area_mac/mac_04/mac_04_5_shop.c new file mode 100644 index 0000000000..77ea3ff5b0 --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_5_shop.c @@ -0,0 +1,82 @@ +#include "mac_04.h" + +s32 N(ShopMessages)[] = { + MSG_Shop_001B, + MSG_Shop_001C, + MSG_Shop_001D, + MSG_Shop_001E, + MSG_Shop_001F, + MSG_Shop_0020, + MSG_Shop_0021, + MSG_Shop_0022, + MSG_Shop_0023, + MSG_Shop_0024, + MSG_Shop_0025, + MSG_Shop_0026, + MSG_Shop_0027, + MSG_Shop_0028, + MSG_Shop_0029, + MSG_Shop_002A, + MSG_Shop_002B, + MSG_Shop_002C, + MSG_Shop_002D, + MSG_Shop_002E, + MSG_Shop_002F, + MSG_Shop_0030, + MSG_Shop_0031, +}; + +ShopItemData N(Inventory)[] = { + { .itemID = ITEM_STONE_CAP, .price = 30, .descMsg = MSG_ItemShopDesc_StoneCap }, + { .itemID = ITEM_DIZZY_DIAL, .price = 15, .descMsg = MSG_ItemShopDesc_DizzyDial }, + { .itemID = ITEM_THUNDER_RAGE, .price = 20, .descMsg = MSG_ItemShopDesc_ThunderRage }, + { .itemID = ITEM_TASTY_TONIC, .price = 5, .descMsg = MSG_ItemShopDesc_TastyTonic }, + { .itemID = ITEM_VOLT_SHROOM, .price = 10, .descMsg = MSG_ItemShopDesc_VoltShroom }, + { .itemID = ITEM_SUPER_SHROOM, .price = 20, .descMsg = MSG_ItemShopDesc_SuperShroom }, + {} +}; + +ShopSellPriceData N(PriceList)[] = { + { .itemID = ITEM_FIRE_FLOWER, .sellPrice = 7 }, + { .itemID = ITEM_POW_BLOCK, .sellPrice = 5 }, + { .itemID = ITEM_SHOOTING_STAR, .sellPrice = 20 }, + { .itemID = ITEM_WHACKAS_BUMP, .sellPrice = 50 }, + { .itemID = ITEM_STOP_WATCH, .sellPrice = 20 }, + { .itemID = ITEM_REPEL_GEL, .sellPrice = 30 }, + {} +}; + +EvtScript N(EVS_OnBuy) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(3) + EVT_CASE_EQ(4) + EVT_CASE_EQ(1) + EVT_CASE_EQ(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +ShopItemLocation N(ItemPositions)[] = { + { .posModelID = MODEL_mono1, .triggerColliderID = COLLIDER_mono1 }, + { .posModelID = MODEL_mono2, .triggerColliderID = COLLIDER_mono2 }, + { .posModelID = MODEL_mono3, .triggerColliderID = COLLIDER_mono3 }, + { .posModelID = MODEL_mono4, .triggerColliderID = COLLIDER_mono4 }, + { .posModelID = MODEL_mono5, .triggerColliderID = COLLIDER_mono5 }, + { .posModelID = MODEL_mono6, .triggerColliderID = COLLIDER_mono6 }, +}; + +ShopOwner N(Owner) = { + .npcID = NPC_HarryT, + .idleAnim = ANIM_HarryT_Idle, + .talkAnim = ANIM_HarryT_Talk, + .onBuyEvt = &N(EVS_OnBuy), + .shopMsgIDs = N(ShopMessages) , +}; + +EvtScript N(EVS_SetupShop) = { + EVT_CALL(MakeShop, EVT_PTR(N(ItemPositions)), EVT_PTR(N(Inventory)), EVT_PTR(N(PriceList)), ITEM_ENTITY_FLAGS_10000) + EVT_CALL(MakeShopOwner, EVT_PTR(N(Owner))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/mac_04_6_npc.c new file mode 100644 index 0000000000..2e034683b9 --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_6_npc.c @@ -0,0 +1,528 @@ +#include "mac_04.h" + +extern EvtScript ItemShopInteract; + +#include "world/common/npc/Toad_Wander.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" + +NpcSettings N(NpcSettings_ChetRippo) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +#include "world/common/npc/GoombaFamily.inc.c" +#include "world/common/npc/StarSpirit.inc.c" +#include "world/common/npc/Twink.inc.c" +#define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo +#include "world/common/complete/Quizmo.inc.c" + +MAP_STATIC_PAD(1,key_choice); +#include "world/common/complete/KeyItemChoice.inc.c" + +EvtScript N(EVS_TossTrainInToybox) = { + EVT_CALL(func_802D2884, -440, -150, 0) + EVT_WAIT(15) + EVT_THREAD + EVT_WAIT(7) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 50) + EVT_SETF(LVar5, 3) + EVT_CALL(MakeItemEntity, ITEM_TOY_TRAIN, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(LVar7, LVar0) + EVT_CALL(MakeLerp, LVar4, -150, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetItemPos, LVar7, -440, LVar3, LVar0) + EVT_ADDF(LVar5, EVT_FLOAT(-0.5)) + EVT_ADD(LVar3, LVar5) + EVT_IF_LT(LVar3, 0) + EVT_SET(LVar3, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(RemoveItemEntity, LVar7) + EVT_END_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ItemPrompt_ToyTrain) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowKeyChoicePopup) + EVT_SET(LVar2, LVar0) + EVT_IF_LE(LVar2, 0) + EVT_IF_EQ(LVar2, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_Toybox, 160, 40) + EVT_END_IF + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, 0) + EVT_CALL(MakeLerp, 0, -90, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_DIV(LVar2, 3) + EVT_CALL(RotateGroup, MODEL_box_top, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC_WAIT(N(EVS_TossTrainInToybox)) + EVT_CALL(MakeLerp, -90, 0, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_DIV(LVar2, 3) + EVT_CALL(RotateGroup, MODEL_box_top, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, 0) + EVT_CALL(CloseChoicePopup) + EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_UNBIND + EVT_CALL(GotoMap, EVT_PTR("omo_03"), omo_03_ENTRY_6) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(ItemList_ToyTrain)[] = { + ITEM_TOY_TRAIN, + ITEM_NONE +}; + +EvtScript N(EVS_Toybox_SetupTrainPrompt) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_ToyTrain)), TRIGGER_WALL_PRESS_A, COLLIDER_o468, EVT_PTR(N(ItemList_ToyTrain)), 0, 1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(get_total_equipped_bp_cost)(void) { + s32 bpCost = 0; + s32 i = 0; + ItemData* itemTable = gItemTable; + + for (; i < ARRAY_COUNT(gPlayerData.equippedBadges); i++) { + s16 badge = gPlayerData.equippedBadges[i]; + + if (badge != 0) { + bpCost += gMoveTable[itemTable[badge].moveID].costBP; + } + } + return bpCost; +} + +API_CALLABLE(N(EnforceNewStatLimits)) { + PlayerData* playerData = &gPlayerData; + Bytecode* args = script->ptrReadPos; + s32 outVar = *args++; + s32 bpCost = N(get_total_equipped_bp_cost)(); + s32 i; + + if (gPlayerData.maxBP >= bpCost) { + evt_set_variable(script, outVar, FALSE); + return ApiStatus_DONE2; + } else { + s16* badges = gPlayerData.equippedBadges; + // force unequip all badges if over the limit + for (i = 0; i < ARRAY_COUNT(gPlayerData.equippedBadges); i++) { + badges[i] = 0; + } + enforce_hpfp_limits(); + evt_set_variable(script, outVar, TRUE); + return ApiStatus_DONE2; + } +} + +// npc scripts +#include "npc_muskular.inc.c" +#include "npc_twink.inc.c" +#include "npc_toybox_shyguy.inc.c" +#include "npc_harry_t.inc.c" +#include "npc_chet_rippo.inc.c" +#include "npc_new_residents.inc.c" +#include "npc_toad_01.inc.c" +#include "npc_toad_02.inc.c" +#include "npc_toad_kids.inc.c" +#include "npc_toadette_03.inc.c" +#include "npc_toad_03.inc.c" +#include "npc_gossip_trio.inc.c" +#include "npc_goomba_family.inc.c" + +StaticNpc N(NpcData_Townsfolk)[] = { + { + .id = NPC_ChetRippo, + .settings = &N(NpcSettings_ChetRippo), + .pos = { 410.0f, 20.0f, -200.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_ChetRippo), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ChetRippo_Idle, + }, + .tattle = MSG_NpcTattle_ChetRippo, + }, + { + .id = NPC_HarryT, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 310.0f, 20.0f, -430.0f }, + .yaw = 230, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_HarryT), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_HarryT_Idle, + .walk = ANIM_HarryT_Walk, + .run = ANIM_HarryT_Run, + .chase = ANIM_HarryT_Run, + .anim_4 = ANIM_HarryT_Idle, + }, + .tattle = MSG_NpcTattle_HarryT_ShopOwner, + }, + { + .id = NPC_NewResident1, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -80.0f, 20.0f, -100.0f }, + .yaw = 133, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_NewResident1), + .drops = TOADETTE_DROPS, + .animations = TOADETTE_GREEN_ANIMS, + .tattle = MSG_NpcTattle_MAC_NewResidentA, + }, + { + .id = NPC_NewResident2, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -133.0f, 20.0f, -82.0f }, + .yaw = 133, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_NewResident2), + .drops = TOADETTE_DROPS, + .animations = TOADETTE_PURPLE_ANIMS, + .tattle = MSG_NpcTattle_MAC_NewResidentB, + }, + { + .id = NPC_Toad_01, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { 48.0f, 0.0f, 153.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_01), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 48, 0, 153 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 48, 0, 153 }, + .detectSize = { 10 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + .tattle = MSG_NpcTattle_MAC_TalksAlot, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -239.0f, 20.0f, 105.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_02), + .drops = TOAD_DROPS, + .animations = TOAD_BLUE_ANIMS, + .tattle = MSG_NpcTattle_MAC_WaryListener, + }, + { + .id = NPC_ToadKid_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 254.0f, 20.0f, 436.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ToadKid_01), + .drops = TOAD_KID_DROPS, + .animations = TOAD_KID_RED_ANIMS, + .tattle = MSG_NpcTattle_MAC_CarefreeKids, + }, + { + .id = NPC_ToadKid_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 304.0f, 20.0f, 410.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ToadKid_02), + .drops = TOAD_KID_DROPS, + .animations = TOAD_KID_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_MAC_OutdoorKids, + }, + { + .id = NPC_ToadKid_03, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 345.0f, 20.0f, 438.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ToadKid_03), + .drops = TOAD_KID_DROPS, + .animations = TOAD_KID_GREEN_ANIMS, + .tattle = MSG_NpcTattle_MAC_ShyKid, + }, + { + .id = NPC_Toadette_03, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -274.0f, 0.0f, 400.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toadette_03), + .drops = TOADETTE_DROPS, + .animations = TOADETTE_ORANGE_ANIMS, + .tattle = MSG_NpcTattle_ToadWhoWalks, + }, + { + .id = NPC_Toad_03, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 500.0f, 20.0f, -160.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_03), + .drops = TOAD_DROPS, + .animations = TOAD_GREEN_ANIMS, + .tattle = MSG_NpcTattle_GuideToad, + }, + { + .id = NPC_GossipTrio1, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -110.0f, 0.0f, 568.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_GossipTrio1), + .drops = TOAD_DROPS, + .animations = TOAD_GREEN_ANIMS, + .tattle = MSG_NpcTattle_GreatGossipTrioA, + }, + { + .id = NPC_GossipTrio2, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -114.0f, 0.0f, 498.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_GossipTrio2), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_GreatGossipTrioB, + }, + { + .id = NPC_GossipTrio3, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -52.0f, 0.0f, 525.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_GossipTrio3), + .drops = TOAD_DROPS, + .animations = TOAD_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_GreatGossipTrioC, + }, +}; + +s32 N(ExtraAnims_Twink)[] = { + ANIM_Twink_Idle, + ANIM_Twink_Fly, + ANIM_Twink_Talk, + -1 +}; + +StaticNpc N(NpcData_Chapter4)[] = { + { + .id = NPC_Twink, + .settings = &N(NpcSettings_Twink), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_TwinkStartCh4), + .drops = TWINK_DROPS, + .animations = TWINK_ANIMS, + .extraAnimations = N(ExtraAnims_Twink), + }, + { + .id = NPC_ShyGuy_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Red_Anim01, + .walk = ANIM_ShyGuy_Red_Anim02, + .run = ANIM_ShyGuy_Red_Anim03, + .chase = ANIM_ShyGuy_Red_Anim03, + .anim_4 = ANIM_ShyGuy_Red_Anim01, + .anim_5 = ANIM_ShyGuy_Red_Anim01, + .death = ANIM_ShyGuy_Red_Anim0C, + .hit = ANIM_ShyGuy_Red_Anim0C, + .anim_8 = ANIM_ShyGuy_Red_Anim15, + .anim_9 = ANIM_ShyGuy_Red_Anim12, + .anim_A = ANIM_ShyGuy_Red_Anim11, + .anim_B = ANIM_ShyGuy_Red_Anim10, + .anim_C = ANIM_ShyGuy_Red_Anim05, + .anim_D = ANIM_ShyGuy_Red_Anim01, + .anim_E = ANIM_ShyGuy_Red_Anim01, + .anim_F = ANIM_ShyGuy_Red_Anim01, + }, + }, + { + .id = NPC_ShyGuy_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ShyGuy_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Red_Anim01, + .walk = ANIM_ShyGuy_Red_Anim02, + .run = ANIM_ShyGuy_Red_Anim03, + .chase = ANIM_ShyGuy_Red_Anim03, + .anim_4 = ANIM_ShyGuy_Red_Anim01, + .anim_5 = ANIM_ShyGuy_Red_Anim01, + .death = ANIM_ShyGuy_Red_Anim0C, + .hit = ANIM_ShyGuy_Red_Anim0C, + .anim_8 = ANIM_ShyGuy_Red_Anim15, + .anim_9 = ANIM_ShyGuy_Red_Anim12, + .anim_A = ANIM_ShyGuy_Red_Anim11, + .anim_B = ANIM_ShyGuy_Red_Anim10, + .anim_C = ANIM_ShyGuy_Red_Anim05, + .anim_D = ANIM_ShyGuy_Red_Anim01, + .anim_E = ANIM_ShyGuy_Red_Anim01, + .anim_F = ANIM_ShyGuy_Red_Anim01, + }, + }, +}; + +StaticNpc N(NpcData_PostChapter4)[] = { + { + .id = NPC_Muskular, + .settings = &N(NpcSettings_StarSpirit), + .pos = { -486.0f, 20.0f, 259.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Muskular), + .drops = MUSKULAR_DROPS, + .animations = MUSKULAR_ANIMS, + }, + { + .id = NPC_Twink, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_TwinkEndCh4), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = TWINK_ANIMS, + }, +}; + +StaticNpc N(NpcData_GoombaFamily)[] = { + { + .id = NPC_Goomama, + .settings = &N(NpcSettings_Goomba_Family), + .pos = { -126.0f, 0.0f, 329.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Goomama), + .drops = GOOMAMA_DROPS, + .animations = GOOMAMA_ANIMS, + .tattle = MSG_NpcTattle_Goomama, + }, + { + .id = NPC_Goombaria, + .settings = &N(NpcSettings_Goomba_Family), + .pos = { -117.0f, 0.0f, 305.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Goombaria), + .drops = GOOMBARIA_DROPS, + .animations = GOOMBARIA_ANIMS, + .tattle = MSG_NpcTattle_Goombaria, + }, +}; + +StaticNpc N(NpcData_ChuckQuizmo) = { + .id = NPC_ChuckQuizmo, + .settings = &N(Quizmo_NpcSettings), + .pos = { 57.0f, 20.0f, -114.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, + .initVarCount = 1, + .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_04 }}, + .drops = QUIZMO_DROPS, + .animations = QUIZMO_ANIMS, + .tattle = MSG_NpcTattle_ChuckQuizmo, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Townsfolk)), + NPC_GROUP(N(NpcData_ChuckQuizmo)), + {} +}; + +NpcGroupList N(Chapter4NPCs) = { + NPC_GROUP(N(NpcData_Townsfolk)), + NPC_GROUP(N(NpcData_Chapter4)), + {} +}; + +NpcGroupList N(PostChapter4NPCs) = { + NPC_GROUP(N(NpcData_Townsfolk)), + NPC_GROUP(N(NpcData_PostChapter4)), + {} +}; + +NpcGroupList N(Chapter7NPCs) = { + NPC_GROUP(N(NpcData_Townsfolk)), + NPC_GROUP(N(NpcData_GoombaFamily)), + {} +}; diff --git a/src/world/area_mac/mac_04/mac_04_7_wish_scene.c b/src/world/area_mac/mac_04/mac_04_7_wish_scene.c new file mode 100644 index 0000000000..89ff10ecc9 --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_7_wish_scene.c @@ -0,0 +1,84 @@ +#include "mac_04.h" + +#define NAME_SUFFIX _Wish +#include "world/common/npc/Toad_Wander.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" +#include "world/common/npc/GoombaFamily.inc.c" +#include "world/common/npc/StarSpirit.inc.c" +#define NAME_SUFFIX + +EvtScript N(EVS_Scene_WishingToadKid) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -100, 0, 200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -100, 0, 200) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-400.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-8.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_WishingToadKid, ANIM_ToadKid_Red_Talk, ANIM_ToadKid_Red_Disappointed, 0, MSG_HOS_0070) + EVT_WAIT(10) + EVT_CALL(GotoMap, EVT_PTR("hos_20"), hos_20_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_WishingToadKid) = { + EVT_CALL(SetNpcPos, NPC_SELF, -100, 0, 200) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_WishSceneToads)[] = { + { + .id = NPC_WishingToadKid, + .settings = &N(NpcSettings_Toad_Stationary_Wish), + .pos = { 350.0f, 0.0f, -20.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_WishingToadKid), + .drops = TOAD_KID_DROPS, + .animations = TOAD_KID_RED_ANIMS, + }, + { + .id = NPC_GossipTrio1, + .settings = &N(NpcSettings_Toad_Stationary_Wish), + .pos = { -245.0f, 20.0f, 100.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8, + .drops = TOAD_DROPS, + .animations = TOAD_GREEN_ANIMS, + .tattle = MSG_NpcTattle_GreatGossipTrioA, + }, + { + .id = NPC_GossipTrio2, + .settings = &N(NpcSettings_Toad_Stationary_Wish), + .pos = { -25.0f, 0.0f, 170.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8, + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_GreatGossipTrioB, + }, + { + .id = NPC_GossipTrio3, + .settings = &N(NpcSettings_Toad_Stationary_Wish), + .pos = { -100.0f, 0.0f, 305.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8, + .drops = TOAD_DROPS, + .animations = TOAD_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_GreatGossipTrioC, + }, +}; + +NpcGroupList N(WishSceneNPCs) = { + NPC_GROUP(N(NpcData_WishSceneToads)), + {} +}; diff --git a/src/world/area_mac/mac_04/mac_04_8_entity.c b/src/world/area_mac/mac_04/mac_04_8_entity.c new file mode 100644 index 0000000000..2a407f4b41 --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_8_entity.c @@ -0,0 +1,311 @@ +#include "mac_04.h" +#include "entity.h" +#include "sprite.h" + +void N(render_shrunk_player)(void); +void N(appendGfx_shrunk_player)(void*); + +MAP_RODATA_PAD(2,unk); + +API_CALLABLE(N(CreateShrinkingWorker)) { + gPlayerStatus.animFlags |= PA_FLAGS_INVISIBLE; + evt_set_variable(script, MV_DrawShinkingPlayerWorker, create_worker_world(NULL, N(render_shrunk_player))); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DestroyShrinkingWorker)) { + s32 index = evt_get_variable(script, MV_DrawShinkingPlayerWorker); + gPlayerStatus.animFlags &= ~PA_FLAGS_INVISIBLE; + free_worker(index); + + return ApiStatus_DONE2; +} + +void N(render_shrunk_player)(void) { + RenderTask renderTask; + s32 screenX, screenY, screenZ; + + get_screen_coords(gCurrentCamID, + gPlayerStatus.position.x, gPlayerStatus.position.y, gPlayerStatus.position.z, + &screenX, &screenY, &screenZ); + + renderTask.appendGfxArg = &gPlayerStatus; + renderTask.appendGfx = N(appendGfx_shrunk_player); + renderTask.renderMode = gPlayerStatus.renderMode; + renderTask.distance = screenZ; + + queue_render_task(&renderTask); +} + +void N(appendGfx_shrunk_player)(void* data) { + PlayerStatus* playerStatus = data; + f32 shrinkScale = evt_get_float_variable(NULL, MV_PlayerShrinkScale); + Matrix4f transformMtx; + Matrix4f tempMtx; + + guRotateF(transformMtx, playerStatus->spriteFacingAngle, 0.0f, 1.0f, 0.0f); + guScaleF(tempMtx, shrinkScale * SPRITE_WORLD_SCALE_D, shrinkScale * SPRITE_WORLD_SCALE_D, shrinkScale * SPRITE_WORLD_SCALE_D); + guMtxCatF(transformMtx, tempMtx, transformMtx); + guTranslateF(tempMtx, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); + guMtxCatF(transformMtx, tempMtx, transformMtx); + playerStatus->animNotifyValue = spr_update_player_sprite(0, playerStatus->trueAnimation, 1.0f); + spr_draw_player_sprite(0, 0, 0, NULL, transformMtx); +} + +EvtScript N(EVS_ShrinkPlayer) = { + EVT_SETF(MV_PlayerShrinkScale, EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_TIME_STOPPED, TRUE) + EVT_CALL(N(CreateShrinkingWorker)) + EVT_THREAD + EVT_WAIT(8) + EVT_CALL(MakeLerp, 100, 20, 20, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_PlayerShrinkScale, LVar0) + EVT_DIVF(MV_PlayerShrinkScale, 100) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UnshrinkPlayer) = { + EVT_SETF(MV_PlayerShrinkScale, EVT_FLOAT(0.2)) + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_TIME_STOPPED, TRUE) + EVT_CALL(N(CreateShrinkingWorker)) + EVT_THREAD + EVT_CALL(MakeLerp, 20, 100, 40, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_PlayerShrinkScale, LVar0) + EVT_DIVF(MV_PlayerShrinkScale, 100) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FinishUnshrinking) = { + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_TIME_STOPPED, FALSE) + EVT_CALL(N(DestroyShrinkingWorker)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCameraOnPlayer) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterToybox) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC_WAIT(N(EVS_ShrinkPlayer)) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_FocusCameraOnPlayer), LVarA) + EVT_THREAD + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, 0) + EVT_CALL(MakeLerp, 0, -90, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_DIV(LVar2, 3) + EVT_CALL(RotateGroup, MODEL_box_top, LVar0, 0, 0, 1) + EVT_CALL(TranslateGroup, MODEL_box_top, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlaySoundAtPlayer, SOUND_D9, 0) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.35)) + EVT_CALL(PlayerJump, -450, 20, -160, 32) + EVT_END_THREAD + EVT_WAIT(25) + EVT_IF_EQ(GF_StartedChapter4, FALSE) + EVT_SET(GF_StartedChapter4, TRUE) + EVT_CALL(FadeOutMusic, 0, 1500) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_4, TRANSITION_6) + EVT_WAIT(100) + EVT_RETURN + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_03"), omo_03_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitToybox) = { + EVT_SET(AF_ExitingToybox, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC_WAIT(N(EVS_UnshrinkPlayer)) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_WAIT(1) + EVT_THREAD + EVT_CALL(MakeLerp, -90, 0, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_DIV(LVar2, 3) + EVT_CALL(RotateGroup, MODEL_box_top, LVar0, 0, 0, 1) + EVT_CALL(TranslateGroup, MODEL_box_top, 0, LVar2, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_1AA, 0) + EVT_END_THREAD + EVT_EXEC_GET_TID(N(EVS_FocusCameraOnPlayer), LVarA) + EVT_CALL(PlaySoundAtPlayer, SOUND_DA, 0) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) + EVT_CALL(PlayerJump, -480, 45, -90, 25) + EVT_EXEC_WAIT(N(EVS_FinishUnshrinking)) + EVT_KILL_THREAD(LVarA) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BounceOffSpring) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_FocusCameraOnPlayer), LVarA) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) + EVT_CALL(PlayerJump, -430, 20, -45, 15) + EVT_SET(AF_ExitingToybox, FALSE) + EVT_KILL_THREAD(LVarA) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseSpring_Toybox) = { + EVT_IF_EQ(AF_ExitingToybox, FALSE) + EVT_EXEC(N(EVS_EnterToybox)) + EVT_ELSE + EVT_EXEC(N(EVS_BounceOffSpring)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UnlockStoreroom) = { + EVT_EXEC_WAIT(N(EVS_MakeStoreroom)) + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/RemovePadlock.inc.c" + +s32 N(StoreroomKeyList)[] = { + ITEM_STOREROOM_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_ItemPrompt_StoreroomKey) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_269, 0, 155, 48, -480) + EVT_SET(LVar0, MV_StoreroomLockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_WAIT(5) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0004) + EVT_CALL(SetNpcFlagBits, NPC_HarryT, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Run) + EVT_CALL(NpcMoveTo, NPC_HarryT, 295, -460, 0) + EVT_CALL(NpcMoveTo, NPC_HarryT, 230, -480, 0) + EVT_CALL(NpcJump0, NPC_HarryT, 200, 30, -524, 0) + EVT_CALL(SetNpcPos, NPC_HarryT, 200, 30, -524) + EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Idle) + EVT_CALL(SetNpcFlagBits, NPC_HarryT, NPC_FLAG_100, FALSE) + EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0005) + EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ForceStoreroomUnlock) = { + EVT_SET(LVar0, MV_StoreroomLockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnInspect_StreetSign) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0173, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 155, 48, -480, 90, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_UnlockStoreroom))) + EVT_SET(MV_StoreroomLockEntityID, LVar0) + EVT_CALL(SetEntityCullMode, 3) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_StoreroomKey)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(StoreroomKeyList)), 0, 1) + EVT_END_IF + EVT_CALL(MakeItemEntity, ITEM_VIS_GROUP(ITEM_TOY_TRAIN, VIS_GROUP_2), 50, 40, -430, ITEM_SPAWN_MODE_KEY, GF_MAC04_Item_ToyTrain) + EVT_THREAD + EVT_IF_LT(GB_StoryProgress, STORY_CH4_GOT_TOY_TRAIN) + EVT_LOOP(0) + EVT_IF_NE(GF_MAC04_Item_ToyTrain, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH4_GOT_TOY_TRAIN) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_IF + EVT_END_THREAD + EVT_CALL(MakeItemEntity, ITEM_VIS_GROUP(ITEM_SNOWMAN_DOLL, VIS_GROUP_2), 50, 40, -310, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_MAC04_Item_SnowmanDoll) + EVT_CALL(MakeItemEntity, ITEM_VIS_GROUP(ITEM_VOLT_SHROOM, VIS_GROUP_2), 50, 40, -370, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_MAC04_Item_VoltShroom) + EVT_CALL(MakeItemEntity, ITEM_VIS_GROUP(ITEM_DIZZY_DIAL, VIS_GROUP_2), 50, 40, -490, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_MAC04_Item_DizzyDial) + EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), -480, 20, -90, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring_Toybox))) + EVT_CALL(SetEntityCullMode, 2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspect_StreetSign)), TRIGGER_WALL_PRESS_A, COLLIDER_sign, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/mac_04_9_music_mix.c b/src/world/area_mac/mac_04/mac_04_9_music_mix.c new file mode 100644 index 0000000000..6523202cf5 --- /dev/null +++ b/src/world/area_mac/mac_04/mac_04_9_music_mix.c @@ -0,0 +1,21 @@ +#include "mac_04.h" + +#include "world/common/atomic/MonitorMusicProximityTrigger.inc.c" + +MusicProximityTrigger N(MusicMixTrigger) = { + .pos = { -480.0f, 220.0f }, + .innerDist = 100.0f, + .outerDist = 120.0f, + .unk = 9, + .manualActivationFlag = MF_MusicMixTrigger, +}; + +EvtScript N(EVS_SetupMusicTriggers) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN, 0, 8) + EVT_CALL(EnableMusicProximityMix, 0) + EVT_THREAD + EVT_CALL(N(MonitorMusicProximityTrigger), EVT_PTR(N(MusicMixTrigger))) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_chet_rippo.inc.c b/src/world/area_mac/mac_04/npc_chet_rippo.inc.c new file mode 100644 index 0000000000..1aaabc450c --- /dev/null +++ b/src/world/area_mac/mac_04/npc_chet_rippo.inc.c @@ -0,0 +1,217 @@ +#include "world/common/todo/GetPlayerCoins.inc.c" + +API_CALLABLE(N(GetCurrentStatMaxima)) { + Bytecode* args = script->ptrReadPos; + s32 out1 = *args++; + s32 out2 = *args++; + s32 out3 = *args++; + + evt_set_variable(script, out1, gPlayerData.hardMaxHP); + evt_set_variable(script, out2, gPlayerData.hardMaxFP); + evt_set_variable(script, out3, gPlayerData.maxBP); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AdjustStatMaxima)) { + PlayerData* playerData = &gPlayerData; + s32 bp = 0; + s32 fp = 0; + s32 hp = 0; + + switch (script->varTable[10]) { + case 0: + hp = 10; + fp = -5; + bp = -3; + break; + case 1: + hp = -5; + fp = 10; + bp = -3; + break; + case 2: + hp = -5; + fp = -5; + bp = 6; + break; + } + + playerData->hardMaxHP += hp; + playerData->curMaxHP += hp; + if (playerData->curMaxHP > 75) { + playerData->curMaxHP = 75; + } + if (playerData->curHP > playerData->curMaxHP) { + playerData->curHP = playerData->curMaxHP; + } + playerData->hardMaxFP += fp; + playerData->curMaxFP += fp; + if (playerData->curMaxFP > 75) { + playerData->curMaxFP = 75; + } + if (playerData->curFP > playerData->curMaxFP) { + playerData->curFP = playerData->curMaxFP; + } + playerData->maxBP += bp; + if (playerData->maxBP > 30) { + playerData->maxBP = 30; + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetCurrentStatValues)) { + PlayerData* playerData = &gPlayerData; + + script->varTable[0] = playerData->curMaxHP; + script->varTable[1] = playerData->curMaxFP; + script->varTable[2] = playerData->maxBP; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetNpcShadowScale)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + f32 newShadowScale = evt_get_float_variable(script, *args++); + + resolve_npc(script, npcID)->shadowScale = newShadowScale; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetStatusMenuIgnoreChanges)) { + status_menu_ignore_changes(); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetStatusMenuRespondToChanges)) { + status_menu_respond_to_changes(); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ForceStatusMenuToAppear)) { + status_menu_respond_to_changes(); + open_status_menu_long(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcInteract_ChetRippo) = { + EVT_IF_EQ(GF_MAC04_Met_ChetRippo, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_00A8) + EVT_SET(GF_MAC04_Met_ChetRippo, TRUE) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_00A9) + EVT_END_IF + EVT_CALL(N(SetStatusMenuIgnoreChanges)) + EVT_CALL(SpeakToPlayer, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, LVar0) + EVT_CALL(ShowCoinCounter, TRUE) + EVT_CALL(ShowChoice, MSG_Choice_000E) + EVT_IF_NE(LVar0, 0) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(ContinueSpeech, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, MSG_MAC_Housing_00AA) + EVT_CALL(N(SetStatusMenuRespondToChanges)) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(GetPlayerCoins)) + EVT_IF_LT(LVar0, 39) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(ContinueSpeech, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, MSG_MAC_Housing_00AB) + EVT_CALL(N(SetStatusMenuRespondToChanges)) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(GetCurrentStatValues)) + EVT_CALL(SetMessageValue, LVar0, 0) + EVT_CALL(SetMessageValue, LVar1, 1) + EVT_CALL(SetMessageValue, LVar2, 2) + EVT_CALL(ContinueSpeech, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, MSG_MAC_Housing_00AC) + EVT_CALL(ShowChoice, MSG_Choice_000B) + EVT_IF_EQ(LVar0, 3) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(ContinueSpeech, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, MSG_MAC_Housing_00AD) + EVT_CALL(N(SetStatusMenuRespondToChanges)) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar2, 0) + EVT_CALL(N(GetCurrentStatMaxima), LVar3, LVar4, LVar5) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_IF_GT(LVar3, 40) + EVT_SET(LVar2, 1) + EVT_END_IF + EVT_SET(LVar1, MSG_Menus_00D1) + EVT_CASE_EQ(1) + EVT_IF_GT(LVar4, 40) + EVT_SET(LVar2, 1) + EVT_END_IF + EVT_SET(LVar1, MSG_Menus_00D2) + EVT_CASE_EQ(2) + EVT_IF_GT(LVar5, 24) + EVT_SET(LVar2, 1) + EVT_END_IF + EVT_SET(LVar1, MSG_Menus_00D3) + EVT_END_SWITCH + EVT_SET(LVarA, LVar0) + EVT_IF_EQ(LVar2, 1) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(ContinueSpeech, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, MSG_MAC_Housing_00B1) + EVT_CALL(N(SetStatusMenuRespondToChanges)) + EVT_RETURN + EVT_END_IF + EVT_CALL(AddCoin, -39) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(SetMessageMsg, LVar1, 0) + EVT_CALL(ContinueSpeech, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, MSG_MAC_Housing_00AE) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_ChetRippo, ANIM_ChetRippo_Spread) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_24B, 0) + EVT_CALL(GetNpcPos, NPC_ChetRippo, LVar6, LVar7, LVar8) + EVT_ADD(LVar7, 26) + EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar6, LVar7, LVar8, 1, 60) + EVT_CALL(SetNpcAnimation, NPC_ChetRippo, ANIM_ChetRippo_ShakeSlow) + EVT_WAIT(80) + EVT_CALL(SetNpcAnimation, NPC_ChetRippo, ANIM_ChetRippo_Idle) + EVT_CALL(N(AdjustStatMaxima)) + EVT_CALL(N(EnforceNewStatLimits), LVar6) + EVT_IF_EQ(LVar6, 0) + EVT_SET(LVar7, MSG_MAC_Housing_00AF) + EVT_ELSE + EVT_SET(LVar7, MSG_MAC_Housing_00B0) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_ChetRippo, ANIM_ChetRippo_Talk, ANIM_ChetRippo_Idle, 0, LVar7) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_ChetRippo, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_ChetRippo, SOUND_2098, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) + EVT_CALL(SetNpcPos, NPC_ChetRippo, NPC_DISPOSE_LOCATION) + EVT_SET(AF_MAC_32, TRUE) + EVT_CALL(N(ForceStatusMenuToAppear)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ChetRippo) = { + EVT_IF_EQ(AF_MAC_32, FALSE) + EVT_SET(LVar0, 0) + EVT_CALL(N(GetCurrentStatMaxima), LVar1, LVar2, LVar3) + EVT_IF_LE(LVar1, 5) + EVT_SET(LVar0, 1) + EVT_END_IF + EVT_IF_LE(LVar2, 5) + EVT_SET(LVar0, 1) + EVT_END_IF + EVT_IF_LE(LVar3, 3) + EVT_SET(LVar0, 1) + EVT_END_IF + EVT_ELSE + EVT_SET(LVar0, 1) + EVT_END_IF + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 38, 52) + EVT_CALL(N(SetNpcShadowScale), -1, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ChetRippo))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_goomba_family.inc.c b/src/world/area_mac/mac_04/npc_goomba_family.inc.c new file mode 100644 index 0000000000..8d26d04903 --- /dev/null +++ b/src/world/area_mac/mac_04/npc_goomba_family.inc.c @@ -0,0 +1,57 @@ +EvtScript N(EVS_NpcInteract_Goomama) = { + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(DisablePartnerAI, 1) + EVT_IF_EQ(GF_MAC04_HeardGoombaFamilyArgument, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_MAC_Housing_00B6) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_MAC_Housing_00B7) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_MAC_Housing_00B8) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_MAC_Housing_00B9) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_MAC_Housing_00BA) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_MAC_Housing_00BB) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_MAC_Housing_00BC) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_MAC_Housing_00BD) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_MAC_Housing_00BE) + EVT_SET(GF_MAC04_HeardGoombaFamilyArgument, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_MAC_Housing_00BF) + EVT_END_IF + EVT_CALL(EnablePartnerAI) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_MAC_Housing_00B5) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goombaria) = { + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(DisablePartnerAI, 1) + EVT_IF_EQ(AF_MAC_30, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_MAC_Housing_00C1) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_MAC_Housing_00C2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_MAC_Housing_00C3) + EVT_SET(AF_MAC_30, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_MAC_Housing_00C4) + EVT_END_IF + EVT_CALL(EnablePartnerAI) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_MAC_Housing_00C0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goomama) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Goomama))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goombaria) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Goombaria))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_gossip_trio.inc.c b/src/world/area_mac/mac_04/npc_gossip_trio.inc.c new file mode 100644 index 0000000000..e2d223d9f1 --- /dev/null +++ b/src/world/area_mac/mac_04/npc_gossip_trio.inc.c @@ -0,0 +1,83 @@ +EvtScript N(EVS_NpcInteract_GossipTrio) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0081) + EVT_SET(LVar1, MSG_MAC_Housing_0082) + EVT_SET(LVar2, MSG_MAC_Housing_0083) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0084) + EVT_SET(LVar1, MSG_MAC_Housing_0085) + EVT_SET(LVar2, MSG_MAC_Housing_0086) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0087) + EVT_SET(LVar1, MSG_MAC_Housing_0088) + EVT_SET(LVar2, MSG_MAC_Housing_0089) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_008A) + EVT_SET(LVar1, MSG_MAC_Housing_008B) + EVT_SET(LVar2, MSG_MAC_Housing_008C) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_008D) + EVT_SET(LVar1, MSG_MAC_Housing_008E) + EVT_SET(LVar2, MSG_MAC_Housing_008F) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0090) + EVT_SET(LVar1, MSG_MAC_Housing_0091) + EVT_SET(LVar2, MSG_MAC_Housing_0092) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Housing_0093) + EVT_SET(LVar1, MSG_MAC_Housing_0094) + EVT_SET(LVar2, MSG_MAC_Housing_0095) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0096) + EVT_SET(LVar1, MSG_MAC_Housing_0097) + EVT_SET(LVar2, MSG_MAC_Housing_0098) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Housing_0099) + EVT_SET(LVar1, MSG_MAC_Housing_009A) + EVT_SET(LVar2, MSG_MAC_Housing_009B) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_009C) + EVT_SET(LVar1, MSG_MAC_Housing_009D) + EVT_SET(LVar2, MSG_MAC_Housing_009E) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Housing_009F) + EVT_SET(LVar1, MSG_MAC_Housing_00A0) + EVT_SET(LVar2, MSG_MAC_Housing_00A1) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_00A2) + EVT_SET(LVar1, MSG_MAC_Housing_00A3) + EVT_SET(LVar2, MSG_MAC_Housing_00A4) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Housing_00A5) + EVT_SET(LVar1, MSG_MAC_Housing_00A6) + EVT_SET(LVar2, MSG_MAC_Housing_00A7) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_GossipTrio1, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 0, LVar0) + EVT_CALL(SpeakToPlayer, NPC_GossipTrio2, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar1) + EVT_CALL(SpeakToPlayer, NPC_GossipTrio3, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, LVar2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_GossipTrio1) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_GossipTrio))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_GossipTrio2) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_GossipTrio))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_GossipTrio3) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_GossipTrio))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_harry_t.inc.c b/src/world/area_mac/mac_04/npc_harry_t.inc.c new file mode 100644 index 0000000000..2b6c2d9ccb --- /dev/null +++ b/src/world/area_mac/mac_04/npc_harry_t.inc.c @@ -0,0 +1,59 @@ +s32 N(ItemList_StoreroomKey)[] = { + ITEM_STOREROOM_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_NpcInteract_HarryT) = { + EVT_SET(LVar9, 0) + EVT_IF_GE(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_SET(LVar9, 1) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVar9, 1) + EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0001) + EVT_SET(LVar0, EVT_PTR(N(ItemList_StoreroomKey))) + EVT_SET(LVar1, 0) + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0002) + EVT_CASE_EQ(0) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0003) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Run) + EVT_CALL(NpcMoveTo, NPC_HarryT, 295, -460, 0) + EVT_CALL(NpcMoveTo, NPC_HarryT, 230, -480, 0) + EVT_CALL(NpcJump0, NPC_HarryT, 198, 30, -480, 0) + EVT_CALL(NpcJump0, NPC_HarryT, 162, 40, -480, 0) + EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Idle) + EVT_WAIT(20) + EVT_EXEC(N(EVS_ForceStoreroomUnlock)) + EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Run) + EVT_CALL(NpcMoveTo, NPC_HarryT, 200, -524, 0) + EVT_CALL(SetNpcPos, NPC_HarryT, 200, 30, -524) + EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Idle) + EVT_CALL(InterpNpcYaw, NPC_HarryT, 180, 0) + EVT_CALL(PlayerFaceNpc, NPC_HarryT, FALSE) + EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0005) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_GRAVITY, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_END_SWITCH + EVT_ELSE + EVT_EXEC_WAIT(ItemShopInteract) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_HarryT) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_HarryT))) + EVT_IF_GE(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_CALL(SetNpcAnimation, NPC_HarryT, ANIM_HarryT_Idle) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_muskular.inc.c b/src/world/area_mac/mac_04/npc_muskular.inc.c new file mode 100644 index 0000000000..63d4a519ab --- /dev/null +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -0,0 +1,214 @@ + +API_CALLABLE(N(UpgradeStarPowerCh4)) { + PlayerData* playerData = &gPlayerData; + + set_max_SP(4); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcIdle_Muskular) = { + EVT_LOOP(0) + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_RescuedMuskular) = { + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(func_802CF56C, 2) + EVT_CALL(SetNpcPos, NPC_Muskular, -520, 40, 270) + EVT_CALL(PlayerFaceNpc, NPC_Muskular, FALSE) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Muskular, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -420, 20, 235) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -470, 20, 250) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, MSG_MAC_Housing_00C5) + EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), -9) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, MSG_MAC_Housing_00C6) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -470, 20, 250) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Muskular, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableNpcAI, NPC_Muskular, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Leap) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar3, LVar1) + EVT_ADD(LVar0, 10) + EVT_ADD(LVar1, 50) + EVT_ADD(LVar2, 10) + EVT_ADD(LVar3, 30) + EVT_LOOP(5) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20) + EVT_WAIT(6) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20) + EVT_WAIT(6) + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 20) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Idle) + EVT_CALL(EnableNpcAI, NPC_Muskular, TRUE) + EVT_CALL(N(UpgradeStarPowerCh4)) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0194, 160, 40) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, MSG_MAC_Housing_00C7) + EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Housing_00C8, 160, 40) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -470, 20, 250) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -500) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), -9) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(1) + EVT_CALL(SetNpcPos, NPC_Twink, -600, 200, 350) + EVT_CALL(NpcFlyTo, NPC_Twink, -437, 60, 270, 0, -10, EASING_LINEAR) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00C9) + EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) + EVT_WAIT(20) + EVT_CALL(NpcJump1, NPC_Twink, -460, 45, 220, 10) + EVT_CALL(SpeakToNpc, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 512, NPC_Muskular, MSG_MAC_Housing_00CA) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -300) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(1) + EVT_CALL(SpeakToNpc, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, NPC_Twink, MSG_MAC_Housing_00CB) + EVT_CALL(SpeakToNpc, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, NPC_Muskular, MSG_MAC_Housing_00CC) + EVT_CALL(SpeakToNpc, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, NPC_Twink, MSG_MAC_Housing_00CD) + EVT_CALL(SpeakToNpc, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, NPC_Muskular, MSG_MAC_Housing_00CE) + EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.5), -9) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, NPC_Twink, MSG_MAC_Housing_00CF) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -450, 20, 250) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -400) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_40000, TRUE) + EVT_THREAD + EVT_LOOP(25) + EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20) + EVT_WAIT(4) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 1800) + EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Muskular, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Muskular, LVar2, LVar3, LVar4) + EVT_SET(LVar5, LVar3) + EVT_ADD(LVar5, 180) + EVT_CALL(MakeLerp, LVar3, LVar5, 100, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_Muskular, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_Muskular, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_Muskular, SOUND_2045, 0) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(115) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 0, 8) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -450, 20, 250) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcSpeed, NPC_Twink, 4) + EVT_CALL(NpcFlyTo, NPC_Twink, -480, 40, 270, 0, 10, EASING_LINEAR) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D0) + EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) + EVT_WAIT(30) + EVT_CALL(NpcFacePlayer, NPC_Twink, 0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(NpcFlyTo, NPC_Twink, -600, 200, 350, 0, -10, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_Twink, NPC_DISPOSE_LOCATION) + EVT_SET(GB_StoryProgress, STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Muskular) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_04_ENTRY_5) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Muskular))) + EVT_EXEC(N(EVS_Scene_RescuedMuskular)) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_new_residents.inc.c b/src/world/area_mac/mac_04/npc_new_residents.inc.c new file mode 100644 index 0000000000..b52427f920 --- /dev/null +++ b/src/world/area_mac/mac_04/npc_new_residents.inc.c @@ -0,0 +1,89 @@ +EvtScript N(EVS_NpcInteract_NewResident1) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0006) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0007) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0008) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0009) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_000A) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_000B) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Housing_000C) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_000D) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Housing_000E) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_000F) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Housing_0010) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0011) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Housing_0012) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toadette_Green_Talk, ANIM_Toadette_Green_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_NewResident1) = { + EVT_SET(AF_MAC_2D, FALSE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_NewResident1))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_NewResident2) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0013) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0014) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0015) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0016) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0017) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0018) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Housing_0019) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_001A) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Housing_001B) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_001C) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Housing_001D) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_001E) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Housing_001F) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toadette_Purple_Talk, ANIM_Toadette_Purple_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_NewResident2) = { + EVT_SET(AF_MAC_2E, FALSE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_NewResident2))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_toad_01.inc.c b/src/world/area_mac/mac_04/npc_toad_01.inc.c new file mode 100644 index 0000000000..81577d9b4b --- /dev/null +++ b/src/world/area_mac/mac_04/npc_toad_01.inc.c @@ -0,0 +1,43 @@ +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0020) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0021) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0022) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0023) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0024) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0025) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Housing_0026) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0027) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Housing_0028) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0029) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Housing_002A) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_002B) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Housing_002C) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_toad_02.inc.c b/src/world/area_mac/mac_04/npc_toad_02.inc.c new file mode 100644 index 0000000000..cb4c12a65a --- /dev/null +++ b/src/world/area_mac/mac_04/npc_toad_02.inc.c @@ -0,0 +1,43 @@ +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_002D) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_002E) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_002F) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0030) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0031) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0032) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Housing_0033) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0034) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Housing_0035) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0036) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Housing_0037) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0038) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Housing_0039) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_toad_03.inc.c b/src/world/area_mac/mac_04/npc_toad_03.inc.c new file mode 100644 index 0000000000..c9debd37b9 --- /dev/null +++ b/src/world/area_mac/mac_04/npc_toad_03.inc.c @@ -0,0 +1,43 @@ +EvtScript N(EVS_NpcInteract_Toad_03) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0074) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0075) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0076) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0077) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0078) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0079) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Housing_007A) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_007B) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Housing_007C) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_007D) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Housing_007E) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_007F) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Housing_0080) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_03) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_03))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_toad_kids.inc.c b/src/world/area_mac/mac_04/npc_toad_kids.inc.c new file mode 100644 index 0000000000..52fc492cd9 --- /dev/null +++ b/src/world/area_mac/mac_04/npc_toad_kids.inc.c @@ -0,0 +1,83 @@ +EvtScript N(EVS_NpcInteract_ToadKids) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_003A) + EVT_SET(LVar1, MSG_MAC_Housing_003B) + EVT_SET(LVar2, MSG_MAC_Housing_003C) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_003D) + EVT_SET(LVar1, MSG_MAC_Housing_003E) + EVT_SET(LVar2, MSG_MAC_Housing_003F) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0040) + EVT_SET(LVar1, MSG_MAC_Housing_0041) + EVT_SET(LVar2, MSG_MAC_Housing_0042) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0043) + EVT_SET(LVar1, MSG_MAC_Housing_0044) + EVT_SET(LVar2, MSG_MAC_Housing_0045) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0046) + EVT_SET(LVar1, MSG_MAC_Housing_0047) + EVT_SET(LVar2, MSG_MAC_Housing_0048) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0049) + EVT_SET(LVar1, MSG_MAC_Housing_004A) + EVT_SET(LVar2, MSG_MAC_Housing_004B) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Housing_004C) + EVT_SET(LVar1, MSG_MAC_Housing_004D) + EVT_SET(LVar2, MSG_MAC_Housing_004E) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_004F) + EVT_SET(LVar1, MSG_MAC_Housing_0050) + EVT_SET(LVar2, MSG_MAC_Housing_0051) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Housing_0052) + EVT_SET(LVar1, MSG_MAC_Housing_0053) + EVT_SET(LVar2, MSG_MAC_Housing_0054) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0055) + EVT_SET(LVar1, MSG_MAC_Housing_0056) + EVT_SET(LVar2, MSG_MAC_Housing_0057) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Housing_0058) + EVT_SET(LVar1, MSG_MAC_Housing_0059) + EVT_SET(LVar2, MSG_MAC_Housing_005A) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_005B) + EVT_SET(LVar1, MSG_MAC_Housing_005C) + EVT_SET(LVar2, MSG_MAC_Housing_005D) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Housing_005E) + EVT_SET(LVar1, MSG_MAC_Housing_005F) + EVT_SET(LVar2, MSG_MAC_Housing_0060) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_ToadKid_01, ANIM_ToadKid_Red_Talk, ANIM_ToadKid_Red_Idle, 0, LVar0) + EVT_CALL(SpeakToPlayer, NPC_ToadKid_02, ANIM_ToadKid_Yellow_Talk, ANIM_ToadKid_Yellow_Idle, 0, LVar1) + EVT_CALL(SpeakToPlayer, NPC_ToadKid_03, ANIM_ToadKid_Green_Talk, ANIM_ToadKid_Green_Idle, 0, LVar2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadKid_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadKids))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadKid_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadKids))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadKid_03) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadKids))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_toadette_03.inc.c b/src/world/area_mac/mac_04/npc_toadette_03.inc.c new file mode 100644 index 0000000000..51a4e71300 --- /dev/null +++ b/src/world/area_mac/mac_04/npc_toadette_03.inc.c @@ -0,0 +1,62 @@ +EvtScript N(EVS_NpcInteract_Toadette_03) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0061) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_0062) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0063) + EVT_CASE_LT(STORY_CH4_ENTERED_THE_TOY_BOX) + EVT_SET(LVar0, MSG_MAC_Housing_0064) + EVT_CASE_LT(STORY_CH4_GOT_STOREROOM_KEY) + EVT_SET(LVar0, MSG_MAC_Housing_0065) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_SET(LVar0, MSG_MAC_Housing_0066) + EVT_CASE_LT(STORY_CH4_GOT_FRYING_PAN) + EVT_SET(LVar0, MSG_MAC_Housing_0067) + EVT_CASE_LT(STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_SET(LVar0, MSG_MAC_Housing_0068) + EVT_CASE_LT(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(FindKeyItem, ITEM_MYSTERY_NOTE, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_IF_EQ(GF_MAC00_DictionaryReturned, FALSE) + EVT_SET(LVar0, MSG_MAC_Housing_0069) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_006B) + EVT_END_IF + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Housing_006A) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_006C) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Housing_006D) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_006E) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Housing_006F) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Housing_0070) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Housing_0071) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Housing_0072) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Housing_0073) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toadette_Orange_Talk, ANIM_Toadette_Orange_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toadette_03) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH3_STAR_SPIRIT_RESCUED, STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, -300, 0, 325) + EVT_END_SWITCH + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette_03))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c new file mode 100644 index 0000000000..2ccdd96e52 --- /dev/null +++ b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c @@ -0,0 +1,253 @@ +#include "world/common/todo/GetFloorCollider.inc.c" + +API_CALLABLE(N(IsPartnerBow)) { + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { + script->varTable[0] = TRUE; + } else { + script->varTable[0] = FALSE; + } + return ApiStatus_DONE2; +} + +EvtScript N(D_802480E0_84ACB0) = { + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_B0000021, 0) + EVT_WAIT(2) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80248128_84ACF8) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hu, SOUND_BASIC_DOOR_OPEN, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(20) + EVT_ADD(LVar0, 3) + EVT_CALL(RotateModel, MODEL_hh_door, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar0, 90) + EVT_CALL(RotateModel, MODEL_hh_door, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802481E0_84ADB0) = { + EVT_SET(LVar0, 90) + EVT_LOOP(20) + EVT_ADD(LVar0, -3) + EVT_CALL(RotateModel, MODEL_hh_door, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar0, 0) + EVT_CALL(RotateModel, MODEL_hh_door, LVar0, 0, -1, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hu, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80248298_84AE68) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_1AB, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(36) + EVT_ADD(LVar0, 10) + EVT_CALL(RotateModel, MODEL_hkai1, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_hkai2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar0, 0) + EVT_CALL(RotateModel, MODEL_hkai1, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_hkai2, LVar0, 0, 1, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_1AC, 0) + EVT_CALL(PlaySound, SOUND_A) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802483B8_84AF88) = { + EVT_WAIT(20) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_01, NPC_FLAG_100, TRUE) + EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 5, MSG_MAC_Housing_00B3) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim02) + EVT_WAIT(4) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim03) + EVT_WAIT(4) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim04) + EVT_WAIT(4) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -440, 3, 50) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim01) + EVT_WAIT(8) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim00) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 0, 10) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 0, 10) + EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 5, MSG_MAC_Housing_00B4) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim08) + EVT_WAIT(4) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim09) + EVT_WAIT(4) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim0A) + EVT_EXEC(N(D_80248298_84AE68)) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_01, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_ShyGuy_01, -440, 20, -75, 20) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim00) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_FOUND_HIDDEN_DOOR) + EVT_SET(GB_StoryProgress, STORY_CH4_FOUND_HIDDEN_DOOR) + EVT_EXEC_WAIT(N(EVS_MakeHiddenRoom)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80248624_84B1F4) = { + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_203E, 0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_ShyGuy_01, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 0, MSG_MAC_Housing_00B2) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim02) + EVT_WAIT(4) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim03) + EVT_WAIT(4) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim04) + EVT_WAIT(4) + EVT_EXEC_WAIT(N(D_80248128_84ACF8)) + EVT_SET(LVar0, 14) + EVT_EXEC_GET_TID(N(D_802480E0_84ACB0), LVarA) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -501, 223, 15) + EVT_KILL_THREAD(LVarA) + EVT_EXEC_WAIT(N(D_802481E0_84ADB0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80248798_84B368) = { + EVT_SET_GROUP(EVT_GROUP_EF) + EVT_IF_NE(GB_StoryProgress, STORY_CH4_MET_WITH_TWINK) + EVT_RETURN + EVT_END_IF + EVT_LOOP(150) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar2, 200) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar7, 0) + EVT_LOOP(0) + EVT_CALL(N(IsPartnerBow)) + EVT_IF_NE(LVar0, 0) + EVT_SET(LVar7, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar2, 100) + EVT_BREAK_LOOP + EVT_END_IF + EVT_IF_GT(LVar2, 200) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(D_80248128_84ACF8)) + EVT_CALL(SetNpcPos, NPC_ShyGuy_01, -501, 20, 223) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim02) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -506, 168, 15) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim00) + EVT_EXEC_WAIT(N(D_802481E0_84ADB0)) + EVT_IF_EQ(LVar7, 1) + EVT_EXEC_WAIT(N(D_802483B8_84AF88)) + EVT_ELSE + EVT_EXEC_WAIT(N(D_80248624_84B1F4)) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_THREAD + EVT_WAIT(10) + EVT_EXEC(N(D_80248798_84B368)) + EVT_END_THREAD + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_ShyGuy_01, NPC_DISPOSE_LOCATION) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80248A14_84B5E4) = { + EVT_CALL(GetNpcPos, NPC_ShyGuy_02, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 20) + EVT_CALL(MakeItemEntity, ITEM_VIS_GROUP(ITEM_STOREROOM_KEY, VIS_GROUP_1), LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(LVar9, LVar0) + EVT_WAIT(1) + EVT_LOOP(30) + EVT_CALL(GetNpcPos, NPC_ShyGuy_02, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 20) + EVT_CALL(SetItemPos, LVar9, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(RemoveItemEntity, LVar9) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80248B08) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_RETURN + EVT_END_IF + EVT_IF_GT(GB_StoryProgress, STORY_CH4_GOT_STOREROOM_KEY) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_ShyGuy_02, 250, 20, -402) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_02, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_HarryT, ANIM_HarryT_Talk, ANIM_HarryT_Idle, 0, MSG_MAC_Housing_0000) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_THREAD + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_SET(LVar0, 0) + EVT_LOOP(36) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_ADD(LVar0, 45) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(InterpPlayerYaw, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(23) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_mu, SOUND_BASIC_DOOR_OPEN, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 8) + EVT_CALL(RotateModel, MODEL_msdoor, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(10) + EVT_ADD(LVar0, -8) + EVT_CALL(RotateModel, MODEL_msdoor, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_mu, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_END_THREAD + EVT_EXEC(N(D_80248A14_84B5E4)) + EVT_SET(LVar0, 15) + EVT_EXEC_GET_TID(N(D_802480E0_84ACB0), LVarA) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_02, 254, -66, 30) + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetNpcPos, NPC_ShyGuy_02, NPC_DISPOSE_LOCATION) + EVT_SET(GF_MAC04_StoreroomKeyStolen, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShyGuy_02) = { + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_04/npc_twink.inc.c b/src/world/area_mac/mac_04/npc_twink.inc.c new file mode 100644 index 0000000000..a0d94b6e1c --- /dev/null +++ b/src/world/area_mac/mac_04/npc_twink.inc.c @@ -0,0 +1,96 @@ +EvtScript N(EVS_NpcInit_TwinkEndCh4) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, mac_04_ENTRY_5) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +Vec3f N(FlightPath_TwinkArrive)[] = { + { -70.0, 106.0, 0.0 }, + { -50.0, 30.0, 0.0 }, + { 0.0, 0.0, 0.0 }, +}; + +Vec3f N(FlightPath_TwinkDepart)[] = { + { 0.0, 0.0, 0.0 }, + { -50.0, 30.0, 0.0 }, + { -70.0, 106.0, 0.0 }, +}; + +EvtScript N(EVS_NpcIdle_TwinkStartCh4) = { + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PushSong, 112, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Bridge_008F, 160, 40) + EVT_CALL(GetPlayerPos, LVar4, LVar5, LVar6) + EVT_SUBF(LVar4, EVT_FLOAT(50.0)) + EVT_ADDF(LVar5, EVT_FLOAT(40.0)) + EVT_CALL(InterpNpcYaw, NPC_Twink, 90, 0) + EVT_CALL(LoadPath, 35, EVT_PTR(N(FlightPath_TwinkArrive)), 3, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar2, LVar5) + EVT_CALL(SetNpcPos, NPC_Twink, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -10, -300, 15, -9) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0090) + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(15) + EVT_CALL(SetNpcJumpscale, NPC_Twink, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 10) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0091) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002D) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0092) + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -40, -200, 15, -15) + EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0093) + EVT_WAIT(5) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) + EVT_CALL(GetNpcPos, NPC_Twink, LVar4, LVar5, LVar6) + EVT_CALL(LoadPath, 35, EVT_PTR(N(FlightPath_TwinkDepart)), 3, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_ADD(LVar3, LVar6) + EVT_CALL(SetNpcPos, NPC_Twink, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_Twink, NPC_DISPOSE_LOCATION) + EVT_CALL(PopSong) + EVT_SET(GB_StoryProgress, STORY_CH4_MET_WITH_TWINK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TwinkStartCh4) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH4_FRYING_PAN_STOLEN) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_TwinkStartCh4))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c deleted file mode 100644 index d5b850d78a..0000000000 --- a/src/world/area_mac/mac_05/852170.c +++ /dev/null @@ -1,352 +0,0 @@ -#include "mac_05.h" -#include "effects.h" - -static char* N(exit_str_0) = "mac_04"; -static char* N(exit_str_1) = "kgr_01"; - -#define CHUCK_QUIZMO_NPC_ID 6 - -#include "world/common/atomic/TexturePan.inc.c" - -#define NAMESPACE dup_mac_05 -#include "world/common/todo/UnkFloatFunc001.inc.c" -#define NAMESPACE mac_05 - -ApiStatus func_8024047C_8525EC(Evt* script, s32 isInitialCall) { - gGameStatusPtr->exitTangent = 0.0f; - return ApiStatus_BLOCK; -} - -#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" - -extern s32 N(Quizmo_Worker); -extern s32 N(Quizmo_AnswerResult); -extern EffectInstance* N(Quizmo_StageEffect); -extern EffectInstance* N(Quizmo_AudienceEffect); -extern EffectInstance* N(Quizmo_VannaTEffect); - -#include "world/common/atomic/Quizmo.inc.c" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750); - -extern s32 N(ItemChoice_HasSelectedItem); -extern s32 N(ItemChoice_SelectedItemID); - -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++); - N(ItemChoice_HasSelectedItem) = TRUE; - return ApiStatus_DONE2; -} - -extern s32 mac_05_D_80252A00[]; - -ApiStatus func_8024266C_8547DC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (ptr != NULL) { - for (i = 0; ptr[i] != 0; i++) { - mac_05_D_80252A00[i] = ptr[i]; - } - mac_05_D_80252A00[i] = 0; - } else { - for (i = 0; i < 112; i++) { - mac_05_D_80252A00[i] = i + 16; - mac_05_D_80252A00[112] = 0; - } - } - return ApiStatus_DONE2; -} - -extern s32 mac_05_D_80252BC8[]; - -ApiStatus func_80242708_854878(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (ptr != NULL) { - for (i = 0; ptr[i] != 0; i++) { - mac_05_D_80252BC8[i] = ptr[i]; - } - mac_05_D_80252BC8[i] = 0; - } else { - for (i = 0; i < 91; i++) { - mac_05_D_80252BC8[i] = i + 128; - mac_05_D_80252BC8[91] = 0; - } - } - return ApiStatus_DONE2; -} - -extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/todo/LetterDelivery.inc.c" - -// float stuff -#ifdef NON_MATCHING -ApiStatus func_80242A90_854C00(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 temp_s1 = evt_get_variable(script, *args++); - s32 temp_s3 = *args++; - s32 temp_s4 = *args++; - s32 temp_s5 = *args++; - Npc* npc = get_npc_safe(0); - f32 temp_f20; - f32 var_f20; - f32 var_f22; - f32 var_f24; - f32 var_f26; - - switch (temp_s1) { - case 0: - var_f26 = 55.0f; - break; - case 1: - var_f26 = 85.0f; - break; - case 2: - var_f26 = 25.0f; - break; - case 3: - var_f24 = -295.0f; - var_f22 = -10.0f; - var_f20 = 400.0f; - break; - case 4: - var_f24 = -285.0f; - var_f22 = -10.0f; - var_f20 = 380.0f; - break; - default: - var_f24 = -295.0f; - var_f22 = -10.0f; - var_f20 = 420.0f; - break; - } - if (temp_s1 < 3) { - temp_f20 = -npc->yaw; - var_f24 = npc->pos.x + 30.0f + (sin_deg(temp_f20) * var_f26); - var_f22 = npc->pos.y + 50.0f; - var_f20 = npc->pos.z + (cos_deg(temp_f20) * var_f26); - } - evt_set_float_variable(script, temp_s3, var_f24); - evt_set_float_variable(script, temp_s4, var_f22); - evt_set_float_variable(script, temp_s5, var_f20); - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00); -#endif - -static char* N(exit_str_2) = "mac_06"; - -// maybe a duplicate, not sure if the NPCs are the same -API_CALLABLE(func_80242C78_854DE8) { - Bytecode* args = script->ptrReadPos; - Npc* npc0 = get_npc_safe(0); - Npc* npc1; - Npc* partner; - f32 forward, radius; - f32 x, y, z; - - if (isInitialCall) { - script->functionTemp[0] = evt_get_variable(script, *args++); - switch (script->functionTemp[0]) { - case 0: - script->functionTemp[1] = 55; - break; - case 1: - script->functionTemp[1] = 85; - break; - default: - script->functionTemp[1] = 25; - break; - } - } - - radius = script->functionTemp[1]; - forward = -npc0->yaw; - x = npc0->pos.x + 30.0f + sin_deg(forward) * radius; - z = npc0->pos.z + cos_deg(forward) * radius; - y = npc0->pos.y + 50.0f; - - switch (script->functionTemp[0]) { - case 0: - gPlayerStatus.position.x = x; - gPlayerStatus.position.y = y; - gPlayerStatus.position.z = z; - npc0->colliderPos.x = npc0->pos.x; - npc0->colliderPos.y = npc0->pos.y; - npc0->colliderPos.z = npc0->pos.z; - npc0->flags |= NPC_FLAG_DIRTY_SHADOW; - break; - case 1: - partner = get_npc_safe(NPC_PARTNER); - if (partner == NULL) { - return ApiStatus_DONE2; - } - partner->pos.x = x; - partner->pos.y = y; - partner->pos.z = z; - partner->colliderPos.x = partner->pos.x; - partner->colliderPos.y = partner->pos.y; - partner->colliderPos.z = partner->pos.z; - partner->flags |= NPC_FLAG_DIRTY_SHADOW; - break; - case 2: - npc1 = get_npc_safe(1); - npc1->pos.x = x; - npc1->pos.y = y; - npc1->pos.z = z; - npc1->colliderPos.x = npc1->pos.x; - npc1->colliderPos.y = npc1->pos.y; - npc1->colliderPos.z = npc1->pos.z; - npc1->flags |= NPC_FLAG_DIRTY_SHADOW; - break; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_80242E84_854FF4(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_safe(0); - - if (isInitialCall) { - script->functionTemp[0] = evt_get_variable(script, *args++); - if (script->functionTemp[0] == 0) { - script->functionTemp[2] = 0; - script->functionTemp[1] = 90; - } else { - script->functionTemp[2] = 10; - script->functionTemp[1] = 290; - npc->pos.x = 650.0f; - npc->pos.y = -30.0f; - npc->pos.z = 372.0f; - } - } - - switch (script->functionTemp[2]) { - case 0: - npc->currentAnim = 0xB60001; - npc->yaw -= 1.0f; - npc->pos.x += 3.0f; - script->functionTemp[1]--; - if (script->functionTemp[1] <= 0) { - script->functionTemp[2] = 1; - script->functionTemp[1] = 200; - } - break; - case 1: - if (evt_get_variable(NULL, MapFlag(1)) != 0) { - npc->pos.x += 3.0f; - script->functionTemp[1]--; - if (script->functionTemp[1] <= 0) { - return ApiStatus_DONE1; - } - } - break; - case 10: - npc->yaw = 270.0f; - npc->pos.x -= 3.0f; - script->functionTemp[1]--; - if (script->functionTemp[1] <= 0) { - script->functionTemp[2] = 11; - script->functionTemp[1] = 90; - } - break; - case 11: - npc->yaw -= 1.0f; - script->functionTemp[1]--; - if (script->functionTemp[1] <= 0) { - return ApiStatus_DONE1; - } - break; - } - return ApiStatus_BLOCK; -} - -#include "world/common/todo/GetFloorCollider.inc.c" - -ApiStatus func_802430B4_855224(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_safe(-4); - s32 outVal = -1; - - if (gCollisionStatus.bombetteExploded >= 0) { - f32 temp = 11.0f; - f32 x = npc->pos.x; - f32 y = npc->pos.y + temp; - f32 z = npc->pos.z; - - temp = 12.0f; - if (npc_raycast_down_around(npc->collisionChannel, &x, &y, &z, &temp, npc->yaw, npc->collisionRadius) && - temp <= 12.0f) - { - outVal = D_8010C978; - } - } - evt_set_variable(script, *args++, outVal); - return ApiStatus_DONE2; -} - -ApiStatus func_802431B0_855320(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_safe(4); - f32 x = npc->pos.x + 20.0f; - f32 y = npc->pos.y; - f32 z = npc->pos.z - 15.0f; - - if (y < 0.0f) { - fx_rising_bubble(0, x, y, z, 0.0f); - sfx_adjust_env_sound_pos(SOUND_JR_TROOPA_SWIM, 0, x, y, z); - } - return ApiStatus_DONE2; -} - -ApiStatus func_80243254_8553C4(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - s32 outVar0 = *args++; - s32 outVar1 = *args++; - Npc* npc = resolve_npc(script, npcID); - f32 theta; - f32 x; - f32 z; - - if (npc == NULL) { - return ApiStatus_DONE2; - } - - theta = clamp_angle(atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z)); - x = playerStatus->position.x + (sin_deg(theta) * 40.0f); - z = playerStatus->position.z - (cos_deg(theta) * 40.0f); - evt_set_variable(script, outVar0, x); - evt_set_variable(script, outVar1, z); - return ApiStatus_DONE2; -} - -ApiStatus func_8024335C_8554CC(Evt* script, s32 isInitialCall) { - if (func_8014AD40() == 0) { - return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; - } -} - -ApiStatus func_80243380_8554F0(Evt* script, s32 isInitialCall) { - script->varTable[0] = (s32) ((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0]; - return ApiStatus_DONE2; -} - -ApiStatus func_802433BC_85552C(Evt* script, s32 isInitialCall) { - script->varTable[0] = get_item_count(); - return ApiStatus_DONE2; -} diff --git a/src/world/area_mac/mac_05/855560.c b/src/world/area_mac/mac_05/855560.c deleted file mode 100644 index 7505543edb..0000000000 --- a/src/world/area_mac/mac_05/855560.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "mac_05.h" - -extern u32 N(unkAngle1); -extern s32 N(unkAngle2); -extern s32 N(unkAngle3); - -#include "world/common/atomic/WhaleAnim.inc.c" - -ApiStatus N(UnkPlayerPosFunc)(Evt* script, s32 isInitialCall) { - Npc* player = get_npc_safe(ACTOR_PLAYER); - f32 yaw = -player->yaw; - f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 70.0f); - f32 z = player->pos.z + (cos_deg(yaw) * 70.0f); - f32 y = player->pos.y + 50.0f; - - evt_set_float_variable(script, LVar0, x); - evt_set_float_variable(script, LVar1, y); - evt_set_float_variable(script, LVar2, z); - return ApiStatus_DONE2; -} - -#include "world/common/atomic/WhaleGeyser.inc.c" - -MAP_RODATA_PAD(2, unk); diff --git a/src/world/area_mac/mac_05/mac_05.h b/src/world/area_mac/mac_05/mac_05.h index 154b1a53d0..b36d3c137b 100644 --- a/src/world/area_mac/mac_05/mac_05.h +++ b/src/world/area_mac/mac_05/mac_05.h @@ -2,8 +2,70 @@ /// @brief Toad Town - Port District #include "common.h" -#include "../mac.h" #include "message_ids.h" #include "map.h" +#include "../mac.h" +#include "mapfs/mac_05_shape.h" +#include "mapfs/mac_05_hit.h" + +#include "sprite/npc/Kolorado.h" +#include "sprite/npc/ChuckQuizmo.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/Fuzzipede.h" +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/WorldKooper.h" +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/WorldBow.h" +#include "sprite/npc/WorldWatt.h" +#include "sprite/npc/JrTroopa.h" +#include "sprite/npc/Fishmael.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/Bartender.h" +#include "sprite/npc/Musician.h" +#include "sprite/npc/Chanterelle.h" + +enum { + NPC_Whale = 0, + NPC_Kolorado = 1, + NPC_Fishmael = 2, + NPC_Fuzzipede = 3, + NPC_JrTroopa_01 = 4, + NPC_JrTroopa_02 = 5, + NPC_ChuckQuizmo = 6, + NPC_Bartender = 7, + NPC_Toad_02 = 8, + NPC_Chanterelle = 9, + NPC_ArtistToad = 10, + NPC_TradeEventToad = 11, + NPC_Toad_04 = 12, + NPC_Toad_05 = 13, + NPC_Toad_06 = 14, + NPC_Toad_07 = 15, +}; + +enum { + MF_Unk_01 = MapFlag(1), + MF_Unk_0A = MapFlag(10), +}; + #define NAMESPACE mac_05 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_802496FC); +extern EvtScript N(EVS_80248878); +extern EvtScript N(EVS_8025194C); +extern EvtScript N(EVS_802526E0); +extern EvtScript N(EVS_802441E0); +extern EvtScript N(EVS_AnimateClub64Sign); +extern EvtScript N(EVS_MakeEntities); + +extern EvtScript N(EVS_80244298); +extern EvtScript N(EVS_802442C4); +extern EvtScript N(EVS_802442E8); +extern EvtScript N(EVS_80244314); +extern EvtScript N(EVS_80244340); + +extern NpcGroupList N(NpcSetA); +extern NpcGroupList N(NpcSetB); +extern NpcGroupList N(NpcSetC); diff --git a/src/world/area_mac/mac_05/mac_05_0_header.c b/src/world/area_mac/mac_05/mac_05_0_header.c new file mode 100644 index 0000000000..f9d6e0648f --- /dev/null +++ b/src/world/area_mac/mac_05/mac_05_0_header.c @@ -0,0 +1,16 @@ +#include "mac_05.h" + +EntryList N(Entrances) = { + [mac_05_ENTRY_0] { 426.0, 0.0, -426.0, 225.0 }, + [mac_05_ENTRY_1] { 0.0, 0.0, 0.0, 0.0 }, + [mac_05_ENTRY_2] { -120.0, 24.0, 375.0, 0.0 }, + [mac_05_ENTRY_3] { -280.0, -10.0, 371.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mac_05 }, +}; diff --git a/src/world/area_mac/mac_05/mac_05_1_music.c b/src/world/area_mac/mac_05/mac_05_1_music.c new file mode 100644 index 0000000000..86bde9fc30 --- /dev/null +++ b/src/world/area_mac/mac_05/mac_05_1_music.c @@ -0,0 +1,46 @@ +#include "mac_05.h" + +EvtScript N(EVS_802441E0) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH5_WHALE_MOUTH_OPEN, STORY_CH5_ENTERED_WHALE) + EVT_CALL(SetMusicTrack, 0, SONG_WHALE_THEME, 0, 8) + EVT_CASE_RANGE(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_INVASION, 0, 8) + EVT_CASE_DEFAULT + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_END_SWITCH + EVT_CALL(PlaySound, SOUND_80000058) + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80244298) = { + EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802442C4) = { + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802442E8) = { + EVT_CALL(SetMusicTrack, 0, SONG_CLUB64, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80244314) = { + EVT_CALL(SetMusicTrack, 0, SONG_WHALE_THEME, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80244340) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_05/mac_05_2_entity.c b/src/world/area_mac/mac_05/mac_05_2_entity.c new file mode 100644 index 0000000000..0307dbeb08 --- /dev/null +++ b/src/world/area_mac/mac_05/mac_05_2_entity.c @@ -0,0 +1,30 @@ +#include "mac_05.h" +#include "entity.h" + +EvtScript N(EVS_OnInspect_StreetSign) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0174, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnInspect_Menu) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_016C, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -150, 60, -375, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), -50, 0, -300, 0, MODEL_o106, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_MAC05_HiddenPanel) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), -490, 130, 160, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_MAC05_MultiCoinBrick) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspect_StreetSign)), TRIGGER_WALL_PRESS_A, COLLIDER_sign, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspect_Menu)), TRIGGER_WALL_PRESS_A, COLLIDER_o154, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_05/mac_05_3_main.c b/src/world/area_mac/mac_05/mac_05_3_main.c new file mode 100644 index 0000000000..bb76c1c889 --- /dev/null +++ b/src/world/area_mac/mac_05/mac_05_3_main.c @@ -0,0 +1,179 @@ +#include "mac_05.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +#define NAMESPACE dup_mac_05 +#include "world/common/todo/UnkFloatFunc001.inc.c" +#define NAMESPACE mac_05 + +ApiStatus func_8024047C_8525EC(Evt* script, s32 isInitialCall) { + gGameStatusPtr->exitTangent = 0.0f; + return ApiStatus_BLOCK; +} + +EvtScript N(D_8024457C_8566EC) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SET(LVarC, 0) + EVT_LABEL(0) + EVT_IF_GE(LVarC, 60) + EVT_SET(LVarC, 0) + EVT_END_IF + EVT_CALL(dup_mac_05_UnkFloatFunc001, LVarC, LVar0, EVT_FLOAT(-1.0), EVT_FLOAT(1.0), 30, 0, 0) + EVT_CALL(ScaleModel, MODEL_kaimen, 1, LVar0, 1) + EVT_ADD(LVarC, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80244648_8567B8) = { + EVT_LOOP(0) + EVT_CALL(MakeLerp, 600, -240, 320, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o177, LVar0, -25, -75) + EVT_CALL(RotateModel, MODEL_o177, 0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -240, 600, 320, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o177, LVar0, -25, -75) + EVT_CALL(RotateModel, MODEL_o177, 180, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_mac_04_1) = EVT_EXIT_WALK(60, mac_05_ENTRY_0, "mac_04", mac_04_ENTRY_1); + +EvtScript N(D_80244810_856980) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, mac_05_ENTRY_3) + EVT_EXEC(ExitWalk) + EVT_SET(GB_StoryProgress, STORY_CH5_ENTERED_WHALE) + EVT_CALL(GotoMap, EVT_PTR("kgr_01"), kgr_01_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mac_04_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(D_80244810_856980)), TRIGGER_FLOOR_TOUCH, COLLIDER_deilit9, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802448C4_856A34) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(mac_05_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(mac_05_ENTRY_1) + EVT_EXEC(N(EVS_802496FC)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(mac_05_ENTRY_2) + EVT_EXEC(N(EVS_80248878)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(mac_05_ENTRY_3) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerPos, -160, -10, 371) + EVT_CALL(SetNpcPos, NPC_PARTNER, -160, -10, 371) + EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAGS_8000000, 1) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(InterruptUsePartner) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(MakeLerp, -160, -220, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetPlayerPos, LVar0, -10, 371) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, -10, 371) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Yell) + EVT_WAIT(30) + EVT_CALL(SetPlayerPos, -280, -10, 371) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC_WAIT(EnterWalk) + EVT_CALL(SetNpcPos, NPC_Whale, -220, 10, 372) + EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAGS_8000000, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, EVT_PTR(N(NpcSetA))) + EVT_CASE_LT(STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_SET(LVar0, EVT_PTR(N(NpcSetB))) + EVT_CASE_LT(STORY_CH5_RETURNED_TO_TOAD_TOWN) + EVT_CALL(GetEntryID, LVar1) + EVT_IF_EQ(LVar1, mac_05_ENTRY_1) + EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, FALSE) + EVT_SET(LVar0, EVT_PTR(N(NpcSetC))) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(NpcSetB))) + EVT_END_IF + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(NpcSetA))) + EVT_END_IF + EVT_CASE_LT(STORY_CH6_BEGAN_PEACH_MISSION) + EVT_SET(LVar0, EVT_PTR(N(NpcSetA))) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(NpcSetA))) + EVT_END_SWITCH + EVT_CALL(MakeNpcs, FALSE, LVar0) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_8025194C)) + EVT_CALL(GetEntryID, LVar0) + EVT_EXEC(N(EVS_802526E0)) + EVT_EXEC(N(EVS_802441E0)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitne, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(D_802448C4_856A34)) + EVT_WAIT(1) + EVT_EXEC(N(D_8024457C_8566EC)) + EVT_CALL(SetTexPanner, MODEL_kaimen, 1) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 100, 100, -70, -50) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_EXEC(N(D_80244648_8567B8)) + EVT_EXEC(N(EVS_AnimateClub64Sign)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c new file mode 100644 index 0000000000..e6def94fc1 --- /dev/null +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -0,0 +1,2595 @@ +#include "mac_05.h" + +NpcSettings N(NpcSettings_Whale) = { + .height = 24, + .radius = 48, + .level = 99, +}; + +#include "world/common/npc/Kolorado.inc.c" + +NpcSettings N(NpcSettings_JrTroopa_01) = { + .height = 32, + .radius = 24, + .level = 99, +}; + +#include "world/common/npc/Toad_Patrol.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" + +NpcSettings N(NpcSettings_Unused1) = { + .height = 48, + .radius = 32, + .level = 99, +}; + +#define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo +#include "world/common/complete/Quizmo.inc.c" + +MAP_STATIC_PAD(1,key_choice); +#include "world/common/complete/KeyItemChoice.inc.c" +MAP_STATIC_PAD(1,item_choice); +#include "world/common/complete/NormalItemChoice.inc.c" + +#include "world/common/complete/LetterDelivery.inc.c" + +s32 N(Fishmael_LetterList)[] = { + ITEM_LETTER15, ITEM_NONE +}; + +EvtScript N(EVS_Fishmael_LetterPrompt) = { + EVT_CALL(N(LetterDelivery_Init), NPC_Fishmael, + ANIM_Fishmael_Talk, ANIM_Fishmael_Idle, + ITEM_LETTER15, ITEM_LETTER16, + MSG_MAC_Port_0064, MSG_MAC_Port_0065, + MSG_MAC_Port_0066, MSG_MAC_Port_0067, + EVT_PTR(N(Fishmael_LetterList))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +s32 N(Kolorado_LetterList)[] = { + ITEM_LETTER25, ITEM_NONE +}; + +EvtScript N(EVS_Kolorado_LetterPrompt) = { + EVT_CALL(N(LetterDelivery_Init), NPC_Kolorado, + ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, + ITEM_LETTER25, ITEM_NONE, + MSG_MAC_Port_0085, MSG_MAC_Port_0086, + MSG_MAC_Port_0087, MSG_MAC_Port_0088, + EVT_PTR(N(Kolorado_LetterList))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Kolorado_LetterReward) = { + EVT_IF_EQ(LVarC, 2) + EVT_GIVE_STAR_PIECE() + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(Kolorado_ArtifactList)[] = { + ITEM_ARTIFACT, ITEM_NONE +}; + +EvtScript N(EVS_Kolorado_ArtifactReward) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_008E) + EVT_GIVE_STAR_PIECE() + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_008F) + EVT_SET(GF_SBK_GaveArtifactToKolorado, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Kolorado_TryArtifactTrade) = { + EVT_IF_EQ(GF_SBK_GaveArtifactToKolorado, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(FindKeyItem, ITEM_ARTIFACT, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(AF_MAC_44, FALSE) + EVT_SET(AF_MAC_44, TRUE) + EVT_IF_EQ(GF_SBK_KeptArtifactFromKolorado, FALSE) + EVT_SET(GF_SBK_KeptArtifactFromKolorado, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0089) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_008A) + EVT_END_IF + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_008B) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, LVar0) + EVT_SET(LVar0, EVT_PTR(N(Kolorado_ArtifactList))) + EVT_SET(LVar1, 1) + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) + EVT_SWITCH(LVar0) + EVT_CASE_GE(1) + EVT_EXEC_WAIT(N(EVS_Kolorado_ArtifactReward)) + EVT_BREAK_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_008C) + EVT_SET(LVar0, EVT_PTR(N(Kolorado_ArtifactList))) + EVT_SET(LVar1, 1) + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) + EVT_SWITCH(LVar0) + EVT_CASE_GE(1) + EVT_EXEC_WAIT(N(EVS_Kolorado_ArtifactReward)) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_008D) + EVT_END_SWITCH + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +// float stuff +#ifdef NON_MATCHING +API_CALLABLE(func_80242A90_854C00) { + Bytecode* args = script->ptrReadPos; + s32 temp_s1 = evt_get_variable(script, *args++); + s32 temp_s3 = *args++; + s32 temp_s4 = *args++; + s32 temp_s5 = *args++; + Npc* npc = get_npc_safe(0); + f32 temp_f20; + f32 var_f20; + f32 var_f22; + f32 var_f24; + f32 var_f26; + + switch (temp_s1) { + case 0: + var_f26 = 55.0f; + break; + case 1: + var_f26 = 85.0f; + break; + case 2: + var_f26 = 25.0f; + break; + case 3: + var_f24 = -295.0f; + var_f22 = -10.0f; + var_f20 = 400.0f; + break; + case 4: + var_f24 = -285.0f; + var_f22 = -10.0f; + var_f20 = 380.0f; + break; + default: + var_f24 = -295.0f; + var_f22 = -10.0f; + var_f20 = 420.0f; + break; + } + if (temp_s1 < 3) { + temp_f20 = -npc->yaw; + var_f24 = npc->pos.x + 30.0f + (sin_deg(temp_f20) * var_f26); + var_f22 = npc->pos.y + 50.0f; + var_f20 = npc->pos.z + (cos_deg(temp_f20) * var_f26); + } + evt_set_float_variable(script, temp_s3, var_f24); + evt_set_float_variable(script, temp_s4, var_f22); + evt_set_float_variable(script, temp_s5, var_f20); + return ApiStatus_DONE2; +} +#else +API_CALLABLE(func_80242A90_854C00); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00); +#endif + +// maybe a duplicate, not sure if the NPCs are the same +API_CALLABLE(N(func_80242C78_854DE8)) { + Bytecode* args = script->ptrReadPos; + Npc* npc0 = get_npc_safe(0); + Npc* npc1; + Npc* partner; + f32 forward, radius; + f32 x, y, z; + + if (isInitialCall) { + script->functionTemp[0] = evt_get_variable(script, *args++); + switch (script->functionTemp[0]) { + case 0: + script->functionTemp[1] = 55; + break; + case 1: + script->functionTemp[1] = 85; + break; + default: + script->functionTemp[1] = 25; + break; + } + } + + radius = script->functionTemp[1]; + forward = -npc0->yaw; + x = npc0->pos.x + 30.0f + sin_deg(forward) * radius; + z = npc0->pos.z + cos_deg(forward) * radius; + y = npc0->pos.y + 50.0f; + + switch (script->functionTemp[0]) { + case 0: + gPlayerStatus.position.x = x; + gPlayerStatus.position.y = y; + gPlayerStatus.position.z = z; + npc0->colliderPos.x = npc0->pos.x; + npc0->colliderPos.y = npc0->pos.y; + npc0->colliderPos.z = npc0->pos.z; + npc0->flags |= NPC_FLAG_DIRTY_SHADOW; + break; + case 1: + partner = get_npc_safe(NPC_PARTNER); + if (partner == NULL) { + return ApiStatus_DONE2; + } + partner->pos.x = x; + partner->pos.y = y; + partner->pos.z = z; + partner->colliderPos.x = partner->pos.x; + partner->colliderPos.y = partner->pos.y; + partner->colliderPos.z = partner->pos.z; + partner->flags |= NPC_FLAG_DIRTY_SHADOW; + break; + case 2: + npc1 = get_npc_safe(1); + npc1->pos.x = x; + npc1->pos.y = y; + npc1->pos.z = z; + npc1->colliderPos.x = npc1->pos.x; + npc1->colliderPos.y = npc1->pos.y; + npc1->colliderPos.z = npc1->pos.z; + npc1->flags |= NPC_FLAG_DIRTY_SHADOW; + break; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(func_80242E84_854FF4)) { + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_safe(0); + + if (isInitialCall) { + script->functionTemp[0] = evt_get_variable(script, *args++); + if (script->functionTemp[0] == 0) { + script->functionTemp[2] = 0; + script->functionTemp[1] = 90; + } else { + script->functionTemp[2] = 10; + script->functionTemp[1] = 290; + npc->pos.x = 650.0f; + npc->pos.y = -30.0f; + npc->pos.z = 372.0f; + } + } + + switch (script->functionTemp[2]) { + case 0: + npc->currentAnim = ANIM_Kolorado_Idle; + npc->yaw -= 1.0f; + npc->pos.x += 3.0f; + script->functionTemp[1]--; + if (script->functionTemp[1] <= 0) { + script->functionTemp[2] = 1; + script->functionTemp[1] = 200; + } + break; + case 1: + if (evt_get_variable(NULL, MapFlag(1)) != 0) { + npc->pos.x += 3.0f; + script->functionTemp[1]--; + if (script->functionTemp[1] <= 0) { + return ApiStatus_DONE1; + } + } + break; + case 10: + npc->yaw = 270.0f; + npc->pos.x -= 3.0f; + script->functionTemp[1]--; + if (script->functionTemp[1] <= 0) { + script->functionTemp[2] = 11; + script->functionTemp[1] = 90; + } + break; + case 11: + npc->yaw -= 1.0f; + script->functionTemp[1]--; + if (script->functionTemp[1] <= 0) { + return ApiStatus_DONE1; + } + break; + } + return ApiStatus_BLOCK; +} + +EvtScript N(D_802484D8_85A648) = { + EVT_CALL(N(func_80242C78_854DE8), LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802484F8_85A668) = { + EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_ELSE + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 100) + EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_ELSE + EVT_SET(LVar3, LVar0) + EVT_SUB(LVar3, 100) + EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, LVar3) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802486EC_85A85C) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar4, LVar4) + EVT_IF_GT(LVar0, -150) + EVT_CALL(GetPlayerPos, LVar0, LVar4, LVar4) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_ELSE + EVT_SET(LVar3, LVar0) + EVT_SUB(LVar3, -150) + EVT_CALL(GetPlayerPos, LVar0, LVar4, LVar4) + EVT_SUB(LVar0, LVar3) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar4, LVar4) + EVT_IF_LT(LVar0, -150) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_ELSE + EVT_CALL(SetCamTarget, CAM_DEFAULT, -150, LVar1, LVar2) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80248878) = { + EVT_SET(GB_StoryProgress, STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -120, 24, 375) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_009F) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Shout) + EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 40) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 475) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerPos, -120, 24, 375) + EVT_CALL(PlaySoundAtPlayer, SOUND_44, 0) + EVT_CALL(PlayerJump1, -310, -10, 372, 80) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(SetNpcPos, NPC_PARTNER, -120, 24, 375) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_44, 0) + EVT_CALL(NpcJump0, NPC_PARTNER, -345, 0, 372, 80) + EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Fuzzipede, -120, 24, 375) + EVT_CALL(SetNpcJumpscale, NPC_Fuzzipede, EVT_FLOAT(0.5)) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_44, 0) + EVT_CALL(NpcJump0, NPC_Fuzzipede, -280, -10, 372, 90) + EVT_CALL(NpcFaceNpc, NPC_Fuzzipede, NPC_Whale, 0) + EVT_END_THREAD + EVT_WAIT(50) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcJumpscale, NPC_Kolorado, EVT_FLOAT(0.1)) + EVT_CALL(NpcJump0, NPC_Kolorado, -380, -10, 372, 20) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Whale, 0) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Still) + EVT_WAIT(60) + EVT_CALL(NpcFacePlayer, NPC_Kolorado, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Fuzzipede, 0) + EVT_CALL(NpcFaceNpc, NPC_Fuzzipede, NPC_Whale, 0) + EVT_CALL(PlayerFaceNpc, NPC_Fuzzipede, FALSE) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_CALL(GetNpcPos, NPC_Fuzzipede, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Whale, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Fuzzipede, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04, 5, MSG_MAC_Port_00A0) + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00A1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Whale, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 475) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-63.5), 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-5.0)) + EVT_CALL(SpeakToNpc, NPC_Fuzzipede, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04, 0, NPC_Whale, MSG_MAC_Port_00A2) + EVT_CALL(NpcFacePlayer, NPC_Fuzzipede, 0) + EVT_WAIT(10) + EVT_CALL(EndSpeech, NPC_Fuzzipede, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcJumpscale, NPC_Fuzzipede, 1) + EVT_CALL(GetNpcPos, NPC_Fuzzipede, LVar0, LVar1, LVar2) + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_LOOP(10) + EVT_ADD(LVar2, -60) + EVT_CALL(PlaySoundAtNpc, NPC_Fuzzipede, SOUND_20D9, 0) + EVT_CALL(NpcJump0, NPC_Fuzzipede, LVar0, LVar1, LVar2, 10) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Fuzzipede, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Fuzzipede, 0) + EVT_CALL(PlayerFaceNpc, NPC_Fuzzipede, FALSE) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_Fuzzipede, NPC_DISPOSE_LOCATION) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Whale, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, 0) + EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00A3) + EVT_CALL(GetNpcPos, NPC_Kolorado, LVar0, LVar1, LVar2) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-7.0)) + EVT_WAIT(5) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFacePlayer, NPC_Kolorado, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Kolorado, 0) + EVT_CALL(PlayerFaceNpc, NPC_Kolorado, FALSE) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_00A4) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_PARTNER, 0) + EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) + EVT_END_THREAD + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_MAC_Port_00A5) + EVT_CASE_EQ(PARTNER_KOOPER) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_MAC_Port_00A6) + EVT_CASE_EQ(PARTNER_BOMBETTE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_MAC_Port_00A7) + EVT_CASE_EQ(PARTNER_PARAKARRY) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_MAC_Port_00A8) + EVT_CASE_EQ(PARTNER_BOW) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_MAC_Port_00A9) + EVT_CASE_EQ(PARTNER_WATT) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_MAC_Port_00AA) + EVT_END_SWITCH + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Whale, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 475) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-63.5), 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-5.0)) + EVT_WAIT(5) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Whale, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, 0) + EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00AB) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_THREAD + EVT_WAIT(100) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) + EVT_END_THREAD + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802496C0_85B830) = { + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802496FC) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_SET(LVar0, 1) + EVT_EXEC_GET_TID(N(D_802484F8_85A668), LVarA) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) + EVT_SET(LVar0, 0) + EVT_EXEC_GET_TID(N(D_802484D8_85A648), LVarB) + EVT_SET(LVar0, 1) + EVT_EXEC_GET_TID(N(D_802484D8_85A648), LVarC) + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_SET(LVar0, 2) + EVT_EXEC_GET_TID(N(D_802484D8_85A648), LVarD) + EVT_END_IF + EVT_CALL(N(func_80242E84_854FF4), 2) + EVT_KILL_THREAD(LVarB) + EVT_KILL_THREAD(LVarC) + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_KILL_THREAD(LVarD) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt9, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run) + EVT_CALL(func_80242A90_854C00, 5, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_32C, 0) + EVT_CALL(SetNpcJumpscale, NPC_Kolorado, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Kolorado, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) + EVT_END_IF + EVT_CALL(func_80242A90_854C00, 3, LVar0, LVar1, LVar2) + EVT_EXEC(N(D_802496C0_85B830)) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_TALK) + EVT_CALL(func_80242A90_854C00, 4, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_tt9, COLLIDER_FLAGS_UPPER_MASK) + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_TalkSad) + EVT_CALL(InterpNpcYaw, NPC_Whale, 270, 60) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Whale, 0) + EVT_CALL(NpcJump0, NPC_Whale, -220, 10, 372, 20) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, FALSE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH5_SUSHIE_JOINED_PARTY, STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, FALSE) + EVT_CALL(SetNpcVar, NPC_JrTroopa_01, 0, 1) + EVT_END_IF + EVT_CASE_EQ(STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_CALL(SetNpcVar, NPC_Kolorado, 0, 1) + EVT_END_SWITCH + EVT_EXEC(N(EVS_802441E0)) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80249C34_85BDA4) = { + EVT_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(PlayerJump1, -310, -10, 372, 30) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, -345, -10, 372, 30) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, 0) + EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80249D80_85BEF0) = { + EVT_WAIT(20) + EVT_CALL(PlayerMoveTo, -285, 485, 40) + EVT_CALL(PlayerMoveTo, -310, 372, 20) + EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -345, 372, 30) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) + EVT_CALL(EnablePartnerAI) + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/GetFloorCollider.inc.c" + +API_CALLABLE(N(func_802430B4_855224)) { + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + s32 outVal = -1; + + if (gCollisionStatus.bombetteExploded >= 0) { + f32 temp = 11.0f; + f32 x = npc->pos.x; + f32 y = npc->pos.y + temp; + f32 z = npc->pos.z; + + temp = 12.0f; + if (npc_raycast_down_around(npc->collisionChannel, &x, &y, &z, &temp, npc->yaw, npc->collisionRadius) && + temp <= 12.0f) + { + outVal = D_8010C978; + } + } + evt_set_variable(script, *args++, outVal); + return ApiStatus_DONE2; +} + +EvtScript N(D_80249E84_85BFF4) = { + EVT_SET(LVarA, 0) + EVT_LOOP(0) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_IF_EQ(LVar0, 29) + EVT_SET(LVar5, 0) + EVT_CALL(GetPlayerActionState, LVar1) + EVT_IF_EQ(LVar1, ACTION_STATE_HAMMER) + EVT_ADD(LVar5, 1) + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(GetPlayerTargetYaw, LVar3) + EVT_IF_LT(LVar3, 180) + EVT_IF_GT(LVar2, -60) + EVT_ADD(LVar5, 1) + EVT_END_IF + EVT_ELSE + EVT_IF_GT(LVar2, -40) + EVT_ADD(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVar5, 2) + EVT_IF_EQ(LVarA, 2) + EVT_SET(LocalFlag(0), TRUE) + EVT_RETURN + EVT_ELSE + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerActionState, LVar1) + EVT_IF_EQ(LVar1, ACTION_STATE_IDLE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(PlayerJump1, LVar2, LVar3, LVar4, 10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_CALL(PlaySoundAt, SOUND_41, 0, 0, 0, 480) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Panic) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_WalkSad) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ADD(LVarA, 1) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVar1, ACTION_STATE_SPIN_POUND) + EVT_SET(LocalFlag(0), TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(N(func_802430B4_855224), LVar2) + EVT_IF_EQ(LVar2, 29) + EVT_IF_EQ(LVar0, 29) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024A1F8_85C368) = { + EVT_EXEC_WAIT(N(D_80249E84_85BFF4)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(10) + EVT_CALL(PlaySoundAt, SOUND_41, 0, 0, 0, 480) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Panic) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC_GET_TID(N(D_802486EC_85A85C), LVarA) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC(N(D_80249C34_85BDA4)) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Run) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Run, ANIM_Kolorado_Run, 5, MSG_MAC_Port_0090) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_EXEC(N(D_80249D80_85BEF0)) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_kujira, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_WalkSad) + EVT_CALL(MakeLerp, 480, 372, 50, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_Whale, -73, -53, LVar0) + EVT_IF_EQ(LVar1, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(MakeLerp, -73, -220, 50, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_Whale, LVar0, -53, 372) + EVT_IF_EQ(LVar1, 1) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_WAIT(20) + EVT_CALL(MakeLerp, -53, 10, 50, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_Whale, -220, LVar0, 372) + EVT_IF_EQ(LVar1, 1) + EVT_WAIT(1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_HurtStill) + EVT_WAIT(50) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Talk) + EVT_KILL_THREAD(LVarA) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Kolorado, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Whale, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Kolorado, 0) + EVT_CALL(PlayerFaceNpc, NPC_Kolorado, FALSE) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_0091) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Whale, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 475) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-63.5), 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-5.0)) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Whale, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, 0) + EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) + EVT_END_THREAD + EVT_EXEC(N(EVS_80244314)) + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Talk, 5, MSG_MAC_Port_0092) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Kolorado, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-7.0)) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Whale, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Kolorado, 0) + EVT_CALL(PlayerFaceNpc, NPC_Kolorado, FALSE) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_0093) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Whale, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 475) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-63.5), 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-5.0)) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Whale, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, 0) + EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_0094) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Kolorado, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar1, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-7.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(NpcFaceNpc, NPC_Kolorado, NPC_Whale, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Whale, 0) + EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) + EVT_END_THREAD + EVT_SET(GB_StoryProgress, STORY_CH5_WHALE_MOUTH_OPEN) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Yell) + EVT_WAIT(50) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_IF_GE(GB_StoryProgress, STORY_CH5_WHALE_MOUTH_OPEN) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_ENTERED_WHALE) + EVT_CALL(GetNpcAnimation, NPC_Whale, LVar0) + EVT_IF_EQ(LVar0, ANIM_Kolorado_Yell) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_IdleSad) + EVT_WAIT(15) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Still) + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Talk, 5, MSG_MAC_Port_0097) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Yell) + EVT_WAIT(30) + EVT_RETURN + EVT_ELSE + EVT_CALL(GetNpcAnimation, NPC_Whale, LVar0) + EVT_IF_EQ(LVar0, ANIM_Kolorado_Yell) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_IdleSad) + EVT_WAIT(15) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Still) + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Talk, 5, MSG_MAC_Port_0098) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Yell) + EVT_WAIT(30) + EVT_RETURN + EVT_END_IF + EVT_ELSE + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00B0) + EVT_CALL(ShowChoice, MSG_Choice_0010) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00B2) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_RETURN + EVT_ELSE + EVT_CALL(EndSpeech, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5) + EVT_END_IF + EVT_CALL(SetNpcJumpscale, NPC_SELF, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_SELF, -220, -30, 372, 20) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_TalkSad) + EVT_CALL(InterpNpcYaw, NPC_Whale, 180, 60) + EVT_SET(LVar0, 0) + EVT_EXEC(N(D_802484F8_85A668)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt9, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_CALL(func_80242A90_854C00, 0, LVar0, LVar1, LVar2) + EVT_EXEC(N(D_802496C0_85B830)) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_THREAD + EVT_CALL(N(func_80242C78_854DE8), 0) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_TALK) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar3, LVar5, 10) + EVT_CALL(func_80242A90_854C00, 1, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_THREAD + EVT_CALL(N(func_80242C78_854DE8), 1) + EVT_END_THREAD + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Talk, 0, MSG_MAC_Port_00AD) + EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run) + EVT_CALL(NpcMoveTo, NPC_Kolorado, LVar3, LVar5, 20) + EVT_CALL(func_80242A90_854C00, 2, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_32C, 0) + EVT_CALL(SetNpcJumpscale, NPC_Kolorado, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Kolorado, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) + EVT_THREAD + EVT_CALL(N(func_80242C78_854DE8), 2) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00AE) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Shout) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Idle) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00B1) + EVT_END_IF + EVT_SET(MF_Unk_01, FALSE) + EVT_THREAD + EVT_CALL(N(func_80242E84_854FF4), 0) + EVT_CALL(GotoMap, EVT_PTR("mac_06"), mac_06_ENTRY_0) + EVT_END_THREAD + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_CALL(SpeakToPlayer, NPC_Whale, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_MAC_Port_00AF) + EVT_SET(MF_Unk_01, TRUE) + EVT_ELSE + EVT_SET(MF_Unk_01, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_CALL(SetNpcFlagBits, NPC_Whale, NPC_FLAG_1000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Whale, NPC_FLAG_HAS_SHADOW, FALSE) + EVT_CALL(InterpNpcYaw, NPC_Whale, 270, 0) + EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_Whale, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_WalkSad) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kujira_atari, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_Whale, 0, -60, 290) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_WalkSad) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kujira_atari, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH5_WHALE_MOUTH_OPEN) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kujira, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Run) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kujira_atari, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcPos, NPC_Whale, -73, -53, 480) + EVT_EXEC(N(D_8024A1F8_85C368)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_05_ENTRY_2) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Talk) + EVT_CALL(SetNpcPos, NPC_Whale, -220, 10, 372) + EVT_RETURN + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Talk) + EVT_CALL(SetNpcPos, NPC_Whale, -220, 10, 372) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Still) + EVT_CALL(SetNpcPos, NPC_Whale, -220, 10, 372) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Kolorado) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_EQ(LVar1, -10) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.5)) + EVT_CALL(NpcMoveTo, NPC_SELF, -335, 400, 10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_00B3) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlayerMoveTo, -340, 380, 20) + EVT_CALL(InterpPlayerYaw, 45, 0) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -280, 280, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -340, 70, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -260, -140, 0) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(7.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 150, -140, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_SET(GB_StoryProgress, STORY_CH5_RETURNED_TO_TOAD_TOWN) + EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, FALSE) + EVT_CALL(SetNpcVar, NPC_JrTroopa_01, 0, 1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Kolorado) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_WHALE_MOUTH_OPEN) + EVT_IF_EQ(AF_MAC_38, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_0083) + EVT_SET(AF_MAC_38, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_0084) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_0095) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_0096) + EVT_CASE_LT(STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_00AC) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_Kolorado_TryArtifactTrade)) + EVT_EXEC_WAIT(N(EVS_Kolorado_LetterPrompt)) + EVT_EXEC_WAIT(N(EVS_Kolorado_LetterReward)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kolorado) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_CALL(SetNpcPos, NPC_SELF, -380, -10, 372) + EVT_CALL(NpcFaceNpc, NPC_SELF, NPC_Whale, 0) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Kolorado))) + EVT_CASE_EQ(STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado))) + EVT_CASE_DEFAULT + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(func_802431B0_855320)) { + Npc* npc = get_npc_safe(4); + f32 x = npc->pos.x + 20.0f; + f32 y = npc->pos.y; + f32 z = npc->pos.z - 15.0f; + + if (y < 0.0f) { + fx_rising_bubble(0, x, y, z, 0.0f); + sfx_adjust_env_sound_pos(SOUND_JR_TROOPA_SWIM, 0, x, y, z); + } + return ApiStatus_DONE2; +} + +EvtScript N(D_8024BCBC_85DE2C) = { + EVT_LOOP(0) + EVT_CALL(N(func_802431B0_855320)) + EVT_WAIT(5) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(func_80243254_8553C4)) { + PlayerStatus* playerStatus = &gPlayerStatus; + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + s32 outVar0 = *args++; + s32 outVar1 = *args++; + Npc* npc = resolve_npc(script, npcID); + f32 theta; + f32 x; + f32 z; + + if (npc == NULL) { + return ApiStatus_DONE2; + } + + theta = clamp_angle(atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z)); + x = playerStatus->position.x + (sin_deg(theta) * 40.0f); + z = playerStatus->position.z - (cos_deg(theta) * 40.0f); + evt_set_variable(script, outVar0, x); + evt_set_variable(script, outVar1, z); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcIdle_JrTroopa_01) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(45) + EVT_EXEC(N(EVS_80244298)) + EVT_CALL(PlaySound, SOUND_80000055) + EVT_EXEC_GET_TID(N(D_8024BCBC_85DE2C), LVar9) + EVT_CALL(SetNpcPos, NPC_SELF, 150, -30, 490) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Whale, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Port_00B4, 160, 40) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -100, -10, 490) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -100, -10, 490) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 700) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-8.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeTripped) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -40, 490, 0) + EVT_KILL_THREAD(LVar9) + EVT_CALL(StopSound, SOUND_80000055) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kujira, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o236, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.5)) + EVT_CALL(NpcJump0, NPC_SELF, -100, -10, 490, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_OutOfBreath) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_kujira, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o236, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-7.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_OutOfBreath, 0, MSG_MAC_Port_00B5) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 225) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_OutOfBreath, 0, MSG_MAC_Port_00B6) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -250, -10, 490) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Walk) + EVT_CALL(NpcMoveTo, NPC_SELF, -255, 490, 75) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_OutOfBreath) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_RunBack, ANIM_JrTroopa_RunBack, 0, MSG_MAC_Port_00B7) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_RunBack) + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(N(func_80243254_8553C4), -1, LVar0, LVar2) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 45) + EVT_END_THREAD + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBossBattle, SONG_JR_TROOPA_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_JrTroopa_01) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Defeated, ANIM_JrTroopa_Defeated, 5, MSG_MAC_Port_00BD) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_JrTroopa_01) = { + EVT_CALL(DisablePartnerAI, 0) + EVT_SET(GF_MAC01_Defeated_JrTroopa4, TRUE) + EVT_CALL(SetPlayerPos, -340, -10, 380) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_PARTNER, -360, LVar1, 390) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcPos, NPC_SELF, -300, -10, 380) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_JrTroopa_02, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_CALL(SetNpcYaw, NPC_JrTroopa_02, 270) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Defeated) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Defeated, ANIM_JrTroopa_Defeated, 0, MSG_MAC_Port_00BE) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(EnablePartnerAI) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_JrTroopa_02) = { + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Defeated, ANIM_JrTroopa_Defeated, 5, MSG_MAC_Port_00BD) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JrTroopa_01) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JrTroopa_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_JrTroopa_01))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_JrTroopa_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JrTroopa_02) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_JrTroopa_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Fuzzipede1) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_004E) + EVT_SET(LVar1, MSG_MAC_Port_005B) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_004F) + EVT_SET(LVar1, MSG_MAC_Port_005C) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0050) + EVT_SET(LVar1, MSG_MAC_Port_005D) + EVT_END_SWITCH + EVT_CALL(SpeakToNpc, NPC_Fishmael, ANIM_Fishmael_Talk, ANIM_Fishmael_Idle, 0, NPC_Fuzzipede, LVar0) + EVT_CALL(SpeakToNpc, NPC_Fuzzipede, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04, 0, NPC_Fishmael, LVar1) + EVT_EXEC_WAIT(N(EVS_Fishmael_LetterPrompt)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Fishmael) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0051) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0052) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0053) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Port_0054) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0055) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Port_0056) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0057) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Port_0058) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0059) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Port_005A) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Fishmael_Talk, ANIM_Fishmael_Idle, 0, LVar0) + EVT_EXEC_WAIT(N(EVS_Fishmael_LetterPrompt)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Fuzzipede2) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_005E) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Port_005F) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0060) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Port_0061) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0062) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Port_0063) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Fuzzipede_Anim24, ANIM_Fuzzipede_Anim04, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Fishmael) = { + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 38, 38) + EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Fuzzipede1))) + EVT_ELSE + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000, 0) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Fishmael))) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Fuzzipede) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Fuzzipede1))) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_DEFAULT + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000, 0) + EVT_CALL(SetNpcPos, NPC_SELF, -575, 40, 120) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Fuzzipede2))) + EVT_CASE_DEFAULT + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_04) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_001A) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_001B) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_001C) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_001D) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_001E) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_001F) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Port_0020) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0021) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Port_0022) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0023) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Port_0024) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0025) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Port_0026) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_04) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_04))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_05) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0027) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0028) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0029) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_002A) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_002B) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_002C) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Port_002D) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_002E) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Port_002F) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0030) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Port_0031) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0032) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Port_0033) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_05) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_05))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_06) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0034) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0035) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0036) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0037) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0038) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0039) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Port_003A) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_003B) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Port_003C) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_003D) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Port_003E) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_003F) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Port_0040) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_06) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_06))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_07) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0041) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0042) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0043) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0044) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0045) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0046) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Port_0047) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0048) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Port_0049) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_004A) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Port_004B) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_004C) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Port_004D) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_07) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_07))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Bartender) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0000) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0001) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0002) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0003) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0004) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0005) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Port_0006) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0007) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Port_0008) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0009) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Port_000A) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_000B) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Port_000C) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Bartender_Talk, ANIM_Bartender_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bartender) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bartender))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_000D) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_000E) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_000F) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_IF_EQ(GF_MAC04_StoreroomKeyStolen, FALSE) + EVT_SET(LVar0, MSG_MAC_Port_0010) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Port_0011) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0012) + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Port_0013) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0014) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Port_0015) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Port_0016) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Port_0017) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Port_0018) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Port_0019) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_RETURN + EVT_END +}; + +s32 N(D_8024D704_85F874)[] = { + 104, 0 +}; + +EvtScript N(EVS_NpcInteract_ArtistToad) = { + EVT_SET(GF_MAC05_Met_Simon, TRUE) + EVT_SET(LVarA, 0) + EVT_IF_GE(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) + EVT_IF_EQ(AF_MAC_3E, TRUE) + EVT_SET(LVarA, 1) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVarA, 0) + EVT_IF_EQ(AF_MAC_3D, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0070) + EVT_SET(AF_MAC_3D, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0071) + EVT_END_IF + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GF_MAC05_SimonGaveLyrics, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0072) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Musician_Poet_Write) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Musician_Poet_Idle) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0073) + EVT_CALL(SpeakToPlayer, NPC_Chanterelle, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_0074) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0075) + EVT_GIVE_KEY_REWARD(ITEM_LYRICS) + EVT_SET(GF_MAC05_SimonGaveLyrics, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GF_MAC05_SimonGotMelody, TRUE) + EVT_IF_EQ(AF_MAC_3D, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0081) + EVT_SET(AF_MAC_3D, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0082) + EVT_SET(AF_MAC_3D, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END_IF + EVT_CALL(FindKeyItem, ITEM_MELODY, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_IF_EQ(AF_MAC_3D, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0076) + EVT_SET(AF_MAC_3D, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0077) + EVT_END_IF + EVT_ELSE + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_IF_EQ(AF_MAC_3D, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0078) + EVT_SET(AF_MAC_3D, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_0079) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(D_8024D704_85F874))) + EVT_SET(LVar1, 10) + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_007A) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_007B) + EVT_SET(GF_MAC05_SimonGotMelody, TRUE) + EVT_CALL(SpeakToPlayer, NPC_Chanterelle, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_007C) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_007D) + EVT_CALL(SpeakToPlayer, NPC_Chanterelle, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_007E) + EVT_CALL(SetNpcFlagBits, NPC_Chanterelle, NPC_FLAG_100, TRUE) + EVT_THREAD + EVT_CALL(PlayerMoveTo, 167, -513, 20) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(10) + EVT_CALL(EnablePartnerAI) + EVT_CALL(func_802CF56C, 2) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Walk) + EVT_CALL(NpcMoveTo, NPC_Chanterelle, 112, -511, 60) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_Walk) + EVT_CALL(NpcMoveTo, NPC_Bartender, 70, -540, 45) + EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_Idle) + EVT_END_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 112, 0, -511) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 112, 0, -511) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(320.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(InterpNpcYaw, NPC_Toad_02, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_ArtistToad, 270, 0) + EVT_WAIT(60) + EVT_EXEC(N(EVS_802442C4)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_CALL(SetNpcAnimation, NPC_Toad_02, ANIM_Toad_Red_Disappointed) + EVT_CALL(SetNpcAnimation, NPC_ArtistToad, ANIM_Musician_Poet_Pensive) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_Talk) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Still) + EVT_WAIT(30) + EVT_CALL(SetMusicTrack, 0, SONG_POP_DIVA_SONG, 0, 8) + EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_StrumGuitar) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Sing) + EVT_WAIT(150) + EVT_WAIT(150) + EVT_WAIT(150) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) + EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_Idle) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Toad_02, ANIM_Toad_Red_Idle) + EVT_CALL(SetNpcAnimation, NPC_ArtistToad, ANIM_Musician_Poet_Idle) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(30) + EVT_EXEC(N(EVS_802442E8)) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_Walk) + EVT_CALL(NpcMoveTo, NPC_Bartender, -85, -520, 40) + EVT_CALL(SetNpcAnimation, NPC_Bartender, ANIM_Bartender_Idle) + EVT_CALL(InterpNpcYaw, NPC_Bartender, 90, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Walk) + EVT_CALL(NpcMoveTo, NPC_Chanterelle, 208, -530, 60) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) + EVT_CALL(InterpNpcYaw, NPC_Chanterelle, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_ArtistToad, 90, 0) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_WAIT(10) + EVT_CALL(func_802CF56C, 2) + EVT_CALL(SetNpcFlagBits, NPC_Chanterelle, NPC_FLAG_100, FALSE) + EVT_END_THREAD + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(60) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Poet_Talk, ANIM_Musician_Poet_Idle, 0, MSG_MAC_Port_007F) + EVT_CALL(SpeakToPlayer, NPC_Chanterelle, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_0080) + EVT_WAIT(10) + EVT_SET(LVar0, ITEM_ATTACK_FX_D) + EVT_SET(LVar3, ITEM_TYPE_BADGE) + EVT_EXEC_WAIT(N(GiveKeyReward)) + EVT_CALL(AddBadge, LVar0, LVar1) + EVT_CALL(SetTattleMessage, NPC_Chanterelle, MSG_NpcTattle_PopDiva_CanSing) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ArtistToad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ArtistToad))) + EVT_SET(AF_MAC_3D, FALSE) + EVT_SET(AF_MAC_3E, FALSE) + EVT_IF_EQ(GF_MAC05_Met_Simon, TRUE) + EVT_SET(AF_MAC_3E, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(func_8024335C_8554CC)) { + if (func_8014AD40() == 0) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +EvtScript N(D_8024E23C_8603AC) = { + EVT_SET(MF_Unk_0A, TRUE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000 | ENEMY_FLAGS_8000000, 1) + EVT_CALL(InterpNpcYaw, NPC_Chanterelle, 270, 0) + EVT_CALL(SetMusicTrack, 0, SONG_POP_DIVA_SONG, 1, 8) + EVT_CHILD_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Sing) + EVT_WAIT(1900) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_WAIT(30) + EVT_CALL(N(func_8024335C_8554CC)) + EVT_SET(MF_Unk_0A, FALSE) + EVT_END_CHILD_THREAD + EVT_LOOP(0) + EVT_IF_EQ(MF_Unk_0A, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_EXEC(N(EVS_802442E8)) + EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000 | ENEMY_FLAGS_8000000, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Chanterelle) = { + EVT_IF_EQ(GF_MAC05_SimonGaveLyrics, FALSE) + EVT_IF_EQ(AF_MAC_3F, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_0068) + EVT_SET(AF_MAC_3F, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_0069) + EVT_SET(AF_MAC_3F, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GF_MAC05_SimonGotMelody, FALSE) + EVT_IF_EQ(AF_MAC_3F, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_006A) + EVT_SET(AF_MAC_3F, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_006B) + EVT_SET(AF_MAC_3F, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(AF_MAC_3F, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_006C) + EVT_SET(AF_MAC_3F, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_006D) + EVT_END_IF + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_IF_NE(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_006E) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Chanterelle_Talk, ANIM_Chanterelle_Idle, 0, MSG_MAC_Port_006F) + EVT_EXEC(N(D_8024E23C_8603AC)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Chanterelle) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Chanterelle))) + EVT_IF_EQ(GF_MAC05_SimonGotMelody, TRUE) + EVT_CALL(SetTattleMessage, NPC_Chanterelle, MSG_NpcTattle_PopDiva_CanSing) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(CheckTradeEventTime)) { + script->varTable[0] = (s32) ((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0]; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetTradeEventItemCount)) { + script->varTable[0] = get_item_count(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcInteract_Toad_03) = { + EVT_SET(LVar0, 7) + EVT_CALL(N(CheckTradeEventTime)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00BF) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(GetTradeEventItemCount)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00C0) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_SET(GF_TradingEvent3_Active, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00C1) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 11) + EVT_EXEC_WAIT(N(EVS_ChooseItem)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00C5) + EVT_RETURN + EVT_CASE_EQ(ITEM_COCONUT) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00C2) + EVT_GIVE_CONSUMABLE_REWARD(ITEM_YUMMY_MEAL) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00C3) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_SET(GF_TradingEvent3_Active, FALSE) + EVT_ADD(GB_TradingEvent_Count, 1) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_MAC_Port_00C4) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TradeEventToad) = { + EVT_IF_NE(GF_TradingEvent3_Active, FALSE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_03))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Toad_01) = { + .id = NPC_Whale, + .settings = &N(NpcSettings_Whale), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_01), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_Whale, +}; + +StaticNpc N(NpcData_Kolorado) = { + .id = NPC_Kolorado, + .settings = &N(NpcSettings_Kolorado), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Kolorado), + .drops = KOLORADO_DROPS, + .animations = KOLORADO_ANIMS, + .tattle = MSG_NpcTattle_Kolorado, +}; + +StaticNpc N(NpcData_Fishmael) = { + .id = NPC_Fishmael, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 370.0f, -10.0f, -115.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Fishmael), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Fishmael_Idle, + }, + .tattle = MSG_NpcTattle_Fishmael, +}; + +AnimID N(Fuzzipede_ExtraAnims)[] = { + ANIM_Fuzzipede_Anim00, + ANIM_Fuzzipede_Anim04, + ANIM_Fuzzipede_Anim08, + ANIM_Fuzzipede_Anim0A, + ANIM_Fuzzipede_Anim24, + -1 +}; + +StaticNpc N(NpcData_Fuzzipede) = { + .id = NPC_Fuzzipede, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 320.0f, -10.0f, -115.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Fuzzipede), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Fuzzipede_Anim04, + }, + .extraAnimations = N(Fuzzipede_ExtraAnims), + .tattle = MSG_NpcTattle_Fuzzipede, +}; + +AnimID N(JrTroopa_ExtraAnims)[] = { + ANIM_JrTroopa_Still, + ANIM_JrTroopa_PointStill, + ANIM_JrTroopa_Idle, + ANIM_JrTroopa_OutOfBreath, + ANIM_JrTroopa_Walk, + ANIM_JrTroopa_Charge, + ANIM_JrTroopa_ChargeArmsUp, + ANIM_JrTroopa_ChargeTripped, + ANIM_JrTroopa_RunBack, + ANIM_JrTroopa_Defeated, + ANIM_JrTroopa_TiredTalk, + ANIM_JrTroopa_PointTalk, + -1 +}; + +StaticNpc N(NpcData_JrTroopa_01)[] = { + { + .id = NPC_JrTroopa_01, + .settings = &N(NpcSettings_JrTroopa_01), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_JrTroopa_01), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_JrTroopa_Idle, + .walk = ANIM_JrTroopa_Walk, + .run = ANIM_JrTroopa_Walk, + .chase = ANIM_JrTroopa_Walk, + .anim_4 = ANIM_JrTroopa_Idle, + .anim_5 = ANIM_JrTroopa_Idle, + .death = ANIM_JrTroopa_Idle, + .hit = ANIM_JrTroopa_Idle, + .anim_8 = ANIM_JrTroopa_Idle, + .anim_9 = ANIM_JrTroopa_Idle, + .anim_A = ANIM_JrTroopa_Idle, + .anim_B = ANIM_JrTroopa_Idle, + .anim_C = ANIM_JrTroopa_Idle, + .anim_D = ANIM_JrTroopa_Idle, + .anim_E = ANIM_JrTroopa_Idle, + .anim_F = ANIM_JrTroopa_Idle, + }, + .extraAnimations = N(JrTroopa_ExtraAnims), + .tattle = MSG_NpcTattle_JrTroopa, + }, + { + .id = NPC_JrTroopa_02, + .settings = &N(NpcSettings_JrTroopa_01), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_20000000, + .init = &N(EVS_NpcInit_JrTroopa_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_JrTroopa_Idle, + .walk = ANIM_JrTroopa_Walk, + .run = ANIM_JrTroopa_Walk, + .chase = ANIM_JrTroopa_Walk, + .anim_4 = ANIM_JrTroopa_Idle, + .anim_5 = ANIM_JrTroopa_Idle, + .death = ANIM_JrTroopa_Idle, + .hit = ANIM_JrTroopa_Idle, + .anim_8 = ANIM_JrTroopa_Idle, + .anim_9 = ANIM_JrTroopa_Idle, + .anim_A = ANIM_JrTroopa_Idle, + .anim_B = ANIM_JrTroopa_Idle, + .anim_C = ANIM_JrTroopa_Idle, + .anim_D = ANIM_JrTroopa_Idle, + .anim_E = ANIM_JrTroopa_Idle, + .anim_F = ANIM_JrTroopa_Idle, + }, + .extraAnimations = N(JrTroopa_ExtraAnims), + .tattle = MSG_NpcTattle_JrTroopa, + }, +}; + +StaticNpc N(NpcData_Toad_04)[] = { + { + .id = NPC_Toad_04, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 320.0f, 0.0f, -300.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Blue_Idle, + .walk = ANIM_Toad_Blue_Walk, + .run = ANIM_Toad_Blue_Run, + .chase = ANIM_Toad_Blue_Run, + .anim_4 = ANIM_Toad_Blue_Idle, + .anim_5 = ANIM_Toad_Blue_Idle, + .death = ANIM_Toad_Blue_Disappointed, + .hit = ANIM_Toad_Blue_Disappointed, + .anim_8 = ANIM_Toad_Blue_Run, + .anim_9 = ANIM_Toad_Blue_Run, + .anim_A = ANIM_Toad_Blue_Run, + .anim_B = ANIM_Toad_Blue_Run, + .anim_C = ANIM_Toad_Blue_Run, + .anim_D = ANIM_Toad_Blue_Run, + .anim_E = ANIM_Toad_Blue_Run, + .anim_F = ANIM_Toad_Blue_Run, + }, + .tattle = MSG_NpcTattle_MAC_PortGuide, + }, + { + .id = NPC_Toad_05, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -330.0f, -10.0f, -90.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_05), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Blue_Idle, + .walk = ANIM_Toad_Blue_Walk, + .run = ANIM_Toad_Blue_Run, + .chase = ANIM_Toad_Blue_Run, + .anim_4 = ANIM_Toad_Blue_Idle, + .anim_5 = ANIM_Toad_Blue_Idle, + .death = ANIM_Toad_Blue_Disappointed, + .hit = ANIM_Toad_Blue_Disappointed, + .anim_8 = ANIM_Toad_Blue_Run, + .anim_9 = ANIM_Toad_Blue_Run, + .anim_A = ANIM_Toad_Blue_Run, + .anim_B = ANIM_Toad_Blue_Run, + .anim_C = ANIM_Toad_Blue_Run, + .anim_D = ANIM_Toad_Blue_Run, + .anim_E = ANIM_Toad_Blue_Run, + .anim_F = ANIM_Toad_Blue_Run, + }, + .tattle = MSG_NpcTattle_MAC_SeaLover, + }, + { + .id = NPC_Toad_06, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -50.0f, 0.0f, -400.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_06), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Red_Idle, + .walk = ANIM_Toad_Red_Walk, + .run = ANIM_Toad_Red_Run, + .chase = ANIM_Toad_Red_Run, + .anim_4 = ANIM_Toad_Red_Idle, + .anim_5 = ANIM_Toad_Red_Idle, + .death = ANIM_Toad_Red_Disappointed, + .hit = ANIM_Toad_Red_Disappointed, + .anim_8 = ANIM_Toad_Red_Run, + .anim_9 = ANIM_Toad_Red_Run, + .anim_A = ANIM_Toad_Red_Run, + .anim_B = ANIM_Toad_Red_Run, + .anim_C = ANIM_Toad_Red_Run, + .anim_D = ANIM_Toad_Red_Run, + .anim_E = ANIM_Toad_Red_Run, + .anim_F = ANIM_Toad_Red_Run, + }, + .tattle = MSG_NpcTattle_MAC_WellTraveledToad, + }, + { + .id = NPC_Toad_07, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 200.0f, 0.0f, -220.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_07), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { -120, 0, -220 }, + { 200, 0, -220 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 180, 20, -435 }, + .detectSize = { 10 }, + } + }, + .animations = { + .idle = ANIM_Toad_Yellow_Idle, + .walk = ANIM_Toad_Yellow_Walk, + .run = ANIM_Toad_Yellow_Run, + .chase = ANIM_Toad_Yellow_Run, + .anim_4 = ANIM_Toad_Yellow_Idle, + .anim_5 = ANIM_Toad_Yellow_Idle, + .death = ANIM_Toad_Yellow_Disappointed, + .hit = ANIM_Toad_Yellow_Disappointed, + .anim_8 = ANIM_Toad_Yellow_Run, + .anim_9 = ANIM_Toad_Yellow_Run, + .anim_A = ANIM_Toad_Yellow_Run, + .anim_B = ANIM_Toad_Yellow_Run, + .anim_C = ANIM_Toad_Yellow_Run, + .anim_D = ANIM_Toad_Yellow_Run, + .anim_E = ANIM_Toad_Yellow_Run, + .anim_F = ANIM_Toad_Yellow_Run, + }, + .tattle = MSG_NpcTattle_MAC_SingsOffKey, + }, +}; + +StaticNpc N(NpcData_Bartender)[] = { + { + .id = NPC_Bartender, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -85.0f, 0.0f, -520.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Bartender), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bartender_Idle, + .walk = ANIM_Bartender_Idle, + .run = ANIM_Bartender_Idle, + .chase = ANIM_Bartender_Idle, + .anim_4 = ANIM_Bartender_Idle, + .anim_5 = ANIM_Bartender_Idle, + .death = ANIM_Bartender_Idle, + .hit = ANIM_Bartender_Idle, + .anim_8 = ANIM_Bartender_Idle, + .anim_9 = ANIM_Bartender_Idle, + .anim_A = ANIM_Bartender_Idle, + .anim_B = ANIM_Bartender_Idle, + .anim_C = ANIM_Bartender_Idle, + .anim_D = ANIM_Bartender_Idle, + .anim_E = ANIM_Bartender_Idle, + .anim_F = ANIM_Bartender_Idle, + }, + .tattle = MSG_NpcTattle_Club64_Bartender, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 30.0f, 0.0f, -570.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Red_Idle, + .walk = ANIM_Toad_Red_Walk, + .run = ANIM_Toad_Red_Run, + .chase = ANIM_Toad_Red_Run, + .anim_4 = ANIM_Toad_Red_Idle, + .anim_5 = ANIM_Toad_Red_Idle, + .death = ANIM_Toad_Red_Disappointed, + .hit = ANIM_Toad_Red_Disappointed, + .anim_8 = ANIM_Toad_Red_Run, + .anim_9 = ANIM_Toad_Red_Run, + .anim_A = ANIM_Toad_Red_Run, + .anim_B = ANIM_Toad_Red_Run, + .anim_C = ANIM_Toad_Red_Run, + .anim_D = ANIM_Toad_Red_Run, + .anim_E = ANIM_Toad_Red_Run, + .anim_F = ANIM_Toad_Red_Run, + }, + .tattle = MSG_NpcTattle_Club64_Waiter, + }, + { + .id = NPC_Chanterelle, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 208.0f, 0.0f, -530.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Chanterelle), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Chanterelle_Idle, + .walk = ANIM_Chanterelle_Still, + .run = ANIM_Chanterelle_Still, + .chase = ANIM_Chanterelle_Still, + .anim_4 = ANIM_Chanterelle_Still, + .anim_5 = ANIM_Chanterelle_Still, + .death = ANIM_Chanterelle_Still, + .hit = ANIM_Chanterelle_Still, + .anim_8 = ANIM_Chanterelle_Still, + .anim_9 = ANIM_Chanterelle_Still, + .anim_A = ANIM_Chanterelle_Still, + .anim_B = ANIM_Chanterelle_Still, + .anim_C = ANIM_Chanterelle_Still, + .anim_D = ANIM_Chanterelle_Still, + .anim_E = ANIM_Chanterelle_Still, + .anim_F = ANIM_Chanterelle_Still, + }, + .tattle = MSG_NpcTattle_PopDiva_CantSing, + }, + { + .id = NPC_ArtistToad, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 158.0f, 0.0f, -555.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ArtistToad), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Musician_Poet_Idle, + .walk = ANIM_Musician_Poet_Idle, + .run = ANIM_Musician_Poet_Idle, + .chase = ANIM_Musician_Poet_Idle, + .anim_4 = ANIM_Musician_Poet_Idle, + .anim_5 = ANIM_Musician_Poet_Idle, + .death = ANIM_Musician_Poet_Idle, + .hit = ANIM_Musician_Poet_Idle, + .anim_8 = ANIM_Musician_Poet_Idle, + .anim_9 = ANIM_Musician_Poet_Idle, + .anim_A = ANIM_Musician_Poet_Idle, + .anim_B = ANIM_Musician_Poet_Idle, + .anim_C = ANIM_Musician_Poet_Idle, + .anim_D = ANIM_Musician_Poet_Idle, + .anim_E = ANIM_Musician_Poet_Idle, + .anim_F = ANIM_Musician_Poet_Idle, + }, + .tattle = MSG_NpcTattle_MasterPoet, + }, + { + .id = NPC_TradeEventToad, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 92.0f, 0.0f, -500.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .init = &N(EVS_NpcInit_TradeEventToad), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Pink_Idle, + .walk = ANIM_Toad_Pink_Walk, + .run = ANIM_Toad_Pink_Run, + .chase = ANIM_Toad_Pink_Run, + .anim_4 = ANIM_Toad_Pink_Idle, + .anim_5 = ANIM_Toad_Pink_Idle, + .death = ANIM_Toad_Pink_Idle, + .hit = ANIM_Toad_Pink_Disappointed, + .anim_8 = ANIM_Toad_Pink_Run, + .anim_9 = ANIM_Toad_Pink_Run, + .anim_A = ANIM_Toad_Pink_Run, + .anim_B = ANIM_Toad_Pink_Run, + .anim_C = ANIM_Toad_Pink_Run, + .anim_D = ANIM_Toad_Pink_Run, + .anim_E = ANIM_Toad_Pink_Run, + .anim_F = ANIM_Toad_Pink_Run, + }, + .tattle = MSG_NpcTattle_PrizeToad, + }, +}; + +StaticNpc N(NpcData_ChuckQuizmo) = { + .id = NPC_ChuckQuizmo, + .settings = &N(Quizmo_NpcSettings), + .pos = { 472.0f, 0.0f, -230.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, + .initVarCount = 1, + .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_05 }}, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ChuckQuizmo_Idle, + .walk = ANIM_ChuckQuizmo_Walk, + .run = ANIM_ChuckQuizmo_Run, + .chase = ANIM_ChuckQuizmo_Run, + .anim_4 = ANIM_ChuckQuizmo_Idle, + .anim_5 = ANIM_ChuckQuizmo_Idle, + .death = ANIM_ChuckQuizmo_Still, + .hit = ANIM_ChuckQuizmo_Still, + .anim_8 = ANIM_ChuckQuizmo_Run, + .anim_9 = ANIM_ChuckQuizmo_Run, + .anim_A = ANIM_ChuckQuizmo_Run, + .anim_B = ANIM_ChuckQuizmo_Run, + .anim_C = ANIM_ChuckQuizmo_Run, + .anim_D = ANIM_ChuckQuizmo_Run, + .anim_E = ANIM_ChuckQuizmo_Run, + .anim_F = ANIM_ChuckQuizmo_Run, + }, + .tattle = MSG_NpcTattle_ChuckQuizmo, +}; + +NpcGroupList N(NpcSetA) = { + NPC_GROUP(N(NpcData_Fuzzipede)), + NPC_GROUP(N(NpcData_Fishmael)), + NPC_GROUP(N(NpcData_Bartender)), + NPC_GROUP(N(NpcData_Toad_04)), + NPC_GROUP(N(NpcData_Toad_01)), + NPC_GROUP(N(NpcData_ChuckQuizmo)), + {} +}; + +NpcGroupList N(NpcSetB) = { + NPC_GROUP(N(NpcData_Kolorado)), + NPC_GROUP(N(NpcData_Fuzzipede)), + NPC_GROUP(N(NpcData_Fishmael)), + NPC_GROUP(N(NpcData_Bartender)), + NPC_GROUP(N(NpcData_Toad_04)), + NPC_GROUP(N(NpcData_Toad_01)), + {} +}; + +NpcGroupList N(NpcSetC) = { + NPC_GROUP(N(NpcData_JrTroopa_01), BTL_KMR_PART_3_FORMATION_05), + NPC_GROUP(N(NpcData_Kolorado)), + NPC_GROUP(N(NpcData_Fishmael)), + NPC_GROUP(N(NpcData_Bartender)), + NPC_GROUP(N(NpcData_Toad_04)), + NPC_GROUP(N(NpcData_Toad_01)), + {} +}; diff --git a/src/world/area_mac/mac_05/mac_05_5_whale.c b/src/world/area_mac/mac_05/mac_05_5_whale.c new file mode 100644 index 0000000000..6e824c2c32 --- /dev/null +++ b/src/world/area_mac/mac_05/mac_05_5_whale.c @@ -0,0 +1,355 @@ +#include "mac_05.h" + +u32 N(unkAngle1) = 0; +s32 N(unkAngle2) = -1; +s32 N(unkAngle3) = -1; + +#include "world/common/atomic/WhaleAnim.inc.c" + +ApiStatus N(UnkPlayerPosFunc)(Evt* script, s32 isInitialCall) { + Npc* player = get_npc_safe(ACTOR_PLAYER); + f32 yaw = -player->yaw; + f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 70.0f); + f32 z = player->pos.z + (cos_deg(yaw) * 70.0f); + f32 y = player->pos.y + 50.0f; + + evt_set_float_variable(script, LVar0, x); + evt_set_float_variable(script, LVar1, y); + evt_set_float_variable(script, LVar2, z); + return ApiStatus_DONE2; +} + +#include "world/common/atomic/WhaleGeyser.inc.c" + +MAP_RODATA_PAD(2, unk); + +EvtScript N(D_80250A5C_862BCC) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80250AD4_862C44) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, 30, 30, 1, 0) + EVT_SETF(LVar1, LVar0) + EVT_DIVF(LVar1, EVT_FLOAT(3.0)) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -40, 30, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, 0, 0) + EVT_IF_GE(LVarC, 30) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt9, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_kujira_atari, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80250D58_862EC8) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -30, 8, 1, 0) + EVT_ADDF(LVar0, EVT_FLOAT(30.0)) + EVT_SETF(LVar1, LVar0) + EVT_DIVF(LVar1, EVT_FLOAT(3.0)) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -40, 120, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80250FA4_863114) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80250FB4_863124) = { + EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar3) + EVT_IF_EQ(LVar3, 0) + EVT_CALL(N(UnkPlayerPosFunc)) + EVT_CALL(PlaySoundAt, SOUND_8000004F, 0, LVar0, LVar1, LVar2) + EVT_CALL(N(CreateWhaleGeyser), 0, LVar0, LVar1, LVar2, 0, -1, 0, 30) + EVT_CALL(SetNpcVar, NPC_Whale, 0, LVar0) + EVT_END_IF + EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar3) + EVT_CALL(N(UnkPlayerPosFunc)) + EVT_CALL(N(SetWhaleGeyserPos), LVar3, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8025110C_86327C) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8025111C_86328C) = { + EVT_IF_GE(LVarC, 0) + EVT_IF_LE(LVarC, 2) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVarC, 15) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVarC, 22) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(EnableModel, MODEL_o170, TRUE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80251244_8633B4) = { + EVT_SET(LVar0, LVarC) + EVT_DIV(LVar0, 20) + EVT_MOD(LVar0, 2) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-1.0), EVT_FLOAT(1.0), 3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802513AC_86351C) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-6.0), EVT_FLOAT(6.0), 3, 0, 0) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar1, EVT_FLOAT(6.0), EVT_FLOAT(-6.0), 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, LVar1, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802514EC_86365C) = { + EVT_SET(LVar0, LVarC) + EVT_DIV(LVar0, 20) + EVT_MOD(LVar0, 2) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-1.0), EVT_FLOAT(1.0), 3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80251654_8637C4) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802516CC_86383C) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, 8, 3, 0, 0) + EVT_SET(LVar1, LVar0) + EVT_DIV(LVar1, 3) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_SET(LVar0, LVarC) + EVT_MUL(LVar0, 2) + EVT_CALL(N(UnkFloatFunc001), LVar0, LVar0, 30, 60, 3, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_8025194C) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(MakeLocalVertexCopy, 1, MODEL_karada, TRUE) + EVT_CALL(SetCustomGfxBuilders, 1, EVT_PTR(N(unkAngleFunc002)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_karada, 1, -1) + EVT_CALL(MakeLocalVertexCopy, 2, MODEL_onaka, TRUE) + EVT_CALL(SetCustomGfxBuilders, 2, EVT_PTR(N(unkAngleFunc003)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_onaka, 2, -1) + EVT_THREAD + EVT_LABEL(0) + EVT_CALL(N(UnkAngleFunc001), 0, LVar0, LVar1, LVar2) + EVT_SUBF(LVar0, -80) + EVT_SUBF(LVar1, -18) + EVT_SUBF(LVar2, 420) + EVT_ADDF(LVar0, 130) + EVT_ADDF(LVar1, -20) + EVT_ADDF(LVar2, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcYaw, NPC_Whale, LVar0) + EVT_MULF(LVar0, -1) + EVT_ADDF(LVar0, -90) + EVT_CALL(TranslateModel, MODEL_bero, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, -100, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_bero, 100, -1, 0) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o173, 102, 4, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_bero, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o170, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o183, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_dou, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, -100, 1, 0) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o173, -102, -4, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(TranslateModel, MODEL_bero, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, 100, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, 100, 0, 0) + EVT_CALL(GetNpcAnimation, NPC_Whale, LVar0) + EVT_IF_NE(LVar0, LVarB) + EVT_SET(LVarB, LVar0) + EVT_SET(LVarC, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_tt9, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o170, TRUE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_IF_NE(LVarB, ANIM_Kolorado_Shout) + EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(PlaySound, SOUND_443) + EVT_CALL(func_802D62E4, SOUND_43) + EVT_CALL(N(DisposeWhaleGeyser), LVar0) + EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_EQ(ANIM_Kolorado_IdleSad) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, 0) + EVT_SET(LVarD, EVT_PTR(N(D_80250D58_862EC8))) + EVT_CASE_EQ(ANIM_Kolorado_Still) + EVT_SET(LVarD, EVT_PTR(N(D_80250A5C_862BCC))) + EVT_CASE_EQ(ANIM_Kolorado_Yell) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, 0) + EVT_SET(LVarD, EVT_PTR(N(D_80250AD4_862C44))) + EVT_CASE_EQ(ANIM_Kolorado_Idle) + EVT_SET(LVarD, EVT_PTR(N(D_80251654_8637C4))) + EVT_CASE_EQ(ANIM_Kolorado_Walk) + EVT_SET(LVarD, EVT_PTR(N(D_802516CC_86383C))) + EVT_CASE_EQ(ANIM_Kolorado_WalkSad) + EVT_SET(LVarD, EVT_PTR(N(D_80250FA4_863114))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(ANIM_Kolorado_Run) + EVT_SET(LVarD, EVT_PTR(N(D_80251244_8633B4))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(ANIM_Kolorado_Panic) + EVT_SET(LVarD, EVT_PTR(N(D_802513AC_86351C))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(ANIM_Kolorado_Talk) + EVT_SET(LVarD, EVT_PTR(N(D_802514EC_86365C))) + EVT_CASE_EQ(ANIM_Kolorado_Shout) + EVT_SET(LVarD, EVT_PTR(N(D_80250FB4_863124))) + EVT_CASE_EQ(ANIM_Kolorado_TalkSad) + EVT_SET(LVarD, EVT_PTR(N(D_8025110C_86327C))) + EVT_CASE_EQ(ANIM_Kolorado_HurtStill) + EVT_SET(LVarD, EVT_PTR(N(D_8025111C_86328C))) + EVT_END_SWITCH + EVT_END_IF + EVT_EXEC_WAIT(LVarD) + EVT_ADD(LVarC, 1) + EVT_IF_GT(LVarC, 1000) + EVT_SET(LVarC, 0) + EVT_END_IF + EVT_GOTO(0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802522B8) = { + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_IdleSad) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_05/mac_05_6_rooms.c b/src/world/area_mac/mac_05/mac_05_6_rooms.c new file mode 100644 index 0000000000..c7270be477 --- /dev/null +++ b/src/world/area_mac/mac_05/mac_05_6_rooms.c @@ -0,0 +1,77 @@ +#include "mac_05.h" + +EvtScript N(D_802522E0_864450) = { + EVT_CALL(RotateModel, MODEL_o80, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80252310_864480) = { + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_o95, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o96, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o98, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o99, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o100, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o101, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o102, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o104, LVar1, 1, 0, 0) + EVT_SET(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_o133, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o134, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o137, LVar1, 1, 0, 0) + EVT_SET(LVar1, LVar0) + EVT_MULF(LVar1, EVT_FLOAT(-1.0)) + EVT_CALL(RotateModel, MODEL_o82, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o83, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o84, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o136, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o81, LVar1, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o135, LVar1, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80252580_8646F0) = { + EVT_CALL(RotateModel, MODEL_o80, LVar0, 1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802525B0_864720) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetMusicTrack, 0, SONG_CLUB64, 0, 8) + EVT_CALL(StopSound, SOUND_80000058) + EVT_CALL(func_802D62E4, 57) + EVT_CALL(EnableGroup, MODEL_bar_inn, TRUE) + EVT_CALL(EnableModel, MODEL_o139, FALSE) + EVT_CALL(EnableModel, MODEL_o140, FALSE) + EVT_CASE_EQ(3) + EVT_SET(MF_Unk_0A, FALSE) + EVT_CALL(EnableGroup, MODEL_bar_inn, FALSE) + EVT_CALL(EnableModel, MODEL_o139, TRUE) + EVT_CALL(EnableModel, MODEL_o140, TRUE) + EVT_WAIT(5) + EVT_EXEC(N(EVS_802441E0)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +s32 N(D_802526C8_864838)[] = { + NPC_Toad_02, + NPC_Bartender, + NPC_Chanterelle, + NPC_ArtistToad, + NPC_TradeEventToad, + -1 +}; + +EvtScript N(EVS_802526E0) = { + EVT_CALL(MakeDoorAdvanced, 2, EVT_PTR(N(D_802522E0_864450)), EVT_PTR(N(D_80252310_864480)), EVT_PTR(N(D_80252580_8646F0)), EVT_PTR(N(D_802525B0_864720)), COLLIDER_deilit1, COLLIDER_deilit1u, MODEL_harbour_club, EVT_PTR(N(D_802526C8_864838))) + EVT_SET(LVar0, 3) + EVT_EXEC(N(D_802525B0_864720)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_05/855F20.c b/src/world/area_mac/mac_05/mac_05_7_club64_sign.c similarity index 72% rename from src/world/area_mac/mac_05/855F20.c rename to src/world/area_mac/mac_05/mac_05_7_club64_sign.c index ea2ffdf937..2cbefaf01c 100644 --- a/src/world/area_mac/mac_05/855F20.c +++ b/src/world/area_mac/mac_05/mac_05_7_club64_sign.c @@ -1,6 +1,8 @@ #include "mac_05.h" -extern f32 D_80252744_8648B4; +s32 N(UnusedInt) = 0; + +f32 N(Club64SignAlphaModulus) = 0.0f; // ordering #ifdef NON_MATCHING @@ -73,31 +75,39 @@ void func_80243DB0_855F20(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f3 INCLUDE_ASM(s32, "world/area_mac/mac_05/855F20", func_80243DB0_855F20); #endif -void func_80243F0C_85607C(s32 index) { +void N(gfx_build_club_64)(s32 index) { Vtx* first; Vtx* copied; s32 numCopied; s32 i; - f32 unk1, unk2, unk3; + f32 colR, colG, colB; mdl_get_copied_vertices(3, &first, &copied, &numCopied); for (i = 0; i < numCopied; i++) { u8* colors = copied[i].v.cn; - f32 temp = D_80252744_8648B4 + (f32)i / (f32)numCopied; - if (temp > 1.0) { - temp -= 1.0; + f32 alpha = N(Club64SignAlphaModulus) + (f32)i / (f32)numCopied; + if (alpha > 1.0) { + alpha -= 1.0; } - func_80243DB0_855F20(temp, 1.0f, 0.5f, &unk1, &unk2, &unk3); + func_80243DB0_855F20(alpha, 1.0f, 0.5f, &colR, &colG, &colB); - colors[0] = unk1 * 255.0f; - colors[1] = unk2 * 255.0f; - colors[2] = unk3 * 255.0f; + colors[0] = colR * 255.0f; + colors[1] = colG * 255.0f; + colors[2] = colB * 255.0f; } gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(3)); - D_80252744_8648B4 += 0.01; - if (D_80252744_8648B4 > 1.0) { - D_80252744_8648B4 -= 1.0f; + N(Club64SignAlphaModulus) += 0.01; + if (N(Club64SignAlphaModulus) > 1.0) { + N(Club64SignAlphaModulus) -= 1.0f; } } + +EvtScript N(EVS_AnimateClub64Sign) = { + EVT_CALL(MakeLocalVertexCopy, 3, MODEL_o187, TRUE) + EVT_CALL(SetCustomGfxBuilders, 3, EVT_PTR(N(gfx_build_club_64)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_o187, 3, -1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_06/mac_06.h b/src/world/area_mac/mac_06/mac_06.h index 214564cc83..38daa3839c 100644 --- a/src/world/area_mac/mac_06/mac_06.h +++ b/src/world/area_mac/mac_06/mac_06.h @@ -13,16 +13,22 @@ #include "sprite/npc/JrTroopa.h" enum { - NPC_Whale = 0, - NPC_01 = 1, - NPC_Kolorado = 2, - NPC_JrTroopa = 3, + NPC_Whale = 0, + NPC_01 = 1, + NPC_Kolorado = 2, + NPC_JrTroopa = 3, }; enum { - MV_Unk_00 = MapVar(0), - MV_Unk_01 = MapVar(1), - MV_Unk_02 = MapVar(2), + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_Unk_02 = MapVar(2), }; #define NAMESPACE mac_06 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_FlyingGull); +extern EvtScript N(EVS_WhaleMain); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mac/mac_06/mac_06_0_header.c b/src/world/area_mac/mac_06/mac_06_0_header.c new file mode 100644 index 0000000000..5d99940d06 --- /dev/null +++ b/src/world/area_mac/mac_06/mac_06_0_header.c @@ -0,0 +1,12 @@ +#include "mac_06.h" + +EntryList N(Entrances) = { + [mac_06_ENTRY_0] { 0.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, +}; diff --git a/src/world/area_mac/mac_06/mac_06_1_main.c b/src/world/area_mac/mac_06/mac_06_1_main.c index c5fa5d5556..07493741c9 100644 --- a/src/world/area_mac/mac_06/mac_06_1_main.c +++ b/src/world/area_mac/mac_06/mac_06_1_main.c @@ -1,22 +1,5 @@ #include "mac_06.h" -extern EvtScript N(EVS_Main); -extern EvtScript N(EVS_FlyingGull); -extern EvtScript N(EVS_WhaleMain); - -extern NpcGroupList N(DefaultNPCs); - -EntryList N(Entrances) = { - [mac_06_ENTRY_0] { 0.0, 0.0, 100.0, 90.0 }, -}; - -MapSettings N(settings) = { - .main = &N(EVS_Main), - .entryList = &N(Entrances), - .entryCount = ENTRY_COUNT(N(Entrances)), - .background = &gBackgroundImage, -}; - #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_mac/mac_06/mac_06_2.c b/src/world/area_mac/mac_06/mac_06_2_whale.c similarity index 100% rename from src/world/area_mac/mac_06/mac_06_2.c rename to src/world/area_mac/mac_06/mac_06_2_whale.c diff --git a/src/world/area_mac/mac_06/mac_06_3.c b/src/world/area_mac/mac_06/mac_06_3_npc.c similarity index 100% rename from src/world/area_mac/mac_06/mac_06_3.c rename to src/world/area_mac/mac_06/mac_06_3_npc.c diff --git a/src/world/area_mac/machi/7E73A0.c b/src/world/area_mac/machi/7E73A0.c deleted file mode 100644 index fd538bc919..0000000000 --- a/src/world/area_mac/machi/7E73A0.c +++ /dev/null @@ -1,141 +0,0 @@ -#include "machi.h" - -static char* STR01 = "GSW MAP"; -static char* STR02 = "GSW DOKAN"; -static char* STR03 = "GSW FBTL"; -static char* STR04 = "GSW BTL"; -static char* STR05 = "GSW NPC"; -static char* STR06 = "GSW BAT"; -static char* STR07 = "GSW OSR"; -static char* STR08 = "GSW END"; -static char* STR09 = "GSW KPA"; -static char* STR10 = "GSW PRA"; -static char* STR11 = "GSW SAM"; -static char* STR12 = "GSW FLO"; -static char* STR13 = "GSW KZN"; -static char* STR14 = "GSW JAN"; -static char* STR15 = "GSW OMO"; -static char* STR16 = "GSW DGB"; -static char* STR17 = "GSW ARN"; -static char* STR18 = "GSW OBK"; -static char* STR19 = "GSW MIM"; -static char* STR20 = "GSW ISK"; -static char* STR21 = "GSW SBK"; -static char* STR22 = "GSW DRO"; -static char* STR23 = "GSW IWA"; -static char* STR24 = "GSW TRD"; -static char* STR25 = "GSW NOK"; -static char* STR26 = "GSW HOS"; -static char* STR27 = "GSW KKJ"; -static char* STR28 = "GSW KGR"; -static char* STR29 = "GSW TIK"; -static char* STR30 = "GSW MAC"; -static char* STR31 = "GSW KMR"; -static char* STR32 = "GSW EVT"; -static char* STR33 = "GSWF MAP"; -static char* STR34 = "GSWF DOKAN"; -static char* STR35 = "GSWF FBTL"; -static char* STR36 = "GSWF BTL"; -static char* STR37 = "GSWF NPC"; -static char* STR38 = "GSWF BAT"; -static char* STR39 = "GSWF OSR"; -static char* STR40 = "GSWF END"; -static char* STR41 = "GSWF KPA"; -static char* STR42 = "GSWF PRA"; -static char* STR43 = "GSWF SAM"; -static char* STR44 = "GSWF FLO"; -static char* STR45 = "GSWF KZN"; -static char* STR46 = "GSWF JAN"; -static char* STR47 = "GSWF OMO"; -static char* STR48 = "GSWF DGB"; -static char* STR49 = "GSWF ARN"; -static char* STR50 = "GSWF OBK"; -static char* STR51 = "GSWF MIM"; -static char* STR52 = "GSWF ISK"; -static char* STR53 = "GSWF SBK"; -static char* STR54 = "GSWF DRO"; -static char* STR55 = "GSWF IWA"; -static char* STR56 = "GSWF TRD"; -static char* STR57 = "GSWF NOK"; -static char* STR58 = "GSWF HOS"; -static char* STR59 = "GSWF KKJ"; -static char* STR60 = "GSWF KGR"; -static char* STR61 = "GSWF TIK"; -static char* STR62 = "GSWF MAC"; -static char* STR63 = "GSWF KMR"; -static char* STR64 = "GSWF EVT"; - -static char* N(exit_str_0) = "kmr_09"; -static char* N(exit_str_1) = "nok_10"; -static char* N(exit_str_2) = "iwa_00"; -static char* N(exit_str_3) = "tst_01"; -static char* N(exit_str_4) = "jan_00"; - -INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240000_7E73A0); - -ApiStatus N(80240030_7E73D0)(Evt* script, s32 isInitialCall) { - return ApiStatus_DONE2; -} - -ApiStatus func_80240038_7E73D8(Evt* script, s32 isInitialCall) { - return ApiStatus_DONE2; -} - -ApiStatus func_80240040_7E73E0(Evt* script, s32 isInitialCall) { - return ApiStatus_BLOCK; -} - -ApiStatus func_80240048_7E73E8(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[0] = 0; - script->functionTemp[1] = 0; - gOverrideFlags |= GLOBAL_OVERRIDES_10; - } - - set_screen_overlay_params_front(0, script->functionTemp[1]); - - if (script->functionTemp[1] == 255) { - return ApiStatus_DONE2; - } - - script->functionTemp[1] += 10; - if (script->functionTemp[1] > 255) { - script->functionTemp[1] = 255; - } - - return ApiStatus_BLOCK; -} - - -ApiStatus func_802400C8_7E7468(Evt* script, s32 isInitialCall) { - gPlayerData.partners[script->varTable[0] + 1].level++; - script->varTable[0] = PARTNER_NONE; - if (gPlayerData.partners[PARTNER_GOOMBARIO].level > 2) { - gPlayerData.partners[PARTNER_GOOMBARIO].level = 2; - script->varTable[0] = PARTNER_GOOMBARIO; - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80240114_7E74B4(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[0] = 0; - script->functionTemp[1] = 255; - gOverrideFlags |= GLOBAL_OVERRIDES_10; - } - - set_screen_overlay_params_front(0, script->functionTemp[1]); - - if (script->functionTemp[1] == 0) { - gOverrideFlags &= ~GLOBAL_OVERRIDES_10; - return ApiStatus_DONE2; - } - - script->functionTemp[1] -= 10; - if (script->functionTemp[1] < 0) { - script->functionTemp[1] = 0; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/area_mac/machi/7E7550.c b/src/world/area_mac/machi/7E7550.c deleted file mode 100644 index eb6e920242..0000000000 --- a/src/world/area_mac/machi/7E7550.c +++ /dev/null @@ -1,93 +0,0 @@ -#include "machi.h" - -extern s32 D_80241180_7E8520[]; - -ApiStatus func_802401B0_7E7550(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - if (rand_int(1000) < 500) { - func_8005DECC(npc, -1, D_80241180_7E8520, - rand_int(4) + 1, rand_int(3) + 5, rand_int(50) + 50, rand_int(100) + 100); - } else { - func_8005DECC(npc, rand_int(3) + 10, D_80241180_7E8520, - rand_int(4) + 1, rand_int(3) + 5, rand_int(50) + 50, rand_int(100) + 10); - } - return ApiStatus_DONE2; -} - -ApiStatus func_802402EC_7E768C(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - func_8005DFD4(npc); - return ApiStatus_DONE2; -} - -ApiStatus func_80240318_7E76B8(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - func_8005E12C(npc); - return ApiStatus_DONE2; -} - -ApiStatus func_80240344_7E76E4(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - s32 i; - - playerData->curHP = 5; - playerData->curMaxHP = 5; - playerData->bootsLevel = 0; - playerData->hammerLevel = -1; - playerData->fortressKeyCount = 0; - - for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) { - playerData->partners[i].enabled = FALSE; - } - switch_to_partner(PARTNER_NONE); - return ApiStatus_DONE2; -} - -ApiStatus func_802403A0_7E7740(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc_set_palswap_mode_A(npc, 3); - npc_set_palswap_1(npc, 0, 1, 30, 10); - npc_set_palswap_2(npc, 60, 20, 0, 0); - return ApiStatus_DONE2; -} - -ApiStatus func_80240410_7E77B0(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - s32 i; - - playerData->curHP = 8; - playerData->curMaxHP = 8; - playerData->bootsLevel = 0; - playerData->hammerLevel = 0; - playerData->fortressKeyCount = 0; - playerData->partners[PARTNER_NONE].enabled = TRUE; - - for (i = 1; i < ARRAY_COUNT(playerData->partners); i++) { - playerData->partners[i].enabled = FALSE; - } - return ApiStatus_DONE2; -} - -ApiStatus func_8024045C_7E77FC(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - s32 i; - - playerData->curHP = 11; - playerData->curMaxHP = 11; - playerData->bootsLevel = 0; - playerData->hammerLevel = 0; - playerData->fortressKeyCount = 0; - - for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) { - playerData->partners[i].enabled = FALSE; - } - - playerData->partners[PARTNER_NONE].enabled = TRUE; - playerData->partners[PARTNER_GOOMBARIO].enabled = TRUE; - playerData->partners[PARTNER_BOMBETTE].enabled = TRUE; - return ApiStatus_DONE2; -} diff --git a/src/world/area_mac/machi/7E7850.c b/src/world/area_mac/machi/7E7850.c deleted file mode 100644 index 237e7c35f2..0000000000 --- a/src/world/area_mac/machi/7E7850.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "machi.h" - -ApiStatus func_802404B0_7E7850(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(0x37); - - if (isInitialCall) { - script->functionTemp[0] = 0; - } - - switch (script->functionTemp[0]) { - case 0: - npc->moveToPos.x = npc->pos.x + 500.0f; - npc->moveToPos.y = npc->pos.y + 120.0f; - npc->moveToPos.z = npc->pos.z - 500.0f; - npc->duration = 20; - npc->moveToPos.x = (npc->moveToPos.x - npc->pos.x) / npc->duration; - npc->moveToPos.y = (npc->moveToPos.y - npc->pos.y) / npc->duration; - npc->moveToPos.z = (npc->moveToPos.z - npc->pos.z) / npc->duration; - npc->duration = 100; - npc->moveToPos.x /= 10.0f; - npc->moveToPos.y /= 10.0f; - npc->moveToPos.z /= 10.0f; - enable_npc_blur(npc); - script->functionTemp[0] = 1; - break; - case 1: - npc->pos.x += npc->moveToPos.x; - npc->pos.y += npc->moveToPos.y; - npc->pos.z += npc->moveToPos.z; - npc->moveToPos.x = npc->moveToPos.x * 1.05; - npc->moveToPos.y = npc->moveToPos.y * 1.05; - npc->moveToPos.z = npc->moveToPos.z * 1.05; - npc->duration--; - if (npc->duration == 0) { - return ApiStatus_DONE1; - } - break; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_mac/machi/machi.h b/src/world/area_mac/machi/machi.h index 1514455fac..1453eb0c07 100644 --- a/src/world/area_mac/machi/machi.h +++ b/src/world/area_mac/machi/machi.h @@ -2,8 +2,56 @@ /// @brief Debug Warp Zone - Debug Warp Zone #include "common.h" -#include "../mac.h" #include "message_ids.h" #include "map.h" +#include "../mac.h" +#include "mapfs/machi_shape.h" +#include "mapfs/machi_hit.h" + +#include "sprite/npc/StarRod.h" +#include "sprite/npc/Koopa.h" +#include "sprite/npc/Kolorado.h" +#include "sprite/npc/Goompa.h" +#include "sprite/npc/Goombaria.h" +#include "sprite/npc/GoombaKing.h" +#include "sprite/npc/WorldMisstar.h" + +enum { + NPC_05 = 5, + NPC_06 = 6, + NPC_07 = 7, + NPC_Goompa = 10, + NPC_0B = 11, + NPC_0C = 12, + NPC_0D = 13, + NPC_0E = 14, + NPC_0F = 15, + NPC_10 = 16, + NPC_11 = 17, + NPC_12 = 18, + NPC_13 = 19, + NPC_GoombaKing = 40, + NPC_Misstar = 55, +}; + #define NAMESPACE machi + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_GoombaKing_Init); +extern EvtScript N(EVS_FlyPartnerAround); +extern EvtScript N(EVS_MakeEntities); + +extern NpcSettings N(NpcSettings_GoombaKing); +extern StaticNpc N(NpcData_Misstar); +extern NpcGroupList N(DefaultNPCs); + +typedef struct GameVarRange { + /* 00 */ char* name; + /* 04 */ s32 first; + /* 08 */ s32 count; + /* 0C */ s32 next; +} GameVarRange; // size = 0x10 + +extern GameVarRange N(GameByteTable)[]; +extern GameVarRange N(GameFlagTable)[]; diff --git a/src/world/area_mac/machi/machi_0_header.c b/src/world/area_mac/machi/machi_0_header.c new file mode 100644 index 0000000000..aa30ff6585 --- /dev/null +++ b/src/world/area_mac/machi/machi_0_header.c @@ -0,0 +1,28 @@ +#include "machi.h" + +EntryList N(Entrances) = { + [machi_ENTRY_0] { 0.0, 0.0, -485.0, 0.0 }, + [machi_ENTRY_1] { 345.0, 0.0, -345.0, 0.0 }, + [machi_ENTRY_2] { 485.0, 0.0, 0.0, 0.0 }, + [machi_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, + [machi_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [machi_ENTRY_5] { -345.0, 0.0, 345.0, 45.0 }, + [machi_ENTRY_6] { -485.0, 0.0, 0.0, 0.0 }, + [machi_ENTRY_7] { -345.0, 0.0, -345.0, 0.0 }, + [machi_ENTRY_8] { 0.0, 0.0, 0.0, 0.0 }, + [machi_ENTRY_9] { 0.0, 0.0, 0.0, 0.0 }, + [machi_ENTRY_A] { 354.0, 0.0, 294.0, 117.0 }, + [machi_ENTRY_B] { -210.0, 35.0, -100.0, 180.0 }, + [machi_ENTRY_C] { -150.0, 35.0, -100.0, 180.0 }, + [machi_ENTRY_D] { -90.0, 35.0, -100.0, 180.0 }, + [machi_ENTRY_E] { -90.0, 35.0, -200.0, 180.0 }, + [machi_ENTRY_F] { -30.0, 35.0, -200.0, 180.0 }, + [machi_ENTRY_10] { 30.0, 35.0, -200.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, +}; diff --git a/src/world/area_mac/machi/machi_1_tables.c b/src/world/area_mac/machi/machi_1_tables.c new file mode 100644 index 0000000000..ba89a24a1e --- /dev/null +++ b/src/world/area_mac/machi/machi_1_tables.c @@ -0,0 +1,89 @@ +#include "machi.h" + +#define VAR_RANGE_BYTE(s, firstVar, nextRange, nextVar) \ +{ \ + .name = s, \ + .first = EVT_INDEX_OF_GAME_BYTE(firstVar), \ + .count = nextRange - firstVar, \ + .next = nextVar, \ +} + +GameVarRange N(GameByteTable)[] = { + VAR_RANGE_BYTE("GSW EVT", GB_StoryProgress, GB_Unused_KMR_00, GB_Unused_EVT_02), + VAR_RANGE_BYTE("GSW KMR", GB_Unused_KMR_00, GB_MAC01_Merlon_SpinJumpCount, GB_Unused_KMR_05), + VAR_RANGE_BYTE("GSW MAC", GB_MAC01_Merlon_SpinJumpCount, GB_TIK15_RipCheato_PurchaseCount, GB_Unused_MAC_13), + VAR_RANGE_BYTE("GSW TIK", GB_TIK15_RipCheato_PurchaseCount, GB_Unused_KGR_00, GB_Unused_TIK_01), + VAR_RANGE_BYTE("GSW KGR", GB_Unused_KGR_00, GB_Unused_KKJ_00, GB_Unused_KGR_00), + VAR_RANGE_BYTE("GSW KKJ", GB_Unused_KKJ_00, GB_Unused_HOS_00, GB_Unused_KKJ_03), + VAR_RANGE_BYTE("GSW HOS", GB_Unused_HOS_00, GB_Unused_NOK_00, GB_Unused_HOS_00), + VAR_RANGE_BYTE("GSW NOK", GB_Unused_NOK_00, GB_Unused_TRD_00, GB_Unused_NOK_02), + VAR_RANGE_BYTE("GSW TRD", GB_Unused_TRD_00, GB_IWA10_ReturnedLetterCount, GB_Unused_TRD_00), + VAR_RANGE_BYTE("GSW IWA", GB_IWA10_ReturnedLetterCount, GB_DRO02_SheekGiftCount, GB_Unused_IWA_02), + VAR_RANGE_BYTE("GSW DRO", GB_DRO02_SheekGiftCount, GB_Unused_SBK_00, GB_Unused_DRO_02), + VAR_RANGE_BYTE("GSW SBK", GB_Unused_SBK_00, GB_ISK11_ItemSocket1, GB_Unused_SBK_00), + VAR_RANGE_BYTE("GSW ISK", GB_ISK11_ItemSocket1, GB_MIM_CurrentMapID, GB_Unused_ISK_05), + VAR_RANGE_BYTE("GSW MIM", GB_MIM_CurrentMapID, GB_OBK07_SelectedRecord, GB_Unused_MIM_01), + VAR_RANGE_BYTE("GSW OBK", GB_OBK07_SelectedRecord, GB_Unused_ARN_00, GB_Unused_OBK_01), + VAR_RANGE_BYTE("GSW ARN", GB_Unused_ARN_00, GB_ARN_Tubba_MapID, GB_Unused_ARN_00), + VAR_RANGE_BYTE("GSW DGB", GB_ARN_Tubba_MapID, GB_Unused_OMO_00, GB_Unused_DGB_01), + VAR_RANGE_BYTE("GSW OMO", GB_Unused_OMO_00, GB_Unused_JAN_00, GB_Unused_OMO_05), + VAR_RANGE_BYTE("GSW JAN", GB_Unused_JAN_00, GB_Unused_KZN_00, GB_Unused_JAN_00), + VAR_RANGE_BYTE("GSW KZN", GB_Unused_KZN_00, GB_Unused_FLO_00, GB_Unused_KZN_00), + VAR_RANGE_BYTE("GSW FLO", GB_Unused_FLO_00, GB_SAM09_ItemSocket1_LowerByte, GB_Unused_FLO_05), + VAR_RANGE_BYTE("GSW SAM", GB_SAM09_ItemSocket1_LowerByte, GB_Unused_PRA_00, GB_Unused_SAM_08), + VAR_RANGE_BYTE("GSW PRA", GB_Unused_PRA_00, GB_KPA_WaterLevel, GB_Unused_PRA_04), + VAR_RANGE_BYTE("GSW KPA", GB_KPA_WaterLevel, GB_Unused_OSR_00, GB_Unused_KPA_08), + VAR_RANGE_BYTE("GSW END", GB_Unused_END_00, GB_Unused_BAT_00, GB_Unused_END_01), + VAR_RANGE_BYTE("GSW OSR", GB_Unused_OSR_00, GB_Unused_END_00, GB_Unused_OSR_00), + VAR_RANGE_BYTE("GSW BAT", GB_Unused_BAT_00, GB_KootFavor_State, GB_Unused_BAT_00), + VAR_RANGE_BYTE("GSW NPC", GB_KootFavor_State, GB_Tattles_00, GB_Unused_NPC_09), + VAR_RANGE_BYTE("GSW BTL", GB_Tattles_00, GB_Unused_FBTL_00, GB_Unused_BTL_1E), + VAR_RANGE_BYTE("GSW FBTL", GB_Unused_FBTL_00, GB_Unused_DOKAN_00, GB_Unused_FBTL_00), + VAR_RANGE_BYTE("GSW DOKAN", GB_Unused_DOKAN_00, GB_WorldLocation, GB_Unused_DOKAN_00), + VAR_RANGE_BYTE("GSW MAP", GB_WorldLocation, GB_Unused_1B4, GB_Unused_MAP_01), + {} +}; + +#define VAR_RANGE_FLAG(s, firstVar, nextRange, nextVar) \ +{ \ + .name = s, \ + .first = EVT_INDEX_OF_GAME_FLAG(firstVar), \ + .count = nextRange - firstVar, \ + .next = nextVar, \ +} + +GameVarRange N(GameFlagTable)[] = { + VAR_RANGE_FLAG("GSWF EVT", GF_Unused_EVT_00, GF_KMR04_Tree3_Dolly, GF_Unused_EVT_0A), + VAR_RANGE_FLAG("GSWF KMR", GF_KMR04_Tree3_Dolly, GF_Unused_MAC_00, GF_Unused_KMR_51), + VAR_RANGE_FLAG("GSWF MAC", GF_Unused_MAC_00, GF_Unused_TIK_00, GF_Unused_MAC_EF), + VAR_RANGE_FLAG("GSWF TIK", GF_Unused_TIK_00, GF_Unused_KGR_00, GF_Unused_TIK_33), + VAR_RANGE_FLAG("GSWF KGR", GF_Unused_KGR_00, GF_KKJ14_OpenedPassage, GF_Unused_KGR_00), + VAR_RANGE_FLAG("GSWF KKJ", GF_KKJ14_OpenedPassage, GF_Unused_HOS_00, GF_Unused_KKJ_20), + VAR_RANGE_FLAG("GSWF HOS", GF_Unused_HOS_00, GF_NOK01_RecoveredShellA, GF_Unused_HOS_0F), + VAR_RANGE_FLAG("GSWF NOK", GF_NOK01_RecoveredShellA, GF_TRD01_Item_SmashCharge, GF_Unused_NOK_34), + VAR_RANGE_FLAG("GSWF TRD", GF_TRD01_Item_SmashCharge, GF_IWA01_Item_QuakeHammer, GF_Unused_TRD_1D), + VAR_RANGE_FLAG("GSWF IWA", GF_IWA01_Item_QuakeHammer, GF_DRO02_Sheek_SpokeTo, GF_Unused_IWA_25), + VAR_RANGE_FLAG("GSWF DRO", GF_DRO02_Sheek_SpokeTo, GF_SBK30_Met_Kolorado, GF_Unused_DRO_10), + VAR_RANGE_FLAG("GSWF SBK", GF_SBK30_Met_Kolorado, GF_ISK02_UnlockedDoor, GF_Unused_SBK_44), + VAR_RANGE_FLAG("GSWF ISK", GF_ISK02_UnlockedDoor, GF_MIM_ChoosingPath, GF_Unused_ISK_25), + VAR_RANGE_FLAG("GSWF MIM", GF_MIM_ChoosingPath, GF_Unused_OBK_00, GF_Unused_MIM_0C), + VAR_RANGE_FLAG("GSWF OBK", GF_Unused_OBK_00, GF_Unused_ARN_00, GF_Unused_OBK_1A), + VAR_RANGE_FLAG("GSWF ARN", GF_Unused_ARN_00, GF_DGB01_UnlockedEastWing, GF_Unused_ARN_14), + VAR_RANGE_FLAG("GSWF DGB", GF_DGB01_UnlockedEastWing, GF_Unused_OMO_00, GF_Unused_DGB_20), + VAR_RANGE_FLAG("GSWF OMO", GF_Unused_OMO_00, GF_Unused_JAN_00, GF_Unused_OMO_61), + VAR_RANGE_FLAG("GSWF JAN", GF_Unused_JAN_00, GF_Unused_KZN_00, GF_Unused_JAN_44), + VAR_RANGE_FLAG("GSWF KZN", GF_Unused_KZN_00, GF_Unused_FLO_00, GF_Unused_KZN_20), + VAR_RANGE_FLAG("GSWF FLO", GF_Unused_FLO_00, GF_SAM04_PlacedScarf, GF_Unused_FLO_33), + VAR_RANGE_FLAG("GSWF SAM", GF_SAM04_PlacedScarf, GF_PRA_BrokeIllusion, GF_Unused_SAM_27), + VAR_RANGE_FLAG("GSWF PRA", GF_PRA_BrokeIllusion, GF_KPA01_ItemBlock_POWBlock, GF_Unused_PRA_1F), + VAR_RANGE_FLAG("GSWF KPA", GF_KPA01_ItemBlock_POWBlock, GF_Unused_END_00, GF_Unused_KPA_2F), + VAR_RANGE_FLAG("GSWF END", GF_Unused_END_00, GF_OSR02_HiddenItem_UltraShroom, GF_Unused_END_01), + VAR_RANGE_FLAG("GSWF OSR", GF_OSR02_HiddenItem_UltraShroom, GF_MAC01_RowfBadge_00, GF_Unused_OSR_01), + VAR_RANGE_FLAG("GSWF BAT", GF_MAC01_RowfBadge_00, GF_KootFavor_LeftKoopaVillage, GF_Unused_BAT_15), + VAR_RANGE_FLAG("GSWF NPC", GF_KootFavor_LeftKoopaVillage, GF_SpawnedItemDrop_00, GF_Unused_NPC_5A), + VAR_RANGE_FLAG("GSWF BTL", GF_SpawnedItemDrop_00, GF_FBTL_00, GF_Unused_BTL_07), + VAR_RANGE_FLAG("GSWF FBTL", GF_FBTL_00, GF_TIK01_WarpPipes, GF_Unused_FBTL_4B), + VAR_RANGE_FLAG("GSWF DOKAN", GF_TIK01_WarpPipes, GF_MAP_ToadTown, GF_Unused_DOKAN_09), + VAR_RANGE_FLAG("GSWF MAP", GF_MAP_ToadTown, GF_Unused_7E0, GF_Unused_MAP_22), + {} +}; diff --git a/src/world/area_mac/machi/machi_2_main.c b/src/world/area_mac/machi/machi_2_main.c new file mode 100644 index 0000000000..e8d1625308 --- /dev/null +++ b/src/world/area_mac/machi/machi_2_main.c @@ -0,0 +1,77 @@ +#include "machi.h" + +API_CALLABLE(N(CheckGameVarRanges)) { + GameVarRange* bytes; + GameVarRange* flags; + + bytes = N(GameByteTable); + while (TRUE) { + if (bytes->name == 0) { + break; + } + // release version does nothing + bytes++; + } + + flags = N(GameFlagTable); + while (TRUE) { + if (flags->name == 0) { + break; + } + // release version does nothing + flags++; + } + + return 2; +} + +EvtScript N(EVS_GotoMap_kmr_09_1) = { + EVT_CALL(GotoMap, EVT_PTR("kmr_09"), kmr_09_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_nok_10_0) = { + EVT_CALL(GotoMap, EVT_PTR("nok_10"), nok_10_ENTRY_0) //@bug map does not exist! + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_iwa_00_0) = { + EVT_CALL(GotoMap, EVT_PTR("iwa_00"), iwa_00_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_tst_01_0) = { + EVT_CALL(GotoMap, EVT_PTR("tst_01"), tst_01_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_jan_00_0) = { + EVT_CALL(GotoMap, EVT_PTR("jan_00"), jan_00_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_CALL(N(CheckGameVarRanges)) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_kmr_09_1)), TRIGGER_WALL_PUSH, COLLIDER_deilitn, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_nok_10_0)), TRIGGER_WALL_PUSH, COLLIDER_deilitne, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_iwa_00_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_01_0)), TRIGGER_WALL_PUSH, COLLIDER_deilitnw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_jan_00_0)), TRIGGER_WALL_PUSH, COLLIDER_deilitsw, 1, 0) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_GoombaKing_Init)) + EVT_EXEC(N(EVS_FlyPartnerAround)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/machi/machi_3_entity.c b/src/world/area_mac/machi/machi_3_entity.c new file mode 100644 index 0000000000..93e81407d0 --- /dev/null +++ b/src/world/area_mac/machi/machi_3_entity.c @@ -0,0 +1,91 @@ +#include "machi.h" +#include "entity.h" + +API_CALLABLE(N(DoNothing1)) { + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DoNothing2)) { + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DoNothing3)) { + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(func_80240048_7E73E8)) { + if (isInitialCall) { + script->functionTemp[0] = 0; + script->functionTemp[1] = 0; + gOverrideFlags |= GLOBAL_OVERRIDES_10; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + + if (script->functionTemp[1] == 255) { + return ApiStatus_DONE2; + } + + script->functionTemp[1] += 10; + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(func_802400C8_7E7468)) { + gPlayerData.partners[script->varTable[0] + 1].level++; + script->varTable[0] = PARTNER_NONE; + if (gPlayerData.partners[PARTNER_GOOMBARIO].level > 2) { + gPlayerData.partners[PARTNER_GOOMBARIO].level = 2; + script->varTable[0] = PARTNER_GOOMBARIO; + } + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80240114_7E74B4)) { + if (isInitialCall) { + script->functionTemp[0] = 0; + script->functionTemp[1] = 255; + gOverrideFlags |= GLOBAL_OVERRIDES_10; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + + if (script->functionTemp[1] == 0) { + gOverrideFlags &= ~GLOBAL_OVERRIDES_10; + return ApiStatus_DONE2; + } + + script->functionTemp[1] -= 10; + if (script->functionTemp[1] < 0) { + script->functionTemp[1] = 0; + } + + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HugeBlueSwitch), 278, 0, -318, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_GreenStompSwitch), 68, 0, -92, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 119, 0, -166, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), 169, 0, -166, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 0, 60, -326, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 40, 60, -326, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 80, 100, -326, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 120, 104, -326, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 160, 108, -326, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 200, 110, -326, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 240, 100, -326, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_GiantChest), -206, 0, -373, 0, ITEM_SUPER_HAMMER, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), -131, 0, -359, 0, 6, MAKE_ENTITY_END) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, 70, 0, 0, ITEM_SPAWN_MODE_KEY, 1) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, 94, 0, 0, ITEM_SPAWN_MODE_KEY, 1) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, 118, 0, 0, ITEM_SPAWN_MODE_KEY, 1) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, 142, 0, 0, ITEM_SPAWN_MODE_KEY, 1) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, 166, 0, 0, ITEM_SPAWN_MODE_KEY, 1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/machi/machi_4_goomba_king.c b/src/world/area_mac/machi/machi_4_goomba_king.c new file mode 100644 index 0000000000..d735c032cf --- /dev/null +++ b/src/world/area_mac/machi/machi_4_goomba_king.c @@ -0,0 +1,43 @@ +#include "machi.h" + +EvtScript N(EVS_GoombaKing_Init) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_GoombaKing) = { + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_GoombaKing) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_GoombaKing) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_GoombaKing) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_GoombaKing) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_GoombaKing) = { + .defaultAnim = ANIM_GoombaKing_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_GoombaKing), + .onInteract = &N(EVS_NpcInteract_GoombaKing), + .ai = &N(EVS_NpcAI_GoombaKing), + .onHit = &N(EVS_NpcHit_GoombaKing), + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; diff --git a/src/world/area_mac/machi/machi_5_npc.c b/src/world/area_mac/machi/machi_5_npc.c new file mode 100644 index 0000000000..cbca151ba3 --- /dev/null +++ b/src/world/area_mac/machi/machi_5_npc.c @@ -0,0 +1,391 @@ +#include "machi.h" + +s32 N(GoombariaAnims)[] = { + ANIM_Goombaria_Walk, + ANIM_Goombaria_Jump, + ANIM_Goombaria_Fall, + ANIM_Goombaria_Idle, + ANIM_Goombaria_Idle, + ANIM_Goombaria_Run, +}; + +API_CALLABLE(N(func_802401B0_7E7550)) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + if (rand_int(1000) < 500) { + func_8005DECC(npc, -1, N(GoombariaAnims), + rand_int(4) + 1, + rand_int(3) + 5, + rand_int(50) + 50, + rand_int(100) + 100); + } else { + func_8005DECC(npc, rand_int(3) + 10, N(GoombariaAnims), + rand_int(4) + 1, + rand_int(3) + 5, + rand_int(50) + 50, + rand_int(100) + 10); + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_802402EC_7E768C)) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + func_8005DFD4(npc); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80240318_7E76B8)) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + func_8005E12C(npc); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetupChapter0)) { + PlayerData* playerData = &gPlayerData; + s32 i; + + playerData->curHP = 5; + playerData->curMaxHP = 5; + playerData->bootsLevel = 0; + playerData->hammerLevel = -1; + playerData->fortressKeyCount = 0; + + for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) { + playerData->partners[i].enabled = FALSE; + } + switch_to_partner(PARTNER_NONE); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetupStarRodPaletteCycling)) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc_set_palswap_mode_A(npc, 3); + npc_set_palswap_1(npc, 0, 1, 30, 10); + npc_set_palswap_2(npc, 60, 20, 0, 0); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetupChapter1)) { + PlayerData* playerData = &gPlayerData; + s32 i; + + playerData->curHP = 8; + playerData->curMaxHP = 8; + playerData->bootsLevel = 0; + playerData->hammerLevel = 0; + playerData->fortressKeyCount = 0; + playerData->partners[PARTNER_NONE].enabled = TRUE; + + for (i = 1; i < ARRAY_COUNT(playerData->partners); i++) { + playerData->partners[i].enabled = FALSE; + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetupChapter2)) { + PlayerData* playerData = &gPlayerData; + s32 i; + + playerData->curHP = 11; + playerData->curMaxHP = 11; + playerData->bootsLevel = 0; + playerData->hammerLevel = 0; + playerData->fortressKeyCount = 0; + + for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) { + playerData->partners[i].enabled = FALSE; + } + + playerData->partners[PARTNER_NONE].enabled = TRUE; + playerData->partners[PARTNER_GOOMBARIO].enabled = TRUE; + playerData->partners[PARTNER_BOMBETTE].enabled = TRUE; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcAuxAI_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802411A8) = { + EVT_CALL(N(func_802401B0_7E7550)) + EVT_LABEL(0) + EVT_CALL(N(func_802402EC_7E768C)) + EVT_CALL(N(func_80240318_7E76B8)) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Unused) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_Unused) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Unused) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Unused) = { + EVT_CALL(StartBattle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Unused) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_StarRod) = { + EVT_CALL(BringPartnerOut, PARTNER_PARAKARRY) + EVT_WAIT(200) + EVT_CALL(PutPartnerAway) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_StarRod) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_StarRod) = { + EVT_CALL(N(SetupStarRodPaletteCycling)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Koopa) = { + EVT_CALL(N(SetupChapter1)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Koopa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Kolorado) = { + EVT_CALL(N(SetupChapter2)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Kolorado) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_StarRod) = { + .defaultAnim = ANIM_StarRod_Still, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_StarRod), + .onInteract = &N(EVS_NpcInteract_StarRod), + .ai = &N(EVS_NpcAI_StarRod), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_Koopa) = { + .defaultAnim = ANIM_Koopa_Walk, + .height = 24, + .radius = 24, + .onInteract = &N(EVS_NpcInteract_Koopa), + .ai = &N(EVS_NpcAI_Koopa), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_Kolorado) = { + .defaultAnim = ANIM_Kolorado_Walk, + .height = 24, + .radius = 24, + .onInteract = &N(EVS_NpcInteract_Kolorado), + .ai = &N(EVS_NpcAI_Kolorado), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_Goompa) = { + .defaultAnim = ANIM_Goompa_Walk, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_Goompa), + .onInteract = &N(EVS_NpcInteract_Goompa), + .onHit = &N(EVS_NpcHit_Goompa), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000, +}; + +StaticNpc N(NpcData_05)[] = { + { + .id = NPC_05, + .settings = &N(NpcSettings_StarRod), + .pos = { 16.0f, 0.0f, -411.0f }, + .yaw = 0, + .flags = 0, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_06, + .settings = &N(NpcSettings_Koopa), + .pos = { 389.0f, 0.0f, -278.0f }, + .yaw = 0, + .flags = 0, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_07, + .settings = &N(NpcSettings_Kolorado), + .pos = { 481.0f, 0.0f, -44.0f }, + .yaw = 0, + .flags = 0, + .init = (void*) 0x1F64, + .animations = {}, + }, +}; + +StaticNpc N(NpcData_Goompa) = { + .id = NPC_Goompa, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = { + }, +}; + +StaticNpc N(NpcData_0B)[] = { + { + .id = NPC_0B, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_0C, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_0D, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_0E, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_0F, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_10, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_11, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_12, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, + { + .id = NPC_13, + .settings = &N(NpcSettings_Goompa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_8, + .init = (void*) 0x1F64, + .animations = {}, + }, +}; + +StaticNpc N(NpcData_GoombaKing) = { + .id = NPC_GoombaKing, + .settings = &N(NpcSettings_GoombaKing), + .pos = { 12.0f, 0.0f, -13.0f }, + .yaw = 0, + .flags = 0, + .init = (void*) 0x4003, + .animations = {} +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_05), BTL_KMR_PART_1_FORMATION_08), + NPC_GROUP(N(NpcData_Goompa), BTL_KMR_PART_1_FORMATION_08), + NPC_GROUP(N(NpcData_Misstar)), + {} +}; diff --git a/src/world/area_mac/machi/machi_6_misstar.c b/src/world/area_mac/machi/machi_6_misstar.c new file mode 100644 index 0000000000..cb1a0fd38c --- /dev/null +++ b/src/world/area_mac/machi/machi_6_misstar.c @@ -0,0 +1,115 @@ +#include "machi.h" + +API_CALLABLE(N(MisstarFlyAway)) { + Npc* npc = get_npc_unsafe(NPC_Misstar); + + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + switch (script->functionTemp[0]) { + case 0: + npc->moveToPos.x = npc->pos.x + 500.0f; + npc->moveToPos.y = npc->pos.y + 120.0f; + npc->moveToPos.z = npc->pos.z - 500.0f; + npc->duration = 20; + npc->moveToPos.x = (npc->moveToPos.x - npc->pos.x) / npc->duration; + npc->moveToPos.y = (npc->moveToPos.y - npc->pos.y) / npc->duration; + npc->moveToPos.z = (npc->moveToPos.z - npc->pos.z) / npc->duration; + npc->duration = 100; + npc->moveToPos.x /= 10.0f; + npc->moveToPos.y /= 10.0f; + npc->moveToPos.z /= 10.0f; + enable_npc_blur(npc); + script->functionTemp[0] = 1; + break; + case 1: + npc->pos.x += npc->moveToPos.x; + npc->pos.y += npc->moveToPos.y; + npc->pos.z += npc->moveToPos.z; + npc->moveToPos.x = npc->moveToPos.x * 1.05; + npc->moveToPos.y = npc->moveToPos.y * 1.05; + npc->moveToPos.z = npc->moveToPos.z * 1.05; + npc->duration--; + if (npc->duration == 0) { + return ApiStatus_DONE1; + } + break; + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_NpcAuxAI_Misstar) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_Misstar) = { + EVT_LABEL(0) + EVT_SETF(LVar0, EVT_FLOAT(40.0)) + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(4.0)) + EVT_CALL(func_802CFD30, -1, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(-4.0)) + EVT_CALL(func_802CFD30, -1, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Misstar_Bobbing) = { + EVT_LABEL(0) + EVT_LOOP(10) + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Misstar) = { + EVT_EXEC_GET_TID(N(EVS_Misstar_Bobbing), LVarA) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(AwaitPlayerApproach, LVar0, LVar2, 60) + EVT_CALL(N(MisstarFlyAway)) + EVT_KILL_THREAD(LVarA) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Misstar) = { + .defaultAnim = ANIM_WorldMisstar_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_Misstar), + .ai = &N(EVS_NpcAI_Misstar), + .aux = &N(EVS_NpcAux_Misstar), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; + +StaticNpc N(NpcData_Misstar) = { + .id = NPC_Misstar, + .settings = &N(NpcSettings_Misstar), + .pos = { 320.0f, 30.0f, -290.0f }, + .yaw = 100, + .flags = ENEMY_FLAGS_1, + .animations = {}, +}; diff --git a/src/world/area_mac/machi/machi_7_partner.c b/src/world/area_mac/machi/machi_7_partner.c new file mode 100644 index 0000000000..83b3eee260 --- /dev/null +++ b/src/world/area_mac/machi/machi_7_partner.c @@ -0,0 +1,51 @@ +#include "machi.h" + +Vec3f N(FlightPath)[] = { + { -332.0, 10.0, 120.0 }, + { -160.0, 50.0, 300.0 }, + { -71.0, 60.0, 130.0 }, + { 105.0, 70.0, 262.0 }, + { 221.0, 80.0, 120.0 }, + { 404.0, 65.0, 150.0 }, + { 238.0, 50.0, -57.0 }, + { 63.0, 50.0, -42.0 }, + { -131.0, 20.0, 144.0 }, + { -75.0, 80.0, -60.0 }, + { 200.0, 40.0, -300.0 }, + { 20.0, 0.0, -280.0 }, + { 70.0, 0.0, 80.0 }, + { -332.0, 10.0, 120.0 }, +}; + +EvtScript N(EVS_ChasePartner) = { + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_LABEL(0) + EVT_CALL(GetAngleToNPC, NPC_PARTNER, LVar0) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(4.0), LVar0) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlyPartnerAround) = { + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(EnableNpcBlur, NPC_PARTNER, TRUE) + EVT_LABEL(10) + EVT_CALL(LoadPath, 500, EVT_PTR(N(FlightPath)), ARRAY_COUNT(N(FlightPath)), EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mgm/mgm_00/mgm_00.h b/src/world/area_mgm/mgm_00/mgm_00.h index ae2b4a5ad5..fed84d6c67 100644 --- a/src/world/area_mgm/mgm_00/mgm_00.h +++ b/src/world/area_mgm/mgm_00/mgm_00.h @@ -12,9 +12,9 @@ #include "sprite/npc/Toad.h" enum { - NPC_RedToad = 0, - NPC_GreenToad = 1, - NPC_BlueToad = 2, + NPC_RedToad = 0, + NPC_GreenToad = 1, + NPC_BlueToad = 2, }; enum { diff --git a/src/world/area_mgm/mgm_01/mgm_01.h b/src/world/area_mgm/mgm_01/mgm_01.h index ee6760f486..354fbfe25b 100644 --- a/src/world/area_mgm/mgm_01/mgm_01.h +++ b/src/world/area_mgm/mgm_01/mgm_01.h @@ -12,7 +12,7 @@ #include "sprite/npc/Toad.h" enum { - NPC_Toad = 0, + NPC_Toad = 0, }; #define NAMESPACE mgm_01 diff --git a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c index 8f893441ce..dca959edf5 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c +++ b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c @@ -164,7 +164,7 @@ void N(worker_draw_score)(void) { API_CALLABLE(N(DisableMenus)) { gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_MENUS; - func_800E9894(); + status_menu_ignore_changes(); close_status_menu(); return ApiStatus_DONE2; } @@ -637,7 +637,7 @@ API_CALLABLE(N(CreateMinigame)) { data->scoreWindowPosX = SCREEN_WIDTH + 1; data->scoreWindowPosY = 28; - func_800E9894(); + status_menu_ignore_changes(); close_status_menu(); return ApiStatus_DONE2; diff --git a/src/world/area_mgm/mgm_02/mgm_02.h b/src/world/area_mgm/mgm_02/mgm_02.h index b710cab864..a781314b14 100644 --- a/src/world/area_mgm/mgm_02/mgm_02.h +++ b/src/world/area_mgm/mgm_02/mgm_02.h @@ -15,27 +15,27 @@ #include "sprite/npc/Luigi.h" enum { - NPC_Toad = 0, - NPC_Fuzzy_01 = 10, - NPC_Fuzzy_02 = 11, - NPC_Fuzzy_03 = 12, - NPC_Fuzzy_04 = 13, - NPC_Fuzzy_05 = 14, - NPC_Bobomb_01 = 30, - NPC_Bobomb_02 = 31, - NPC_Bobomb_03 = 32, - NPC_Bobomb_04 = 33, - NPC_Bobomb_05 = 34, - NPC_Luigi_01 = 100, - NPC_Luigi_02 = 101, - NPC_Luigi_03 = 102, - NPC_Luigi_04 = 103, - NPC_Luigi_05 = 104, - NPC_Luigi_06 = 105, - NPC_Luigi_07 = 106, - NPC_Luigi_08 = 107, - NPC_Luigi_09 = 108, - NPC_Luigi_10 = 109, + NPC_Toad = 0, + NPC_Fuzzy_01 = 10, + NPC_Fuzzy_02 = 11, + NPC_Fuzzy_03 = 12, + NPC_Fuzzy_04 = 13, + NPC_Fuzzy_05 = 14, + NPC_Bobomb_01 = 30, + NPC_Bobomb_02 = 31, + NPC_Bobomb_03 = 32, + NPC_Bobomb_04 = 33, + NPC_Bobomb_05 = 34, + NPC_Luigi_01 = 100, + NPC_Luigi_02 = 101, + NPC_Luigi_03 = 102, + NPC_Luigi_04 = 103, + NPC_Luigi_05 = 104, + NPC_Luigi_06 = 105, + NPC_Luigi_07 = 106, + NPC_Luigi_08 = 107, + NPC_Luigi_09 = 108, + NPC_Luigi_10 = 109, }; #define NAMESPACE mgm_02 diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index 93749eb46c..724decbf76 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -216,7 +216,7 @@ API_CALLABLE(N(CreateScoreDisplay)) { API_CALLABLE(N(DisableMenus)) { gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_MENUS; - func_800E9894(); + status_menu_ignore_changes(); close_status_menu(); return ApiStatus_DONE2; } @@ -958,7 +958,7 @@ API_CALLABLE(N(CreateMinigame)) { data->windowB_posX = SCREEN_WIDTH; data->timeLeft = PLAY_TIME; - func_800E9894(); + status_menu_ignore_changes(); close_status_menu(); return ApiStatus_DONE2; diff --git a/src/world/area_mim/mim_01/mim_01.h b/src/world/area_mim/mim_01/mim_01.h index c6bb8503b2..b020caa555 100644 --- a/src/world/area_mim/mim_01/mim_01.h +++ b/src/world/area_mim/mim_01/mim_01.h @@ -12,8 +12,8 @@ #include "sprite/npc/SmallPiranha.h" enum { - NPC_PiranhaPlant = 1, - NPC_PiranhaPlant_Hitbox = 2, + NPC_PiranhaPlant = 1, + NPC_PiranhaPlant_Hitbox = 2, }; #define NAMESPACE mim_01 diff --git a/src/world/area_mim/mim_02/mim_02.h b/src/world/area_mim/mim_02/mim_02.h index 219db3c9d7..cb8dd957fb 100644 --- a/src/world/area_mim/mim_02/mim_02.h +++ b/src/world/area_mim/mim_02/mim_02.h @@ -13,9 +13,9 @@ #include "sprite/npc/Fuzzy.h" enum { - NPC_Oaklie = 0, - NPC_Fuzzy_01 = 1, - NPC_Fuzzy_02 = 2, + NPC_Oaklie = 0, + NPC_Fuzzy_01 = 1, + NPC_Fuzzy_02 = 2, }; #define NAMESPACE mim_02 diff --git a/src/world/area_mim/mim_03/mim_03.h b/src/world/area_mim/mim_03/mim_03.h index 327cad9d4d..c360bc3faf 100644 --- a/src/world/area_mim/mim_03/mim_03.h +++ b/src/world/area_mim/mim_03/mim_03.h @@ -10,7 +10,7 @@ #include "mapfs/mim_03_hit.h" enum { - NPC_Oaklie = 0, + NPC_Oaklie = 0, }; #define NAMESPACE mim_03 diff --git a/src/world/area_mim/mim_04/mim_04.h b/src/world/area_mim/mim_04/mim_04.h index b0a4b7e418..e893dadd2a 100644 --- a/src/world/area_mim/mim_04/mim_04.h +++ b/src/world/area_mim/mim_04/mim_04.h @@ -13,8 +13,8 @@ #include "sprite/npc/Fuzzy.h" enum { - NPC_Bubulb = 0, - NPC_Fuzzy = 1, + NPC_Bubulb = 0, + NPC_Fuzzy = 1, }; #define NAMESPACE mim_04 diff --git a/src/world/area_mim/mim_05/mim_05.h b/src/world/area_mim/mim_05/mim_05.h index a72cb50c82..364a54e2c4 100644 --- a/src/world/area_mim/mim_05/mim_05.h +++ b/src/world/area_mim/mim_05/mim_05.h @@ -12,10 +12,10 @@ #include "sprite/npc/SmallPiranha.h" enum { - NPC_PiranhaPlant_01 = 0, - NPC_PiranhaPlant_01_Hitbox = 1, - NPC_PiranhaPlant_02 = 2, - NPC_PiranhaPlant_02_Hitbox = 3, + NPC_PiranhaPlant_01 = 0, + NPC_PiranhaPlant_01_Hitbox = 1, + NPC_PiranhaPlant_02 = 2, + NPC_PiranhaPlant_02_Hitbox = 3, }; #define NAMESPACE mim_05 diff --git a/src/world/area_mim/mim_06/mim_06.h b/src/world/area_mim/mim_06/mim_06.h index 778ae69ff6..62df03c083 100644 --- a/src/world/area_mim/mim_06/mim_06.h +++ b/src/world/area_mim/mim_06/mim_06.h @@ -13,11 +13,11 @@ #include "sprite/npc/Fuzzy.h" enum { - NPC_PiranhaPlant_01 = 0, - NPC_PiranhaPlant_01_Hitbox = 1, - NPC_PiranhaPlant_02 = 2, - NPC_PiranhaPlant_02_Hitbox = 3, - NPC_Fuzzy = 4, + NPC_PiranhaPlant_01 = 0, + NPC_PiranhaPlant_01_Hitbox = 1, + NPC_PiranhaPlant_02 = 2, + NPC_PiranhaPlant_02_Hitbox = 3, + NPC_Fuzzy = 4, }; #define NAMESPACE mim_06 diff --git a/src/world/area_mim/mim_07/mim_07.h b/src/world/area_mim/mim_07/mim_07.h index 8c1717ac05..d9f1b66fbc 100644 --- a/src/world/area_mim/mim_07/mim_07.h +++ b/src/world/area_mim/mim_07/mim_07.h @@ -18,9 +18,9 @@ #include "sprite/npc/Fuzzy.h" enum { - NPC_Fuzzy_01 = 0, - NPC_Fuzzy_02 = 1, - NPC_JrTroopa = 2, + NPC_Fuzzy_01 = 0, + NPC_Fuzzy_02 = 1, + NPC_JrTroopa = 2, }; #define NAMESPACE mim_07 diff --git a/src/world/area_mim/mim_08/mim_08.h b/src/world/area_mim/mim_08/mim_08.h index 76010ec81e..0b5df11ed0 100644 --- a/src/world/area_mim/mim_08/mim_08.h +++ b/src/world/area_mim/mim_08/mim_08.h @@ -13,11 +13,11 @@ #include "sprite/npc/SmallPiranha.h" enum { - NPC_Bzzap = 0, - NPC_PiranhaPlant_01 = 1, - NPC_PiranhaPlant_01_Hitbox = 2, - NPC_PiranhaPlant_02 = 3, - NPC_PiranhaPlant_02_Hitbox = 4, + NPC_Bzzap = 0, + NPC_PiranhaPlant_01 = 1, + NPC_PiranhaPlant_01_Hitbox = 2, + NPC_PiranhaPlant_02 = 3, + NPC_PiranhaPlant_02_Hitbox = 4, }; enum { diff --git a/src/world/area_mim/mim_09/mim_09.h b/src/world/area_mim/mim_09/mim_09.h index e9e2cd49b8..23d2e61d16 100644 --- a/src/world/area_mim/mim_09/mim_09.h +++ b/src/world/area_mim/mim_09/mim_09.h @@ -10,7 +10,7 @@ #include "mapfs/mim_09_hit.h" enum { - NPC_Fuzzy = 0, + NPC_Fuzzy = 0, }; enum { diff --git a/src/world/area_mim/mim_10/mim_10.h b/src/world/area_mim/mim_10/mim_10.h index 79acf00794..eb8298640d 100644 --- a/src/world/area_mim/mim_10/mim_10.h +++ b/src/world/area_mim/mim_10/mim_10.h @@ -13,8 +13,8 @@ #include "sprite/npc/JrTroopa.h" enum { - NPC_Bootler = 0, - NPC_JrTroopa = 1, + NPC_Bootler = 0, + NPC_JrTroopa = 1, }; enum { diff --git a/src/world/area_mim/mim_11/mim_11.h b/src/world/area_mim/mim_11/mim_11.h index 7790935539..e8a4b91602 100644 --- a/src/world/area_mim/mim_11/mim_11.h +++ b/src/world/area_mim/mim_11/mim_11.h @@ -17,8 +17,8 @@ #include "sprite/npc/WorldSkolar.h" enum { - NPC_Bootler = 0, - NPC_Skolar = 2, + NPC_Bootler = 0, + NPC_Skolar = 2, }; enum { diff --git a/src/world/area_mim/mim_12/mim_12.h b/src/world/area_mim/mim_12/mim_12.h index 9e914de980..b39d79d68b 100644 --- a/src/world/area_mim/mim_12/mim_12.h +++ b/src/world/area_mim/mim_12/mim_12.h @@ -13,8 +13,8 @@ #include "sprite/npc/WorldBow.h" enum { - NPC_GateBoo_01 = 0, - NPC_GateBoo_02 = 1, + NPC_GateBoo_01 = 0, + NPC_GateBoo_02 = 1, }; #define NAMESPACE mim_12 diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 1ee2620c15..855261421c 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -112,14 +112,14 @@ ApiStatus func_802426A4_9C7A84(Evt* script, s32 isInitialCall) { ApiStatus func_80242760_9C7B40(Evt* script, s32 isInitialCall) { func_800E98EC(); - func_800E9894(); + status_menu_ignore_changes(); open_status_menu_long(); return ApiStatus_DONE2; } ApiStatus func_80242790_9C7B70(Evt* script, s32 isInitialCall) { func_800E9900(); - func_800E98C4(); + status_menu_respond_to_changes(); close_status_menu(); return ApiStatus_DONE2; } diff --git a/src/world/area_osr/osr_01/AAFFF0.c b/src/world/area_osr/osr_01/AAFFF0.c index 0a5eb84cd8..13f05c3ff7 100644 --- a/src/world/area_osr/osr_01/AAFFF0.c +++ b/src/world/area_osr/osr_01/AAFFF0.c @@ -1,12 +1,10 @@ #include "osr_01.h" -extern s8 wMapBgName; - -ApiStatus func_80240000_AAFFF0(Evt* script, s32 isInitialCall) { - if (gGameStatusPtr->entryID == 3) { - sprintf(&wMapBgName, "hos_bg"); +s32 func_80240000_AAFFF0(void) { + if (gGameStatusPtr->entryID == osr_01_ENTRY_3) { + sprintf(wMapBgName, "hos_bg"); } - return ApiStatus_BLOCK; + return FALSE; } const char* N(exit_str_0) = "mac_01\0\0hos_00\0\0mac_04"; diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 406c988913..d29603e836 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -40,7 +40,7 @@ ApiStatus func_802411D8_D511C8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -extern s32 D_80243E88_846A58[]; +extern s32 pra_02_80243E88[]; ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -49,13 +49,13 @@ ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - D_80243E88_846A58[i] = ptr[i]; + pra_02_80243E88[i] = ptr[i]; } - D_80243E88_846A58[i] = 0; + pra_02_80243E88[i] = 0; } else { for (i = 0; i < 91; i++) { - D_80243E88_846A58[i] = i + 128; - D_80243E88_846A58[91] = 0; + pra_02_80243E88[i] = i + 128; + pra_02_80243E88[91] = 0; } } return ApiStatus_DONE2; diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c index 75d144a6df..cd3a12e8c0 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -27,7 +27,7 @@ EvtScript N(EVS_NpcIdle_Mamar) = { EVT_END }; -API_CALLABLE(N(UpgradeStarPower)) { +API_CALLABLE(N(UpgradeStarPowerCh2)) { set_max_SP(2); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; @@ -99,7 +99,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) EVT_CALL(EnableNpcAI, NPC_Mamar, TRUE) - EVT_CALL(N(UpgradeStarPower)) + EVT_CALL(N(UpgradeStarPowerCh2)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0192, 160, 40) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) @@ -193,7 +193,7 @@ API_CALLABLE(N(CheckTradeEventTime)) { return ApiStatus_DONE2; } -API_CALLABLE(N(GetItemCount)) { +API_CALLABLE(N(GetTradeEventItemCount)) { script->varTable[0] = get_item_count(); return ApiStatus_DONE2; } @@ -211,7 +211,7 @@ EvtScript N(EVS_NpcInteract_TradingToad) = { EVT_SET(GF_TradingEvent2_Active, FALSE) EVT_RETURN EVT_END_IF - EVT_CALL(N(GetItemCount)) + EVT_CALL(N(GetTradeEventItemCount)) EVT_IF_EQ(LVar0, 0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00EF) EVT_RETURN diff --git a/src/world/area_tik/tik_01/tik_01.h b/src/world/area_tik/tik_01/tik_01.h index 37eb402d8e..79a142bfd6 100644 --- a/src/world/area_tik/tik_01/tik_01.h +++ b/src/world/area_tik/tik_01/tik_01.h @@ -10,7 +10,7 @@ #include "mapfs/tik_01_hit.h" enum { - NPC_Blooper = 0, + NPC_Blooper = 0, }; enum { diff --git a/src/world/area_tik/tik_02/tik_02.h b/src/world/area_tik/tik_02/tik_02.h index 162e2ecbc3..d3581ace81 100644 --- a/src/world/area_tik/tik_02/tik_02.h +++ b/src/world/area_tik/tik_02/tik_02.h @@ -10,7 +10,7 @@ #include "mapfs/tik_02_hit.h" enum { - NPC_Blooper = 0, + NPC_Blooper = 0, }; #define NAMESPACE tik_02 diff --git a/src/world/area_tik/tik_04/tik_04.h b/src/world/area_tik/tik_04/tik_04.h index 78877d6e5a..efb2936982 100644 --- a/src/world/area_tik/tik_04/tik_04.h +++ b/src/world/area_tik/tik_04/tik_04.h @@ -10,8 +10,8 @@ #include "mapfs/tik_04_hit.h" enum { - NPC_SpikedGoomba_01 = 0, - NPC_SpikedGoomba_02 = 1, + NPC_SpikedGoomba_01 = 0, + NPC_SpikedGoomba_02 = 1, }; enum { diff --git a/src/world/area_tik/tik_05/tik_05.h b/src/world/area_tik/tik_05/tik_05.h index 0d37a15827..f0219cd93b 100644 --- a/src/world/area_tik/tik_05/tik_05.h +++ b/src/world/area_tik/tik_05/tik_05.h @@ -10,8 +10,8 @@ #include "mapfs/tik_05_hit.h" enum { - NPC_SpikedGoomba_01 = 0, - NPC_SpikedGoomba_02 = 1, + NPC_SpikedGoomba_01 = 0, + NPC_SpikedGoomba_02 = 1, }; enum { diff --git a/src/world/area_tik/tik_07/tik_07.h b/src/world/area_tik/tik_07/tik_07.h index 6519824151..405a01f8f4 100644 --- a/src/world/area_tik/tik_07/tik_07.h +++ b/src/world/area_tik/tik_07/tik_07.h @@ -10,8 +10,8 @@ #include "mapfs/tik_07_hit.h" enum { - NPC_Paragoomba_01 = 0, - NPC_Paragoomba_02 = 1, + NPC_Paragoomba_01 = 0, + NPC_Paragoomba_02 = 1, }; enum { diff --git a/src/world/area_tik/tik_08/tik_08.h b/src/world/area_tik/tik_08/tik_08.h index 76e25eee41..9b3004235b 100644 --- a/src/world/area_tik/tik_08/tik_08.h +++ b/src/world/area_tik/tik_08/tik_08.h @@ -10,7 +10,7 @@ #include "mapfs/tik_08_hit.h" enum { - NPC_Blooper = 0, + NPC_Blooper = 0, }; enum { diff --git a/src/world/area_tik/tik_09/tik_09.h b/src/world/area_tik/tik_09/tik_09.h index ddd2bfb3b6..8bc99c67dc 100644 --- a/src/world/area_tik/tik_09/tik_09.h +++ b/src/world/area_tik/tik_09/tik_09.h @@ -10,9 +10,9 @@ #include "mapfs/tik_09_hit.h" enum { - NPC_KoopaTroopa_01 = 0, - NPC_KoopaTroopa_02 = 1, - NPC_KoopaTroopa_03 = 2, + NPC_KoopaTroopa_01 = 0, + NPC_KoopaTroopa_02 = 1, + NPC_KoopaTroopa_03 = 2, }; enum { diff --git a/src/world/area_tik/tik_12/tik_12.h b/src/world/area_tik/tik_12/tik_12.h index 9a3a672ccf..2f83ce3b17 100644 --- a/src/world/area_tik/tik_12/tik_12.h +++ b/src/world/area_tik/tik_12/tik_12.h @@ -12,7 +12,7 @@ #include "sprite/npc/BuzzyBeetle.h" enum { - NPC_BuzzyBeetle = 0, + NPC_BuzzyBeetle = 0, }; enum { diff --git a/src/world/area_tik/tik_12/tik_12_5_npc.c b/src/world/area_tik/tik_12/tik_12_5_npc.c index b07a71a72e..400b286932 100644 --- a/src/world/area_tik/tik_12/tik_12_5_npc.c +++ b/src/world/area_tik/tik_12/tik_12_5_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_BuzzyBeetle) = { .pos = { -6.0f, -135.0f, 75.0f }, .yaw = 90, .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, - .drops = BUZZY_BEETLE_DROPS, + .drops = TIK_BUZZY_BEETLE_DROPS, .territory = { .wander = { .isFlying = TRUE, diff --git a/src/world/area_tik/tik_15/tik_15.h b/src/world/area_tik/tik_15/tik_15.h index c320d1f23d..093b8b46e0 100644 --- a/src/world/area_tik/tik_15/tik_15.h +++ b/src/world/area_tik/tik_15/tik_15.h @@ -12,7 +12,7 @@ #include "sprite/npc/RipCheato.h" enum { - NPC_RipCheato = 1, + NPC_RipCheato = 1, }; #define NAMESPACE tik_15 diff --git a/src/world/area_tik/tik_18/tik_18.h b/src/world/area_tik/tik_18/tik_18.h index 34289f140c..604ab8e66e 100644 --- a/src/world/area_tik/tik_18/tik_18.h +++ b/src/world/area_tik/tik_18/tik_18.h @@ -10,8 +10,8 @@ #include "mapfs/tik_18_hit.h" enum { - NPC_Gloomba = 0, - NPC_SpikedGloomba = 1, + NPC_Gloomba = 0, + NPC_SpikedGloomba = 1, }; #define NAMESPACE tik_18 diff --git a/src/world/area_tik/tik_20/tik_20.h b/src/world/area_tik/tik_20/tik_20.h index f122a93718..8f46d36a6e 100644 --- a/src/world/area_tik/tik_20/tik_20.h +++ b/src/world/area_tik/tik_20/tik_20.h @@ -10,8 +10,8 @@ #include "mapfs/tik_20_hit.h" enum { - NPC_DarkTroopa_01 = 0, - NPC_DarkTroopa_02 = 1, + NPC_DarkTroopa_01 = 0, + NPC_DarkTroopa_02 = 1, }; #define NAMESPACE tik_20 diff --git a/src/world/area_tik/tik_23/tik_23.h b/src/world/area_tik/tik_23/tik_23.h index 0b73d36604..385f5e2d64 100644 --- a/src/world/area_tik/tik_23/tik_23.h +++ b/src/world/area_tik/tik_23/tik_23.h @@ -10,9 +10,9 @@ #include "mapfs/tik_23_hit.h" enum { - NPC_Spiny_01 = 0, - NPC_Spiny_02 = 1, - NPC_Spiny_03 = 2, + NPC_Spiny_01 = 0, + NPC_Spiny_02 = 1, + NPC_Spiny_03 = 2, }; #define NAMESPACE tik_23 diff --git a/src/world/area_tik/tik_24/tik_24.h b/src/world/area_tik/tik_24/tik_24.h index 3007fe04ca..96492861ba 100644 --- a/src/world/area_tik/tik_24/tik_24.h +++ b/src/world/area_tik/tik_24/tik_24.h @@ -10,8 +10,8 @@ #include "mapfs/tik_18_hit.h" enum { - NPC_DarkTroopa_01 = 0, - NPC_DarkTroopa_02 = 1, + NPC_DarkTroopa_01 = 0, + NPC_DarkTroopa_02 = 1, }; #define NAMESPACE tik_24 diff --git a/src/world/area_tik/tik_25/tik_25_3_entity.c b/src/world/area_tik/tik_25/tik_25_3_entity.c index a9f29cb31b..763127288f 100644 --- a/src/world/area_tik/tik_25/tik_25_3_entity.c +++ b/src/world/area_tik/tik_25/tik_25_3_entity.c @@ -2,14 +2,15 @@ #include "entity.h" API_CALLABLE(N(DismissGotItem)) { - get_entity_by_index(script->varTable[0])->dataBuf.chest->gotItemDone = TRUE; + Entity* bigChest = get_entity_by_index(script->varTable[0]); + bigChest->dataBuf.chest->gotItemDone = TRUE; return ApiStatus_DONE2; } #include "world/common/todo/SetEntityPosition.inc.c" #include "world/common/util/PlaySpringReboundAnimation.inc.c" -EvtScript N(EVS_OpenGiantChest) = { +EvtScript N(EVS_SetupGiantChest_UltraBoots) = { EVT_IF_EQ(GF_TIK25_GiantChest, FALSE) EVT_LABEL(10) EVT_IF_EQ(GF_TIK25_GiantChest, FALSE) @@ -98,7 +99,7 @@ EvtScript N(EVS_OnBreakBlock_SpringL) = { EvtScript N(EVS_MakeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_GiantChest), -270, -90, 0, 90, ITEM_ULTRA_BOOTS, MAKE_ENTITY_END) EVT_CALL(AssignChestFlag, GF_TIK25_GiantChest) - EVT_EXEC(N(EVS_OpenGiantChest)) + EVT_EXEC(N(EVS_SetupGiantChest_UltraBoots)) EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 210, -75, -20, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnBreakBlock_SpringR))) EVT_IF_EQ(GF_TIK25_SpringBrickA, FALSE) diff --git a/src/world/area_trd/trd_00/trd_00.h b/src/world/area_trd/trd_00/trd_00.h index 5e29cfb828..9b309ddfab 100644 --- a/src/world/area_trd/trd_00/trd_00.h +++ b/src/world/area_trd/trd_00/trd_00.h @@ -13,8 +13,8 @@ #include "sprite/npc/WorldEldstar.h" enum { - NPC_KoopaBros = 0, - NPC_Eldstar = 1, + NPC_KoopaBros = 0, + NPC_Eldstar = 1, }; #define NAMESPACE trd_00 diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 6c741ee924..655fb1eed3 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -3,7 +3,7 @@ extern EvtScript N(EVS_SetupMusic); -API_CALLABLE(N(UpgradeStarPower)) { +API_CALLABLE(N(UpgradeStarPowerCh1)) { set_max_SP(1); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; @@ -190,7 +190,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) EVT_CALL(EnableNpcAI, NPC_Eldstar, TRUE) - EVT_CALL(N(UpgradeStarPower)) + EVT_CALL(N(UpgradeStarPowerCh1)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0191, 160, 40) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_010E) diff --git a/src/world/area_trd/trd_01/trd_01.h b/src/world/area_trd/trd_01/trd_01.h index 40053ebe72..a87fff954a 100644 --- a/src/world/area_trd/trd_01/trd_01.h +++ b/src/world/area_trd/trd_01/trd_01.h @@ -13,14 +13,14 @@ #include "sprite/npc/Bobomb.h" enum { - NPC_KoopaTroopa_01 = 0, - NPC_KoopaTroopa_02 = 1, - NPC_KoopaTroopa_03 = 2, - NPC_Bobomb = 3, + NPC_KoopaTroopa_01 = 0, + NPC_KoopaTroopa_02 = 1, + NPC_KoopaTroopa_03 = 2, + NPC_Bobomb = 3, }; enum { - MV_Padlock_EntityIndex = MapVar(0), + MV_Padlock_EntityIndex = MapVar(0), }; enum { diff --git a/src/world/area_trd/trd_02/trd_02.h b/src/world/area_trd/trd_02/trd_02.h index b33ab6fc58..4aa3915f64 100644 --- a/src/world/area_trd/trd_02/trd_02.h +++ b/src/world/area_trd/trd_02/trd_02.h @@ -13,13 +13,13 @@ #include "sprite/npc/KoopaTroopa.h" enum { - NPC_Bobomb_01 = 0, - NPC_Bobomb_02 = 1, - NPC_KoopaTroopa = 2, + NPC_Bobomb_01 = 0, + NPC_Bobomb_02 = 1, + NPC_KoopaTroopa = 2, }; enum { - MV_Padlock_EntityIndex = MapVar(0), + MV_Padlock_EntityIndex = MapVar(0), }; #define NAMESPACE trd_02 diff --git a/src/world/area_trd/trd_03/trd_03.h b/src/world/area_trd/trd_03/trd_03.h index 0b017ec7d6..302dcdc83f 100644 --- a/src/world/area_trd/trd_03/trd_03.h +++ b/src/world/area_trd/trd_03/trd_03.h @@ -13,14 +13,14 @@ #include "sprite/npc/KoopaTroopa.h" enum { - NPC_KoopaBros = 0, - NPC_KoopaTroopa_01 = 10, - NPC_KoopaTroopa_02 = 11, - NPC_KoopaTroopa_03 = 12, + NPC_KoopaBros = 0, + NPC_KoopaTroopa_01 = 10, + NPC_KoopaTroopa_02 = 11, + NPC_KoopaTroopa_03 = 12, }; enum { - MV_PlatformsExtended = MapVar(0), + MV_PlatformsExtended = MapVar(0), }; #define NAMESPACE trd_03 diff --git a/src/world/area_trd/trd_04/trd_04.h b/src/world/area_trd/trd_04/trd_04.h index 78f21a291e..7eddac059d 100644 --- a/src/world/area_trd/trd_04/trd_04.h +++ b/src/world/area_trd/trd_04/trd_04.h @@ -13,14 +13,14 @@ #include "sprite/npc/ParaTroopa.h" enum { - NPC_KoopaTroopa = 0, - NPC_ParaTroopa = 1, + NPC_KoopaTroopa = 0, + NPC_ParaTroopa = 1, }; enum { - MV_Unk_00 = MapVar(0), - MV_Unk_01 = MapVar(1), - MV_Unk_02 = MapVar(2), + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_Unk_02 = MapVar(2), }; #define NAMESPACE trd_04 diff --git a/src/world/area_trd/trd_05/trd_05.h b/src/world/area_trd/trd_05/trd_05.h index 5896ea6e3e..2502e762f6 100644 --- a/src/world/area_trd/trd_05/trd_05.h +++ b/src/world/area_trd/trd_05/trd_05.h @@ -12,8 +12,8 @@ #include "sprite/npc/KoopaBros.h" enum { - NPC_KoopaBros_01 = 0, - NPC_KoopaBros_02 = 1, + NPC_KoopaBros_01 = 0, + NPC_KoopaBros_02 = 1, }; #define NAMESPACE trd_05 diff --git a/src/world/area_trd/trd_06/trd_06.h b/src/world/area_trd/trd_06/trd_06.h index 9ef501cead..f80fcf82ab 100644 --- a/src/world/area_trd/trd_06/trd_06.h +++ b/src/world/area_trd/trd_06/trd_06.h @@ -16,18 +16,18 @@ #include "sprite/npc/KoopaBros.h" enum { - NPC_Bombette = 1, - NPC_Bobomb_01 = 2, - NPC_Bobomb_02 = 3, - NPC_Bobomb_03 = 4, - NPC_Bobomb_04 = 5, - NPC_Jailer_KoopaTroopa = 10, - NPC_Jailer_Bobomb_01 = 11, - NPC_Jailer_Bobomb_02 = 12, - NPC_KoopaBros_Black = 15, - NPC_KoopaBros_Red = 16, - NPC_KoopaBros_Yellow = 17, - NPC_KoopaBros_Green = 18, + NPC_Bombette = 1, + NPC_Bobomb_01 = 2, + NPC_Bobomb_02 = 3, + NPC_Bobomb_03 = 4, + NPC_Bobomb_04 = 5, + NPC_Jailer_KoopaTroopa = 10, + NPC_Jailer_Bobomb_01 = 11, + NPC_Jailer_Bobomb_02 = 12, + NPC_KoopaBros_Black = 15, + NPC_KoopaBros_Red = 16, + NPC_KoopaBros_Yellow = 17, + NPC_KoopaBros_Green = 18, }; #define NAMESPACE trd_06 diff --git a/src/world/area_trd/trd_07/trd_07.h b/src/world/area_trd/trd_07/trd_07.h index 98471e889e..165cf9ed33 100644 --- a/src/world/area_trd/trd_07/trd_07.h +++ b/src/world/area_trd/trd_07/trd_07.h @@ -13,14 +13,14 @@ #include "sprite/npc/ParaTroopa.h" enum { - NPC_KoopaTroopa = 0, - NPC_ParaTroopa_01 = 1, - NPC_ParaTroopa_02 = 2, + NPC_KoopaTroopa = 0, + NPC_ParaTroopa_01 = 1, + NPC_ParaTroopa_02 = 2, }; enum { MV_EnterWalkScriptID = MapVar(0), - MV_DoorScaleZ = MapVar(0), // reusing + MV_DoorScaleZ = MapVar(0), // reusing MV_DoorScaleY = MapVar(1), }; diff --git a/src/world/area_trd/trd_09/trd_09.h b/src/world/area_trd/trd_09/trd_09.h index 1cd69a51b2..58330423f0 100644 --- a/src/world/area_trd/trd_09/trd_09.h +++ b/src/world/area_trd/trd_09/trd_09.h @@ -14,28 +14,28 @@ #include "sprite/npc/BulletBill.h" enum { - NPC_BillBlaster_01 = 10, - NPC_BillBlaster_02 = 11, - NPC_BillBlaster_03 = 12, - NPC_BulletBill_01 = 20, - NPC_BulletBill_02 = 21, - NPC_BulletBill_03 = 22, - NPC_BulletBill_04 = 23, - NPC_BulletBill_05 = 24, - NPC_BulletBill_06 = 25, - NPC_BulletBill_07 = 26, - NPC_BulletBill_08 = 27, - NPC_BulletBill_09 = 28, - NPC_BulletBill_10 = 29, - NPC_BulletBill_Demo1 = 40, - NPC_BulletBill_Demo2 = 41, - NPC_BulletBill_Demo3 = 42, - NPC_BulletBill_Demo4 = 43, - NPC_BulletBill_Demo5 = 44, - NPC_KoopaBros_Red = 70, - NPC_KoopaBros_Green = 71, - NPC_KoopaBros_Yellow = 72, - NPC_KoopaBros_Black = 73, + NPC_BillBlaster_01 = 10, + NPC_BillBlaster_02 = 11, + NPC_BillBlaster_03 = 12, + NPC_BulletBill_01 = 20, + NPC_BulletBill_02 = 21, + NPC_BulletBill_03 = 22, + NPC_BulletBill_04 = 23, + NPC_BulletBill_05 = 24, + NPC_BulletBill_06 = 25, + NPC_BulletBill_07 = 26, + NPC_BulletBill_08 = 27, + NPC_BulletBill_09 = 28, + NPC_BulletBill_10 = 29, + NPC_BulletBill_Demo1 = 40, + NPC_BulletBill_Demo2 = 41, + NPC_BulletBill_Demo3 = 42, + NPC_BulletBill_Demo4 = 43, + NPC_BulletBill_Demo5 = 44, + NPC_KoopaBros_Red = 70, + NPC_KoopaBros_Green = 71, + NPC_KoopaBros_Yellow = 72, + NPC_KoopaBros_Black = 73, }; #define NAMESPACE trd_09 diff --git a/src/world/area_trd/trd_09/trd_09_4_demo.c b/src/world/area_trd/trd_09/trd_09_4_demo.c index 54cf846cea..133679bf90 100644 --- a/src/world/area_trd/trd_09/trd_09_4_demo.c +++ b/src/world/area_trd/trd_09/trd_09_4_demo.c @@ -77,7 +77,7 @@ EvtScript N(EVS_MonitorDemoState) = { s32 N(DemoSceneState) = 0; -// duplicate of func_8024095C_97BF8C +// duplicate of SetupDemoScene from isk_04 API_CALLABLE(N(SetupDemoScene)) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_trd/trd_10/trd_10.h b/src/world/area_trd/trd_10/trd_10.h index 09a71979fe..ef6cdf8376 100644 --- a/src/world/area_trd/trd_10/trd_10.h +++ b/src/world/area_trd/trd_10/trd_10.h @@ -12,10 +12,10 @@ #include "sprite/npc/KoopaBros.h" enum { - NPC_KoopaBros_01 = 0, - NPC_KoopaBros_02 = 1, - NPC_KoopaBros_03 = 2, - NPC_KoopaBros_04 = 3, + NPC_KoopaBros_01 = 0, + NPC_KoopaBros_02 = 1, + NPC_KoopaBros_03 = 2, + NPC_KoopaBros_04 = 3, }; #define NAMESPACE trd_10 diff --git a/src/world/area_tst/tst_04/tst_04.h b/src/world/area_tst/tst_04/tst_04.h index c732383a5e..18ecf6e656 100644 --- a/src/world/area_tst/tst_04/tst_04.h +++ b/src/world/area_tst/tst_04/tst_04.h @@ -12,7 +12,7 @@ #include "sprite/npc/Goompa.h" enum { - NPC_Goompa = 0, + NPC_Goompa = 0, }; #define NAMESPACE tst_04 diff --git a/src/world/area_tst/tst_13/tst_13.h b/src/world/area_tst/tst_13/tst_13.h index 01356d69a2..9bb0820885 100644 --- a/src/world/area_tst/tst_13/tst_13.h +++ b/src/world/area_tst/tst_13/tst_13.h @@ -22,14 +22,14 @@ #define NAMESPACE tst_13 enum { - NPC_00 = 0, - NPC_01 = 1, - NPC_02 = 2, - NPC_03 = 3, - NPC_04 = 4, - NPC_05 = 5, - NPC_06 = 6, - NPC_07 = 7, - NPC_08 = 8, - NPC_09 = 9, + NPC_00 = 0, + NPC_01 = 1, + NPC_02 = 2, + NPC_03 = 3, + NPC_04 = 4, + NPC_05 = 5, + NPC_06 = 6, + NPC_07 = 7, + NPC_08 = 8, + NPC_09 = 9, }; diff --git a/src/world/common/atomic/ToadHouse.inc.c b/src/world/common/atomic/ToadHouse.inc.c index c710f6ed45..f34dc76e96 100644 --- a/src/world/common/atomic/ToadHouse.inc.c +++ b/src/world/common/atomic/ToadHouse.inc.c @@ -3,12 +3,12 @@ #include "../../partners.h" API_CALLABLE(N(ToadHouse_DisableStatusMenu)) { - func_800E9894(); + status_menu_ignore_changes(); return ApiStatus_DONE2; } API_CALLABLE(N(ToadHouse_ShowStatusMenu)) { - func_800E98C4(); + status_menu_respond_to_changes(); sync_status_menu(); return ApiStatus_DONE2; } diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 51986c34b1..9533d9562e 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -51,8 +51,8 @@ static EffectInstance* N(Quizmo_VannaTEffect); // values for Quizmo npc init vars enum { - QUIZ_AREA_MAC = 0, - QUIZ_AREA_KMR = 1, + QUIZ_AREA_KMR = 0, + QUIZ_AREA_MAC = 1, QUIZ_AREA_NOK = 2, QUIZ_AREA_DRO = 3, QUIZ_AREA_JAN = 4, @@ -61,6 +61,11 @@ enum { }; enum { + // area_mac + QUIZ_MAP_MAC_04 = 4, + QUIZ_MAP_MAC_05 = 5, + QUIZ_COUNT_MAC = 6, + // area_dro QUIZ_MAP_DRO_01 = 0, QUIZ_MAP_DRO_02 = 1, QUIZ_COUNT_DRO = 2, diff --git a/src/world/common/enemy/ai/StoneChompAI.inc.c b/src/world/common/enemy/ai/StoneChompAI.inc.c index a0c7e520af..efc81b1500 100644 --- a/src/world/common/enemy/ai/StoneChompAI.inc.c +++ b/src/world/common/enemy/ai/StoneChompAI.inc.c @@ -1,3 +1,4 @@ +MAP_RODATA_PAD(1,pre_hop_ai); #include "world/common/enemy/ai/HoppingAI.inc.c" void N(StoneChompAI_HopInit)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { diff --git a/src/world/common/enemy/complete/ForestFuzzy.inc copy.c b/src/world/common/enemy/complete/ForestFuzzy.inc copy.c deleted file mode 100644 index 8aab41d3ca..0000000000 --- a/src/world/common/enemy/complete/ForestFuzzy.inc copy.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "ForestFuzzy.h" - -#include "world/common/enemy/ai/HoppingAI.inc.c" - -MobileAISettings N(AISettings_ForestFuzzy) = { - .moveSpeed = 1.0f, - .moveTime = 30, - .waitTime = 10, - .alertRadius = 120.0f, - .playerSearchInterval = 5, - .chaseSpeed = 4.5f, - .chaseTurnRate = 90, - .chaseUpdateInterval = 5, - .chaseRadius = 160.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(EVS_NpcAI_ForestFuzzy) = { - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) - EVT_CALL(N(HoppingAI_Main), EVT_PTR(N(AISettings_ForestFuzzy)), 1) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_ForestFuzzy) = { - .height = 20, - .radius = 22, - .level = 11, - .ai = &N(EVS_NpcAI_ForestFuzzy), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; diff --git a/src/world/common/enemy/complete/PokeyMummy.h b/src/world/common/enemy/complete/PokeyMummy.h new file mode 100644 index 0000000000..339e28df89 --- /dev/null +++ b/src/world/common/enemy/complete/PokeyMummy.h @@ -0,0 +1,35 @@ +#include "common.h" +#include "sprite/npc/Pokey.h" + +#define POKEY_MUMMY_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_TASTY_TONIC, 10, 0 }, \ + }, \ + .heartDrops = GENEROUS_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 2, \ +} + +#define POKEY_MUMMY_ANIMS \ +{ \ + .idle = ANIM_Pokey_Mummy_Anim04, \ + .walk = ANIM_Pokey_Mummy_Anim08, \ + .run = ANIM_Pokey_Mummy_Anim08, \ + .chase = ANIM_Pokey_Mummy_Anim08, \ + .anim_4 = ANIM_Pokey_Mummy_Anim04, \ + .anim_5 = ANIM_Pokey_Mummy_Anim04, \ + .death = ANIM_Pokey_Mummy_Anim0C, \ + .hit = ANIM_Pokey_Mummy_Anim0C, \ + .anim_8 = ANIM_Pokey_Mummy_Anim08, \ + .anim_9 = ANIM_Pokey_Mummy_Anim08, \ + .anim_A = ANIM_Pokey_Mummy_Anim08, \ + .anim_B = ANIM_Pokey_Mummy_Anim08, \ + .anim_C = ANIM_Pokey_Mummy_Anim08, \ + .anim_D = ANIM_Pokey_Mummy_Anim08, \ + .anim_E = ANIM_Pokey_Mummy_Anim08, \ + .anim_F = ANIM_Pokey_Mummy_Anim08, \ +} diff --git a/src/world/common/enemy/complete/PokeyMummy.inc.c b/src/world/common/enemy/complete/PokeyMummy.inc.c new file mode 100644 index 0000000000..2c1e93e2e5 --- /dev/null +++ b/src/world/common/enemy/complete/PokeyMummy.inc.c @@ -0,0 +1,32 @@ +#include "PokeyMummy.h" + +#include "world/common/todo/SetNpcB5_3.inc.c" + +MobileAISettings N(AISettings_PokeyMummy) = { + .moveSpeed = 1.8f, + .moveTime = 40, + .waitTime = 10, + .alertRadius = 100.0f, + .playerSearchInterval = 3, + .chaseSpeed = 3.0f, + .chaseTurnRate = 45, + .chaseUpdateInterval = 6, + .chaseRadius = 300.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_PokeyMummy) = { + EVT_CALL(N(SetNpcB5_3)) + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_PokeyMummy))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_PokeyMummy) = { + .height = 72, + .radius = 15, + .level = 10, + .ai = &N(EVS_NpcAI_PokeyMummy), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/SpikeTop.h b/src/world/common/enemy/complete/SpikeTop.h index 4c4c769df9..66bb6eee3e 100644 --- a/src/world/common/enemy/complete/SpikeTop.h +++ b/src/world/common/enemy/complete/SpikeTop.h @@ -2,7 +2,7 @@ #include "sprite/npc/BuzzyBeetle.h" #include "sprite/npc/SpikeTop.h" -#define BUZZY_BEETLE_DROPS \ +#define TIK_BUZZY_BEETLE_DROPS \ { \ .dropFlags = NPC_DROP_FLAGS_80, \ .itemDropChance = 5, \ @@ -15,6 +15,15 @@ .maxCoinBonus = 3, \ } +#define ISK_BUZZY_BEETLE_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = GENEROUS_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 2, \ +} + #define BUZZY_BEETLE_ANIMS \ { \ .idle = ANIM_BuzzyBeetle_Anim01, \ diff --git a/src/world/common/enemy/complete/SpikeTop.inc.c b/src/world/common/enemy/complete/SpikeTop.inc.c index b10413f9ad..9701979fbf 100644 --- a/src/world/common/enemy/complete/SpikeTop.inc.c +++ b/src/world/common/enemy/complete/SpikeTop.inc.c @@ -71,7 +71,7 @@ EvtScript N(D_80243C10_C64920) = { #include "world/common/todo/AwaitPlayerNearNpc.inc.c" -EvtScript N(D_80243C80_C64990) = { +EvtScript N(EVS_NpcAI_BuzzyBeetle_Ceiling) = { EVT_CALL(N(func_80240814_97BE44)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim0F) EVT_CALL(N(AwaitPlayerNearNpc)) @@ -100,11 +100,11 @@ NpcSettings N(NpcSettings_BuzzyBeetle) = { .onDefeat = &EnemyNpcDefeat, }; -NpcSettings N(NpcSettings_Unused2) = { +NpcSettings N(NpcSettings_BuzzyBeetle_Ceiling) = { .height = 20, .radius = 22, .level = 10, - .ai = &N(D_80243C80_C64990), + .ai = &N(EVS_NpcAI_BuzzyBeetle_Ceiling), .onHit = &EnemyNpcHit, .onDefeat = &EnemyNpcDefeat, }; diff --git a/src/world/common/enemy/complete/StoneChomp.h b/src/world/common/enemy/complete/StoneChomp.h new file mode 100644 index 0000000000..576403c8a7 --- /dev/null +++ b/src/world/common/enemy/complete/StoneChomp.h @@ -0,0 +1,33 @@ +#include "common.h" +#include "sprite/npc/StoneChomp.h" + +#define STONE_CHOMP_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_HONEY_SYRUP, 10, 0 }, \ + }, \ + .heartDrops = GENEROUS_HEART_DROPS(3), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ +} + +#define STONE_CHOMP_ANIMS \ +{ \ + .idle = ANIM_StoneChomp_Anim01, \ + .walk = ANIM_StoneChomp_Anim05, \ + .run = ANIM_StoneChomp_Anim04, \ + .chase = ANIM_StoneChomp_Anim04, \ + .anim_4 = ANIM_StoneChomp_Anim01, \ + .anim_5 = ANIM_StoneChomp_Anim01, \ + .death = ANIM_StoneChomp_Anim06, \ + .hit = ANIM_StoneChomp_Anim06, \ + .anim_8 = ANIM_StoneChomp_Anim00, \ + .anim_9 = ANIM_StoneChomp_Anim00, \ + .anim_A = ANIM_StoneChomp_Anim00, \ + .anim_B = ANIM_StoneChomp_Anim00, \ + .anim_C = ANIM_StoneChomp_Anim00, \ + .anim_D = ANIM_StoneChomp_Anim00, \ + .anim_E = ANIM_StoneChomp_Anim00, \ + .anim_F = ANIM_StoneChomp_Anim00, \ +} diff --git a/src/world/common/enemy/complete/StoneChomp.inc.c b/src/world/common/enemy/complete/StoneChomp.inc.c new file mode 100644 index 0000000000..017db2c606 --- /dev/null +++ b/src/world/common/enemy/complete/StoneChomp.inc.c @@ -0,0 +1,88 @@ + +#include "StoneChomp.h" + +#include "world/common/enemy/ai/StoneChompAI.inc.c" +#include "world/area_isk/StoneChompFX.inc.c" + +EvtScript N(EVS_NpcAuxAI_StoneChomp) = { + EVT_CALL(N(StoneChompFXA)) + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_StoneChomp) = { + .moveSpeed = 2.0f, + .moveTime = 30, + .waitTime = 30, + .alertRadius = 100.0f, + .playerSearchInterval = 10, + .chaseSpeed = 5.3f, + .chaseTurnRate = 70, + .chaseUpdateInterval = 10, + .chaseRadius = 500.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_StoneChomp) = { + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(N(StoneChompFXB)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_CALL(N(StoneChompAI_Main), EVT_PTR(N(AISettings_StoneChomp))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_StoneChomp) = { + EVT_CALL(SetBattleMusic, SONG_SPECIAL_BATTLE) + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_NONE) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(GetSelfAnimationFromTable, 7, LVar0) + EVT_EXEC_WAIT(EVS_NpcHitRecoil) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_SPIN) + EVT_THREAD + EVT_CALL(func_800458CC, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVarA, 0) + EVT_LOOP(30) + EVT_ADD(LVarA, 40) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVarA, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_IF + EVT_END_THREAD + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_StoneChomp) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(N(StoneChompFXC)) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_StoneChomp) = { + .height = 32, + .radius = 32, + .level = 14, + .otherAI = &N(EVS_NpcAuxAI_StoneChomp), + .ai = &N(EVS_NpcAI_StoneChomp), + .onHit = &N(EVS_NpcHit_StoneChomp), + .onDefeat = &N(EVS_NpcDefeat_StoneChomp), +}; diff --git a/src/world/common/npc/Boo_Patrol.inc.c b/src/world/common/npc/Boo_Patrol.inc.c index e3cd78f0c6..a7271d053f 100644 --- a/src/world/common/npc/Boo_Patrol.inc.c +++ b/src/world/common/npc/Boo_Patrol.inc.c @@ -1,4 +1,3 @@ -#include "common.h" #include "Boo.h" #include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" diff --git a/src/world/common/npc/Bootler.h b/src/world/common/npc/Bootler.h new file mode 100644 index 0000000000..1a25cd8a07 --- /dev/null +++ b/src/world/common/npc/Bootler.h @@ -0,0 +1,29 @@ +#include "common.h" +#include "sprite/npc/Bootler.h" + +#define BOOTLER_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define BOOTLER_ANIMS \ +{ \ + .idle = ANIM_Bootler_Idle, \ + .walk = ANIM_Bootler_Walk, \ + .run = ANIM_Bootler_Run, \ + .chase = ANIM_Bootler_Run, \ + .anim_4 = ANIM_Bootler_Idle, \ + .anim_5 = ANIM_Bootler_Idle, \ + .death = ANIM_Bootler_Still, \ + .hit = ANIM_Bootler_Still, \ + .anim_8 = ANIM_Bootler_Shock, \ + .anim_9 = ANIM_Bootler_Panic, \ + .anim_A = ANIM_Bootler_Dejected, \ + .anim_B = ANIM_Bootler_Quaver, \ + .anim_C = ANIM_Bootler_Shock, \ + .anim_D = ANIM_Bootler_Panic, \ + .anim_E = ANIM_Bootler_Dejected, \ + .anim_F = ANIM_Bootler_Quaver, \ +} diff --git a/src/world/common/npc/Bootler.inc.c b/src/world/common/npc/Bootler.inc.c new file mode 100644 index 0000000000..ad9524d73a --- /dev/null +++ b/src/world/common/npc/Bootler.inc.c @@ -0,0 +1,7 @@ +#include "Bootler.h" + +NpcSettings N(NpcSettings_Bootler) = { + .height = 24, + .radius = 24, + .level = 99, +}; diff --git a/src/world/common/npc/GoombaFamily.h b/src/world/common/npc/GoombaFamily.h new file mode 100644 index 0000000000..6f941a82e8 --- /dev/null +++ b/src/world/common/npc/GoombaFamily.h @@ -0,0 +1,87 @@ +#include "common.h" +#include "sprite/npc/Goompa.h" +#include "sprite/npc/Gooma.h" +#include "sprite/npc/Goompapa.h" +#include "sprite/npc/Goomama.h" +#include "sprite/npc/Goombaria.h" + +#define GOOMPA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define GOOMPA_ANIMS \ +{ \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Walk, \ + ANIM_Dryite_Green_Run, \ + ANIM_Dryite_Green_Run, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Still, \ + ANIM_Dryite_Green_Still, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ + ANIM_Dryite_Green_Idle, \ +} + +#define GOOMAMA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define GOOMAMA_ANIMS \ +{ \ + .idle = ANIM_Goomama_Idle, \ + .walk = ANIM_Goomama_Walk, \ + .run = ANIM_Goomama_Run, \ + .chase = ANIM_Goomama_Run, \ + .anim_4 = ANIM_Goomama_Idle, \ + .anim_5 = ANIM_Goomama_Idle, \ + .death = ANIM_Goomama_Still, \ + .hit = ANIM_Goomama_Still, \ + .anim_8 = ANIM_Goomama_Run, \ + .anim_9 = ANIM_Goomama_Run, \ + .anim_A = ANIM_Goomama_Run, \ + .anim_B = ANIM_Goomama_Run, \ + .anim_C = ANIM_Goomama_Run, \ + .anim_D = ANIM_Goomama_Run, \ + .anim_E = ANIM_Goomama_Run, \ + .anim_F = ANIM_Goomama_Run, \ +} + +#define GOOMBARIA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define GOOMBARIA_ANIMS \ +{ \ + .idle = ANIM_Goombaria_Idle, \ + .walk = ANIM_Goombaria_Walk, \ + .run = ANIM_Goombaria_Run, \ + .chase = ANIM_Goombaria_Run, \ + .anim_4 = ANIM_Goombaria_Idle, \ + .anim_5 = ANIM_Goombaria_Idle, \ + .death = ANIM_Goombaria_Still, \ + .hit = ANIM_Goombaria_Still, \ + .anim_8 = ANIM_Goombaria_Run, \ + .anim_9 = ANIM_Goombaria_Run, \ + .anim_A = ANIM_Goombaria_Run, \ + .anim_B = ANIM_Goombaria_Run, \ + .anim_C = ANIM_Goombaria_Run, \ + .anim_D = ANIM_Goombaria_Run, \ + .anim_E = ANIM_Goombaria_Run, \ + .anim_F = ANIM_Goombaria_Run, \ +} diff --git a/src/world/common/npc/GoombaFamily.inc.c b/src/world/common/npc/GoombaFamily.inc.c new file mode 100644 index 0000000000..65951d516b --- /dev/null +++ b/src/world/common/npc/GoombaFamily.inc.c @@ -0,0 +1,8 @@ +#include "GoombaFamily.h" + +NpcSettings N(NpcSettings_Goomba_Family) = { + .height = 22, + .radius = 24, + .level = 99, + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; diff --git a/src/world/common/npc/Oaklie.inc.c b/src/world/common/npc/Oaklie.inc.c index 7223c25991..e8c39bd32e 100644 --- a/src/world/common/npc/Oaklie.inc.c +++ b/src/world/common/npc/Oaklie.inc.c @@ -1,4 +1,3 @@ -#include "common.h" #include "Oaklie.h" NpcSettings N(NpcSettings_Oaklie) = { diff --git a/src/world/common/npc/StarSpirit.inc.c b/src/world/common/npc/StarSpirit.inc.c index c2aa4c0f85..30247956aa 100644 --- a/src/world/common/npc/StarSpirit.inc.c +++ b/src/world/common/npc/StarSpirit.inc.c @@ -1,4 +1,3 @@ -#include "common.h" #include "StarSpirit.h" NpcSettings N(NpcSettings_StarSpirit) = { diff --git a/src/world/common/npc/TubbasHeart.inc.c b/src/world/common/npc/TubbasHeart.inc.c index f41f578ff1..c14dafeb1d 100644 --- a/src/world/common/npc/TubbasHeart.inc.c +++ b/src/world/common/npc/TubbasHeart.inc.c @@ -1,4 +1,3 @@ -#include "common.h" #include "TubbasHeart.h" EvtScript N(EVS_NpcAuxAI_TubbasHeart) = { diff --git a/src/world/common/npc/Twink.h b/src/world/common/npc/Twink.h new file mode 100644 index 0000000000..55736cdb1f --- /dev/null +++ b/src/world/common/npc/Twink.h @@ -0,0 +1,29 @@ +#include "common.h" +#include "sprite/npc/Twink.h" + +#define TWINK_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define TWINK_ANIMS \ +{ \ + .idle = ANIM_Twink_Idle, \ + .walk = ANIM_Twink_Fly, \ + .run = ANIM_Twink_Angry, \ + .chase = ANIM_Twink_Angry, \ + .anim_4 = ANIM_Twink_Idle, \ + .anim_5 = ANIM_Twink_Idle, \ + .death = ANIM_Twink_Idle, \ + .hit = ANIM_Twink_Idle, \ + .anim_8 = ANIM_Twink_Idle, \ + .anim_9 = ANIM_Twink_Idle, \ + .anim_A = ANIM_Twink_Idle, \ + .anim_B = ANIM_Twink_Idle, \ + .anim_C = ANIM_Twink_Idle, \ + .anim_D = ANIM_Twink_Idle, \ + .anim_E = ANIM_Twink_Idle, \ + .anim_F = ANIM_Twink_Idle, \ +} diff --git a/src/world/common/npc/Twink.inc.c b/src/world/common/npc/Twink.inc.c new file mode 100644 index 0000000000..8c916402e0 --- /dev/null +++ b/src/world/common/npc/Twink.inc.c @@ -0,0 +1,7 @@ +#include "Twink.h" + +NpcSettings N(NpcSettings_Twink) = { + .height = 20, + .radius = 20, + .level = 99, +}; diff --git a/src/world/common/npc/Yakkey.inc.c b/src/world/common/npc/Yakkey.inc.c index 4534176e2c..e9464a1ee2 100644 --- a/src/world/common/npc/Yakkey.inc.c +++ b/src/world/common/npc/Yakkey.inc.c @@ -1,4 +1,3 @@ -#include "common.h" #include "Yakkey.h" NpcSettings N(NpcSettings_Yakkey) = { diff --git a/src/world/common/todo/AwaitPlayerNearNpc.inc.c b/src/world/common/todo/AwaitPlayerNearNpc.inc.c index 6fa85e70e6..c687d35878 100644 --- a/src/world/common/todo/AwaitPlayerNearNpc.inc.c +++ b/src/world/common/todo/AwaitPlayerNearNpc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(func_80240814_97BE44)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80240814_97BE44)) { Npc* npc = get_npc_safe(script->owner2.npcID); npc->verticalRenderOffset = npc->collisionHeight; @@ -10,7 +10,7 @@ ApiStatus N(func_80240814_97BE44)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(AwaitPlayerNearNpc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AwaitPlayerNearNpc)) { PlayerStatus* playerStatus = &gPlayerStatus; Npc* npc = get_npc_safe(script->owner2.npcID); @@ -21,7 +21,7 @@ ApiStatus N(AwaitPlayerNearNpc)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(func_802408B4_97BEE4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802408B4_97BEE4)) { EncounterStatus* currentEncounter = &gCurrentEncounter; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_safe(script->owner2.npcID); diff --git a/src/world/common/todo/SetNpcB5_3.inc.c b/src/world/common/todo/SetNpcB5_3.inc.c index 9b84350937..b46b8dd0e0 100644 --- a/src/world/common/todo/SetNpcB5_3.inc.c +++ b/src/world/common/todo/SetNpcB5_3.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(SetNpcB5_3)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetNpcB5_3)) { script->owner1.enemy->unk_B5 = 3; return ApiStatus_DONE2; } diff --git a/src/world/dead/area_flo/flo_00/flo_00.h b/src/world/dead/area_flo/flo_00/flo_00.h index 29af241ba9..d0bfba5102 100644 --- a/src/world/dead/area_flo/flo_00/flo_00.h +++ b/src/world/dead/area_flo/flo_00/flo_00.h @@ -14,17 +14,17 @@ #include "sprite/npc/WorldParakarry.h" enum { - NPC_Dummy_Wisterwood = 0, - NPC_Bubulb_01 = 1, - NPC_Bubulb_02 = 2, - NPC_Bubulb_03 = 3, - NPC_Bubulb_04 = 4, - NPC_Tolielup = 5, - NPC_Klevar = 6, - NPC_Lakilulu = 7, - NPC_Lakilester_Epilogue = 0, - NPC_Lakilulu_Epilogue = 1, - NPC_Parakarry_Epilogue = 2, + NPC_Dummy_Wisterwood = 0, + NPC_Bubulb_01 = 1, + NPC_Bubulb_02 = 2, + NPC_Bubulb_03 = 3, + NPC_Bubulb_04 = 4, + NPC_Tolielup = 5, + NPC_Klevar = 6, + NPC_Lakilulu = 7, + NPC_Lakilester_Epilogue = 0, + NPC_Lakilulu_Epilogue = 1, + NPC_Parakarry_Epilogue = 2, }; enum { diff --git a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c index d6a6cb0b59..db3f9b1ca9 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c @@ -10,7 +10,7 @@ NpcSettings N(NpcSettings_Dummy) = { #include "world/common/npc/Tolielup.inc.c" #include "world/common/npc/StarSpirit.inc.c" -API_CALLABLE(N(UpgradeStarPower)) { +API_CALLABLE(N(UpgradeStarPowerCh6)) { set_max_SP(6); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; @@ -498,7 +498,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Idle) EVT_CALL(EnableNpcAI, NPC_Klevar, TRUE) - EVT_CALL(N(UpgradeStarPower)) + EVT_CALL(N(UpgradeStarPowerCh6)) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0196, 160, 40) EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) diff --git a/src/world/dead/area_flo/flo_03/flo_03.h b/src/world/dead/area_flo/flo_03/flo_03.h index 3b8a3e54e9..184c702c04 100644 --- a/src/world/dead/area_flo/flo_03/flo_03.h +++ b/src/world/dead/area_flo/flo_03/flo_03.h @@ -15,12 +15,12 @@ #include "sprite/npc/Dayzee.h" enum { - NPC_Petunia = 0, - NPC_Dayzee = 1, - NPC_MontyMole_01 = 2, - NPC_MontyMole_02 = 3, - NPC_MontyMole_03 = 4, - NPC_MontyMole_04 = 5, + NPC_Petunia = 0, + NPC_Dayzee = 1, + NPC_MontyMole_01 = 2, + NPC_MontyMole_02 = 3, + NPC_MontyMole_03 = 4, + NPC_MontyMole_04 = 5, }; enum { diff --git a/src/world/dead/area_flo/flo_07/flo_07.h b/src/world/dead/area_flo/flo_07/flo_07.h index a4b4bc3f26..3bc459057a 100644 --- a/src/world/dead/area_flo/flo_07/flo_07.h +++ b/src/world/dead/area_flo/flo_07/flo_07.h @@ -11,11 +11,11 @@ #include "mapfs/flo_07_hit.h" enum { - NPC_Posie = 0, + NPC_Posie = 0, }; enum { - MV_GroundShakingScript = MapVar(0), + MV_GroundShakingScript = MapVar(0), }; #define NAMESPACE dead_flo_07 diff --git a/src/world/dead/area_flo/flo_08/flo_08.h b/src/world/dead/area_flo/flo_08/flo_08.h index a9b2d50ea6..0ebdb72d7f 100644 --- a/src/world/dead/area_flo/flo_08/flo_08.h +++ b/src/world/dead/area_flo/flo_08/flo_08.h @@ -11,15 +11,15 @@ #include "mapfs/flo_08_hit.h" enum { - NPC_GateFlower = 0, - NPC_Dayzee_01 = 1, - NPC_Dayzee_02 = 2, - NPC_Dayzee_03 = 3, - NPC_Dayzee_04 = 4, - NPC_Dayzee_05 = 5, - NPC_Dayzee_06 = 6, - NPC_Dayzee_07 = 7, - NPC_AmazyDayzee = 8, + NPC_GateFlower = 0, + NPC_Dayzee_01 = 1, + NPC_Dayzee_02 = 2, + NPC_Dayzee_03 = 3, + NPC_Dayzee_04 = 4, + NPC_Dayzee_05 = 5, + NPC_Dayzee_06 = 6, + NPC_Dayzee_07 = 7, + NPC_AmazyDayzee = 8, }; enum { diff --git a/src/world/dead/area_flo/flo_09/flo_09.h b/src/world/dead/area_flo/flo_09/flo_09.h index d3d7cb5157..2a2a1ca278 100644 --- a/src/world/dead/area_flo/flo_09/flo_09.h +++ b/src/world/dead/area_flo/flo_09/flo_09.h @@ -14,10 +14,10 @@ #include "sprite/npc/Bzzap.h" enum { - NPC_Dayzee_01 = 0, - NPC_Dayzee_02 = 1, - NPC_Bzzap_01 = 2, - NPC_Bzzap_02 = 3, + NPC_Dayzee_01 = 0, + NPC_Dayzee_02 = 1, + NPC_Bzzap_01 = 2, + NPC_Bzzap_02 = 3, }; #define NAMESPACE dead_flo_09 diff --git a/src/world/dead/area_flo/flo_10/flo_10.h b/src/world/dead/area_flo/flo_10/flo_10.h index b762d955a6..ed00fce8fa 100644 --- a/src/world/dead/area_flo/flo_10/flo_10.h +++ b/src/world/dead/area_flo/flo_10/flo_10.h @@ -11,7 +11,7 @@ #include "mapfs/flo_10_hit.h" enum { - NPC_Lily = 0, + NPC_Lily = 0, }; #define NAMESPACE dead_flo_10 diff --git a/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c b/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c index ba3d8d56b7..58fd8875b1 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c +++ b/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c @@ -94,7 +94,7 @@ void N(UnkModelFunc000)(s32 x1, s32 y1, s32 x2, s32 y2) { G_TX_LOADTILE, 0 , G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP, 9, G_TX_NOLOD); gDPLoadSync(gMasterGfxPos++); - gDPLoadTile( gMasterGfxPos++, G_TX_LOADTILE, + gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, (x1)<numEntries = numEntries; menu->initialPos = 0; func_800F4FC4(menu); - func_800E9894(); + status_menu_ignore_changes(); func_800E98EC(); open_status_menu_short(); } @@ -442,7 +442,7 @@ s32 shop_update_item_select_popup(s32* selectedIndex) { void shop_close_item_select_popup(void) { destroy_popup_menu(); func_800E9900(); - func_800E98C4(); + status_menu_respond_to_changes(); close_status_menu(); } diff --git a/src/world/world.c b/src/world/world.c index cd74ac0b1b..4ec59b430c 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -15,14 +15,12 @@ #define ASSET_TABLE_HEADER_SIZE 0x20 #define ASSET_TABLE_FIRST_ENTRY (ASSET_TABLE_ROM_START + ASSET_TABLE_HEADER_SIZE) -s32 D_8008FF60[] = { 0, 1, 2, 3 }; +s32 WorldReverbModeMapping[] = { 0, 1, 2, 3 }; // bss MapSettings gMapSettings; MapConfig* gMapConfig; -extern char wMapBgName[]; - typedef struct { /* 0x00 */ char name[16]; /* 0x10 */ u32 offset; @@ -150,7 +148,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { gPlayerStatus.targetYaw = gPlayerStatus.currentYaw; - func_801497FC(D_8008FF60[mapConfig->unk_1C.word & 0x3]); + sfx_set_reverb_mode(WorldReverbModeMapping[*(s32*)mapConfig->unk_1C & 0x3]); sfx_reset_door_sounds(); if (!skipLoadingAssets) { @@ -285,54 +283,54 @@ f32 gEntityColliderNormals[] = { 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, /// Toad Town #include "area_mac/mac.h" MapConfig mac_maps[] = { - { MAP_UNSPLIT(machi, 0x802407A0), .bgName = "nok_bg" }, + { MAP(machi), .bgName = "nok_bg" }, { MAP_UNSPLIT(mac_00, 0x80243BE0), .bgName = "nok_bg" }, { MAP_UNSPLIT(mac_01, 0x80246730), .bgName = "nok_bg" }, - { MAP_UNSPLIT(mac_02, 0x80243580), .bgName = "nok_bg" }, + { MAP(mac_02), .bgName = "nok_bg" }, { MAP(mac_03), .bgName = "nok_bg" }, - { MAP_UNSPLIT(mac_04, 0x80242080), .bgName = "nok_bg", .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(mac_05, 0x802441A0), .bgName = "nok_bg" }, - { MAP_UNSPLIT(mac_06, 0x802416A0), .bgName = "nok_bg" }, + { MAP_WITH_INIT(mac_04), .bgName = "nok_bg" }, + { MAP(mac_05), .bgName = "nok_bg" }, + { MAP(mac_06), .bgName = "nok_bg" }, }; /// Toad Town Tunnels #include "area_tik/tik.h" MapConfig tik_maps[] = { - { MAP(tik_01), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_02), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_03), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_04), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_05), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_06), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_07), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_08), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_09), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_10), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_12), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_14), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_15), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_17), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_18), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_19), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_20), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_21), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_22), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_23), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_WITH_INIT(tik_24), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(tik_25), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_01), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_02), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_03), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_04), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_05), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_06), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_07), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_08), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_09), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_10), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_12), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_14), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_15), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_17), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_18), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_19), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_20), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_21), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_22), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_23), .songVariation = 1, .sfxReverb = 2 }, + { MAP_WITH_INIT(tik_24), .songVariation = 1, .sfxReverb = 2 }, + { MAP(tik_25), .songVariation = 1, .sfxReverb = 2 }, }; /// Inside the Whale #include "area_kgr/kgr.h" MapConfig kgr_maps[] = { - { MAP(kgr_01), .unk_1C = { .bytes = { .flags = 1 } } }, - { MAP(kgr_02), .unk_1C = { .bytes = { .flags = 1 } } }, + { MAP(kgr_01), .sfxReverb = 1 }, + { MAP(kgr_02), .sfxReverb = 1 }, }; /// Goomba Region #include "area_kmr/kmr.h" MapConfig kmr_maps[] = { - { MAP(kmr_00), .bgName = "kmr_bg", .unk_1C = { .bytes = { .flags = 1 } } }, + { MAP(kmr_00), .bgName = "kmr_bg", .sfxReverb = 1 }, { MAP_UNSPLIT(kmr_02, 0x80243AF0), .bgName = "kmr_bg" }, { MAP(kmr_03), .bgName = "kmr_bg" }, { MAP(kmr_04), .bgName = "kmr_bg" }, @@ -426,40 +424,41 @@ MapConfig sbk_maps[] = { }; /// Dry Dry Ruins +#include "area_isk/isk.h" MapConfig isk_maps[] = { - { MAP_UNSPLIT(isk_01, 0x80240020), .bgName = "sbk3_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_02, 0x80240140), .bgName = "sbk3_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_03, 0x80240030), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_04, 0x80240AD0), .bgName = "sbk3_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_05, 0x80241ED0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_06, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_07, 0x80240130), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_08, 0x80240930), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_09, 0x80240340), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_10, 0x80240DE0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_11, 0x802401A0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_12, 0x80240040), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_13, 0x80242080), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_14, 0x80241D70), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_16, 0x80240B20), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_18, 0x80240910), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(isk_19, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(isk_01), .bgName = "sbk3_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_02), .bgName = "sbk3_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_03), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_04), .bgName = "sbk3_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_05), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_06), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_07), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_08), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_09), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_10), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_11), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_12), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_13), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_14), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_16), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_18), .songVariation = 1, .sfxReverb = 2 }, + { MAP(isk_19), .songVariation = 1, .sfxReverb = 2 }, }; /// Koopa Bros. Fortress #include "area_trd/trd.h" MapConfig trd_maps[] = { { MAP(trd_00), .bgName = "nok_bg" }, - { MAP(trd_01), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP(trd_02), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP(trd_03), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP(trd_04), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP(trd_05), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP(trd_06), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP(trd_07), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP(trd_08), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_01), .songVariation = 1, .sfxReverb = 3 }, + { MAP(trd_02), .songVariation = 1, .sfxReverb = 3 }, + { MAP(trd_03), .songVariation = 1, .sfxReverb = 3 }, + { MAP(trd_04), .songVariation = 1, .sfxReverb = 3 }, + { MAP(trd_05), .songVariation = 1, .sfxReverb = 3 }, + { MAP(trd_06), .songVariation = 1, .sfxReverb = 3 }, + { MAP(trd_07), .songVariation = 1, .sfxReverb = 3 }, + { MAP(trd_08), .songVariation = 1, .sfxReverb = 3 }, { MAP(trd_09), .bgName = "nok_bg" }, - { MAP(trd_10), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_10), .songVariation = 1, .sfxReverb = 3 }, }; /// Koopa Region @@ -482,7 +481,7 @@ MapConfig hos_maps[] = { { MAP_UNSPLIT(hos_02, 0x80242B90), .bgName = "hos_bg" }, { MAP_UNSPLIT(hos_03, 0x802435F0), .bgName = "hos_bg" }, { MAP_UNSPLIT(hos_04, 0x80240EE0), .bgName = "hos_bg" }, - { MAP_UNSPLIT(hos_05, 0x80245910), .bgName = "hos_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP_UNSPLIT(hos_05, 0x80245910), .bgName = "hos_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP_UNSPLIT(hos_06, 0x80242570), .bgName = "hos_bg" }, { MAP_UNSPLIT(hos_10, 0x80240CE0), .bgName = "hos_bg", .init = (MapInit)0x80240000 }, { MAP_UNSPLIT(hos_20, 0x80240390), .bgName = "hos_bg" }, @@ -490,56 +489,56 @@ MapConfig hos_maps[] = { /// Bowser's Castle MapConfig kpa_maps[] = { - { MAP_UNSPLIT(kpa_01, 0x80240A70), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_03, 0x80241EE0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_04, 0x80240190), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_08, 0x802414C0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_09, 0x80241310), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_10, 0x80240360), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_11, 0x80240B40), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_12, 0x802404A0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_13, 0x802404A0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_14, 0x802408A0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_15, 0x802405E0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_16, 0x802403B0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_17, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_32, 0x80240350), .bgName = "kpa_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_33, 0x80240350), .bgName = "kpa_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_40, 0x80240040), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_41, 0x80240040), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_50, 0x80241A40), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_51, 0x80241C40), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_52, 0x80241360), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_53, 0x80240190), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kpa_01, 0x80240A70), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_03, 0x80241EE0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_04, 0x80240190), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_08, 0x802414C0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_09, 0x80241310), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_10, 0x80240360), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_11, 0x80240B40), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_12, 0x802404A0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_13, 0x802404A0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_14, 0x802408A0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_15, 0x802405E0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_16, 0x802403B0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_17, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_32, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_33, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_40, 0x80240040), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_41, 0x80240040), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_50, 0x80241A40), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_51, 0x80241C40), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kpa_52, 0x80241360), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_53, 0x80240190), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, { MAP_UNSPLIT(kpa_60, 0x80240450), .bgName = "kpa_bg" }, { MAP_UNSPLIT(kpa_61, 0x80242360), .bgName = "kpa_bg" }, { MAP_UNSPLIT(kpa_62, 0x80240430), .bgName = "kpa_bg" }, - { MAP_UNSPLIT(kpa_63, 0x802401B0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_70, 0x80240B10), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_81, 0x80240480), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_82, 0x80240460), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_83, 0x80240090), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_90, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_91, 0x80241920), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_94, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_95, 0x80241920), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_96, 0x80240040), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(kpa_100, 0x80240060), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_101, 0x80240060), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_102, 0x802435B0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_111, 0x802413E0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_112, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_113, 0x80240AD0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_114, 0x80240070), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_115, 0x802413F0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_116, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_117, 0x80240010), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(kpa_118, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_119, 0x80240010), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(kpa_121, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kpa_130, 0x80240760), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_133, 0x802404B0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kpa_134, 0x80240740), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP_UNSPLIT(kpa_63, 0x802401B0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_70, 0x80240B10), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_81, 0x80240480), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kpa_82, 0x80240460), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kpa_83, 0x80240090), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kpa_90, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_91, 0x80241920), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_94, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_95, 0x80241920), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_96, 0x80240040), .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_111, 0x802413E0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_112, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_113, 0x80240AD0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_114, 0x80240070), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kpa_115, 0x802413F0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_116, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_117, 0x80240010), .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(kpa_118, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_119, 0x80240010), .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(kpa_121, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kpa_130, 0x80240760), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_133, 0x802404B0), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kpa_134, 0x80240740), .songVariation = 1, .sfxReverb = 3 }, }; /// Peach's Castle Grounds @@ -554,31 +553,31 @@ MapConfig osr_maps[] = { /// Peach's Castle /// @bug There are two entries for kkj_26; the latter is unreachable. MapConfig kkj_maps[] = { - { MAP_UNSPLIT(kkj_00, 0x80241030), .bgName = "nok_bg", .init = (MapInit)0x80240000, .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kkj_01, 0x80240F10), .bgName = "nok_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kkj_02, 0x80240030), .bgName = "nok_bg", .unk_1C = { .bytes = { .flags = 2 } } }, - { MAP_UNSPLIT(kkj_03, 0x80240360), .bgName = "nok_bg", .unk_1C = { .bytes = { .flags = 3 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kkj_10, 0x80241120), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kkj_11, 0x80241160), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(kkj_12, 0x802408D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(kkj_13, 0x802407A0), .bgName = "kpa_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } }, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kkj_00, 0x80241030), .bgName = "nok_bg", .init = (MapInit)0x80240000, .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kkj_01, 0x80240F10), .bgName = "nok_bg", .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kkj_02, 0x80240030), .bgName = "nok_bg", .sfxReverb = 2 }, + { MAP_UNSPLIT(kkj_03, 0x80240360), .bgName = "nok_bg", .sfxReverb = 3, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(kkj_10, 0x80241120), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kkj_11, 0x80241160), .songVariation = 1, .sfxReverb = 3 }, + { MAP_UNSPLIT(kkj_12, 0x802408D0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(kkj_13, 0x802407A0), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 3, .init = (MapInit)0x80240000 }, { MAP_UNSPLIT(kkj_14, 0x80240580), .bgName = "kpa_bg", .init = (MapInit)0x80240000 }, { MAP_UNSPLIT(kkj_15, 0x80240640) }, - { MAP_UNSPLIT(kkj_16, 0x80241090), .unk_1C = { .bytes = { .flags = 1 } } }, + { MAP_UNSPLIT(kkj_16, 0x80241090), .sfxReverb = 1 }, { MAP_UNSPLIT(kkj_17, 0x802405B0) }, { MAP_UNSPLIT(kkj_18, 0x80240830), .bgName = "kpa_bg" }, { MAP_UNSPLIT(kkj_19, 0x80240D20) }, { MAP_UNSPLIT(kkj_20, 0x80240600) }, - { MAP_UNSPLIT(kkj_21, 0x80240010), .unk_1C = { .bytes = { .flags = 1 } } }, - { MAP_UNSPLIT(kkj_22, 0x80240020), .bgName = "kpa_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP_UNSPLIT(kkj_21, 0x80240010), .sfxReverb = 1 }, + { MAP_UNSPLIT(kkj_22, 0x80240020), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP_UNSPLIT(kkj_23, 0x802409F0), .bgName = "kpa_bg", .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kkj_24, 0x80240040), .bgName = "kpa_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP_UNSPLIT(kkj_24, 0x80240040), .bgName = "kpa_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP_UNSPLIT(kkj_25, 0x80240F50), .bgName = "kpa_bg", .init = (MapInit)0x80240000 }, { MAP_UNSPLIT(kkj_26, 0x80240070), .bgName = "kpa_bg" }, - { MAP_UNSPLIT(kkj_26, 0x80240070), .unk_1C = { .bytes = { .flags = 2 } } }, - { MAP_UNSPLIT(kkj_27, 0x802404C0), .unk_1C = { .bytes = { .flags = 1 } } }, - { MAP_UNSPLIT(kkj_28, 0x80240010), .unk_1C = { .bytes = { .flags = 1 } } }, - { MAP_UNSPLIT(kkj_29, 0x80240080), .unk_1C = { .bytes = { .flags = 1 } } }, + { MAP_UNSPLIT(kkj_26, 0x80240070), .sfxReverb = 2 }, + { MAP_UNSPLIT(kkj_27, 0x802404C0), .sfxReverb = 1 }, + { MAP_UNSPLIT(kkj_28, 0x80240010), .sfxReverb = 1 }, + { MAP_UNSPLIT(kkj_29, 0x80240080), .sfxReverb = 1 }, }; /// Jade Jungle @@ -594,47 +593,47 @@ MapConfig jan_maps[] = { { MAP_UNSPLIT(jan_08, 0x80242460), .bgName = "yos_bg" }, { MAP_UNSPLIT(jan_09, 0x80241960), .bgName = "yos_bg" }, { MAP_UNSPLIT(jan_10, 0x80241750), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_11, 0x80240810), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(jan_12, 0x80241280), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(jan_13, 0x802405F0), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(jan_14, 0x80241300), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(jan_15, 0x80240320), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(jan_16, 0x80240590), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(jan_17, 0x80240040), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP_UNSPLIT(jan_11, 0x80240810), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(jan_12, 0x80241280), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(jan_13, 0x802405F0), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(jan_14, 0x80241300), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(jan_15, 0x80240320), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(jan_16, 0x80240590), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(jan_17, 0x80240040), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP_UNSPLIT(jan_18, 0x80240020), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_19, 0x80240040), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(jan_22, 0x802419A0), .bgName = "jan_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, + { MAP_UNSPLIT(jan_19, 0x80240040), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(jan_22, 0x802419A0), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, { MAP_UNSPLIT(jan_23, 0x80240010), .bgName = "yos_bg" }, }; /// Forever Forest #include "area_mim/mim.h" MapConfig mim_maps[] = { - { MAP(mim_01), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_02), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_03), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_04), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_05), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_06), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_07), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_08), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_09), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_01), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_02), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_03), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_04), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_05), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_06), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_07), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_08), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_09), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP(mim_10), .bgName = "nok_bg" }, - { MAP(mim_11), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(mim_12), .bgName = "arn_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(mim_11), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(mim_12), .bgName = "arn_bg", .songVariation = 1, .sfxReverb = 2 }, }; /// Boo's Mansion MapConfig obk_maps[] = { - { MAP_UNSPLIT(obk_01, 0x802411B0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(obk_02, 0x802402E0), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(obk_03, 0x80241020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(obk_04, 0x80240E90), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(obk_05, 0x802409F0), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(obk_06, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(obk_07, 0x80241BA0), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(obk_08, 0x802417B0), .bgName = "obk_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(obk_09, 0x80240460), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP_UNSPLIT(obk_01, 0x802411B0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(obk_02, 0x802402E0), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(obk_03, 0x80241020), .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(obk_04, 0x80240E90), .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(obk_05, 0x802409F0), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(obk_06, 0x80240020), .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(obk_07, 0x80241BA0), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(obk_08, 0x802417B0), .bgName = "obk_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(obk_09, 0x80240460), .songVariation = 1, .sfxReverb = 2 }, }; /// Gusty Gulch @@ -645,57 +644,57 @@ MapConfig arn_maps[] = { { MAP(arn_04), .bgName = "arn_bg" }, { MAP(arn_05), .bgName = "arn_bg" }, { MAP(arn_07), .bgName = "arn_bg" }, - { MAP(arn_08), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP(arn_09), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP(arn_10), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP(arn_11), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP(arn_12), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP(arn_13), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, + { MAP(arn_08), .songVariation = 1, .sfxReverb = 1 }, + { MAP(arn_09), .songVariation = 1, .sfxReverb = 1 }, + { MAP(arn_10), .songVariation = 1, .sfxReverb = 1 }, + { MAP(arn_11), .songVariation = 1, .sfxReverb = 1 }, + { MAP(arn_12), .songVariation = 1, .sfxReverb = 1 }, + { MAP(arn_13), .songVariation = 1, .sfxReverb = 1 }, }; /// Tubba Blubba's Castle MapConfig dgb_maps[] = { { MAP_UNSPLIT(dgb_00, 0x802400D0), .bgName = "arn_bg", .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(dgb_01, 0x80243460), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_02, 0x80241470), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_03, 0x80242830), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_04, 0x80243130), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_05, 0x802414A0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_06, 0x802402E0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_07, 0x80241450), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_08, 0x80243CB0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_09, 0x80243840), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_10, 0x80240210), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_11, 0x80240090), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_12, 0x802402D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_13, 0x80240010), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_14, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_15, 0x802418A0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_16, 0x80241440), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_17, 0x80240020), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(dgb_18, 0x80241280), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP_UNSPLIT(dgb_01, 0x80243460), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_02, 0x80241470), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_03, 0x80242830), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_04, 0x80243130), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_05, 0x802414A0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_06, 0x802402E0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_07, 0x80241450), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_08, 0x80243CB0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_09, 0x80243840), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_10, 0x80240210), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_11, 0x80240090), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_12, 0x802402D0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_13, 0x80240010), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_14, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_15, 0x802418A0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_16, 0x80241440), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_17, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(dgb_18, 0x80241280), .songVariation = 1, .sfxReverb = 2 }, }; /// Mt. Lavalava #include "area_kzn/kzn.h" MapConfig kzn_maps[] = { - { MAP(kzn_01), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_02), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_03), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_04), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_05), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_06), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_07), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_08), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_09), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_10), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_11), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_17), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_18), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_19), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_20), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_22), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP(kzn_23), .bgName = "yos_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(kzn_01), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_02), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_03), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_04), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_05), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_06), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_07), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_08), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_09), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_10), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_11), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_17), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_18), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_19), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_20), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_22), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kzn_23), .bgName = "yos_bg", .songVariation = 1, .sfxReverb = 2 }, }; /// Flower Fields @@ -731,69 +730,69 @@ MapConfig sam_maps[] = { { MAP_UNSPLIT(sam_04, 0x80240740), .bgName = "yki_bg" }, { MAP_UNSPLIT(sam_05, 0x80241D60), .bgName = "sam_bg" }, { MAP_UNSPLIT(sam_06, 0x80242630), .bgName = "sam_bg" }, - { MAP_UNSPLIT(sam_07, 0x80242020), .bgName = "yki_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(sam_08, 0x802417D0), .bgName = "yki_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(sam_09, 0x80240420), .bgName = "yki_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(sam_10, 0x80240CE0), .bgName = "yki_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, + { MAP_UNSPLIT(sam_07, 0x80242020), .bgName = "yki_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(sam_08, 0x802417D0), .bgName = "yki_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(sam_09, 0x80240420), .bgName = "yki_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(sam_10, 0x80240CE0), .bgName = "yki_bg", .songVariation = 1, .sfxReverb = 1 }, { MAP_UNSPLIT(sam_11, 0x802421A0), .bgName = "yki_bg" }, - { MAP_UNSPLIT(sam_12, 0x802403B0), .bgName = "yki_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, + { MAP_UNSPLIT(sam_12, 0x802403B0), .bgName = "yki_bg", .songVariation = 1, .sfxReverb = 1 }, }; /// Crystal Palace MapConfig pra_maps[] = { - { MAP_UNSPLIT(pra_01, 0x80241400), .bgName = "yki_bg", .unk_1C = { .bytes = { .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_02, 0x802416C0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_03, 0x802401E0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_04, 0x80240970), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_05, 0x802411F0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_06, 0x80240F60), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_09, 0x80241670), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_10, 0x802416D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_11, 0x802411F0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_12, 0x80241220), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_13, 0x80241620), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_14, 0x80241200), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_15, 0x80240050), .bgName = "yki_bg", .init = (MapInit)0x80240000, .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(pra_16, 0x80240F60), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_18, 0x80240F50), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_19, 0x802419D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_20, 0x80240F70), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_21, 0x80240140), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_22, 0x802402F0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_27, 0x80241220), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_28, 0x80241220), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_29, 0x802412C0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_31, 0x802410E0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .init = (MapInit)0x80240000, .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } } }, - { MAP_UNSPLIT(pra_33, 0x802410C0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_34, 0x80241040), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_35, 0x80242C40), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_36, 0x80240F70), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_37, 0x80241840), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_38, 0x80241700), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_39, 0x80241700), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } }, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(pra_40, 0x80240F40), .unk_1C = { .bytes = { .songVariation = 1, .flags = 1 } }, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_01, 0x80241400), .bgName = "yki_bg", .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_02, 0x802416C0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_03, 0x802401E0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_04, 0x80240970), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_05, 0x802411F0), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_06, 0x80240F60), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_09, 0x80241670), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_10, 0x802416D0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_11, 0x802411F0), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_12, 0x80241220), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_13, 0x80241620), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_14, 0x80241200), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_15, 0x80240050), .bgName = "yki_bg", .init = (MapInit)0x80240000, .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(pra_16, 0x80240F60), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_18, 0x80240F50), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_19, 0x802419D0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_20, 0x80240F70), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_21, 0x80240140), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_22, 0x802402F0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_27, 0x80241220), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_28, 0x80241220), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_29, 0x802412C0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_31, 0x802410E0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .init = (MapInit)0x80240000, .songVariation = 1, .sfxReverb = 1 }, + { MAP_UNSPLIT(pra_33, 0x802410C0), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_34, 0x80241040), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_35, 0x80242C40), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_36, 0x80240F70), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_37, 0x80241840), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_38, 0x80241700), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_39, 0x80241700), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, + { MAP_UNSPLIT(pra_40, 0x80240F40), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, }; /// Shy Guy's Toy Box MapConfig omo_maps[] = { - { MAP_UNSPLIT(omo_01, 0x80240C40), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_02, 0x80242BD0), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_03, 0x80240900), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_04, 0x80241F30), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_05, 0x80242440), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_06, 0x80240B80), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_07, 0x80243310), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_08, 0x80240E10), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_09, 0x80243700), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_10, 0x802408B0), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_11, 0x802414F0), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_12, 0x802404D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_13, 0x80241510), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_14, 0x802405E0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_15, 0x80240810), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_16, 0x80240620), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(omo_17, 0x80243770), .bgName = "omo_bg", .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP_UNSPLIT(omo_01, 0x80240C40), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_02, 0x80242BD0), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_03, 0x80240900), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_04, 0x80241F30), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_05, 0x80242440), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_06, 0x80240B80), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_07, 0x80243310), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_08, 0x80240E10), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_09, 0x80243700), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_10, 0x802408B0), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_11, 0x802414F0), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_12, 0x802404D0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_13, 0x80241510), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_14, 0x802405E0), .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_15, 0x80240810), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_16, 0x80240620), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP_UNSPLIT(omo_17, 0x80243770), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, }; /// Debug diff --git a/tools/saved_byte_renames.txt b/tools/saved_byte_renames.txt index bce81c2d7d..b96490cdcf 100644 --- a/tools/saved_byte_renames.txt +++ b/tools/saved_byte_renames.txt @@ -313,37 +313,37 @@ GameByte(311) GB_Unused_KPA_0E GameByte(312) GB_Unused_KPA_0F GameByte(313) GB_Unused_KPA_10 GameByte(314) GB_Unused_KPA_11 -GameByte(315) GB_Unused_END_00 -GameByte(316) GB_Unused_END_01 -GameByte(317) GB_Unused_END_02 -GameByte(318) GB_Unused_END_03 -GameByte(319) GB_Unused_END_04 -GameByte(320) GB_Unused_END_05 -GameByte(321) GB_Unused_END_06 -GameByte(322) GB_Unused_END_07 -GameByte(323) GB_Unused_END_08 -GameByte(324) GB_Unused_END_09 -GameByte(325) GB_Unused_END_0A -GameByte(326) GB_Unused_END_0B -GameByte(327) GB_Unused_END_0C -GameByte(328) GB_Unused_END_0D -GameByte(329) GB_Unused_END_0E -GameByte(330) GB_Unused_END_0F -GameByte(331) GB_Unused_END_10 -GameByte(332) GB_Unused_END_11 -GameByte(333) GB_Unused_END_12 -GameByte(334) GB_Unused_END_13 -GameByte(335) GB_Unused_END_14 -GameByte(336) GB_Unused_OSR_00 -GameByte(337) GB_Unused_BAT_00 -GameByte(338) GB_Unused_BAT_01 -GameByte(339) GB_Unused_BAT_02 -GameByte(340) GB_Unused_BAT_03 -GameByte(341) GB_Unused_BAT_04 -GameByte(342) GB_Unused_BAT_05 -GameByte(343) GB_Unused_BAT_06 -GameByte(344) GB_Unused_BAT_07 -GameByte(345) GB_Unused_BAT_08 +GameByte(315) GB_Unused_OSR_00 +GameByte(316) GB_Unused_OSR_01 +GameByte(317) GB_Unused_OSR_02 +GameByte(318) GB_Unused_OSR_03 +GameByte(319) GB_Unused_OSR_04 +GameByte(320) GB_Unused_OSR_05 +GameByte(321) GB_Unused_OSR_06 +GameByte(322) GB_Unused_OSR_07 +GameByte(323) GB_Unused_OSR_08 +GameByte(324) GB_Unused_OSR_09 +GameByte(325) GB_Unused_END_00 +GameByte(326) GB_Unused_END_01 +GameByte(327) GB_Unused_END_02 +GameByte(328) GB_Unused_END_03 +GameByte(329) GB_Unused_END_04 +GameByte(330) GB_Unused_END_05 +GameByte(331) GB_Unused_END_06 +GameByte(332) GB_Unused_END_07 +GameByte(333) GB_Unused_END_08 +GameByte(334) GB_Unused_END_09 +GameByte(335) GB_Unused_END_0A +GameByte(336) GB_Unused_BAT_00 +GameByte(337) GB_Unused_BAT_01 +GameByte(338) GB_Unused_BAT_02 +GameByte(339) GB_Unused_BAT_03 +GameByte(340) GB_Unused_BAT_04 +GameByte(341) GB_Unused_BAT_05 +GameByte(342) GB_Unused_BAT_06 +GameByte(343) GB_Unused_BAT_07 +GameByte(344) GB_Unused_BAT_08 +GameByte(345) GB_Unused_BAT_09 GameByte(346) GB_KootFavor_State GameByte(347) GB_KootFavor_Completed GameByte(348) GB_KootFavor_Current diff --git a/ver/us/asm/bss.s b/ver/us/asm/bss.s index a0f1f485ea..0f14997951 100644 --- a/ver/us/asm/bss.s +++ b/ver/us/asm/bss.s @@ -313,7 +313,7 @@ dlabel D_800A0921 dlabel D_800A0922 .space 2 -dlabel D_800A0924 +dlabel SavedReverbMode .space 4 dlabel D_800A0928 diff --git a/ver/us/asm/data/world/area_isk/isk_01/978140.data.s b/ver/us/asm/data/world/area_isk/isk_01/978140.data.s deleted file mode 100644 index 36f9871ea7..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_01/978140.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_978140 -.word 0xC4100000, 0x00000000, 0xC28E0000, 0x43330000, 0xC40AC000, 0x00000000, 0x432A0000, 0x43AF0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240394, D_80240000_978140, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190095, 0x0000000A, 0x00000002, 0xF8405EF9, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000001, 0x00000053, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00DD, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF8405EF9, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000018, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x000007D0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_01/978360.data.s b/ver/us/asm/data/world/area_isk/isk_01/978360.data.s deleted file mode 100644 index 003268ae3e..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_01/978360.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240220_978360 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802405C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024027C_9783BC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802405C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D8_978418 -.word 0x00000047, 0x00000005, D_80240220_978360, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024027C_9783BC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240320_978460 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802402D8_978418, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802402D8_978418, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406336, 0x00000001, 0x00000046, 0x00000001, 0x80240580, 0x00000044, 0x00000001, 0x80240060, 0x00000044, 0x00000001, 0x80240490, 0x00000044, 0x00000001, D_80240320_978460, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_01/9785C0.data.s b/ver/us/asm/data/world/area_isk/isk_01/9785C0.data.s deleted file mode 100644 index 76af63e9d1..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_01/9785C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240480_9785C0 -.word 0xE3001A01, 0x00000020, 0xDF000000, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000001A, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetCustomGfx, 0x00000000, D_80240480_9785C0, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000001A, 0x00000010, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00004000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFC000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFDEE, 0x0000003C, 0x0000002B, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_02/978820.data.s b/ver/us/asm/data/world/area_isk/isk_02/978820.data.s deleted file mode 100644 index 125a3324f5..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_02/978820.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240110_978820 -.word 0xC3F20000, 0x00000000, 0x43970000, 0x430C0000, 0x43810000, 0x42480000, 0x43F30000, 0x437A0000, 0x438D8000, 0xC2A00000, 0x44048000, 0x437A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402F8_978A08, D_80240110_978820, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190096 - -dlabel D_80240180_978890 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241730, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401DC_9788EC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241738, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240238_978948 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241738, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240294_9789A4 -.word 0x00000047, 0x00000005, D_80240180_978890, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401DC_9788EC, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240238_978948, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F8_978A08 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802416F8, 0x00000046, 0x00000001, 0x80240C80, 0x00000046, 0x00000001, 0x80240640, 0x00000044, 0x00000001, 0x802406D0, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240294_9789A4, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_02/978B80.data.s b/ver/us/asm/data/world/area_isk/isk_02/978B80.data.s deleted file mode 100644 index e61f2f4906..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_02/978B80.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240470_978B80 -.word 0x00000011, 0x00000000 - -dlabel D_80240478_978B88 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000110, 0x0000003C, 0x000001E6, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405EE6, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, isk_02_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x00000265, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000041, 0x00000041, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EE6, 0x00000000, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000043, 0x0000004E, 0x00000006, D_80240478_978B88, 0x00000100, 0x00004000, D_80240470_978B80, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000043, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFDFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_02/978DE0.data.s b/ver/us/asm/data/world/area_isk/isk_02/978DE0.data.s deleted file mode 100644 index ca1433be51..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_02/978DE0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802406D0_978DE0 -.word 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000000, 0x00000044, 0x00000001, D_80240904_979014, 0x00000044, 0x00000001, D_80240A20_979130, 0x00000044, 0x00000001, D_80240B60_979270, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024077C_978E8C -.word 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x000001D1, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x0000000D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000023, 0x00000009, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7EE7, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0xFE363C82, 0x00000000, 0x0000000D, 0x00000043, 0x00000006, RotateModel, 0xFE363C83, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0xF24B1480, 0x00000000, 0x0000000D, 0x00000043, 0x00000006, RotateModel, 0xFE363C83, 0x00000023, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240904_979014 -.word 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_80240040_978750, 0xFFFFFF2E, 0x00000244, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF9718884, 0x00000024, 0x00000002, 0xFE363C83, 0x00000051, 0x00000046, 0x00000001, D_8024077C_978E8C, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000032, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A20_979130 -.word 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_80240040_978750, 0xFFFFFFE2, 0x0000029E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000E5, 0xFFFFFF7B, 0x00000001, 0x000001F4, 0x00000011, 0xF8406214, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF9718885, 0x00000024, 0x00000002, 0xFE363C83, 0x0000005A, 0x00000046, 0x00000001, D_8024077C_978E8C, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000033, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B60_979270 -.word 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_80240040_978750, 0x000000DC, 0x00000258, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF9718886, 0x00000024, 0x00000002, 0xFE363C83, 0x00000063, 0x00000046, 0x00000001, D_8024077C_978E8C, 0x00000024, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000034, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_02/979390.data.s b/ver/us/asm/data/world/area_isk/isk_02/979390.data.s deleted file mode 100644 index 0c026c8550..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_02/979390.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C80_979390 -.word 0x0000000A, 0x00000002, 0xF8405EE6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000110, 0x0000003C, 0x000001E6, 0x0000012C, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_02/9793F0.data.s b/ver/us/asm/data/world/area_isk/isk_02/9793F0.data.s deleted file mode 100644 index f46a66e743..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_02/9793F0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CE0_9793F0 -.word 0x3FE66666, 0x00000028, 0x0000000A, 0x42C80000, 0x00000000, 0x00000003, 0x40400000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240D10_979420 -.word 0x00000043, 0x00000001, isk_02_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240CE0_9793F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D3C_97944C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240D10_979420, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 - -dlabel D_80240D68_979478 -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEC5, 0x000001C7, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240D10_979420, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E74_979584 -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718888, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF6F, 0x00000217, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240D10_979420, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F80_979690 -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000032, 0x00000226, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240D10_979420, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024108C_97979C -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240D68_979478, 0x00000043, 0x00000002, func_800457C4, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410C0_9797D0 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240E74_979584, 0x00000043, 0x00000002, func_800457C4, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410F4_979804 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240F80_979690, 0x00000043, 0x00000002, func_800457C4, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241128_979838 -.word 0x00000000, D_80240D3C_97944C, 0xC3940000, 0x00000000, 0x43D28000, 0x00000A00, D_8024108C_97979C, 0x00000000, 0x00000000, 0x00000130, 0x80050089, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0xFFFFFED3, 0x00000000, 0x000001AB, 0x000000C8, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFED3, 0x00000000, 0x000001AB, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310104, 0x00310108, 0x00310108, 0x00310108, 0x00310104, 0x00310104, 0x0031010C, 0x0031010C, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241318_979A28 -.word 0x00000001, D_80240D3C_97944C, 0xC3050000, 0x00000000, 0x43F88000, 0x00000A00, D_802410C0_9797D0, 0x00000000, 0x00000000, 0x0000011C, 0x80050089, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0xFFFFFF7A, 0x00000000, 0x000001EF, 0x000000C8, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF74, 0x00000000, 0x000001FE, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310104, 0x00310108, 0x00310108, 0x00310108, 0x00310104, 0x00310104, 0x0031010C, 0x0031010C, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241508_979C18 -.word 0x00000002, D_80240D3C_97944C, 0x42340000, 0x00000000, 0x43FC8000, 0x00000A00, D_802410F4_979804, 0x00000000, 0x00000000, 0x00000108, 0x80050089, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0x0000002E, 0x00000000, 0x00000202, 0x000000C8, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000002F, 0x00000000, 0x00000206, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310104, 0x00310108, 0x00310108, 0x00310108, 0x00310104, 0x00310104, 0x0031010C, 0x0031010C, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241128_979838, 0x0B000006, 0x00000001, D_80241318_979A28, 0x0B000006, 0x00000001, D_80241508_979C18, 0x0B010006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_03/979E50.data.s b/ver/us/asm/data/world/area_isk/isk_03/979E50.data.s deleted file mode 100644 index 7a66b42c16..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_03/979E50.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_979E50 -.word 0x43B88000, 0x42480000, 0x43CC0000, 0x426C0000, 0x43C88000, 0xC30C0000, 0x43DF8000, 0x426C0000, 0x440B4000, 0xC31B0000, 0x43600000, 0x43510000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802401E8_97A038, D_80240000_979E50, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190097 - -dlabel D_80240070_979EC0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802417D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400CC_979F1C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802417D0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240128_979F78 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802417D8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240184_979FD4 -.word 0x00000047, 0x00000005, D_80240070_979EC0, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802400CC_979F1C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240128_979F78, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401E8_97A038 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC3, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000020, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000002A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000020, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000014, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241430, 0x00000044, 0x00000001, 0x802411A0, 0x00000044, 0x00000001, 0x802414F0, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240184_979FD4, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_03/97A210.data.s b/ver/us/asm/data/world/area_isk/isk_03/97A210.data.s deleted file mode 100644 index 3c7189a51b..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_03/97A210.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403C0_97A210 -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000031, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFC18, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000001, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC3, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000031, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404AC_97A2FC -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001C6, 0x00000023, 0x0000011D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000FA, 0x00000028, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000236, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB0E7, 0xF24A7480, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AD, 0x00000023, 0x00000116, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024057C_97A3CC -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A881A, 0xF24A6480, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AD, 0xFFFFFF67, 0x00000116, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405D4_97A424 -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001AE, 0x00000023, 0x00000127, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240688_97A4D8 -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000037, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000038, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000039, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000001F4, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x000001F4, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC3, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407DC_97A62C -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000044, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000046, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000003D, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x0000003E, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x0000003F, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00001800, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFE0C, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC3, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00001800, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFE00, 0x00000027, 0x00000002, 0xFE363C86, 0x00000032, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A44_97A894 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, ScaleModel, 0x00000038, 0xF24A7E80, 0xFE363C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AD4_97A924 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x0000000A, 0x00000004, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x00000064, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0x00000001, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x00000046, 0xFE363C82, 0xFE363C83, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BB4_97AA04 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9C, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x0000003C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9C, 0xFFFFFF06, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x0000003C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D5C_97ABAC -.word 0x00000043, 0x00000002, MakeTransformGroup, 0x00000043, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF38, 0x00000000, 0x00000078, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000046, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E28_97AC78 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000044, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EB8_97AD08 -.word 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B3, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000041, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000042, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000044, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000046, 0x00000001, 0x00000044, 0x00000001, D_802404AC_97A2FC, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_80240688_97A4D8, 0x00000044, 0x00000001, D_80240A44_97A894, 0x00000044, 0x00000001, D_80240BB4_97AA04, 0x00000043, 0x00000002, PlaySound, 0x00000053, 0x00000008, 0x00000001, 0x0000004B, 0x00000044, 0x00000001, D_8024057C_97A3CC, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_802407DC_97A62C, 0x00000044, 0x00000001, D_80240D5C_97ABAC, 0x00000043, 0x00000002, PlaySound, 0x00000453, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, D_80240E28_97AC78, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_80240AD4_97A924, 0x00000043, 0x00000002, PlaySound, 0x00000453, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000035, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000037, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000039, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002A, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC3, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000014, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000020, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_802405D4_97A424, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, MakeTransformGroup, 0x0000003C, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC3, 0x00000047, 0x00000005, D_80240EB8_97AD08, 0x00020000, 0xF9718881, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000040, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000041, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000042, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000044, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000046, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000044, 0x00000001, D_802403C0_97A210, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000035, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000037, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000039, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000044, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000046, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000031, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002A, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC3, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000031, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0x000001D3, 0xFFFFFF56, 0x000000DA, 0x00000000, 0xF8405EE7, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000166, 0xFFFFFF85, 0x00000166, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001C9, 0xFFFFFF85, 0x000000D6, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_03/97B340.data.s b/ver/us/asm/data/world/area_isk/isk_03/97B340.data.s deleted file mode 100644 index b043808d1e..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_03/97B340.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802414F0_97B340 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000031, 0x0000004F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000032, 0x0000004F, 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000047, 0x00000005, D_802415A0_97B3F0, 0x00000080, 0x00000032, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000052, 0x00000000, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000031, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000032, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415A0_97B3F0 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PartnerCanUseAbility, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000032, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x000001D6, 0x00000032, 0x0000010C, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000032, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000052, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000031, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000032, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000032, 0x0000208B, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97C0A0.data.s b/ver/us/asm/data/world/area_isk/isk_04/97C0A0.data.s deleted file mode 100644 index d08a32c432..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_04/97C0A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A70_97C0A0 -.word 0x44148000, 0xC2A00000, 0x42A80000, 0x00000000, 0x44148000, 0xC3AA0000, 0x42A80000, 0x00000000, 0x44030000, 0x41C80000, 0xC3290000, 0x432A0000, 0x440EC000, 0xC2A00000, 0xC33A0000, 0x432A0000, 0x44030000, 0xC3520000, 0xC3290000, 0x432A0000, 0x4407C000, 0x41C80000, 0x40A00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240F64, D_80240A70_97C0A0, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190098, 0x0000000A, 0x00000002, 0xF8405EFA, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000001, 0x00000053, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00DE, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF8405EFA, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000018, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x000007D0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97C300.data.s b/ver/us/asm/data/world/area_isk/isk_04/97C300.data.s deleted file mode 100644 index 2f494c69d3..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_04/97C300.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CD0_97C300 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242410, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D2C_97C35C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242418, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D88_97C3B8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242420, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DE4_97C414 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242420, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E40_97C470 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242428, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E9C_97C4CC -.word 0x00000047, 0x00000005, D_80240CD0_97C300, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240D2C_97C35C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240D88_97C3B8, 0x00080000, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240DE4_97C414, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240E40_97C470, 0x00080000, 0x00000012, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F38_97C568 -.word 0x00000024, 0x00000002, 0xFE363C80, D_80240E9C_97C4CC, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020001, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80241348_97C978, 0x00000046, 0x00000001, 0x8024228C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241C94, 0x00000046, 0x00000001, 0x80241440, 0x00000046, 0x00000001, D_80241348_97C978, 0x00000044, 0x00000001, 0x80240B10, 0x00000044, 0x00000001, D_80240F38_97C568, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241090_97C6C0 -.word 0x00000011, 0x00000000 - -dlabel D_80241098_97C6C8 -.word 0x43FF0000, 0x41C80000, 0xC3380000, 0x00000000 - -dlabel D_802410A8_97C6D8 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x0000003F, 0x00000016, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405EE8, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241180_97C7B0 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000258, 0xFFFFFEB6, 0x00000064, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405EE9, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, isk_04_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000004, 0x00000265, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000041, 0x00000041, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000004, 0x7FFFFE00, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241348_97C978 -.word 0x0000000A, 0x00000002, 0xF8405EE8, 0x00000000, 0x00000047, 0x00000005, D_802410A8_97C6D8, 0x00100000, D_80241098_97C6C8, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EE9, 0x00000000, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000044, 0x0000004E, 0x00000006, D_80241180_97C7B0, 0x00000100, 0x00004000, D_80241090_97C6C0, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000004, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000044, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97CA70.data.s b/ver/us/asm/data/world/area_isk/isk_04/97CA70.data.s deleted file mode 100644 index c2342f93db..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_04/97CA70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241440_97CA70 -.word 0x0000000A, 0x00000002, 0xF8405EE9, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000258, 0xFFFFFEB6, 0x00000064, 0x000000A0, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F8, 0xFFFFFF3F, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E6, 0xFFFFFF3F, 0xFFFFFF80, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s b/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s deleted file mode 100644 index 5dc7244bf6..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241530_97CB60 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80241560_97CB90 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_04_TackleAI_Main, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415D0_97CC00 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80241600_97CC30 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_04_TackleAI_Main, D_802415D0_97CC00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241670_97CCA0 -.word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_802416A0_97CCD0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_04_TackleAI_Main, D_80241670_97CCA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241710_97CD40 -.word 0x00000043, 0x00000001, isk_04_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_04_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_04_func_802408B4_97BEE4, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_04_TackleAI_Main, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241804_97CE34 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241560_97CB90, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241710_97CD40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241600_97CC30, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802416A0_97CCD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_802418B4_97CEE4 -.word 0x00000000, D_80241804_97CE34, 0x440C4000, 0x41C80000, 0x423C0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000163, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0x00000231, 0x00000019, 0x0000002F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000025E, 0x00000019, 0x0000005E, 0x00000050, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241AA4_97D0D4 -.word 0x00000001, D_80241804_97CE34, 0x44180000, 0xC3820000, 0xC31E0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x000000AF, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0x00000260, 0xFFFFFEFC, 0xFFFFFF62, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000254, 0xFFFFFEFC, 0xFFFFFF35, 0x00000050, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802418B4_97CEE4, 0x0B090004, 0x00000001, D_80241AA4_97D0D4, 0x0B090004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97D2F0.data.s b/ver/us/asm/data/world/area_isk/isk_04/97D2F0.data.s deleted file mode 100644 index a66476b08d..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_04/97D2F0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241CC0_97D2F0 -.word 0x00000043, 0x00000002, EnableStatusMenu, 0x00000000, 0x00000043, 0x00000002, DemoSetButtons, 0x00000004, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x0000005D, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000000F, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000002D, 0x00000013, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004B, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004C, 0x0000000B, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000045, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFE, 0x00000015, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_04_SwitchToPartner, 0x00000003, 0x00000008, 0x00000001, 0x00000039, 0x00000043, 0x00000002, DemoSetButtons, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000022, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFC, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE9, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD0, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBD, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB4, 0x00000007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB2, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFDC, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000001, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000002F, 0xFFFFFFFA, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004A, 0xFFFFFFF4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000003F, 0xFFFFFFF7, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000011, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000026, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000040, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004C, 0xFFFFFFFA, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFB, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFC, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242490, 0x00000005, 0x00000002, 0x00000008, 0x00000001, 0x00000143, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421C8_97D7F8 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242490, 0x00000002, 0x00000003, 0x00000008, 0x00000001, 0x00000139, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242288_97D8B8 -.word 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000212, 0x00000019, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000C, 0xFFFFFFFD, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000019, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000C, 0xFFFFFFFD, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000019, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024095C_97BF8C, 0x00000024, 0x00000002, 0xF8405B89, 0x00000000, 0x00000044, 0x00000001, D_802421C8_97D7F8, 0x00000044, 0x00000001, D_80241CC0_97D2F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_05/97F990.data.s b/ver/us/asm/data/world/area_isk/isk_05/97F990.data.s deleted file mode 100644 index 55a2a61ac2..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_05/97F990.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241EC0_97F990 -.word 0x43E78000, 0x41C80000, 0xC38B8000, 0x43A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241FF8_97FAC8, D_80241EC0_97F990, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190099 - -dlabel D_80241F10_97F9E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242EA0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F6C_97FA3C -.word 0x00000047, 0x00000005, D_80241F10_97F9E0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000001F, 0x00000000, 0x00000041, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241F6C_97FA3C, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FF8_97FAC8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020002, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242E7C, 0x00000046, 0x00000001, 0x80242230, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000001F, 0x00000000, 0x00000041, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405EFE, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000026, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000026, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241F6C_97FA3C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_05/97FCE0.data.s b/ver/us/asm/data/world/area_isk/isk_05/97FCE0.data.s deleted file mode 100644 index 11ac4afed0..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_05/97FCE0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242210_97FCE0 -.word 0x00000024, 0x00000002, 0xF8405EFE, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000016, 0x0000013C, 0x00000052, 0xFFFFFE1F, 0x00000000, 0xF8405EF2, 0x0000000A, 0x00000002, 0xF8405EFE, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_WideX, 0x000001AF, 0x00000000, 0xFFFFFE22, 0x0000002D, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242210_97FCE0, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0x000000C4, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000122, 0x000000C4, 0xFFFFFE65, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0x00000042, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s b/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s deleted file mode 100644 index 1f349004ba..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242380_97FE50 -.word 0x00000043, 0x00000001, isk_05_StoneChompFXA, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024239C_97FE6C -.word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 - -dlabel D_802423CC_97FE9C -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, isk_05_StoneChompFXB, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_05_StoneChompAI_Main, D_8024239C_97FE6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024243C_97FF0C -.word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242578_980048 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, isk_05_StoneChompFXC, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425E8_9800B8 -.word 0x00000000, 0x00200020, D_80242380_97FE50, 0x00000000, D_802423CC_97FE9C, D_8024243C_97FF0C, 0x00000000, D_80242578_980048, 0x00000000, 0x00000000, 0x000E0000 - -dlabel isk_05_ChompAmbush -.word 0x00000000 - -dlabel D_80242618_9800E8 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024264C_98011C -.word 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242658_980128 -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xF8405EFE, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000A, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x00000266, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000041, 0x00000000, 0x0000000F, 0x00000001, 0x00000003, 0x00000001, 0x00000065, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000065, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x00000267, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000002, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80241B28_97F5F8, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80241DF8_97F8C8, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000029, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000026, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, func_80241D44_97F814, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, func_80241C5C_97F72C, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000000, 0x0000001E, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000004, func_80241C5C_97F72C, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241E24_97F8F4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80241C34_97F704, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802423CC_97FE9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A8C_98055C -.word 0x00000024, 0x00000002, 0xF8405F08, 0x00000001, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405F08, 0x00000001, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x00000265, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000041, 0x00000041, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000043, 0x00000001, isk_05_StoneChompFXC, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BF8_9806C8 -.word 0x0000000A, 0x00000002, 0xF8405F08, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242658_980128, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242A8C_98055C, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C8C_98075C -.word 0x00000001, D_802425E8_9800B8, 0x43C08000, 0x428E0000, 0xC3A50000, 0x00040B00, D_80242BF8_9806C8, 0x00000001, 0x00000000, 0x00000140, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650003, 0x3FFF2666, 0x59980003, 0x3FFF3FFF, 0x4CCC0003, 0x33326665, 0x3FFF0003, 0x33327FFF, 0x33320003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000001D4, 0x00000000, 0xFFFFFE86, 0x000000C8, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001D4, 0x00000000, 0xFFFFFE86, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00350001, 0x00350005, 0x00350004, 0x00350004, 0x00350001, 0x00350001, 0x00350006, 0x00350006, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242C8C_98075C, 0x0B07000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_06/980A20.data.s b/ver/us/asm/data/world/area_isk/isk_06/980A20.data.s deleted file mode 100644 index f5961fd385..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_06/980A20.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_980A20 -.word 0x43EB8000, 0xC2A00000, 0xC3910000, 0x43A00000, 0x43FE8000, 0xC3870000, 0xC39F0000, 0x43A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240160_980B80, D_80240000_980A20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019009A - -dlabel D_80240060_980A80 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241A10, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400BC_980ADC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241A10, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240118_980B38 -.word 0x00000047, 0x00000005, D_80240060_980A80, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802400BC_980ADC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240160_980B80 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020003, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC4, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000021, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000010, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80240320, 0x00000044, 0x00000001, 0x802413A4, 0x00000044, 0x00000001, 0x80241730, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240118_980B38, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_06/980D40.data.s b/ver/us/asm/data/world/area_isk/isk_06/980D40.data.s deleted file mode 100644 index f0e537a633..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_06/980D40.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240320_980D40 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x0000014F, 0xFFFFFF7E, 0xFFFFFDDA, 0x00000011, 0xF8405EF5, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0x00000130, 0xFFFFFEF2, 0xFFFFFE4E, 0x00000000, 0xF8405EEA, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFF03, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFF03, 0xFFFFFE61, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240400_980E20 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000005F, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFC18, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000001, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC4, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404EC_980F0C -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000164, 0xFFFFFFA1, 0xFFFFFE8B, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000016C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFD91, 0x000000C0, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000236, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB0E7, 0xF24A7480, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000164, 0xFFFFFFA1, 0xFFFFFE8B, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405BC_980FDC -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A881A, 0xF24A6480, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000164, 0xFFFFFEE3, 0xFFFFFE8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240614_981034 -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000164, 0xFFFFFFA1, 0xFFFFFE8B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406C8_9810E8 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000003A, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000003B, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000003C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000001F4, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x000001F4, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC4, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024081C_98123C -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000050, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000052, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000049, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x0000004A, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x0000004B, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00001800, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFE0C, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC4, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00001800, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFE00, 0x00000027, 0x00000002, 0xFE363C86, 0x00000032, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A84_9814A4 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, ScaleModel, 0x0000003B, 0xF24A7E80, 0xFE363C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B14_981534 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x0000000A, 0x00000004, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x00000064, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0x00000001, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x00000052, 0xFE363C82, 0xFE363C83, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BF4_981614 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9C, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000048, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003F, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9C, 0xFFFFFF06, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000048, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003F, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E0C_98182C -.word 0x00000043, 0x00000002, MakeTransformGroup, 0x0000004F, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF38, 0x00000000, 0x00000078, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, TranslateGroup, 0x0000004F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240ED8_9818F8 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F68_981988 -.word 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000062, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000049, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004A, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004E, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000044, 0x00000001, D_802404EC_980F0C, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_802406C8_9810E8, 0x00000044, 0x00000001, D_80240A84_9814A4, 0x00000044, 0x00000001, D_80240BF4_981614, 0x00000043, 0x00000002, PlaySound, 0x00000053, 0x00000008, 0x00000001, 0x0000004B, 0x00000044, 0x00000001, D_802405BC_980FDC, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_8024081C_98123C, 0x00000044, 0x00000001, D_80240E0C_98182C, 0x00000043, 0x00000002, PlaySound, 0x00000453, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, D_80240ED8_9818F8, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_80240B14_981534, 0x00000043, 0x00000002, PlaySound, 0x00000453, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000037, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000027, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000042, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000043, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000044, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000045, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000046, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000024, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC4, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000010, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000023, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_80240614_981034, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000048, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC4, 0x00000047, 0x00000005, D_80240F68_981988, 0x00020000, 0xF9718882, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000049, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000044, 0x00000001, D_80240400_980E20, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000037, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000042, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000043, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000044, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000045, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000046, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000027, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_06/982150.data.s b/ver/us/asm/data/world/area_isk/isk_06/982150.data.s deleted file mode 100644 index b13553917d..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_06/982150.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241730_982150 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x00000065, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000065, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000047, 0x00000005, D_802417E0_982200, 0x00000080, 0x00000021, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0x00000000, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417E0_982200 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PartnerCanUseAbility, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000157, 0xFFFFFFB0, 0xFFFFFE5B, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000021, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000021, 0x0000208B, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/982550.data.s b/ver/us/asm/data/world/area_isk/isk_07/982550.data.s deleted file mode 100644 index 02e028ed35..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_07/982550.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240110_982550 -.word 0xC38D8000, 0xC3C30000, 0x44048000, 0x42DC0000, 0x440C0000, 0xC3AA0000, 0x43590000, 0x43520000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240270_9826B0, D_80240110_982550, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019009B - -dlabel D_80240170_9825B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802429E0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401CC_98260C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802429E8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240228_982668 -.word 0x00000047, 0x00000005, D_80240170_9825B0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401CC_98260C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240270_9826B0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020004, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241658, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80240460, 0x00000044, 0x00000001, 0x80241C98, 0x00000044, 0x00000001, 0x80241A14, 0x00000044, 0x00000001, 0x80241F50, 0x00000044, 0x00000001, 0x80242190, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240228_982668, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/982860.data.s b/ver/us/asm/data/world/area_isk/isk_07/982860.data.s deleted file mode 100644 index 54f8cf9eb7..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_07/982860.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240420_982860 -.word 0x00000024, 0x00000002, 0xF8405EF6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240440_982880 -.word 0x00000024, 0x00000002, 0xF8405EFF, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EED, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFED4, 0xFFFFFE84, 0x00000212, 0x00000032, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EFF, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_WideX, 0x000001D6, 0xFFFFFF06, 0x0000010E, 0x00000096, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240440_982880, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EF6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_TriggerBlock, 0xFFFFFF06, 0xFFFFFEB6, 0x00000221, 0xFFFFFFE7, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240420_982860, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0xFFFFFF06, 0xFFFFFE7A, 0x00000221, 0x00000000, 0xF8405EEB, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFF3F, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFF3F, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFF3F, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFF3F, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2A, 0xFFFFFF3F, 0x000001CB, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFEBD, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFEBD, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFEBD, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFEBD, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2A, 0xFFFFFEBD, 0x000001CB, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000053, 0x000001EA, 0xFFFFFF06, 0x000000D7, 0x00000011, 0xF8405EF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s b/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s deleted file mode 100644 index 94956383be..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240860_982CA0 -.word 0x3FE66666, 0x00000028, 0x0000000A, 0x42C80000, 0x00000000, 0x00000003, 0x40400000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240890_982CD0 -.word 0x00000043, 0x00000001, isk_07_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240860_982CA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408BC_982CFC -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240890_982CD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 - -dlabel D_802408E8_982D28 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240014_982454, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0xFFFFFE7A, 0x0000023B, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF05, 0xFFFFFE7A, 0x00000229, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF05, 0xFFFFFE7A, 0x00000229, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0xFFFFFF06, 0xFFFFFF10, 0x00000221, 0x0000000D, 0xF8405EEB, 0x00000024, 0x00000002, 0xF8405EEC, 0x00000001, 0x00000046, 0x00000001, 0x80241E84, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BAC_982FEC -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888D, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x00000069, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF74, 0x00000210, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240890_982CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CD8_983118 -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888D, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000002F, 0x0000021F, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240890_982CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DFC_98323C -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888D, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000E3, 0x000001E9, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240890_982CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F20_983360 -.word 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000000, 0x00000043, 0x00000002, SetSelfEnemyFlags, 0x00800000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240BAC_982FEC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802408E8_982D28, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x00000064, 0x00000000, 0x00000043, 0x00000002, func_800457C4, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FA8_9833E8 -.word 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000000, 0x00000043, 0x00000002, SetSelfEnemyFlags, 0x00800000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240CD8_983118, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802408E8_982D28, 0x00000043, 0x00000002, func_800457C4, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241018_983458 -.word 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000000, 0x00000043, 0x00000002, SetSelfEnemyFlags, 0x00800000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240DFC_98323C, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802408E8_982D28, 0x00000043, 0x00000002, func_800457C4, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241088_9834C8 -.word 0x00000000, D_802408BC_982CFC, 0xC3040000, 0xC3C30000, 0x43F60000, 0x00000A00, D_80240F20_983360, 0x00000000, 0x00000000, 0x00000130, 0x80050089, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0xFFFFFED3, 0x00000000, 0x000001AB, 0x000000C8, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFED3, 0x00000000, 0x000001AB, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310104, 0x00310108, 0x00310108, 0x00310108, 0x00310104, 0x00310104, 0x0031010C, 0x0031010C, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241278_9836B8 -.word 0x00000001, D_802408BC_982CFC, 0x42340000, 0xC3C30000, 0x43FD8000, 0x00000A00, D_80240FA8_9833E8, 0x00000000, 0x00000000, 0x00000107, 0x80050089, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0x00000034, 0xFFFFFE7A, 0x0000023D, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000034, 0xFFFFFE7A, 0x0000023D, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310104, 0x00310108, 0x00310108, 0x00310108, 0x00310104, 0x00310104, 0x0031010C, 0x0031010C, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241468_9838A8 -.word 0x00000002, D_802408BC_982CFC, 0x435C0000, 0xC3C28000, 0x43E98000, 0x00000A00, D_80241018_983458, 0x00000000, 0x00000000, 0x000000F4, 0x80050089, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0x000000F3, 0xFFFFFE7A, 0x0000020B, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000F3, 0xFFFFFE7A, 0x0000020B, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310104, 0x00310108, 0x00310108, 0x00310108, 0x00310104, 0x00310104, 0x0031010C, 0x0031010C, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00310108, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241088_9834C8, 0x0B00000D, 0x00000001, D_80241278_9836B8, 0x0B02000D, 0x00000001, D_80241468_9838A8, 0x0B03000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/983AD0.data.s b/ver/us/asm/data/world/area_isk/isk_07/983AD0.data.s deleted file mode 100644 index 76639f35f5..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_07/983AD0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241690_983AD0 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000023, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000023, 0x80000002, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000004, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024177C_983BBC -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x80000002, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000001E, 0x00000004, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241868_983CA8 -.word 0x00000043, 0x00000007, InterpCamTargetPos, 0x00000000, 0x00000001, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000171, 0xFFFFFEA3, 0x00000171, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000046, 0x00000001, D_80241690_983AD0, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_8024177C_983BBC, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000047, 0x00000005, D_80241868_983CA8, 0x00020000, 0xF971888E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A80_983EC0 -.word 0x00000011, 0x00000000 - -dlabel D_80241A88_983EC8 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFFFFFED4, 0xFFFFFE84, 0x00000212, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405EED, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, isk_07_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x00000265, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000041, 0x00000041, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000004F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EED, 0x00000000, 0x00000043, 0x00000002, MakeTransformGroup, 0x0000004F, 0x0000004E, 0x00000006, D_80241A88_983EC8, 0x00000100, 0x00004000, D_80241A80_983EC0, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005A, 0x00000000, 0x00000041, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0x00000000, 0x00000041, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x00000266, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000041, 0x00000000, 0x0000000F, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000005A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x00000267, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000041, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000005A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/984390.data.s b/ver/us/asm/data/world/area_isk/isk_07/984390.data.s deleted file mode 100644 index 7fbb642344..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_07/984390.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241F50_984390 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x00000053, 0x00000047, 0x00000005, D_80241F90_9843D0, 0x00000080, 0x00000025, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F90_9843D0 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x0000208B, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888E, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF2, 0x00000000, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802400F0_982530, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/9845D0.data.s b/ver/us/asm/data/world/area_isk/isk_07/9845D0.data.s deleted file mode 100644 index 48ffeaad6b..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_07/9845D0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242190_9845D0 -.word 0x0000000A, 0x00000002, 0xF8405EF6, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000031, 0x7FFFFE00, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405EF6, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x00000069, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000006D, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF69, 0xFFFFFE7A, 0x00000240, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF69, 0xFFFFFE7A, 0x00000240, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_8024286C_984CAC, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000033, 0xFFFFFE7A, 0x0000024D, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_802428E8_984D28, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000EF, 0xFFFFFE7A, 0x00000203, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_80242964_984DA4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000205, 0xFFFFFE7A, 0x00000124, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, 0x80241D74, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0x00000026, 0x00000000, 0x0000000D, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0x00000023, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000074, 0x00000026, 0x00000000, 0x0000000D, 0x00000043, 0x00000006, RotateModel, 0x00000074, 0x00000023, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000026, 0x00000000, 0x0000000D, 0x00000043, 0x00000006, RotateModel, 0x0000007D, 0x00000023, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242750_984B90 -.word 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x000001D1, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x0000000D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000023, 0x00000009, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7EE7, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0xFE363C82, 0x00000000, 0x0000000D, 0x00000043, 0x00000006, RotateModel, 0xFE363C83, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024286C_984CAC -.word 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006B, 0x00000046, 0x00000001, D_80242750_984B90, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428E8_984D28 -.word 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000046, 0x00000001, D_80242750_984B90, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242964_984DA4 -.word 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007D, 0x00000046, 0x00000001, D_80242750_984B90, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000031, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_08/985720.data.s b/ver/us/asm/data/world/area_isk/isk_08/985720.data.s deleted file mode 100644 index cd4a07d9ad..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_08/985720.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408F0_985720 -.word 0xC3FF0000, 0xC3C30000, 0x434F0000, 0x43160000, 0xC40B4000, 0xC4020000, 0x43600000, 0x43160000, 0xC3C88000, 0xC3C30000, 0x43DF8000, 0x43A00000, 0xC3C88000, 0xC4020000, 0x43DF8000, 0x43A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240B60_985990, D_802408F0_985720, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019009C - -dlabel D_80240970_9857A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241630, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409CC_9857FC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241638, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A28_985858 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241640, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A84_9858B4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241648, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AE0_985910 -.word 0x00000047, 0x00000005, D_80240970_9857A0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802409CC_9857FC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A28_985858, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A84_9858B4, 0x00080000, 0x0000000D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B60_985990 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020005, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241244, 0x00000046, 0x00000001, 0x80241260, 0x00000046, 0x00000001, 0x8024154C, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240AE0_985910, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s b/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s deleted file mode 100644 index 5888596f1a..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CD0_985B00 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80240D00_985B30 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_08_TackleAI_Main, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D70_985BA0 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80240DA0_985BD0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_08_TackleAI_Main, D_80240D70_985BA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E10_985C40 -.word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_80240E40_985C70 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_08_TackleAI_Main, D_80240E10_985C40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EB0_985CE0 -.word 0x00000043, 0x00000001, isk_08_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_08_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_08_func_802408B4_97BEE4, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_08_TackleAI_Main, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FA4_985DD4 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240D00_985B30, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240EB0_985CE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240DA0_985BD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80240E40_985C70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80241054_985E84 -.word 0x00000001, D_80240FA4_985DD4, 0xC3CF8000, 0xC4020000, 0x43B18000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0xFFFFFE50, 0xFFFFFDF8, 0x00000186, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE3E, 0xFFFFFDF8, 0x00000182, 0x0000003C, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241054_985E84, 0x0B0A0004, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_08/986090.data.s b/ver/us/asm/data/world/area_isk/isk_08/986090.data.s deleted file mode 100644 index 9fb8dafdd6..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_08/986090.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241260_986090 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFEBD, 0x00000166, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE35, 0xFFFFFEBD, 0x000000D6, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFE3B, 0x00000166, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE35, 0xFFFFFE3B, 0x000000D6, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241380_9861B0 -.word 0xC40E4000, 0xC4020000, 0x434F0000, 0x00000000 - -dlabel D_80241390_9861C0 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000024, 0x0000000C, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000024, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000024, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405EEE, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241468_986298 -.word 0x00000043, 0x00000003, EnableModel, 0x00000028, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002E, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEE, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EF0, 0x00000000, 0x00000047, 0x00000005, D_80241390_9861C0, 0x00100000, D_80241380_9861B0, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80241468_986298, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000024, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000024, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000046, 0x00000001, D_80241468_986298, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_09/986810.data.s b/ver/us/asm/data/world/area_isk/isk_09/986810.data.s deleted file mode 100644 index 1a6eab9c07..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_09/986810.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240330_986810 -.word 0xC40FC000, 0xC3C30000, 0x42A20000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240608, D_80240330_986810, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019009D, 0x0000000A, 0x00000002, 0xF8405EFB, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000001, 0x00000053, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00DF, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF8405EFB, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000018, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x000007D0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000042, 0x00000001, 0x00000008, 0x00000001, 0x00000082, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_09/986A60.data.s b/ver/us/asm/data/world/area_isk/isk_09/986A60.data.s deleted file mode 100644 index f23f4a6ab9..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_09/986A60.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240580_986A60 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242670, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405DC_986ABC -.word 0x00000047, 0x00000005, D_80240580_986A60, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020006, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240AC8, 0x00000044, 0x00000001, 0x80241DB0, 0x00000044, 0x00000001, 0x80240380, 0x00000046, 0x00000001, 0x80241CA4, 0x00000024, 0x00000002, 0xFE363C80, D_802405DC_986ABC, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s b/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s deleted file mode 100644 index c6002283b3..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel isk_09_varStash -.word 0x00000000 - -dlabel D_802406F4_986BD4 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024075C_986C3C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802406F4_986BD4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024083C_986D1C -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000031, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024087C_986D5C -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000031, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000032, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408BC_986D9C -.word 0x0000000A, 0x00000002, 0xF8405F04, 0x00000000, 0x00000046, 0x00000001, D_8024083C_986D1C, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F04, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFC, 0xFFFFFF22, 0xFFFFFEA5, 0xFFFFFDED, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000046, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC5, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x8024053C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017D, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_802402BC_98679C, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC5, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024087C_986D5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A5C_986F3C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405F05, 0x00000001, 0x00000046, 0x00000001, D_8024075C_986C3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AA8_986F88 -.word 0x00000024, 0x00000002, 0xF8405F00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0xFFFFFF62, 0xFFFFFE9A, 0xFFFFFDCE, 0x0000011B, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F04, 0x00000044, 0x00000001, D_802408BC_986D9C, 0x0000000A, 0x00000002, 0xF8405F00, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0xFFFFFEEE, 0xFFFFFE7A, 0xFFFFFDFB, 0x00000073, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240AA8_986F88, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000032, 0xFFFFFF10, 0xFFFFFDE9, 0x000000DE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F05, 0x00000043, 0x00000002, AssignScript, D_80240A5C_986F3C, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFEBD, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFEBD, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFEBD, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFEBD, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFEBD, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFEBD, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFF3F, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFF3F, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFF3F, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFF3F, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFF3F, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFF3F, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFFC1, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFFC1, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFFC1, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFFC1, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFFC1, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFFC1, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_09/987560.data.s b/ver/us/asm/data/world/area_isk/isk_09/987560.data.s deleted file mode 100644 index 7123dce6c7..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_09/987560.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241080_987560 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C83, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C84, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C84, 0x80000002, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0xFE363C85, 0x0000000C, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241178_987658 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C83, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C84, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C83, 0x80000002, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0xFE363C85, 0x0000000C, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241264_987744 -.word 0x00000024, 0x00000002, 0xFE363C82, 0x0000005D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000015, 0x00000024, 0x00000002, 0xFE363C84, 0x00000016, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000046, 0x00000001, D_80241080_987560, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412C0_9877A0 -.word 0x00000024, 0x00000002, 0xFE363C82, 0x0000005D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000015, 0x00000024, 0x00000002, 0xFE363C84, 0x00000016, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000046, 0x00000001, D_80241178_987658, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024131C_9877FC -.word 0x00000024, 0x00000002, 0xFE363C82, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000046, 0x00000001, D_80241080_987560, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241378_987858 -.word 0x00000024, 0x00000002, 0xFE363C82, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000046, 0x00000001, D_80241178_987658, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413D4_9878B4 -.word 0x00000024, 0x00000002, 0xFE363C82, 0x00000065, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000046, 0x00000001, D_80241080_987560, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241430_987910 -.word 0x00000024, 0x00000002, 0xFE363C82, 0x00000065, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000046, 0x00000001, D_80241178_987658, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024148C_98796C -.word 0x00000024, 0x00000002, 0xFE363C82, 0x00000069, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000046, 0x00000001, D_80241080_987560, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414E8_9879C8 -.word 0x00000024, 0x00000002, 0xFE363C82, 0x00000069, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000046, 0x00000001, D_80241178_987658, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241544_987A24 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDF6, 0xFFFFFECA, 0xFFFFFFA1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDF6, 0xFFFFFE87, 0xFFFFFFA4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80241264_987744, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDF6, 0xFFFFFF22, 0xFFFFFFA4, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_8024131C_9877FC, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416D8_987BB8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDF6, 0xFFFFFECA, 0xFFFFFFA1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDF6, 0xFFFFFE87, 0xFFFFFFA4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_802412C0_9877A0, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDF6, 0xFFFFFF22, 0xFFFFFFA4, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80241378_987858, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024186C_987D4C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFE68, 0xFFFFFECA, 0xFFFFFEA5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE68, 0xFFFFFE87, 0xFFFFFEA5, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_802413D4_9878B4, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE68, 0xFFFFFF22, 0xFFFFFEA5, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_8024148C_98796C, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A00_987EE0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFE68, 0xFFFFFECA, 0xFFFFFEA5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE68, 0xFFFFFE87, 0xFFFFFEA5, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80241430_987910, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE68, 0xFFFFFF22, 0xFFFFFEA5, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_802414E8_9879C8, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B94_988074 -.word 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000046, 0x00000001, D_80241544_987A24, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802416D8_987BB8, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF971888F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C1C_9880FC -.word 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000046, 0x00000001, D_80241A00_987EE0, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_8024186C_987D4C, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000006, RotateModel, 0x00000065, 0x0000005A, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000006, RotateModel, 0x00000069, 0x0000005A, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000047, 0x00000005, D_80241B94_988074, 0x00020000, 0xF971888F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241C1C_9880FC, 0x00020000, 0xF9718890, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_09/988290.data.s b/ver/us/asm/data/world/area_isk/isk_09/988290.data.s deleted file mode 100644 index a98bb20cf6..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_09/988290.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241DB0_988290 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x0000004D, 0x00000047, 0x00000005, D_80241E80_988360, 0x00000080, 0x00000024, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x00000051, 0x00000047, 0x00000005, D_8024207C_98855C, 0x00000080, 0x00000025, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000026, 0x00000055, 0x00000047, 0x00000005, D_80242278_988758, 0x00000080, 0x00000026, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x00000059, 0x00000047, 0x00000005, D_80242474_988954, 0x00000080, 0x00000027, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E80_988360 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000024, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000024, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000024, 0x0000208B, 0x00000000, 0x00000024, 0x00000002, 0xF971888F, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888F, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF2, 0x00000000, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000024, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802402F0_9867D0, 0x00000024, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024207C_98855C -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x0000208B, 0x00000000, 0x00000024, 0x00000002, 0xF971888F, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888F, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF2, 0x00000000, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802402F0_9867D0, 0x00000025, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242278_988758 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000026, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000055, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000026, 0x0000208B, 0x00000000, 0x00000024, 0x00000002, 0xF971888F, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888F, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF2, 0x00000000, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000055, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802402F0_9867D0, 0x00000026, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242474_988954 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000027, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000027, 0x0000208B, 0x00000000, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000003, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718890, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF2, 0x00000000, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802402F0_9867D0, 0x00000027, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s deleted file mode 100644 index d116da1020..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240DB0_989910 -.word 0xC4148000, 0xC4020000, 0x42A80000, 0x00000000, 0xC40FC000, 0xC4430000, 0xC2A20000, 0x43340000, 0xC4104000, 0xC4430000, 0x42A20000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240F98_989AF8, D_80240DB0_989910, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019009E - -dlabel D_80240E20_989980 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241E80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E7C_9899DC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241E88, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240ED8_989A38 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241E90, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F34_989A94 -.word 0x00000047, 0x00000005, D_80240E20_989980, 0x00080000, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240E7C_9899DC, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240ED8_989A38, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F98_989AF8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020007, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000046, 0x00000001, D_802418E0_98A440, 0x00000046, 0x00000001, 0x80241CD4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240F34_989A94, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel isk_10_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel isk_10_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel isk_10_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel isk_10_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80241164_989CC4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, isk_10_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, isk_10_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, isk_10_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, isk_10_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, isk_10_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, isk_10_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, isk_10_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412C8_989E28 -.word 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, isk_10_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, isk_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, isk_10_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, isk_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241164_989CC4, 0x00000043, 0x00000003, isk_10_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, isk_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, isk_10_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241748_98A2A8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDBF, 0xFFFFFCF4, 0xFFFFFFB5, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDCF, 0xFFFFFDF8, 0x00000017, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418E0_98A440 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFDDA, 0xFFFFFD30, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F07, 0x00000043, 0x00000002, AssignScript, D_802412C8_989E28, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240D38_989898, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFDFC, 0xFFFFFCF4, 0xFFFFFFB9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241748_98A2A8, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFE3B, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFD37, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_10/98A580.data.s b/ver/us/asm/data/world/area_isk/isk_10/98A580.data.s deleted file mode 100644 index ab30abac9a..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_10/98A580.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A20_98A580 -.word 0xC4144000, 0xC4020000, 0x42D00000, 0x00000000 - -dlabel D_80241A30_98A590 -.word 0xC40E4000, 0xC4430000, 0xC2C60000, 0x00000000 - -dlabel D_80241A40_98A5A0 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x0000001E, 0x0000000E, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405EF0, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B18_98A678 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x0000001B, 0x00000013, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x0000001B, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000001B, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000003, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405EEF, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BF0_98A750 -.word 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000024, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000025, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000026, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000027, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000028, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEE, 0x00000000, 0x00000047, 0x00000005, D_80241A40_98A5A0, 0x00100000, D_80241A20_98A580, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EF0, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEE, 0x00000000, 0x00000047, 0x00000005, D_80241A40_98A5A0, 0x00100000, D_80241A20_98A580, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80241BF0_98A750, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000046, 0x00000001, D_80241BF0_98A750, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEF, 0x00000000, 0x00000047, 0x00000005, D_80241B18_98A678, 0x00100000, D_80241A30_98A590, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001B, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000003, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_11/98AB70.data.s b/ver/us/asm/data/world/area_isk/isk_11/98AB70.data.s deleted file mode 100644 index d41e4c3fee..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_11/98AB70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240160_98AB70 -.word 0xC38A8000, 0xC4020000, 0x44044000, 0x42D20000, 0x43A90000, 0xC3EB0000, 0x43D90000, 0x43700000, 0x43B90000, 0xC4160000, 0x43EC0000, 0x43700000, 0x43340000, 0xC4638000, 0x440A0000, 0x43820000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240590, D_80240160_98AB70, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019009F, 0x0000000A, 0x00000002, 0xF8405EFC, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000001, 0x00000053, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00E0, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF8405EFC, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000018, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x000007D0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_11/98ADB0.data.s b/ver/us/asm/data/world/area_isk/isk_11/98ADB0.data.s deleted file mode 100644 index df738d3317..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_11/98ADB0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403A0_98ADB0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242C10, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403FC_98AE0C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242C18, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240458_98AE68 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404B4_98AEC4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242C20, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240510_98AF20 -.word 0x00000047, 0x00000005, D_802403A0_98ADB0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802403FC_98AE0C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240458_98AE68, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802404B4_98AEC4, 0x00080000, 0x0000000D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020008, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000046, 0x00000001, 0x80240920, 0x00000044, 0x00000001, 0x802401E0, 0x00000046, 0x00000001, 0x80241930, 0x00000046, 0x00000001, 0x80242B80, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000044, 0x00000001, 0x80241104, 0x00000043, 0x00000003, EnableGroup, 0x00000096, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000031, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000037, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000062, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000005, TranslateModel, 0x00000087, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000086, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000089, 0x00000000, 0xFFFFFFC9, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008A, 0x00000000, 0xFFFFFFC9, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFFFFFF97, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFFFFFF97, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240510_98AF20, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_11/98B330.data.s b/ver/us/asm/data/world/area_isk/isk_11/98B330.data.s deleted file mode 100644 index 43af6998cb..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_11/98B330.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240920_98B330 -.word 0x0000000A, 0x00000002, 0xF8405EF8, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000163, 0xFFFFFE34, 0x000001AE, 0xFFFFFFD8, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7D, 0xFFFFFE3B, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFE3B, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFE3B, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFDB9, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFDB9, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFD37, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFD37, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFCB5, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFCB5, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFFB5, 0xFFFFFD30, 0x00000271, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_11/98B620.data.s b/ver/us/asm/data/world/area_isk/isk_11/98B620.data.s deleted file mode 100644 index ceb44bfacd..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_11/98B620.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C10_98B620 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFED4, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, TranslateModel, 0x00000087, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000086, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000089, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008A, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000057, 0x00000000, 0x00000010, 0xFFFFFDCE, 0x0000026D, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFDDA, 0x00000019, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, TranslateModel, 0x00000089, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008A, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000057, 0x00000000, 0x00000029, 0xFFFFFDB5, 0x0000026A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFCE0, 0x00000019, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000057, 0x00000000, 0x00000042, 0xFFFFFD9C, 0x00000268, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFBE6, 0x00000019, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, TranslateModel, 0x0000008F, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000090, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000057, 0x00000000, 0x0000005F, 0xFFFFFD83, 0x00000266, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021C, 0x00000016, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE021E, 0x00000017, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0220, 0x00000015, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000024, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000031, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000037, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000020, 0x00000055, 0x00000000, 0x00000043, 0x00000005, func_80240000_98AA10, 0xFFFFFFF0, 0xFFFFFE4A, 0x000001FE, 0x000000F0, 0x00000043, 0x00000005, func_80240000_98AA10, 0x00000010, 0xFFFFFE4A, 0x000001FE, 0x000000F0, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, func_80240000_98AA10, 0xFFFFFFE5, 0xFFFFFE4A, 0x000001FC, 0x000000F0, 0x00000043, 0x00000005, func_80240000_98AA10, 0xFFFFFFC0, 0xFFFFFE4A, 0x000001F9, 0x000000F0, 0x00000043, 0x00000005, func_80240000_98AA10, 0x0000001B, 0xFFFFFE4A, 0x000001FC, 0x000000F0, 0x00000043, 0x00000005, func_80240000_98AA10, 0x00000040, 0xFFFFFE4A, 0x000001F9, 0x000000F0, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, func_80240000_98AA10, 0xFFFFFFB6, 0xFFFFFE4A, 0x000001F8, 0x000000F0, 0x00000043, 0x00000005, func_80240000_98AA10, 0xFFFFFF98, 0xFFFFFE4A, 0x000001F3, 0x000000F0, 0x00000043, 0x00000005, func_80240000_98AA10, 0x0000004A, 0xFFFFFE4A, 0x000001F8, 0x000000F0, 0x00000043, 0x00000005, func_80240000_98AA10, 0x00000068, 0xFFFFFE4A, 0x000001F3, 0x000000F0, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000003, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000014A, 0xF24A7C80, 0x00000043, 0x00000002, StopSound, 0x80000003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0x00000000, 0xFFFFFE7A, 0x00000226, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060002, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060003, 0x00000008, 0x00000001, 0x00000008, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerSpeed, 0x00000004, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000042, 0x0000022B, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFBE, 0x0000022B, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x0000022B, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000212, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000008C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AD54D, 0xF24A1FB4, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000212, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000096, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000062, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000212, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000212, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24AAA80, 0x00000008, 0x00000001, 0x0000005A, 0x00000044, 0x00000001, D_80240C10_98B620, 0x00000008, 0x00000001, 0x0000003C, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241920_98C330 -.word 0x00000015, 0x00000016, 0x00000017, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x0000004E, 0x00000006, D_80241BC4_98C5D4, 0x00000100, 0x00000024, D_80241920_98C330, 0x00000000, 0x00000001, 0x0000004E, 0x00000006, D_80241E8C_98C89C, 0x00000100, 0x00000022, D_80241920_98C330, 0x00000000, 0x00000001, 0x0000004E, 0x00000006, D_80242154_98CB64, 0x00000100, 0x0000002A, D_80241920_98C330, 0x00000000, 0x00000001, 0x0000004E, 0x00000006, D_8024241C_98CE2C, 0x00000100, 0x00000028, D_80241920_98C330, 0x00000000, 0x00000001, 0x0000004E, 0x00000006, D_802426E4_98D0F4, 0x00000100, 0x00000026, D_80241920_98C330, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8E, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xF5DE021C, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021C, 0xFFFFFFA8, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE021D, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021D, 0xFFFFFFD4, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE021E, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021E, 0x00000000, 0xFFFFFE04, 0x000001FE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE021F, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021F, 0x0000002C, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0220, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE0220, 0x00000058, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BC4_98C5D4 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021C, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000024, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021C, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021C, 0x00000024, 0x00000002, 0xF5DE021C, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8A, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021C, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021C, 0xFFFFFFA8, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000024, 0x00000261, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E8C_98C89C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021D, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021D, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021D, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021D, 0x00000024, 0x00000002, 0xF5DE021D, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8B, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021D, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021D, 0xFFFFFFD4, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242154_98CB64 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021E, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002A, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021E, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021E, 0x00000024, 0x00000002, 0xF5DE021E, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8C, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021E, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021E, 0x00000000, 0xFFFFFE04, 0x000001FE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002A, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024241C_98CE2C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021F, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021F, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000028, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021F, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021F, 0x00000024, 0x00000002, 0xF5DE021F, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8D, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021F, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021F, 0x0000002C, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000028, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426E4_98D0F4 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE0220, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE0220, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000026, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE0220, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE0220, 0x00000024, 0x00000002, 0xF5DE0220, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8E, 0x00000024, 0x00000002, 0xFD050F8E, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0220, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE0220, 0x00000058, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000026, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_11/98D3C0.data.s b/ver/us/asm/data/world/area_isk/isk_11/98D3C0.data.s deleted file mode 100644 index 647f3d4ef5..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_11/98D3C0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802429B0_98D3C0 -.word 0x00000011, 0x00000000 - -dlabel D_802429B8_98D3C8 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000163, 0xFFFFFE34, 0x000001AE, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405EF8, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, isk_11_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x00000265, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000041, 0x00000041, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000050, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EF8, 0x00000000, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000050, 0x0000004E, 0x00000006, D_802429B8_98D3C8, 0x00000100, 0x00004000, D_802429B0_98D3C0, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000050, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFDFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_12/98D640.data.s b/ver/us/asm/data/world/area_isk/isk_12/98D640.data.s deleted file mode 100644 index 1166c34e01..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_12/98D640.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_98D640 -.word 0x43D90000, 0xC3EB0000, 0x43A90000, 0x41E80000, 0x43EC0000, 0xC4250000, 0x43B90000, 0x41E80000, 0x44000000, 0xC4520000, 0x43888000, 0x41D80000, 0x44110000, 0xC4318000, 0x41A00000, 0x433F0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240270_98D8B0, D_80240000_98D640, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900A0 - -dlabel D_80240080_98D6C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242180, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400DC_98D71C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242180, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240138_98D778 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242188, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240194_98D7D4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242190, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F0_98D830 -.word 0x00000047, 0x00000005, D_80240080_98D6C0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802400DC_98D71C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240138_98D778, 0x00080000, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240194_98D7D4, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240270_98D8B0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x00020009, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC6, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000026, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000026, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000024, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80240450, 0x00000044, 0x00000001, 0x80241498, 0x00000044, 0x00000001, 0x80241E74, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802401F0_98D830, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_12/98DA70.data.s b/ver/us/asm/data/world/area_isk/isk_12/98DA70.data.s deleted file mode 100644 index 3958905423..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_12/98DA70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240430_98DA70 -.word 0x00000024, 0x00000002, 0xF8405F01, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F01, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0x00000273, 0xFFFFFCB8, 0x00000087, 0x0000004B, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240430_98DA70, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFE3B, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F9, 0xFFFFFE3B, 0x0000002C, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFD7D, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F9, 0xFFFFFD7D, 0x0000002C, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001A1, 0xFFFFFD7D, 0x000000C4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001BC, 0xFFFFFD7D, 0x00000078, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0x000001CD, 0xFFFFFD08, 0x0000006D, 0x00000000, 0xF8405EF7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_12/98DCB0.data.s b/ver/us/asm/data/world/area_isk/isk_12/98DCB0.data.s deleted file mode 100644 index 35b1a2fe08..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_12/98DCB0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240670_98DCB0 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000005B, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFC18, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000001, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC6, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024075C_98DD9C -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001F4, 0xFFFFFE1B, 0x000000B2, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000032, 0xFFFFFF36, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000236, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB0E7, 0xF24A7480, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000020D, 0xFFFFFE1B, 0x00000098, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024082C_98DE6C -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A881A, 0xF24A6E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000020D, 0xFFFFFD30, 0x00000098, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240884_98DEC4 -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000020D, 0xFFFFFE1B, 0x00000098, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240938_98DF78 -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000062, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000063, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000064, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000065, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000001F4, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x000001F4, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC6, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AA0_98E0E0 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000006D, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x0000006F, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000068, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x00000069, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00001800, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFE0C, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC6, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00001800, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFE00, 0x00000027, 0x00000002, 0xFE363C86, 0x00000032, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CF4_98E334 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, ScaleModel, 0x00000063, 0xF24A7E80, 0xFE363C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D84_98E3C4 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x0000000A, 0x00000004, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x00000064, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0x00000001, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x0000006F, 0xFE363C82, 0xFE363C83, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E64_98E4A4 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9C, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9C, 0xFFFFFF06, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024100C_98E64C -.word 0x00000043, 0x00000002, MakeTransformGroup, 0x0000006C, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF38, 0x00000000, 0x00000078, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, TranslateGroup, 0x0000006C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410D8_98E718 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241168_98E7A8 -.word 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0x00000068, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000069, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006A, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006D, 0x00000001, 0x00000044, 0x00000001, D_8024075C_98DD9C, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_80240938_98DF78, 0x00000044, 0x00000001, D_80240CF4_98E334, 0x00000044, 0x00000001, D_80240E64_98E4A4, 0x00000043, 0x00000002, PlaySound, 0x00000053, 0x00000008, 0x00000001, 0x0000004B, 0x00000044, 0x00000001, D_8024082C_98DE6C, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_80240AA0_98E0E0, 0x00000044, 0x00000001, D_8024100C_98E64C, 0x00000043, 0x00000002, PlaySound, 0x00000453, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, D_802410D8_98E718, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_80240D84_98E3C4, 0x00000043, 0x00000002, PlaySound, 0x00000453, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000062, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000060, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000037, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000038, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC6, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000024, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000026, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_80240884_98DEC4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000067, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC6, 0x00000047, 0x00000005, D_80241168_98E7A8, 0x00020000, 0xF9718883, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000068, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000069, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006D, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000037, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000038, 0x7FFFFE00, 0x00000044, 0x00000001, D_80240670_98DCB0, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000062, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000060, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_12/98ED40.data.s b/ver/us/asm/data/world/area_isk/isk_12/98ED40.data.s deleted file mode 100644 index 14fbed24ac..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_12/98ED40.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241700_98ED40 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PartnerCanUseAbility, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFE2A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000211, 0xFFFFFE2A, 0x00000052, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003C, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000091, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003C, 0x0000208B, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241924_98EF64 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003E, 0x0000208A, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF2, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000096, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003E, 0x0000208B, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000104, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000058, 0x00000000, 0x000001C1, 0xFFFFFCCA, 0x00000094, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000059, 0x00000000, 0x000001C1, 0xFFFFFCCA, 0x00000094, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000058, 0x00000000, 0x000001CC, 0xFFFFFCDA, 0x0000006C, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x00000016, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000059, 0x00000000, 0x000001CC, 0xFFFFFCDA, 0x0000006C, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000058, 0x00000000, 0x000001B0, 0xFFFFFCC7, 0x000000BD, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000003C, 0x00000001, 0x00000003, 0x00000001, 0x00000018, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000089, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000059, 0x00000000, 0x000001B0, 0xFFFFFCC7, 0x000000BD, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7AE7, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000058, 0x00000000, 0x000001C3, 0xFFFFFCD4, 0x00000089, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x00000032, 0x00000001, 0x00000003, 0x00000001, 0x0000001A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000059, 0x00000000, 0x000001C3, 0xFFFFFCD4, 0x00000089, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7BB4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003B, 0x00000091, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003C, 0x00000091, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003E, 0x00000096, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000047, 0x00000005, D_80241700_98ED40, 0x00000080, 0x0000003C, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000091, 0x00000000, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718892, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000096, 0x00000000, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xFFFFFFCC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xFFFFFFCC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000089, 0xFFFFFFCC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0xFFFFFFCC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405F01, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000096, 0x00000000, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405F01, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF2, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000096, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80241924_98EF64, 0x00000080, 0x0000003E, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_13/991850.data.s b/ver/us/asm/data/world/area_isk/isk_13/991850.data.s deleted file mode 100644 index 6273394599..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_13/991850.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242070_991850 -.word 0x440E0000, 0xC4228000, 0xC2F00000, 0x43AA0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242148_991928, D_80242070_991850, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900A1 - -dlabel D_802420C0_9918A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242EA0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024211C_9918FC -.word 0x00000047, 0x00000005, D_802420C0_9918A0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242148_991928 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x0002000A, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242E80, 0x00000046, 0x00000001, 0x802422D0, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024211C_9918FC, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s b/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s deleted file mode 100644 index af885b67d3..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802422B0_991A90 -.word 0x00000024, 0x00000002, 0xF8405F02, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000015, 0x000001CC, 0xFFFFFDC8, 0xFFFFFEAA, 0x00000000, 0xF8405EF1, 0x0000000A, 0x00000002, 0xF8405F02, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_WideX, 0x00000238, 0xFFFFFD76, 0xFFFFFED2, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802422B0_991A90, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFE3B, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFDB9, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E9, 0xFFFFFE3B, 0xFFFFFF7D, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E9, 0xFFFFFDB9, 0xFFFFFF7D, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242460_991C40 -.word 0x00000043, 0x00000001, isk_13_StoneChompFXA, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024247C_991C5C -.word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 - -dlabel D_802424AC_991C8C -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, isk_13_StoneChompFXB, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_13_StoneChompAI_Main, D_8024247C_991C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024251C_991CFC -.word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242658_991E38 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, isk_13_StoneChompFXC, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426C8_991EA8 -.word 0x00000000, 0x00200020, D_80242460_991C40, 0x00000000, D_802424AC_991C8C, D_8024251C_991CFC, 0x00000000, D_80242658_991E38, 0x00000000, 0x00000000, 0x000E0000 - -dlabel D_802426F4_991ED4 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405EF1, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80241BA8_991388, 0x00000043, 0x00000005, func_80241EF8_9916D8, 0x000000FF, 0x00000080, 0x000000FF, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AADB0, 0x00000043, 0x00000005, func_80241EF8_9916D8, 0x000000FF, 0x00000080, 0x000000FF, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, func_80241EF8_9916D8, 0x000000FF, 0x00000080, 0x000000FF, 0x00000080, 0x00000026, 0x00000002, 0xFE363C80, 0x00000080, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A93E0, 0x00000043, 0x00000005, func_80241EF8_9916D8, 0x000000FF, 0xFE363C80, 0x000000FF, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, func_80241EF8_9916D8, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, func_80241E34_991614, 0xFE363C80, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000004, func_80241D38_991518, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C86, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000004, func_80241D38_991518, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242044_991824, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080013, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80241D38_991518, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B20_992300 -.word 0x00000024, 0x00000002, 0xF8405F09, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80241D08_9914E8, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, isk_13_StoneChompFXC, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BFC_9923DC -.word 0x0000000A, 0x00000002, 0xF8405F09, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802426F4_991ED4, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242B20_992300, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C90_992470 -.word 0x00000001, D_802426C8_991EA8, 0x43DC0000, 0xC3EB0000, 0xC3960000, 0x00140B00, D_80242BFC_9923DC, 0x00000001, 0xFFFFFD76, 0x00000140, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650003, 0x3FFF2666, 0x59980003, 0x3FFF3FFF, 0x4CCC0003, 0x33326665, 0x3FFF0003, 0x33327FFF, 0x33320003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000001D4, 0x00000000, 0xFFFFFE86, 0x000000C8, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001D4, 0x00000000, 0xFFFFFE86, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00350001, 0x00350005, 0x00350004, 0x00350004, 0x00350001, 0x00350001, 0x00350006, 0x00350006, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242C90_992470, 0x0B07000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_14/994490.data.s b/ver/us/asm/data/world/area_isk/isk_14/994490.data.s deleted file mode 100644 index 97fc62df06..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_14/994490.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241D60_994490 -.word 0xC4068000, 0xC4430000, 0xC3590000, 0x41E80000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241E38_994568, D_80241D60_994490, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900A2 - -dlabel D_80241DB0_9944E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242A20, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E0C_99453C -.word 0x00000047, 0x00000005, D_80241DB0_9944E0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E38_994568 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x0002000B, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802429FC, 0x00000046, 0x00000001, 0x80241FD8, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241E0C_99453C, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_14/9946D0.data.s b/ver/us/asm/data/world/area_isk/isk_14/9946D0.data.s deleted file mode 100644 index e52fa8aa81..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_14/9946D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241FA0_9946D0 -.word 0x00000024, 0x00000002, 0xF8405F03, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000017, 0xFFFFFE7B, 0xFFFFFD46, 0xFFFFFE58, 0x00000000, 0xF8405EF3, 0x0000000A, 0x00000002, 0xF8405F03, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_WideX, 0xFFFFFE05, 0xFFFFFCF4, 0xFFFFFE74, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241FA0_9946D0, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE35, 0xFFFFFDB9, 0xFFFFFF2A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFDB9, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE35, 0xFFFFFD37, 0xFFFFFF2A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_14/994860.data.s b/ver/us/asm/data/world/area_isk/isk_14/994860.data.s deleted file mode 100644 index 1653cb69cd..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_14/994860.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242130_994860 -.word 0x00000043, 0x00000001, isk_14_StoneChompFXA, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024214C_99487C -.word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 - -dlabel D_8024217C_9948AC -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, isk_14_StoneChompFXB, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_14_StoneChompAI_Main, D_8024214C_99487C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421EC_99491C -.word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242328_994A58 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, isk_14_StoneChompFXC, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242398_994AC8 -.word 0x00000000, 0x00200020, D_80242130_994860, 0x00000000, D_8024217C_9948AC, D_802421EC_99491C, 0x00000000, D_80242328_994A58, 0x00000000, 0x00000000, 0x000E0000 - -dlabel D_802423C4_994AF4 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFDFB, 0xFFFFFCF4, 0xFFFFFE6E, 0x00000043, 0x00000001, func_80241AF0_994220, 0x00000043, 0x00000004, func_80241BEC_99431C, 0xFFFFFDFB, 0xFFFFFCF4, 0xFFFFFE6E, 0x00000043, 0x00000004, func_80241CA0_9943D0, 0x00000055, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x00000055, 0x00000000, 0x00000014, 0x00000008, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, func_80241CA0_9943D0, 0xFE363C80, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241BC4_9942F4, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00350004, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80241BC4_9942F4, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00100004, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024217C_9948AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426D4_994E04 -.word 0x00000024, 0x00000002, 0xF8405F0A, 0x00000001, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718893, 0x00000001, 0x00000043, 0x00000001, isk_14_StoneChompFXC, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242764_994E94 -.word 0x0000000A, 0x00000002, 0xF8405F0A, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802423C4_994AF4, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802426D4_994E04, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024280C_994F3C -.word 0x00000001, D_80242398_994AC8, 0x00000000, 0xC47A0000, 0x00000000, 0x00040900, D_80242764_994E94, 0x00000001, 0xFFFFFCF4, 0x000000DA, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650003, 0x3FFF2666, 0x59980003, 0x3FFF3FFF, 0x4CCC0003, 0x33326665, 0x3FFF0003, 0x33327FFF, 0x33320003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000001D4, 0x00000000, 0xFFFFFE86, 0x000000C8, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001D4, 0x00000000, 0xFFFFFE86, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00350001, 0x00350005, 0x00350004, 0x00350004, 0x00350001, 0x00350001, 0x00350006, 0x00350006, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00350000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024280C_994F3C, 0x0B07000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_16/995CF0.data.s b/ver/us/asm/data/world/area_isk/isk_16/995CF0.data.s deleted file mode 100644 index 29d2df7fc2..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_16/995CF0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B00_995CF0 -.word 0x43998000, 0xC4638000, 0x43F60000, 0x42480000, 0x43F60000, 0xC4638000, 0x43998000, 0x435C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241080_996270, D_80240B00_995CF0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900A3 - -dlabel D_80240B60_995D50 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFC7, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC8, 0x00000016, 0x00000001, 0xFFFFFFC8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000198, 0xFFFFFC90, 0x0000019E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, isk_16_StarSpiritEffectFunc2, 0x00000001, 0x000000B4, 0x00000198, 0xFFFFFC7C, 0x0000019E, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0xFFFFFC90, 0xFFFFFC72, 0x00000056, 0x00000000, 0x00000043, 0x00000001, isk_16_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, isk_16_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000198, 0xFFFFFCC7, 0x0000019E, 0x00000057, 0x00000000, 0x00000043, 0x00000002, isk_16_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000198, 0xFFFFFC72, 0x0000019E, 0x00000043, 0x00000002, isk_16_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, isk_16_StarSpiritEffectFunc5, 0x00000001, 0x00000198, 0xFFFFFC90, 0x0000019E, 0xFFFFFC72, 0x00000056, 0x00000000, 0x00000043, 0x00000001, isk_16_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, isk_16_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFC9, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242D64, 0x00000001, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FF8_9961E8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D6C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241054_996244 -.word 0x00000047, 0x00000005, D_80240FF8_9961E8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241080_996270 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x0002000C, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241A24, 0x00000046, 0x00000001, 0x80242C30, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC8, 0x00000044, 0x00000001, D_80240B60_995D50, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000054, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000019, 0x00000001, 0xFFFFFFC8, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000044, 0x00000001, 0x80241A50, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000024, 0x00000002, 0xFE363C80, D_80241054_996244, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_16/996410.data.s b/ver/us/asm/data/world/area_isk/isk_16/996410.data.s deleted file mode 100644 index 57ca6f58aa..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_16/996410.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241220_996410 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241290_996480 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000001, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000046, 0x00000001, 0x8024246C, 0x00000044, 0x00000001, D_80240B60_995D50, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241328_996518 -.word 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000096, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241220_996410, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241290_996480, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFA24, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413C0_9965B0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413D0_9965C0 -.word 0x00680001, 0x00280024, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802413FC_9965EC -.word 0x00690003, 0x00200020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241428_996618 -.word 0x00680000, 0x00280024, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241454_996644 -.word 0x00000000, D_802413D0_9965C0, 0x43E48000, 0xC4A28000, 0x439E0000, 0x00440A05, D_80241328_996518, 0x00000001, 0x00000000, 0x000000E6, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680006, 0x00680006, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241428_996618, 0x43FA0000, 0xC4A28000, 0x439E0000, 0x00440A05, 0x00000000, 0x00000000, 0x00000000, 0x000000E6, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680006, 0x00680006, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00680001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241834_996A24 -.word 0x00000002, D_802413FC_9965EC, 0x43E48000, 0xC4A28000, 0x439E0000, 0x00440A05, D_802413C0_9965B0, 0x00000000, 0x00000000, 0x000000E6, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00690000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80241454_996644, 0x0C000002, 0x00000001, D_80241834_996A24, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_16/996C40.data.s b/ver/us/asm/data/world/area_isk/isk_16/996C40.data.s deleted file mode 100644 index 77426cae4b..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_16/996C40.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A50_996C40 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, isk_16_UnkFunc27, 0x00000000, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, isk_16_UnkFunc27, 0x00000002, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, isk_16_UnkFunc26, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000019A, 0xFFFFFC72, 0x0000019A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000150, 0xFFFFFC72, 0x000001D3, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000117, 0xFFFFFC72, 0x00000208, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC7D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC72, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000000F3, 0xFE363C81, 0x00000217, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000002D, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000137, 0x000001E7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000157, 0x000001CC, 0x00000000, 0x00000046, 0x00000001, D_80241054_996244, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000019A, 0xFFFFFC72, 0x0000019A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00E2, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000019A, 0xFFFFFAEC, 0x0000019A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000019A, 0xFFFFFC77, 0x0000019A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00680010, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x00000064, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000005, 0x00000001, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFC, 0x00000043, 0x0000000B, isk_16_UnkFunc26, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x0000000B, isk_16_UnkFunc26, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF252C280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000006E, 0x00000064, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7C62, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A76BE, 0x0000002E, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C85, 0xFE363C83, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001C9, 0xFFFFFCE0, 0x0000013C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003B, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003EF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000E, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000027, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000D, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000027, 0x00000043, 0x00000003, func_802CFE2C, 0x00000000, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x0000000C, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000037, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001C9, 0xFFFFFAEC, 0x0000013C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001B6, 0xFFFFFCE0, 0x0000014C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A5C80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0068000B, 0x00680001, 0x00000000, 0x000D00E3, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242424_997614 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00002061, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00E8, 0x000000A0, 0x00000028, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680006, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020E3, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000001BA, 0xFFFFFC72, 0x00000189, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E2, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000001A0, 0xFFFFFC72, 0x000001A4, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E2, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000018B, 0xFFFFFC72, 0x000001B8, 0x0000000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000019A, 0xFFFFFC72, 0x0000019A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001EA, 0xFFFFFC72, 0x00000147, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000000, 0x00000045, 0x00000002, D_80242424_997614, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000204, 0xFFFFFC72, 0x00000107, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000001ED, 0x00000124, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680006, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E2, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0068000B, 0x00680001, 0x00000005, 0x000D00E9, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00690003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9A80, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x000001E6, 0xFFFFFC72, 0x00000154, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000130, 0x000001B2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000001BC, 0x0000013C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x000001D9, 0x00000151, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x0000013E, 0x000001CC, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000103, 0x0000020A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFA24, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, GetDist2D, 0xFE363C86, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C86, 0x00000032, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00680002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080022, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000130, 0x000001B2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000001BC, 0x0000013C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000001D9, 0x00000151, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000013E, 0x000001CC, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000103, 0x0000020A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFA24, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00EA, 0x000000A0, 0x00000028, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF8405F06, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_16/997E20.data.s b/ver/us/asm/data/world/area_isk/isk_16/997E20.data.s deleted file mode 100644 index 384d35abcf..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_16/997E20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242C30_997E20 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFD37, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFD37, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFCB5, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFCB5, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_18/998860.data.s b/ver/us/asm/data/world/area_isk/isk_18/998860.data.s deleted file mode 100644 index e275400cf7..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_18/998860.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408F0_998860 -.word 0xC4040000, 0xC4430000, 0x43590000, 0x43160000, 0x43D78000, 0xC4430000, 0x43C20000, 0x43660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240A50_9989C0, D_802408F0_998860, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900A4 - -dlabel D_80240950_9988C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241760, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409AC_99891C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241768, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A08_998978 -.word 0x00000047, 0x00000005, D_80240950_9988C0, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802409AC_99891C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A50_9989C0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x0002000E, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241574, 0x00000046, 0x00000001, 0x802415B0, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC6, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000021, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000022, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240A08_998978, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s b/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s deleted file mode 100644 index 5df5213556..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C20_998B90 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80240C50_998BC0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_18_TackleAI_Main, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CC0_998C30 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80240CF0_998C60 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_18_TackleAI_Main, D_80240CC0_998C30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D60_998CD0 -.word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_80240D90_998D00 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_18_TackleAI_Main, D_80240D60_998CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E00_998D70 -.word 0x00000043, 0x00000001, isk_18_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_18_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_18_func_802408B4_97BEE4, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_18_TackleAI_Main, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EF4_998E64 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240C50_998BC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 - -dlabel D_80240F20_998E90 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240E00_998D70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240CF0_998C60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80240D90_998D00, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80240FA4_998F14 -.word 0x00000000, D_80240F20_998E90, 0xC3BA0000, 0xC42F0000, 0x43DB8000, 0x00000400, 0x00000000, 0x00000001, 0x00000B0E, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0xFFFFFE8C, 0xFFFFFD44, 0x000001B7, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE8C, 0xFFFFFD44, 0x000001B7, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241194_999104 -.word 0x00000001, D_80240F20_998E90, 0xC2680000, 0xC42F0000, 0x4413C000, 0x00000400, 0x00000000, 0x00000001, 0x00000B0B, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0xFFFFFFC6, 0xFFFFFD44, 0x0000024F, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFC6, 0xFFFFFD44, 0x0000024F, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241384_9992F4 -.word 0x00000002, D_80240EF4_998E64, 0x43920000, 0xC4430000, 0x43F40000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x66650002, 0x3FFF2666, 0x59980002, 0x3FFF3FFF, 0x4CCC0002, 0x33326665, 0x3FFF0002, 0x33327FFF, 0x33320002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0x00000124, 0xFFFFFCF4, 0x000001E8, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000124, 0xFFFFFCF4, 0x000001E8, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240FA4_998F14, 0x0B0F0009, 0x00000001, D_80241194_999104, 0x0B130009, 0x00000001, D_80241384_9992F4, 0x0B0C0009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_18/999520.data.s b/ver/us/asm/data/world/area_isk/isk_18/999520.data.s deleted file mode 100644 index b22193b1e5..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_18/999520.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802415B0_999520 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000131, 0xFFFFFD1E, 0x000001B3, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000008A, 0xFFFFFD1E, 0x00000202, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD2, 0xFFFFFD1E, 0x00000212, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF1F, 0xFFFFFD1E, 0x000001E2, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE88, 0xFFFFFD1E, 0x00000178, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1E, 0xFFFFFD1E, 0x000000E1, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_19/999740.data.s b/ver/us/asm/data/world/area_isk/isk_19/999740.data.s deleted file mode 100644 index 6d6d4c8554..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_19/999740.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_999740 -.word 0x44090000, 0xC4638000, 0x43360000, 0x41A80000, 0x440F4000, 0xC4638000, 0x41A80000, 0x433A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240394, D_80240000_999740, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900A5, 0x0000000A, 0x00000002, 0xF8405EFD, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000001, 0x00000053, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D00E1, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF8405EFD, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000019, 0x00000000, 0x000007D0, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x000007D0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFC7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000019, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0xFFFFFFC8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000018, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_19/999960.data.s b/ver/us/asm/data/world/area_isk/isk_19/999960.data.s deleted file mode 100644 index 7bd8eee26d..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_19/999960.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240220_999960 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240520, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024027C_9999BC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240528, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D8_999A18 -.word 0x00000047, 0x00000005, D_80240220_999960, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024027C_9999BC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240320_999A60 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802402D8_999A18, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802402D8_999A18, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000B, 0x00000043, 0x00000002, SetSpriteShading, 0x0002000F, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80240460, 0x00000044, 0x00000001, 0x80240060, 0x00000044, 0x00000001, D_80240320_999A60, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_19/999BA0.data.s b/ver/us/asm/data/world/area_isk/isk_19/999BA0.data.s deleted file mode 100644 index b83cc848db..0000000000 --- a/ver/us/asm/data/world/area_isk/isk_19/999BA0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240460_999BA0 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E6, 0xFFFFFCB3, 0x00000082, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F3, 0xFFFFFCB3, 0x0000002A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000230, 0xFFFFFCAE, 0x00000064, 0xFFFFFFF6, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s index 95cd9b86af..1e6928efce 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s @@ -84,7 +84,7 @@ dlabel D_802458FC_7F060C .word 0x00000043, 0x00000006, RotateModel, 0x00000078, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024592C_7F063C -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000086, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000086, 0x00000000, 0x00000043, 0x00000002, func_802D5EE0, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000086, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000086, 0x00000000, 0x00000043, 0x00000002, EnableMusicProximityMix, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802459C0_7F06D0 .word 0x00000043, 0x00000006, RotateModel, 0x000000D0, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F9100.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F9100.data.s index a0b80b3dbf..63f3701a7c 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7F9100.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7F9100.data.s @@ -6,4 +6,4 @@ dlabel D_8024E3F0_7F9100 .word 0x41700000, 0xC3C80000, 0x42B40000, 0x42F00000, 0x00000007, 0xFAA2B58A dlabel D_8024E408_7F9118 -.word 0x43DE8000, 0xC3998000, 0x42B40000, 0x42DC0000, 0x00000003, 0xFAA2B58B, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000043, 0x00000002, func_802D5EE0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_00_MonitorMusicProximityTrigger, D_8024E3F0_7F9100, 0x00000057, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF99, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_00_MonitorMusicProximityTrigger, D_8024E408_7F9118, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x43DE8000, 0xC3998000, 0x42B40000, 0x42DC0000, 0x00000003, 0xFAA2B58B, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000043, 0x00000002, EnableMusicProximityMix, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_00_MonitorMusicProximityTrigger, D_8024E3F0_7F9100, 0x00000057, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF99, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_00_MonitorMusicProximityTrigger, D_8024E408_7F9118, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_01/806F50.data.s b/ver/us/asm/data/world/area_mac/mac_01/806F50.data.s index fbe6342a4f..f3ad2d63a9 100644 --- a/ver/us/asm/data/world/area_mac/mac_01/806F50.data.s +++ b/ver/us/asm/data/world/area_mac/mac_01/806F50.data.s @@ -6,7 +6,7 @@ dlabel D_802466D0_806F50 .word 0xC4160000, 0x00000000, 0x00000000, 0x42B40000, 0x44160000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC40E8000, 0x43340000, 0x00000000, 0x00000000, 0x44160000, 0x00000000, 0xC3C80000, 0x00000000, 0x00000000, 0x42B40000, 0x43840000, 0x41D80000, 0x43AF0000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80246EF8_807778, D_802466D0_806F50, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190001 dlabel D_80246770_806FF0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000060, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000000, 0x00000008, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000044, 0x00000001, 0x802488A8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007C, 0x00000001, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_802D5EE0, 0x00000000, 0x00000043, 0x00000004, AdjustMusicProximityMix, 0x00000000, 0x00000002, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000008A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000060, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000000, 0x00000008, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000044, 0x00000001, 0x802488A8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007C, 0x00000001, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnableMusicProximityMix, 0x00000000, 0x00000043, 0x00000004, AdjustMusicProximityMix, 0x00000000, 0x00000002, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000008A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246950_8071D0 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802626B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_01/808D70.data.s b/ver/us/asm/data/world/area_mac/mac_01/808D70.data.s index 2e5e8ca201..de587049ec 100644 --- a/ver/us/asm/data/world/area_mac/mac_01/808D70.data.s +++ b/ver/us/asm/data/world/area_mac/mac_01/808D70.data.s @@ -24,4 +24,4 @@ dlabel D_80248878_8090F8 .word 0xC3160000, 0x43A50000, 0x42DC0000, 0x43020000, 0x00000008, 0xFAA2B58B dlabel D_80248890_809110 -.word 0x43850000, 0x43B90000, 0x43480000, 0x435C0000, 0x00000005, 0xFAA2B58C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000043, 0x00000002, func_802D5EE0, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58E, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_01_MonitorMusicProximityTrigger, D_80248860_8090E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_01_MonitorMusicProximityTrigger, D_80248878_8090F8, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_01_MonitorMusicProximityTrigger, D_80248890_809110, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x43850000, 0x43B90000, 0x43480000, 0x435C0000, 0x00000005, 0xFAA2B58C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000043, 0x00000002, EnableMusicProximityMix, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58E, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_01_MonitorMusicProximityTrigger, D_80248860_8090E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_01_MonitorMusicProximityTrigger, D_80248878_8090F8, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_01_MonitorMusicProximityTrigger, D_80248890_809110, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/8267E0.data.s b/ver/us/asm/data/world/area_mac/mac_02/8267E0.data.s deleted file mode 100644 index 53855b78b8..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_02/8267E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243520_8267E0 -.word 0xC4160000, 0x00000000, 0x00000000, 0x42B40000, 0x44160000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC4160000, 0x43340000, 0x00000000, 0x00000000, 0x44160000, 0x00000000, 0xC3E10000, 0x41F00000, 0x43750000, 0x42B40000, 0xC3E60000, 0x42480000, 0xC3870000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024473C, D_80243520_8267E0, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190002, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000044, 0x00000001, 0x8024E150, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s b/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s deleted file mode 100644 index 8ddd01e2ed..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243630_8268F0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_02_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mac_02_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_02_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_02_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D74_827034 -.word 0x00000043, 0x00000001, mac_02_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E50_827110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E50_827110 -.word 0x00000043, 0x00000001, mac_02_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_02_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_02_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_02_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244360_827620 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802443FC_8276BC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024E1D0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244458_827718 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024E1D8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802444B4_827774 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024E1E0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244510_8277D0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024E1E8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024456C_82782C -.word 0x00000043, 0x00000003, GotoMap, 0x8024E1F0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024459C_82785C -.word 0x00000043, 0x00000003, GotoMap, 0x8024E1F8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802445CC_82788C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000046, 0x00000001, D_80243D74_827034, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244624_8278E4 -.word 0x00000047, 0x00000005, D_802443FC_8276BC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244458_827718, 0x00080000, 0x0000002A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802444B4_827774, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244510_8277D0, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C82, D_8024456C_82782C, 0x00000047, 0x00000005, D_802445CC_82788C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000031, 0x00000024, 0x00000002, 0xFE363C82, D_8024459C_82785C, 0x00000047, 0x00000005, D_802445CC_82788C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000028, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000029, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000001, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718896, 0x00000000, 0x00000024, 0x00000002, 0xF9718897, 0x00000000, 0x00000024, 0x00000002, 0xF9718898, 0x00000000, 0x00000024, 0x00000002, 0xF9718899, 0x00000000, 0x00000024, 0x00000002, 0xF971889A, 0x00000000, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF971889D, 0x00000000, 0x00000024, 0x00000002, 0xF971889E, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024E0B8, 0x00000018, 0x00000001, 0xFFFFFFCD, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024E0D0, 0x00000018, 0x00000001, 0xFFFFFFF3, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024E0B8, 0x00000018, 0x00000001, 0xFFFFFFFB, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024E0F4, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024E0B8, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80245DF0, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000003, EnableGroup, 0x00000083, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000086, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFB4, 0x00000043, 0x00000003, EnableGroup, 0x0000007F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000086, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000046, 0x7FFFFE00, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000007F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000083, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C82, 0x00000028, 0x00000024, 0x00000002, 0xFE363C83, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80244360_827620, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80244EC8, 0x00000044, 0x00000001, 0x80245B14, 0x00000044, 0x00000001, 0x802435C0, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80244624_8278E4, 0x00000044, 0x00000001, EnterWalk, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80244624_8278E4, 0x00000044, 0x00000001, D_80243630_8268F0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/827E70.data.s b/ver/us/asm/data/world/area_mac/mac_02/827E70.data.s deleted file mode 100644 index d65211e1ba..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_02/827E70.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244BB0_827E70 -.word 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BE0_827EA0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005B, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C81, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000060, 0xFE363C81, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000061, 0xFE363C81, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244CC0_827F80 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005A, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D44_828004 -.word 0x00000043, 0x00000006, RotateModel, 0x00000040, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D74_828034 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C81, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C81, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244DD4_828094 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C03, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016A, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000039, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405C03, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000039, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244EBC_82817C -.word 0x00000000, 0xFFFFFFFF - -dlabel D_80244EC4_828184 -.word 0xFFFFFFFF, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000002, D_80244BB0_827E70, D_80244BE0_827EA0, 0x00000000, D_80244CC0_827F80, 0x0000003C, 0x0000003B, 0x0000006B, D_80244EBC_82817C, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000002, D_80244D44_828004, D_80244D74_828034, 0x00000000, D_80244DD4_828094, 0x00000033, 0x00000034, 0x00000047, D_80244EC4_828184, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_80244CC0_827F80, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000039, 0x00000001, 0x00000043, 0x00000001, func_802405F0_8238B0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_80244CC0_827F80, 0x00000044, 0x00000001, D_80244DD4_828094, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/8282E0.data.s b/ver/us/asm/data/world/area_mac/mac_02/8282E0.data.s deleted file mode 100644 index f8f5cad302..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_02/8282E0.data.s +++ /dev/null @@ -1,78 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245020_8282E0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_02_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_02_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245380_828640 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_02_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_02_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, mac_02_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, mac_02_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245984_828C44 -.word 0x00000001, 0x00000077 - -dlabel D_8024598C_828C4C -.word 0x00000001, 0x0000006F - -dlabel D_80245994_828C54 -.word 0x00000002, 0x00000053, 0x00000082, 0xFFFFFDE3, 0x0000007B, 0x00000082, 0xFFFFFDD9 - -dlabel D_802459B0_828C70 -.word D_80245984_828C44, D_8024598C_828C4C, 0x00000000, D_80245994_828C54, 0x00000000 - -dlabel D_802459C4_828C84 -.word 0x42C40000, 0x41A00000, 0xC404C000, 0x00000000 - -dlabel D_802459D4_828C94 -.word 0x00000001, 0x00000072 - -dlabel D_802459DC_828C9C -.word 0x00000001, 0x00000070 - -dlabel D_802459E4_828CA4 -.word 0x00000002, 0xFFFFFEAF, 0x00000068, 0xFFFFFF3A, 0xFFFFFED7, 0x00000068, 0xFFFFFF30 - -dlabel D_80245A00_828CC0 -.word D_802459D4_828C94, D_802459DC_828C9C, 0x00000000, D_802459E4_828CA4, 0x00000000 - -dlabel D_80245A14_828CD4 -.word 0xC3A18000, 0x41A00000, 0xC33E0000, 0x00000000 - -dlabel D_80245A24_828CE4 -.word 0x00000001, 0x00000075 - -dlabel D_80245A2C_828CEC -.word 0x00000001, 0x0000006C - -dlabel D_80245A34_828CF4 -.word 0x00000002, 0x00000248, 0x0000007D, 0xFFFFFFBA, 0x00000270, 0x0000007D, 0xFFFFFFB0 - -dlabel D_80245A50_828D10 -.word D_80245A24_828CE4, D_80245A2C_828CEC, 0x00000000, D_80245A34_828CF4, 0x00000000 - -dlabel D_80245A64_828D24 -.word 0x44158000, 0x00000000, 0xC2860000, 0x00000000 - -dlabel D_80245A74_828D34 -.word 0x00000001, 0x00000073 - -dlabel D_80245A7C_828D3C -.word 0x00000001, 0x00000071 - -dlabel D_80245A84_828D44 -.word 0x00000002, 0xFFFFFD90, 0x00000050, 0xFFFFFF5A, 0xFFFFFDB8, 0x00000050, 0xFFFFFF50, D_80245A74_828D34, D_80245A7C_828D3C, 0x00000000, D_80245A84_828D44, 0x00000000, 0xC4180000, 0x41A00000, 0xC31C0000, 0x00000000 - -dlabel D_80245AC4_828D84 -.word 0x00000001, 0x00000074 - -dlabel D_80245ACC_828D8C -.word 0x00000001, 0x0000006D - -dlabel D_80245AD4_828D94 -.word 0x00000002, 0x000000EB, 0x00000050, 0x0000021F, 0x00000113, 0x00000050, 0x00000215 - -dlabel D_80245AF0_828DB0 -.word D_80245AC4_828D84, D_80245ACC_828D8C, 0x00000000, D_80245AD4_828D94, 0x00000000 - -dlabel D_80245B04_828DC4 -.word 0x43AF8000, 0x41A00000, 0x440AC000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802459B0_828C70, 0x00000047, 0x00000005, D_80245380_828640, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245380_828640, 0x00100000, D_802459C4_828C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245A00_828CC0, 0x00000047, 0x00000005, D_80245380_828640, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245380_828640, 0x00100000, D_80245A14_828CD4, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245A50_828D10, 0x00000047, 0x00000005, D_80245380_828640, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245380_828640, 0x00100000, D_80245A64_828D24, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245AF0_828DB0, 0x00000047, 0x00000005, D_80245380_828640, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245380_828640, 0x00100000, D_80245B04_828DC4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s deleted file mode 100644 index 929a222493..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s +++ /dev/null @@ -1,285 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245C50_828F10 -.word 0x0000006B, 0x00000000 - -dlabel D_80245C58_828F18 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFFFFFE2A, 0x0000001E, 0xFFFFFF65, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, mac_02_RemovePadlock, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405C03, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245D60_829020 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016B, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245DA8_829068 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0171, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x0000000A, 0x00000002, 0xF8405C03, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFE2A, 0x0000001E, 0xFFFFFF65, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80245C58_828F18, 0x00000100, 0x00004000, D_80245C50_828F10, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000006B, 0xFFFFFE64, 0x00000014, 0xFFFFFEC0, 0x00000011, 0xF8405C04, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000190, 0x00000000, 0x00000064, 0x00000000, 0x00000014, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CA9, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0xFFFFFE89, 0x00000000, 0x000000BE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245D60_829020, 0x00000047, 0x00000005, D_80245DA8_829068, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245F40_829200 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80245F70_829230 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80245F40_829200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245F90_829250 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80245F70_829230, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80245F70_829230, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80245FE8_8292A8 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80246018_8292D8 -.word 0x00000043, 0x00000002, mac_02_PatrolNoAttackAI_Main, D_80245FE8_8292A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80246018_8292D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80246018_8292D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80246090_829350 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802460E8_8293A8 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80246114_8293D4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246124_8293E4 -.word 0x00000000, 0x002A001A, D_80246114_8293D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel mac_02_varStash -.word 0x00000000 - -dlabel D_80246154_829414 -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel mac_02_Quizmo_Answers -.byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01 - -dlabel mac_02_Quizmo_Requirements -.word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040 - -dlabel D_80246244_829504 -.word 0x00000043, 0x00000001, mac_02_Quizmo_ShouldQuizmoLeave, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AF000C, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802462F4_8295B4 -.word 0x00000043, 0x00000003, mac_02_Quizmo_GetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000003, mac_02_Quizmo_SetCamVfov, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetCamType, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000172, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFE8E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xF24AAE80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000011, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFFEF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024658C_82984C -.word 0x00000043, 0x00000003, mac_02_Quizmo_SetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802465C8_829888 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, mac_02_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000053, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_02_Quizmo_SpinPlayer, 0x00000043, 0x00000004, func_802D2884, 0xF4ACD481, 0xF4ACD483, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246778_829A38 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, mac_02_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0x0000006C, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xF4ACD482, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, mac_02_Quizmo_UpdatePartnerPosition, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C86, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_02_Quizmo_SpinPartner, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802468B0_829B70 -.word 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, mac_02_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0xFFFFFFBA, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, NpcFacePlayer, 0x0000000C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246A1C_829CDC -.word 0x00000044, 0x00000001, D_802465C8_829888, 0x00000044, 0x00000001, D_80246778_829A38, 0x00000046, 0x00000001, D_802468B0_829B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246A90_829D50 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010016, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246ACC_829D8C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xF4ACD482, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247614_82A8D4 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010023, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247654_82A914 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000006, mac_02_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000019, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C82, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF4ACD483, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xF4ACD481, 0xF4ACD483, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247730_82A9F0 -.word 0x00000045, 0x00000002, D_80246ACC_829D8C, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000049, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80247654_82A914, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802477E0_82AAA0 -.word 0x00000045, 0x00000002, D_80247614_82A8D4, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80247654_82A914, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247890_82AB50 -.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246244_829504, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_02_Quizmo_HideEntities, 0x00000043, 0x00000001, mac_02_Quizmo_HideWorld, 0x00000044, 0x00000001, D_802462F4_8295B4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246A1C_829CDC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, mac_02_Quizmo_CreateStage, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246A90_829D50, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, mac_02_Quizmo_UnkStageEffectMode, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, mac_02_Quizmo_CreateWorker, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, mac_02_Quizmo_UpdateRecords, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_02_Quizmo_SetStageLightsDelay, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, mac_02_Quizmo_SetStageLightsDelay, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, mac_02_Quizmo_SetVannaAnim_Clap, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_02_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_02_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_02_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247730_82A9F0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, mac_02_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, mac_02_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, mac_02_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, mac_02_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802477E0_82AAA0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_02_Quizmo_UnkStageEffectMode, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_02_Quizmo_SetVannaAnim_Wave, 0x00000043, 0x00000001, mac_02_Quizmo_DestroyEffects, 0x00000046, 0x00000001, D_80246244_829504, 0x00000044, 0x00000001, D_8024658C_82984C, 0x00000043, 0x00000001, mac_02_Quizmo_FadeInWorld, 0x00000043, 0x00000001, mac_02_Quizmo_ShowEntities, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802485C0_82B880 -.word 0x00000043, 0x00000001, mac_02_Quizmo_ShouldAppear, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_02_Quizmo_RenderInit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248634_82B8F4 -.word 0x0000003C, 0x00000001, 0x8024E548, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247890_82AB50, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802486B4_82B974 -.word 0x00000043, 0x00000001, mac_02_Quizmo_NPC_Aux_Impl, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802486D0_82B990 -.word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80248700_82B9C0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802486D0_82B990, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, 0x00000000, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, D_80248700_82B9C0, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 - -dlabel mac_02_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel mac_02_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80248780_82BA40 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802488C4_82BB84 -.word 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248780_82BA40, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248914_82BBD4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248A48_82BD08 -.word 0x00000043, 0x00000002, func_80242BA8_825E68, 0xFE363C80, 0x0000004E, 0x00000006, D_80248914_82BBD4, 0x00000010, 0x00000000, mac_02_D_8024E738, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248A98_82BD58 -.word 0x0000008A, 0x0000008C, 0x0000008E, 0x00000095, 0x0000008B, 0x00000080, 0x000000AC, 0x0000009D, 0x0000009C, 0x000000A4, 0x000000A3, 0x000000A2, 0x00000094, 0x0000009F, 0x0000009E, 0x000000A0, 0x000000A5, 0x000000A6, 0x000000A7, 0x000000A8, 0x000000A9, 0x000000AA, 0x000000AB, 0x000000AD, 0x000000AE, 0x000000AF, 0x0000008D, 0x000000A1, 0x00000093, 0xFFFFFFFF - -dlabel D_80248B10_82BDD0 -.word 0x00000000, 0x000000C2, 0x00000001, 0x000000B6, 0x00000001, 0x000000B0, 0x00000001, 0x00000089, 0x00000001, 0x000000D6, 0x00000001, 0x000000C3, 0x00000001, 0x000000C7, 0x00000004, 0x0000009A, 0x00000002, 0x000000C0, 0x00000001, 0x000000C1, 0x00000001, 0x000000C9, 0x00000001, 0x000000D8, 0x00000001, 0x0000009B, 0x00000001, 0x000000D9, 0x00000003, 0x000000BE, 0x00000001, 0x000000D4, 0x00000001, 0x000000D5, 0x00000001, 0x000000B9, 0x00000002, 0x000000BD, 0x00000001, 0x000000CA, 0x00000001, 0x000000D7, 0x00000001, 0x000000DA, 0x00000001, 0x00000095, 0x00000001, 0x0000008B, 0x00000004, 0x0000008F, 0x00000001, 0x000000B7, 0x00000001, 0x000000B8, 0x00000001, 0x000000C4, 0x00000001, 0x000000C5, 0x00000001, 0x000000C6, 0x00000002, 0x000000BB, 0x00000001, 0x000000B2, 0x00000001, 0x000000B3, 0x00000001, 0x000000B4, 0x00000001, 0x000000BA, 0x00000001, 0x000000CC, 0x00000004, 0x00000082, 0x00000001, 0x000000CD, 0x00000001, 0x000000C8, 0x00000002, 0x000000BF, 0x00000001, 0x000000CF, 0x00000003, 0x000000BC, 0x00000001, 0x000000CE, 0x00000001, 0x000000D0, 0x00000001, 0x000000CB, 0x00000001, 0x000000D1, 0x00000001, 0x000000B1, 0x00000001, 0x000000B5, 0x00000001, 0x000000D3, 0x00000004, 0x00000080, 0x00000002, 0x000000D2, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80248CB0_82BF70 -.byte 0x01, 0x01, 0x1A, 0x11, 0x11, 0x02, 0x03, 0x03, 0x03, 0x0C, 0x0C, 0x0C, 0x0C, 0x00, 0x00, 0x00, 0x04, 0x05, 0x06, 0x00, 0x00, 0x09, 0x0A, 0x27, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -dlabel D_80248CD0_82BF90 -.byte 0x01, 0x01, 0x1A, 0x11, 0x11, 0x02, 0x03, 0x03, 0x03, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x04, 0x05, 0x06, 0x00, 0x07, 0x09, 0x0A, 0x27, 0x00, 0x10, 0x01, 0x03, 0x1E, 0x00, 0x00, 0x00 - -dlabel D_80248CF0_82BFB0 -.byte 0x00, 0x11, 0x1A, 0x1A, 0x11, 0x11, 0x00, 0x00, 0x00, 0x13, 0x14, 0x15, 0x00, 0x00, 0x00, 0x00, 0x17, 0x17, 0x12, 0x17, 0x17, 0x19, 0x12, 0x00, 0x00, 0x12, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x1A, 0x1A, 0x11, 0x12, 0x00, 0x00, 0x00, 0x1B, 0x1C, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x16, 0x16, 0x12, 0x17, 0x16, 0x19, 0x12, 0x00, 0x00, 0x12, 0x11, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x1A, 0x1A, 0x1E, 0x00, 0x00, 0x00, 0x1F, 0x20, 0x21, 0x00, 0x00, 0x00, 0x00, 0x16, 0x16, 0x1E, 0x17, 0x16, 0x22, 0x1E, 0x00, 0x00, 0x1E, 0x1A, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x1B, 0x1C, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x16, 0x16, 0x12, 0x17, 0x16, 0x22, 0x12, 0x00, 0x00, 0x12, 0x1A, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x00, 0x00, 0x00, 0x1B, 0x1C, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x16, 0x16, 0x12, 0x24, 0x07, 0x23, 0x12, 0x00, 0x00, 0x12, 0x11, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x25, 0x26, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x0C, 0x27, 0x0C, 0x0C, 0x0C, 0x0C, 0x00, 0x0C, 0x12, 0x00, 0x00, 0x28, 0x00, 0x0C, 0x00, 0x12, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0C, 0x03, 0x0C, 0x27, 0x0C, 0x0C, 0x0C, 0x0C, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x03, 0x0C, 0x27, 0x0C, 0x0C, 0x0C, 0x0C, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0C, 0x27, 0x03, 0x03, 0x03, 0x03, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x27, 0x0C, 0x0C, 0x0C, 0x0C, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x30, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x27, 0x27, 0x27, 0x27, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0C, 0x0C, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0C, 0x0C, 0x00, 0x12, 0x12, 0x00, 0x18, 0x08, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0C, 0x00, 0x12, 0x12, 0x00, 0x18, 0x08, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x12, 0x12, 0x00, 0x18, 0x08, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x12, 0x00, 0x12, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x2F, 0x00, 0x00, 0x30, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x1E, 0x12, 0x00, 0x12, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x32, 0x0B, 0x27, 0x07, 0x1E, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x08, 0x0D, 0x30, 0x12, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0B, 0x12, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 - -dlabel D_8024903C_82C2FC -.word 0x000000BF, 0x0000008D, 0x00000029, 0x000000BF, 0x000000A9, 0x00000029, 0x000000BF, 0x000000AE, 0x00000029, 0x000000D5, 0x000000C7, 0x0000001E, 0x000000D5, 0x000000B6, 0x00000012, 0x000000D5, 0x000000B9, 0x0000001E, 0x000000D5, 0x000000B8, 0x0000000E, 0x000000A9, 0x00000093, 0x0000000E - -dlabel D_8024909C_82C35C -.word 0x00000080, 0x00000089, 0x0000009B, 0x0000008F, 0x00000095, 0x0000009A, 0x0000008B, 0x000000B6, 0x000000B5, 0x000000B0, 0x000000C3, 0x000000C7, 0x000000C9, 0x000000D8, 0x000000D5, 0x000000CA, 0x000000BD, 0x00000082, 0x000000C8, 0x000000B1, 0x000000D3, 0x000000C0, 0x000000BF - -dlabel D_802490F8_82C3B8 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00AA0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF46, 0xFFFFFE83, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF24, 0xFFFFFE57, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00AA0007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0007, 0x00AA0007, 0x00000005, 0x0004000E, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00AA0008, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00AA0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF46, 0xFFFFFE83, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF14, 0xFFFFFEC2, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00AA0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249264_82C524 -.word 0x00000023, 0x00000000 - -dlabel D_8024926C_82C52C -.word 0x0000000A, 0x00000002, 0xF8405C99, 0x00000001, 0x00000043, 0x00000002, func_80243088_826348, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001A, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C1, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000003, AddItem, 0x000000C1, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001B, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001C, 0x00000024, 0x00000002, 0xF8405C99, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0006, 0x00000000, 0x00040017, 0x00000024, 0x00000002, 0xFE363C80, D_80249264_82C524, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802488C4_82BB84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0006, 0x00000000, 0x00040018, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0005, 0x00AA0001, 0x00000000, 0x00040019, 0x00000046, 0x00000001, D_802490F8_82C3B8, 0x00000043, 0x00000002, func_80243088_826348, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001A, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C1, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000003, AddItem, 0x000000C1, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001B, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001C, 0x00000024, 0x00000002, 0xF8405C99, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249548_82C808 -.word 0x00000029, 0x00000000 - -dlabel D_80249550_82C810 -.word 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001D, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001E, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80249548_82C808, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802488C4_82BB84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001F, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040020, 0x00000024, 0x00000002, 0xF8405C9A, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249684_82C944 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8405C98, 0x00000000, 0x00000024, 0x00000002, 0xF8405C98, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040003, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040005, 0x00000003, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040006, 0x00000043, 0x00000002, ShowChoice, 0x001E0009, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9A, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040007, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000043, 0x00000003, AddItem, 0xFE363C88, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040008, 0x00000043, 0x00000002, ShowChoice, 0x001E0008, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C89, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C81, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000B, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242DBC_82607C, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, RemoveItem, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242C44_825F04, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xF8405C9A, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000003, 0x00000001, 0x00000006, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000D, 0x00000046, 0x00000001, D_802490F8_82C3B8, 0x00000014, 0x00000001, 0xFE363C87, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040012, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000F, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040010, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040013, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040011, 0x00000023, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040014, 0x00000043, 0x00000002, func_80242F60_826220, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000003, AddItem, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040015, 0x00000003, 0x00000001, 0x00000009, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A034_82D2F4 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x00000046, 0x00000001, D_8024926C_82C52C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000029, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80249684_82C944, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80249550_82C810, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A0D4_82D394 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A034_82D2F4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000002D, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF14, 0x00000014, 0xFFFFFEC2, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AA0001, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x0000000B, 0x00000002, 0xF8405C99, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AA0006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A1B4_82D474 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A234_82D4F4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A558_82D818 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A5C8_82D888 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024A558_82D818, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A8C0_82DB80 -.word 0x0000003C, 0x00000000 - -dlabel D_8024A8C8_82DB88 -.word 0x00000043, 0x0000000B, mac_02_LetterDelivery_Init, 0x00000001, 0x00AB0004, 0x00AB0001, 0x0000003C, 0x00000000, 0x00040036, 0x00040037, 0x00040038, 0x00000000, D_8024A8C0_82DB80, 0x00000046, 0x00000001, D_8024A5C8_82D888, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A918_82DBD8 -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0004, 0x00AB0001, 0x00000000, 0x00040039, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00AB0006, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00AB0001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A9E0_82DCA0 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000024, 0x00000002, 0xFE363C80, 0x00040021, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0004002A, 0x00000024, 0x00000002, 0xFE363C81, 0x0004002B, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0004002C, 0x00000024, 0x00000002, 0xFE363C81, 0x0004002D, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0004002E, 0x00000024, 0x00000002, 0xFE363C81, 0x0004002F, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00040030, 0x00000024, 0x00000002, 0xFE363C81, 0x00040031, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00040032, 0x00000024, 0x00000002, 0xFE363C81, 0x00040033, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00040034, 0x00000024, 0x00000002, 0xFE363C81, 0x00040035, 0x00000023, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000009, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000000, 0xFE363C81, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0004, 0x00AB0001, 0x00000000, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024A8C8_82DB88, 0x00000046, 0x00000001, D_8024A918_82DBD8, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AC30_82DEF0 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFCB, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AB0006, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000186, 0x00000000, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A9E0_82DCA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024ACA4_82DF64 -.word 0x0000000A, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000000C1, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF24ADA80, 0x00000012, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000000C3, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A1A80, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000007, func_802CFD30, 0x00000009, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AD78_82E038 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000014, 0x00000001, 0xFE363C83, 0x00000021, 0x00000002, 0xFFFFFFCC, 0x0000002F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00040022, 0x00000190, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000001AE, 0x0000003C, 0xFFFFFFD8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00BF0002, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000293, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000244, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001AE, 0x00000001, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AE, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A5080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x000001AE, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000013B, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x000001C7, 0xFFFFFFD8, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000013B, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000000, 0x00040023, 0x00000043, 0x00000002, ShowChoice, 0x001E0036, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00040024, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00040025, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000000, 0xFE363C81, 0x00000008, 0x00000001, 0x00000014, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00BF0009, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000001F4, 0x00000032, 0x0000001E, 0x00000046, 0x00000001, D_8024ACA4_82DF64, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000005, 0x00040026, 0x00000046, 0x00000001, D_8024ACA4_82DF64, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcScale, 0x00000009, 0xF24A8280, 0xF24A8280, 0xF24A8280, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000168, 0x00000014, 0x0000001E, 0x00000046, 0x00000001, D_8024ACA4_82DF64, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000005, 0x00040027, 0x00000046, 0x00000001, D_8024ACA4_82DF64, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00BF0002, 0x00000043, 0x00000005, SetNpcScale, 0x00000009, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000001E0, 0x00000046, 0x0000000A, 0x00000046, 0x00000001, D_8024ACA4_82DF64, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000293, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFF, 0x00000226, 0x00000028, 0x0000000A, 0x00000028, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000005, 0x00040028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000000, 0x00040029, 0x00000044, 0x00000001, 0x8024E150, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFCD, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B544_82E804 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFCB, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024AD78_82E038, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B5AC_82E86C -.word 0x00000043, 0x00000005, GetNpcPos, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x00000023, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000046, 0x00000043, 0x00000005, GetNpcPos, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C89, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B6A0_82E960 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000B, 0xB0000021, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B6E8_82E9A8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000028, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00040016, 0x000000A0, 0x00000028, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8680, 0xFFFFFF74, 0x00000014, 0xFFFFFF74, 0x00000190, 0x0000000F, 0xFFFFFFFA, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFFFFFF38, 0x00000014, 0xFFFFFEFC, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000B, 0x003B0004, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_8024B5AC_82E86C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003C, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF8, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003C, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000B, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_8024B6A0_82E960, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000B, 0x00000008, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000B, 0xFFFFFF74, 0xFFFFFF10, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000B, 0xFFFFFF74, 0xFFFFFF74, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000B, 0xFFFFFF74, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000B, 0xFFFFFF42, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000B, 0xFFFFFEA2, 0xFFFFFFEC, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BA68_82ED28 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF4, 0x00000044, 0x00000001, D_8024B6E8_82E9A8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BA9C_82ED5C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C80, 0x0004003A, 0x00000018, 0x00000001, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C80, 0x0004003B, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000024, 0x00000002, 0xFE363C80, 0x0004003C, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004003D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004003E, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x0004003F, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00040040, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00040041, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00040042, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00040043, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00040044, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00040045, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00040046, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00040047, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00040048, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00040049, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00830204, 0x00830201, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BCDC_82EF9C -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000014, 0x00000000, 0xFFFFFDDA, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00830202, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFEC, 0xFFFFFDDA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00830201, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00830202, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000014, 0xFFFFFDDA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00830201, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BE48_82F108 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB4, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024BCDC_82EF9C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024BA9C_82ED5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BE98_82F158 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004004A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004004B, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x0004004C, 0x00000018, 0x00000001, 0xFFFFFFFD, 0x00000024, 0x00000002, 0xFE363C80, 0x0004004D, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0004004E, 0x00000018, 0x00000001, 0x00000059, 0x0000000A, 0x00000002, 0xF8405C9A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004004F, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00040050, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00040051, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00040052, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00040053, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00040054, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00040055, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00040056, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00840304, 0x00840301, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C090_82F350 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024BE98_82F158, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C0B4_82F374 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00040057, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00040058, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00040059, 0x00000018, 0x00000001, 0xFFFFFFF3, 0x00000024, 0x00000002, 0xFE363C80, 0x0004005A, 0x00000018, 0x00000001, 0xFFFFFFFD, 0x00000024, 0x00000002, 0xFE363C80, 0x0004005B, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0004005C, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0004005D, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0004005E, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0004005F, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00040060, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00040061, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00040062, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00040063, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00830104, 0x00830101, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C278_82F538 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C0B4_82F374, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C29C_82F55C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000024, 0x00000002, 0xFE363C80, 0x00040064, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00040065, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00040066, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00040067, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00040068, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00040069, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0004006A, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00860304, 0x00860301, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C3A4_82F664 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB5, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C29C_82F55C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C3F8_82F6B8 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004006B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004006C, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x0004006D, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C9E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004006E, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004006F, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00040070, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00040071, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00040072, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00040073, 0x00000024, 0x00000002, 0xF8405C92, 0x00000001, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00040074, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00040075, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00040076, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00040077, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00830304, 0x00830301, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C5F4_82F8B4 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C3F8_82F6B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C618_82F8D8 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00040078, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00040079, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x0004007A, 0x00000018, 0x00000001, 0xFFFFFFF3, 0x00000024, 0x00000002, 0xFE363C80, 0x0004007B, 0x00000018, 0x00000001, 0xFFFFFFFD, 0x00000024, 0x00000002, 0xFE363C80, 0x0004007C, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0004007D, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0004007E, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0004007F, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00040080, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00040081, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00040082, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00040083, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00040084, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000008, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C7DC_82FA9C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C618_82F8D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C800_82FAC0 -.word 0x0000000A, 0x00000002, 0xF8405C9B, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990007, 0x00990007, 0x00000000, 0x00040085, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990005, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990002, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00040086, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddKeyItem, 0x0000002B, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00040087, 0x00000024, 0x00000002, 0xF8405C9B, 0x00000001, 0x00000043, 0x00000003, SetTattleMessage, 0x00000002, 0x001A003C, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000018, 0x00000001, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C80, 0x00040088, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00040089, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008A, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008B, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008C, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008D, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008E, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00990003, 0x00990002, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CA88_82FD48 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C800_82FAC0, 0x0000000A, 0x00000002, 0xF8405C9B, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990007, 0x00000043, 0x00000003, SetTattleMessage, 0x00000002, 0x001A003B, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CB04_82FDC4 -.word 0x00AA0000, 0x00AA0001, 0x00AA0002, 0x00AA0001, 0x00AA0004, 0x00AA0005, 0x00AA0006, 0x00AA0007, 0x00AA0008, 0xFFFFFFFF - -dlabel D_8024CB2C_82FDEC -.word 0x00990000, 0x00990001, 0x00990002, 0x00990003, 0x00990005, 0x00990007, 0xFFFFFFFF - -dlabel D_8024CB48_82FE08 -.word 0x00000000, D_80246090_829350, 0xC3590000, 0x41A00000, 0xC3D90000, 0x00002D09, D_8024A0D4_82D394, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AA0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024CB04_82FDC4, 0x001A0033, 0x00000001, D_80246090_829350, 0x43C28000, 0x00000000, 0xC2B40000, 0x00002D09, D_8024AC30_82DEF0, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AB0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001A0034, 0x00000002, D_80246124_8293E4, 0x43160000, 0x41A00000, 0x43FA0000, 0x00000801, D_8024CA88_82FD48, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990002, 0x0099000E, 0x0099000E, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00000000, 0x00000000, D_8024CB2C_82FDEC, 0x001A003C, 0x00000003, D_80245F90_829250, 0x42200000, 0x00000000, 0xC2700000, 0x00002D09, D_8024BE48_82F108, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A0035, 0x00000004, D_80246090_829350, 0xC1D00000, 0x00000000, 0xC35C0000, 0x00002D09, D_8024C090_82F350, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00840301, 0x00840302, 0x00840303, 0x00840303, 0x00840301, 0x00840301, 0x00840306, 0x00840306, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00000000, 0x00000000, 0x00000000, 0x001A0036, 0x00000005, D_80246090_829350, 0xC3AF0000, 0x41A00000, 0xC30C0000, 0x00002D09, D_8024C278_82F538, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830101, 0x00830102, 0x00830103, 0x00830103, 0x00830101, 0x00830101, 0x00830106, 0x00830106, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00000000, 0x00000000, 0x00000000, 0x001A0037, 0x00000006, D_80245F90_829250, 0x43340000, 0x41A00000, 0xC3D98000, 0x00002D09, D_8024C3A4_82F664, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000B4, 0x00000014, 0xFFFFFE4D, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000B4, 0x00000014, 0xFFFFFE4D, 0x0000000A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00860301, 0x00860302, 0x00860303, 0x00860303, 0x00860301, 0x00860301, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00000000, 0x00000000, 0x00000000, 0x001A0038, 0x00000007, D_80245F90_829250, 0xC3200000, 0x00000000, 0x41C80000, 0x00002D09, D_8024C5F4_82F8B4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830301, 0x00830302, 0x00830303, 0x00830303, 0x00830301, 0x00830301, 0x00830306, 0x00830306, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00000000, 0x00000000, 0x00000000, 0x001A0039, 0x00000008, D_80246090_829350, 0xC2A00000, 0x00000000, 0x43960000, 0x00002D09, D_8024C7DC_82FA9C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A003A - -dlabel D_8024DCB8_830F78 -.word 0x00000009, D_802460E8_8293A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D09, D_8024B544_82E804, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00BF0001, 0x00BF0002, 0x00BF0003, 0x00BF0003, 0x00BF0001, 0x00BF0001, 0x00BF0000, 0x00BF0000, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024DEA8_831168 -.word 0x003B0000, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0011, 0x003B0002, 0x003B0004, 0xFFFFFFFF - -dlabel D_8024DEC8_831188 -.word 0x0000000B, D_80246090_829350, 0x00000000, 0xC47A0000, 0x00000000, 0x00002F09, D_8024BA68_82ED28, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, D_8024DEA8_831168, 0x00000000, 0x00000009, D_8024CB48_82FE08, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, D_8024CB48_82FE08, 0x00000000, 0x00000001, D_8024DCB8_830F78, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024DEC8_831188, 0x00000000, 0x00000009, D_8024CB48_82FE08, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/8313E0.data.s b/ver/us/asm/data/world/area_mac/mac_02/8313E0.data.s deleted file mode 100644 index b22adfb95e..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_02/8313E0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024E120_8313E0 -.word 0xC3160000, 0xC34D0000, 0x42F00000, 0x43160000, 0x00000001, 0xFAA2B58A - -dlabel D_8024E138_8313F8 -.word 0xC3C80000, 0x437A0000, 0x42DC0000, 0x43020000, 0x00000004, 0xFAA2B58B, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000043, 0x00000002, func_802D5EE0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_02_MonitorMusicProximityTrigger, D_8024E120_8313E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_02_MonitorMusicProximityTrigger, D_8024E138_8313F8, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/844BF0.data.s b/ver/us/asm/data/world/area_mac/mac_04/844BF0.data.s deleted file mode 100644 index b94b3959f2..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/844BF0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242020_844BF0 -.word 0x44188000, 0x00000000, 0x00000000, 0x438C0000, 0xC3D20000, 0x00000000, 0x43D70000, 0x420C0000, 0xC3F50000, 0x41A00000, 0xC3160000, 0x43340000, 0xC3D20000, 0x41A00000, 0xC2BE0000, 0x00000000, 0x00000000, 0xC2C80000, 0x00000000, 0x00000000, 0xC3D20000, 0x41A00000, 0x436B0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024240C, D_80242020_844BF0, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190004, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000004, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000044, 0x00000001, 0x8024F4E8, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, StopSound, 0x80000017, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/844D50.data.s b/ver/us/asm/data/world/area_mac/mac_04/844D50.data.s deleted file mode 100644 index 044afde037..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/844D50.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242180_844D50 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024F558, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421DC_844DAC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024F560, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242238_844E08 -.word 0x00000047, 0x00000005, D_80242180_844D50, 0x00080000, 0x00000041, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802421DC_844DAC, 0x00080000, 0x00000042, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242280_844E50 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80242238_844E08, 0x00000044, 0x00000001, 0x8024ECDC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80242238_844E08, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFE5C, 0x00000014, 0xFFFFFFA1, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFE5C, 0x00000014, 0xFFFFFFBF, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, func_80240194_842D64, 0x00000043, 0x0000000A, func_80240050_842C20, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003B6, 0x000003E8, 0x00000044, 0x00000001, 0x8024DED0, 0x00000016, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_80242238_844E08, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242238_844E08, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000001, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024E824, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF3, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024DC88, 0x00000018, 0x00000001, 0x00000006, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024DCAC, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024DCD0, 0x00000018, 0x00000001, 0x00000029, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024DC88, 0x00000018, 0x00000001, 0x00000058, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024DCF4, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024DC88, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF97188B1, 0x00000000, 0x00000046, 0x00000001, 0x8024F2C0, 0x00000044, 0x00000001, 0x80242E88, 0x00000044, 0x00000001, 0x80243B24, 0x00000044, 0x00000001, 0x80243D9C, 0x00000046, 0x00000001, 0x80246C58, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x802420C0, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80242280_844E50, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000008, 0x00000001, 0x00000041, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/845280.data.s b/ver/us/asm/data/world/area_mac/mac_04/845280.data.s deleted file mode 100644 index 3b7f171e2f..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/845280.data.s +++ /dev/null @@ -1,69 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802426B0_845280 -.word 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426E0_8452B0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000055, 0xFE363C81, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000057, 0xFE363C81, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C81, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000059, 0xFE363C81, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005B, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242800_8453D0 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000048, 0x00000001, 0x00000044, 0x00000001, 0x80248B08, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, EnableGroup, 0x00000048, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242870_845440 -.word 0x00000043, 0x00000006, RotateModel, 0x0000002B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428A0_845470 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000023, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000024, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000025, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000026, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000028, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242990_845560 -.word 0x00000043, 0x00000006, RotateModel, 0x0000002B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429C0_845590 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000022, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, EnableGroup, 0x00000022, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A24_8455F4 -.word 0x00000043, 0x00000006, RotateModel, 0x00000064, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A54_845624 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A85A0, 0x00000043, 0x00000005, TranslateModel, 0x00000066, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0x00000068, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0x0000006A, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0x00000000, 0x00000000, 0xFE363C81, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B48_845718 -.word 0x00000043, 0x00000006, RotateModel, 0x00000064, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B78_845748 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BA8_845778 -.word 0x00000043, 0x00000006, RotateModel, 0x00000092, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BD8_8457A8 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x0000008B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008A, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C58_845828 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000089, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80248798, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, EnableGroup, 0x00000089, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000076, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D08_8458D8 -.word 0x00000043, 0x00000006, RotateModel, 0x00000094, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000095, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D58_845928 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DD8_8459A8 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DE8_8459B8 -.word 0x00000000, 0x0000000F, 0xFFFFFFFF - -dlabel D_80242DF4_8459C4 -.word 0x00000001, 0x00000002, 0xFFFFFFFF - -dlabel D_80242E00_8459D0 -.word 0x0000000E, 0xFFFFFFFF - -dlabel D_80242E08_8459D8 -.word 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000002, D_80242D08_8458D8, D_80242D58_845928, 0x00000000, D_80242DD8_8459A8, 0x0000000D, 0x0000000E, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E48_845A18 -.word 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00002002, D_80242A24_8455F4, D_80242A54_845624, D_80242B48_845718, D_80242B78_845748, 0x00000049, 0x00000048, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00001002, D_802426B0_845280, D_802426E0_8452B0, 0x00000000, D_80242800_8453D0, 0x00000038, 0x00000039, 0x00000070, D_80242DE8_8459B8, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000002, D_80242870_845440, D_802428A0_845470, D_80242990_845560, D_802429C0_845590, 0x00000022, 0x00000023, 0x0000002F, D_80242DF4_8459C4, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000002, D_80242BA8_845778, D_80242BD8_8457A8, 0x00000000, D_80242C58_845828, 0x00000012, 0x00000013, 0x0000009E, D_80242E00_8459D0, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000046, 0x00000001, D_80242E48_845A18, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF6, 0x00000046, 0x00000001, D_80242E08_8459D8, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000089, 0x00000001, 0x00000043, 0x00000001, func_802401C0_842D90, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000043, 0x00000006, RotateModel, 0x0000008B, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008C, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008A, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_80242800_8453D0, 0x00000044, 0x00000001, D_802429C0_845590, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/845CA0.data.s b/ver/us/asm/data/world/area_mac/mac_04/845CA0.data.s deleted file mode 100644 index bffcdb27b7..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/845CA0.data.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802430D0_845CA0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243430_846000 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, mac_04_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, mac_04_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A34_846604 -.word 0x00000001, 0x000000A0 - -dlabel D_80243A3C_84660C -.word 0x00000001, 0x0000009F - -dlabel D_80243A44_846614 -.word 0x00000002, 0x000001B4, 0x00000087, 0xFFFFFF0A, 0x000001DC, 0x00000087, 0xFFFFFF00 - -dlabel D_80243A60_846630 -.word D_80243A34_846604, D_80243A3C_84660C, 0x00000000, D_80243A44_846614, 0x00000000 - -dlabel D_80243A74_846644 -.word 0x43EB0000, 0x41A00000, 0xC3720000, 0x00000000 - -dlabel D_80243A84_846654 -.word 0x00000001, 0x000000A2 - -dlabel D_80243A8C_84665C -.word 0x00000001, 0x000000A3 - -dlabel D_80243A94_846664 -.word 0x00000002, 0x00000029, 0x0000006E, 0xFFFFFF6B, 0x00000051, 0x0000006E, 0xFFFFFF61 - -dlabel D_80243AB0_846680 -.word D_80243A84_846654, D_80243A8C_84665C, 0x00000000, D_80243A94_846664, 0x00000000 - -dlabel D_80243AC4_846694 -.word 0x42480000, 0x41A00000, 0xC30D0000, 0x00000000 - -dlabel D_80243AD4_8466A4 -.word 0x00000001, 0x000000A5 - -dlabel D_80243ADC_8466AC -.word 0x00000001, 0x000000A1 - -dlabel D_80243AE4_8466B4 -.word 0x00000002, 0xFFFFFEC7, 0x00000085, 0x00000050, 0xFFFFFEEF, 0x00000085, 0x00000046 - -dlabel D_80243B00_8466D0 -.word D_80243AD4_8466A4, D_80243ADC_8466AC, 0x00000000, D_80243AE4_8466B4, 0x00000000 - -dlabel D_80243B14_8466E4 -.word 0xC3928000, 0x41A00000, 0x42AC0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243A60_846630, 0x00000047, 0x00000005, D_80243430_846000, 0x00001000, 0x0000003B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243430_846000, 0x00100000, D_80243A74_846644, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243AB0_846680, 0x00000047, 0x00000005, D_80243430_846000, 0x00001000, 0x00000026, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243430_846000, 0x00100000, D_80243AC4_846694, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243B00_8466D0, 0x00000047, 0x00000005, D_80243430_846000, 0x00001000, 0x00000027, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243430_846000, 0x00100000, D_80243B14_8466E4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8467E0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8467E0.data.s deleted file mode 100644 index a1e306fead..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/8467E0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243C10_8467E0 -.word 0x0027001B, 0x0027001C, 0x0027001D, 0x0027001E, 0x0027001F, 0x00270020, 0x00270021, 0x00270022, 0x00270023, 0x00270024, 0x00270025, 0x00270026, 0x00270027, 0x00270028, 0x00270029, 0x0027002A, 0x0027002B, 0x0027002C, 0x0027002D, 0x0027002E, 0x0027002F, 0x00270030, 0x00270031 - -dlabel D_80243C6C_84683C -.word 0x00000088, 0x0000001E, 0x00240007, 0x0000009A, 0x0000000F, 0x00240029, 0x00000082, 0x00000014, 0x00240002, 0x00000089, 0x00000005, 0x0024000E, 0x0000008B, 0x0000000A, 0x00240008, 0x0000008C, 0x00000014, 0x0024000A, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243CC0_846890 -.word 0x00000080, 0x00000007, 0x00000000, 0x00000090, 0x00000005, 0x00000000, 0x00000083, 0x00000014, 0x00000000, 0x00000093, 0x00000032, 0x00000000, 0x00000092, 0x00000014, 0x00000000, 0x00000097, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243D14_8468E4 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D68_846938 -.word 0x0034002C, 0x0035002D, 0x0036002E, 0x0037002F, 0x00380030, 0x00390031 - -dlabel D_80243D80_846950 -.word 0x00000000, 0x00880001, 0x00880004, D_80243D14_8468E4, 0x00000000, 0x00000000, D_80243C10_8467E0, 0x00000043, 0x00000005, MakeShop, D_80243D68_846938, D_80243C6C_84683C, D_80243CC0_846890, 0x00010000, 0x00000043, 0x00000002, MakeShopOwner, D_80243D80_846950, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s deleted file mode 100644 index ac8dd37fc9..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s +++ /dev/null @@ -1,276 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243DE0_8469B0 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80243E10_8469E0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80243DE0_8469B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E30_846A00 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80243E10_8469E0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80243E10_8469E0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80243E88_846A58 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243EE0_846AB0 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243F0C_846ADC -.word 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80243F38_846B08 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243FBC_846B8C -.word 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel mac_04_varStash -.word 0x00000000 - -dlabel D_80243FEC_846BBC -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel mac_04_Quizmo_Answers -.byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01 - -dlabel mac_04_Quizmo_Requirements -.word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040 - -dlabel D_802440DC_846CAC -.word 0x00000043, 0x00000001, mac_04_Quizmo_ShouldQuizmoLeave, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AF000C, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024418C_846D5C -.word 0x00000043, 0x00000003, mac_04_Quizmo_GetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000003, mac_04_Quizmo_SetCamVfov, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetCamType, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000172, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFE8E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xF24AAE80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000011, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFFEF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244424_846FF4 -.word 0x00000043, 0x00000003, mac_04_Quizmo_SetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244460_847030 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, mac_04_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000053, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_04_Quizmo_SpinPlayer, 0x00000043, 0x00000004, func_802D2884, 0xF4ACD481, 0xF4ACD483, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244610_8471E0 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, mac_04_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0x0000006C, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xF4ACD482, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, mac_04_Quizmo_UpdatePartnerPosition, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C86, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_04_Quizmo_SpinPartner, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244748_847318 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000014, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, mac_04_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0xFFFFFFBA, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000043, 0x00000005, SetNpcPos, 0x00000014, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000014, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802448B4_847484 -.word 0x00000044, 0x00000001, D_80244460_847030, 0x00000044, 0x00000001, D_80244610_8471E0, 0x00000046, 0x00000001, D_80244748_847318, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244928_8474F8 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010016, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244964_847534 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xF4ACD482, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802454AC_84807C -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010023, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802454EC_8480BC -.word 0x00000056, 0x00000000, 0x00000043, 0x00000006, mac_04_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000019, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C82, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF4ACD483, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xF4ACD481, 0xF4ACD483, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802455C8_848198 -.word 0x00000045, 0x00000002, D_80244964_847534, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000049, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802454EC_8480BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245678_848248 -.word 0x00000045, 0x00000002, D_802454AC_84807C, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802454EC_8480BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245728_8482F8 -.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_04_Quizmo_HideEntities, 0x00000043, 0x00000001, mac_04_Quizmo_HideWorld, 0x00000044, 0x00000001, D_8024418C_846D5C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802448B4_847484, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, mac_04_Quizmo_CreateStage, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80244928_8474F8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, mac_04_Quizmo_UnkStageEffectMode, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, mac_04_Quizmo_CreateWorker, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, mac_04_Quizmo_UpdateRecords, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_04_Quizmo_SetStageLightsDelay, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, mac_04_Quizmo_SetStageLightsDelay, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, mac_04_Quizmo_SetVannaAnim_Clap, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_04_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_04_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_04_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802455C8_848198, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, mac_04_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, mac_04_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, mac_04_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, mac_04_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80245678_848248, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_04_Quizmo_UnkStageEffectMode, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_04_Quizmo_SetVannaAnim_Wave, 0x00000043, 0x00000001, mac_04_Quizmo_DestroyEffects, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000044, 0x00000001, D_80244424_846FF4, 0x00000043, 0x00000001, mac_04_Quizmo_FadeInWorld, 0x00000043, 0x00000001, mac_04_Quizmo_ShowEntities, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246458_849028 -.word 0x00000043, 0x00000001, mac_04_Quizmo_ShouldAppear, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_04_Quizmo_RenderInit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802464CC_84909C -.word 0x0000003C, 0x00000001, 0x8024F5A8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80245728_8482F8, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024654C_84911C -.word 0x00000043, 0x00000001, mac_04_Quizmo_NPC_Aux_Impl, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246568_849138 -.word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80246598_849168 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80246568_849138, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802465B8_849188 -.word 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, 0x00000000, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, D_80246598_849168, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 - -dlabel mac_04_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel mac_04_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80246618_8491E8 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_04_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024675C_84932C -.word 0x00000043, 0x00000002, func_802417AC_84437C, 0xFE363C80, 0x0000004E, 0x00000006, D_80246618_8491E8, 0x00000010, 0x00000000, mac_04_D_8024F5D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241720_8442F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802467AC_84937C -.word 0x00000043, 0x00000004, func_802D2884, 0xFFFFFE48, 0xFFFFFF6A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000026, 0x00000002, 0xFE363C85, 0x00000003, 0x00000043, 0x00000007, MakeItemEntity, 0x00000021, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C84, 0xFFFFFF6A, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetItemPos, 0xFE363C87, 0xFFFFFE48, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7880, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024697C_84954C -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0158, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001AA, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFA6, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000046, 0x00000001, D_802467AC_84937C, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFA6, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001AA, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFFB, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024F568, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246C50_849820 -.word 0x00000021, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFB, 0x0000004E, 0x00000006, D_8024697C_84954C, 0x00000100, 0x00000017, D_80246C50_849820, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246CA0_849870 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246D94_849964 -.word 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000011, 0xFFFFFDF8, 0x00000028, 0x0000010E, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000011, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000011, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFE5C, 0x00000014, 0x000000EB, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE2A, 0x00000014, 0x000000FA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000011, 0x00150002, 0x00150001, 0x00000200, 0x000600C5, 0x00000043, 0x00000005, GetNpcPos, 0x00000011, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xFFFFFFF7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000011, 0x00150002, 0x00150001, 0x00000200, 0x000600C6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE2A, 0x00000014, 0x000000FA, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000011, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000011, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00150003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000139, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00150001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000011, 0x00000001, 0x00000043, 0x00000001, PostChapter4StatUpdate, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0194, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000011, 0x00150002, 0x00150001, 0x00000200, 0x000600C7, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000600C8, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE2A, 0x00000014, 0x000000FA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFE0C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xFFFFFFF7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFFFFFDA8, 0x000000C8, 0x0000015E, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0xFFFFFE4B, 0x0000003C, 0x0000010E, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x000600C9, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, NpcJump1, 0x00000010, 0xFFFFFE34, 0x0000002D, 0x000000DC, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000010, 0x00200009, 0x00200001, 0x00000200, 0x00000011, 0x000600CA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00150002, 0x00150001, 0x00000200, 0x00000010, 0x000600CB, 0x00000043, 0x00000007, SpeakToNpc, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x00000011, 0x000600CC, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00150002, 0x00150001, 0x00000200, 0x00000010, 0x000600CD, 0x00000043, 0x00000007, SpeakToNpc, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x00000011, 0x000600CE, 0x00000043, 0x00000005, GetNpcPos, 0x00000011, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xFFFFFFF7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00150002, 0x00150001, 0x00000200, 0x00000010, 0x000600CF, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE3E, 0x00000014, 0x000000FA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFE70, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, GetNpcPos, 0x00000011, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000011, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000011, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000011, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000011, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000011, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000070, 0x00000000, 0x00000008, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE3E, 0x00000014, 0x000000FA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000010, 0x00000004, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0xFFFFFE20, 0x00000028, 0x0000010E, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x000600D0, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000010, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x000600D1, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x000600D2, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x000600D3, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000010, 0xFFFFFDA8, 0x000000C8, 0x0000015E, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000007, 0x00000044, 0x00000001, 0x802420C0, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B1C_84A6EC -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80246CA0_849870, 0x00000044, 0x00000001, D_80246D94_849964, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B8C_84A75C -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247BD4_84A7A4 -.word 0xC28C0000, 0x42D40000, 0x00000000, 0xC2480000, 0x41F00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80247BF8_84A7C8 -.word 0x00000000, 0x00000000, 0x00000000, 0xC2480000, 0x41F00000, 0x00000000, 0xC28C0000, 0x42D40000, 0x00000000 - -dlabel D_80247C1C_84A7EC -.word 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, PushSong, 0x00000070, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0004008F, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xF24B4280, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24B1A80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000023, D_80247BD4_84A7A4, 0x00000003, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0xFFFFFFF6, 0xFFFFFED4, 0x0000000F, 0xFFFFFFF7, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x00040090, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000010, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x00040091, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x00040092, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0xFFFFFFD8, 0xFFFFFF38, 0x0000000F, 0xFFFFFFF1, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00200009, 0x00200001, 0x00000000, 0x00040093, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, LoadPath, 0x00000023, D_80247BF8_84A7C8, 0x00000003, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, PopSong, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF5, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024808C_84AC5C -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFF4, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80247C1C_84A7EC, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802480E0_84ACB0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C80, 0xB0000021, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248128_84ACF8 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000092, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000043, 0x00000006, RotateModel, 0x00000092, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802481E0_84ADB0 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x00000092, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000092, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248298_84AE68 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001AB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000024, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, RotateModel, 0x00000094, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000095, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000094, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000095, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001AC, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802483B8_84AF88 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000100, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000E, 0x003B0311, 0x003B0301, 0x00000005, 0x000600B3, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0303, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0304, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE48, 0x00000003, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0301, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0300, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x000000B4, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x000000B4, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x00000000, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000E, 0x003B0311, 0x003B0301, 0x00000005, 0x000600B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0308, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0309, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B030A, 0x00000044, 0x00000001, D_80248298_84AE68, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000E, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0x0000000E, 0xFFFFFE48, 0x00000014, 0xFFFFFFB5, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0300, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF6, 0x00000046, 0x00000001, D_80242E08_8459D8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248624_84B1F4 -.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000E, 0x0000203E, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000E, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x0000000E, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000E, 0x003B0311, 0x003B0301, 0x00000000, 0x000600B2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000E, 0x000000B4, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0303, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0304, 0x00000008, 0x00000001, 0x00000004, 0x00000046, 0x00000001, D_80248128_84ACF8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000045, 0x00000002, D_802480E0_84ACB0, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE0B, 0x000000DF, 0x0000000F, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000046, 0x00000001, D_802481E0_84ADB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248798_84B368 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFF5, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mac_04_IsPartnerBow, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000064, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80248128_84ACF8, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0xFFFFFE0B, 0x00000014, 0x000000DF, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0302, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000E, 0xFFFFFE06, 0x000000A8, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x003B0300, 0x00000046, 0x00000001, D_802481E0_84ADB0, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x00000046, 0x00000001, D_802483B8_84AF88, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80248624_84B1F4, 0x00000043, 0x00000002, mac_04_GetFloorCollider, 0xFE363C80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248798_84B368, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000E, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248A14_84B5E4 -.word 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x00010020, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C89, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE0180, 0xFFFFFFF8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x000000FA, 0x00000014, 0xFFFFFE6E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x003B0004, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000024, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000017, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000039, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF8, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000039, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80248A14_84B5E4, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000045, 0x00000002, D_802480E0_84ACB0, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000000FE, 0xFFFFFFBE, 0x0000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF8405CA2, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248E14_84B9E4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248E24_84B9F4 -.word 0x00000020, 0x00000000 - -dlabel D_80248E2C_84B9FC -.word 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060001, 0x00000024, 0x00000002, 0xFE363C80, D_80248E24_84B9F4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_8024675C_84932C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060002, 0x00000016, 0x00000001, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000300, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000127, 0xFFFFFE34, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000000E6, 0xFFFFFE20, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000000C6, 0x0000001E, 0xFFFFFE20, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000000A2, 0x00000028, 0xFFFFFE20, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880001, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, 0x8024F24C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000000C8, 0xFFFFFDF4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x0000001E, 0xFFFFFDF4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000300, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x80284054, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024911C_84BCEC -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80248E2C_84B9FC, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249184_84BD54 -.word 0x0000000A, 0x00000002, 0xF8405CA3, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A8, 0x00000024, 0x00000002, 0xF8405CA3, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A9, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_80241C20_8447F0, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0x001E000E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AA, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_GetPlayerCoins, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000027, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AB, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B90_844760, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AC, 0x00000043, 0x00000002, ShowChoice, 0x001E000B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AD, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D1, 0x00000016, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C84, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D2, 0x00000016, 0x00000001, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D3, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600B1, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFD9, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AE, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x0000024B, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C87, 0x0000001A, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60006, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60001, 0x00000043, 0x00000001, func_80241A64_844634, 0x00000043, 0x00000002, func_802418AC_84447C, 0xFE363C86, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600AF, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600B0, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x00002098, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF97188B2, 0x00000001, 0x00000043, 0x00000001, func_80241C60_844830, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802497B0_84C380 -.word 0x0000000A, 0x00000002, 0xF97188B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000026, 0x00000034, 0x00000043, 0x00000003, mac_04_SetNpcShadowScale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00010000, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249184_84BD54, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249918_84C4E8 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060006, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060007, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00060008, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060009, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000A, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000B, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000C, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000D, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000E, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0006000F, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00060010, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00060011, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00060012, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00840204, 0x00840201, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249AF0_84C6C0 -.word 0x00000024, 0x00000002, 0xF97188AD, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249918_84C4E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249B24_84C6F4 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060013, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060014, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00060015, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060016, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060017, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00060018, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00060019, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0006001A, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0006001B, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0006001C, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0006001D, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0006001E, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0006001F, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00840304, 0x00840301, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249CFC_84C8CC -.word 0x00000024, 0x00000002, 0xF97188AE, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249B24_84C6F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249D30_84C900 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060020, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060021, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00060022, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060023, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060024, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00060025, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00060026, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00060027, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00060028, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00060029, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0006002A, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0006002B, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0006002C, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249F08_84CAD8 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249D30_84C900, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249F2C_84CAFC -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006002D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006002E, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x0006002F, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060030, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060031, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00060032, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00060033, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00060034, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00060035, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00060036, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00060037, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00060038, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00060039, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A104_84CCD4 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249F2C_84CAFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A128_84CCF8 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006003A, 0x00000024, 0x00000002, 0xFE363C81, 0x0006003B, 0x00000024, 0x00000002, 0xFE363C82, 0x0006003C, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006003D, 0x00000024, 0x00000002, 0xFE363C81, 0x0006003E, 0x00000024, 0x00000002, 0xFE363C82, 0x0006003F, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00060040, 0x00000024, 0x00000002, 0xFE363C81, 0x00060041, 0x00000024, 0x00000002, 0xFE363C82, 0x00060042, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060043, 0x00000024, 0x00000002, 0xFE363C81, 0x00060044, 0x00000024, 0x00000002, 0xFE363C82, 0x00060045, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060046, 0x00000024, 0x00000002, 0xFE363C81, 0x00060047, 0x00000024, 0x00000002, 0xFE363C82, 0x00060048, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00060049, 0x00000024, 0x00000002, 0xFE363C81, 0x0006004A, 0x00000024, 0x00000002, 0xFE363C82, 0x0006004B, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0006004C, 0x00000024, 0x00000002, 0xFE363C81, 0x0006004D, 0x00000024, 0x00000002, 0xFE363C82, 0x0006004E, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0006004F, 0x00000024, 0x00000002, 0xFE363C81, 0x00060050, 0x00000024, 0x00000002, 0xFE363C82, 0x00060051, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00060052, 0x00000024, 0x00000002, 0xFE363C81, 0x00060053, 0x00000024, 0x00000002, 0xFE363C82, 0x00060054, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00060055, 0x00000024, 0x00000002, 0xFE363C81, 0x00060056, 0x00000024, 0x00000002, 0xFE363C82, 0x00060057, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00060058, 0x00000024, 0x00000002, 0xFE363C81, 0x00060059, 0x00000024, 0x00000002, 0xFE363C82, 0x0006005A, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0006005B, 0x00000024, 0x00000002, 0xFE363C81, 0x0006005C, 0x00000024, 0x00000002, 0xFE363C82, 0x0006005D, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0006005E, 0x00000024, 0x00000002, 0xFE363C81, 0x0006005F, 0x00000024, 0x00000002, 0xFE363C82, 0x00060060, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00860004, 0x00860001, 0x00000000, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00860304, 0x00860301, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00860104, 0x00860101, 0x00000000, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A4E0_84D0B0 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A128_84CCF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A504_84D0D4 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A128_84CCF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A528_84D0F8 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A128_84CCF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A54C_84D11C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060061, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060062, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00060063, 0x00000018, 0x00000001, 0xFFFFFFF7, 0x00000024, 0x00000002, 0xFE363C80, 0x00060064, 0x00000018, 0x00000001, 0xFFFFFFF8, 0x00000024, 0x00000002, 0xFE363C80, 0x00060065, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x00000024, 0x00000002, 0xFE363C80, 0x00060066, 0x00000018, 0x00000001, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C80, 0x00060067, 0x00000018, 0x00000001, 0xFFFFFFFD, 0x00000024, 0x00000002, 0xFE363C80, 0x00060068, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000025, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF8405C74, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060069, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006006B, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006006A, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0006006C, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0006006D, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0006006E, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0006006F, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00060070, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00060071, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00060072, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00060073, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00840004, 0x00840001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A7F4_84D3C4 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFF1, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFED4, 0x00000000, 0x00000145, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A54C_84D11C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A858_84D428 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060074, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060075, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00060076, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060077, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060078, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00060079, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0006007A, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0006007B, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0006007C, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0006007D, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0006007E, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0006007F, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00060080, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830104, 0x00830101, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AA30_84D600 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A858_84D428, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AA54_84D624 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060081, 0x00000024, 0x00000002, 0xFE363C81, 0x00060082, 0x00000024, 0x00000002, 0xFE363C82, 0x00060083, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00060084, 0x00000024, 0x00000002, 0xFE363C81, 0x00060085, 0x00000024, 0x00000002, 0xFE363C82, 0x00060086, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00060087, 0x00000024, 0x00000002, 0xFE363C81, 0x00060088, 0x00000024, 0x00000002, 0xFE363C82, 0x00060089, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006008A, 0x00000024, 0x00000002, 0xFE363C81, 0x0006008B, 0x00000024, 0x00000002, 0xFE363C82, 0x0006008C, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0006008D, 0x00000024, 0x00000002, 0xFE363C81, 0x0006008E, 0x00000024, 0x00000002, 0xFE363C82, 0x0006008F, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00060090, 0x00000024, 0x00000002, 0xFE363C81, 0x00060091, 0x00000024, 0x00000002, 0xFE363C82, 0x00060092, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00060093, 0x00000024, 0x00000002, 0xFE363C81, 0x00060094, 0x00000024, 0x00000002, 0xFE363C82, 0x00060095, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00060096, 0x00000024, 0x00000002, 0xFE363C81, 0x00060097, 0x00000024, 0x00000002, 0xFE363C82, 0x00060098, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00060099, 0x00000024, 0x00000002, 0xFE363C81, 0x0006009A, 0x00000024, 0x00000002, 0xFE363C82, 0x0006009B, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0006009C, 0x00000024, 0x00000002, 0xFE363C81, 0x0006009D, 0x00000024, 0x00000002, 0xFE363C82, 0x0006009E, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0006009F, 0x00000024, 0x00000002, 0xFE363C81, 0x000600A0, 0x00000024, 0x00000002, 0xFE363C82, 0x000600A1, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A2, 0x00000024, 0x00000002, 0xFE363C81, 0x000600A3, 0x00000024, 0x00000002, 0xFE363C82, 0x000600A4, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A5, 0x00000024, 0x00000002, 0xFE363C81, 0x000600A6, 0x00000024, 0x00000002, 0xFE363C82, 0x000600A7, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00830104, 0x00830101, 0x00000000, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000B, 0x00830004, 0x00830001, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00830304, 0x00830301, 0x00000000, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AE0C_84D9DC -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024AA54_84D624, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AE30_84DA00 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024AA54_84D624, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AE54_84DA24 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024AA54_84D624, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AE78_84DA48 -.word 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000001, 0x0000000A, 0x00000002, 0xF8405CA4, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A10004, 0x00A10001, 0x00000000, 0x000600B6, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000600B7, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A10004, 0x00A10001, 0x00000000, 0x000600B8, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000600B9, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A10004, 0x00A10001, 0x00000000, 0x000600BA, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000600BB, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000013, 0x009E000B, 0x009E0001, 0x00000000, 0x000600BC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000600BD, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000013, 0x009E000B, 0x009E0001, 0x00000000, 0x000600BE, 0x00000024, 0x00000002, 0xF8405CA4, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A10004, 0x00A10001, 0x00000000, 0x000600BF, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A10004, 0x00A10001, 0x00000000, 0x000600B5, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B064_84DC34 -.word 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000001, 0x0000000A, 0x00000002, 0xF97188B0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x009E000B, 0x009E0001, 0x00000000, 0x000600C1, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000600C2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x009E000B, 0x009E0001, 0x00000000, 0x000600C3, 0x00000024, 0x00000002, 0xF97188B0, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x009E000B, 0x009E0001, 0x00000000, 0x000600C4, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x009E000B, 0x009E0001, 0x00000000, 0x000600C0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B190_84DD60 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024AE78_84DA48, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B1B4_84DD84 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024B064_84DC34, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B1D8_84DDA8 -.word 0x0000000D, D_80243EE0_846AB0, 0x43CD0000, 0x41A00000, 0xC3480000, 0x00000D09, D_802497B0_84C380, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00A60001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001A0051, 0x00000000, D_80243E88_846A58, 0x439B0000, 0x41A00000, 0xC3D70000, 0x00002D09, D_8024911C_84BCEC, 0x00000000, 0x00000000, 0x000000E6, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00880001, 0x00880002, 0x00880003, 0x00880003, 0x00880001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001A0044, 0x00000001, D_80243E88_846A58, 0xC2A00000, 0x41A00000, 0xC2C80000, 0x00002D09, D_80249AF0_84C6C0, 0x00000000, 0x00000000, 0x00000085, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00840201, 0x00840202, 0x00840203, 0x00840203, 0x00840201, 0x00840201, 0x00840206, 0x00840206, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00840203, 0x00000000, 0x00000000, 0x00000000, 0x001A004F, 0x00000002, D_80243E88_846A58, 0xC3050000, 0x41A00000, 0xC2A40000, 0x00002D09, D_80249CFC_84C8CC, 0x00000000, 0x00000000, 0x00000085, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00840301, 0x00840302, 0x00840303, 0x00840303, 0x00840301, 0x00840301, 0x00840306, 0x00840306, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00000000, 0x00000000, 0x00000000, 0x001A0050, 0x00000003, D_80243E30_846A00, 0x42400000, 0x00000000, 0x43190000, 0x00002D09, D_80249F08_84CAD8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000000, 0x00000099, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000030, 0x00000000, 0x00000099, 0x0000000A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A0045, 0x00000004, D_80243E88_846A58, 0xC36F0000, 0x41A00000, 0x42D20000, 0x00002D09, D_8024A104_84CCD4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A0046, 0x00000005, D_80243E88_846A58, 0x437E0000, 0x41A00000, 0x43DA0000, 0x00002D09, D_8024A4E0_84D0B0, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00860001, 0x00860002, 0x00860003, 0x00860003, 0x00860001, 0x00860001, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00000000, 0x00000000, 0x00000000, 0x001A0047, 0x00000006, D_80243E88_846A58, 0x43980000, 0x41A00000, 0x43CD0000, 0x00002D09, D_8024A504_84D0D4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00860301, 0x00860302, 0x00860303, 0x00860303, 0x00860301, 0x00860301, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00000000, 0x00000000, 0x00000000, 0x001A0048, 0x00000007, D_80243E88_846A58, 0x43AC8000, 0x41A00000, 0x43DB0000, 0x00002D09, D_8024A528_84D0F8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00860101, 0x00860102, 0x00860103, 0x00860103, 0x00860101, 0x00860101, 0x00860100, 0x00860100, 0x00860100, 0x00860100, 0x00860100, 0x00860100, 0x00860100, 0x00860100, 0x00860100, 0x00860100, 0x00000000, 0x00000000, 0x00000000, 0x001A0049, 0x00000008, D_80243E88_846A58, 0xC3890000, 0x00000000, 0x43C80000, 0x00002D09, D_8024A7F4_84D3C4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00840001, 0x00840002, 0x00840003, 0x00840003, 0x00840001, 0x00840001, 0x00840006, 0x00840006, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00840003, 0x00000000, 0x00000000, 0x00000000, 0x001A004A, 0x00000009, D_80243E88_846A58, 0x43FA0000, 0x41A00000, 0xC3200000, 0x00002D09, D_8024AA30_84D600, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830101, 0x00830102, 0x00830103, 0x00830103, 0x00830101, 0x00830101, 0x00830106, 0x00830106, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00000000, 0x00000000, 0x00000000, 0x001A004B, 0x0000000A, D_80243E88_846A58, 0xC2DC0000, 0x00000000, 0x440E0000, 0x00002D09, D_8024AE0C_84D9DC, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830101, 0x00830102, 0x00830103, 0x00830103, 0x00830101, 0x00830101, 0x00830106, 0x00830106, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00000000, 0x00000000, 0x00000000, 0x001A004C, 0x0000000B, D_80243E88_846A58, 0xC2E40000, 0x00000000, 0x43F90000, 0x00002D09, D_8024AE30_84DA00, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A004D, 0x0000000C, D_80243E88_846A58, 0xC2500000, 0x00000000, 0x44034000, 0x00002D09, D_8024AE54_84DA24, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830301, 0x00830302, 0x00830303, 0x00830303, 0x00830301, 0x00830301, 0x00830306, 0x00830306, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00000000, 0x00000000, 0x00000000, 0x001A004E - -dlabel D_8024CCF8_84F8C8 -.word 0x00200001, 0x00200005, 0x00200009, 0xFFFFFFFF - -dlabel D_8024CD08_84F8D8 -.word 0x00000010, D_80243FBC_846B8C, 0x00000000, 0xC47A0000, 0x00000000, 0x00002D09, D_8024808C_84AC5C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, D_8024CCF8_84F8C8, 0x00000000, 0x0000000E, D_80243E88_846A58, 0x00000000, 0xC47A0000, 0x00000000, 0x00002F09, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, D_80243E88_846A58, 0x00000000, 0xC47A0000, 0x00000000, 0x00002F09, D_80248E14_84B9E4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024D2D8_84FEA8 -.word 0x00000011, D_80243F38_846B08, 0xC3F30000, 0x41A00000, 0x43818000, 0x00000D09, D_80247B1C_84A6EC, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150000, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00150001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, D_80243F38_846B08, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D09, D_80247B8C_84A75C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024D6B8_850288 -.word 0x00000012, D_80243F0C_846ADC, 0xC2FC0000, 0x00000000, 0x43A48000, 0x00002D09, D_8024B190_84DD60, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00A10001, 0x00A10002, 0x00A10003, 0x00A10003, 0x00A10001, 0x00A10001, 0x00A10000, 0x00A10000, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00000000, 0x00000000, 0x00000000, 0x001A0066, 0x00000013, D_80243F0C_846ADC, 0xC2EA0000, 0x00000000, 0x43988000, 0x00002D09, D_8024B1B4_84DD84, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x009E0001, 0x009E0005, 0x009E0007, 0x009E0007, 0x009E0001, 0x009E0001, 0x009E0000, 0x009E0000, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x00000000, 0x00000000, 0x00000000, 0x001A0067 - -dlabel D_8024DA98_850668 -.word 0x00000014, D_802465B8_849188, 0x42640000, 0x41A00000, 0xC2E40000, 0x00006D09, 0x00000000, 0x00000001, 0x00010604, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AF0001, 0x00AF0002, 0x00AF0003, 0x00AF0003, 0x00AF0001, 0x00AF0001, 0x00AF0000, 0x00AF0000, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0002, 0x0000000E, D_8024B1D8_84DDA8, 0x00000000, 0x00000001, D_8024DA98_850668, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000E, D_8024B1D8_84DDA8, 0x00000000, 0x00000003, D_8024CD08_84F8D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000E, D_8024B1D8_84DDA8, 0x00000000, 0x00000002, D_8024D2D8_84FEA8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000E, D_8024B1D8_84DDA8, 0x00000000, 0x00000002, D_8024D6B8_850288, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8508F0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8508F0.data.s deleted file mode 100644 index 836b5e6948..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/8508F0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024DD20_8508F0 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_8024DD50_850920 -.word 0x00000043, 0x00000002, BasicAI_Main, D_8024DD20_8508F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024DD50_850920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8024DD50_850920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_8024DDC8_850998 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000C8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000C8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2443A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000015, 0x00860004, 0x00860006, 0x00000000, 0x000A0070, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x8024F570, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E024_850BF4 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0x000000C8, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E064_850C34 -.word 0x00000015, D_8024DDC8_850998, 0x43AF0000, 0x00000000, 0xC1A00000, 0x00402D09, D_8024E024_850BF4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00860001, 0x00860002, 0x00860003, 0x00860003, 0x00860001, 0x00860001, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, D_8024DDC8_850998, 0xC3750000, 0x41A00000, 0x42C80000, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830101, 0x00830102, 0x00830103, 0x00830103, 0x00830101, 0x00830101, 0x00830106, 0x00830106, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00000000, 0x00000000, 0x00000000, 0x001A004C, 0x0000000B, D_8024DDC8_850998, 0xC1C80000, 0x00000000, 0x432A0000, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A004D, 0x0000000C, D_8024DDC8_850998, 0xC2C80000, 0x00000000, 0x43988000, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830301, 0x00830302, 0x00830303, 0x00830303, 0x00830301, 0x00830301, 0x00830306, 0x00830306, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00000000, 0x00000000, 0x00000000, 0x001A004E, 0x00000004, D_8024E064_850C34, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/851410.data.s b/ver/us/asm/data/world/area_mac/mac_04/851410.data.s deleted file mode 100644 index 65876dd19a..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/851410.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024E840_851410 -.word 0x00000026, 0x00000002, 0xFD050F8A, 0xF24A7E80, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x20000000, 0x00000001, 0x00000043, 0x00000001, func_80241C90_844860, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000014, 0x00000014, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x0000002F, 0x00000002, 0xFD050F8A, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E924_8514F4 -.word 0x00000026, 0x00000002, 0xFD050F8A, 0xF24A7B4D, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x20000000, 0x00000001, 0x00000043, 0x00000001, func_80241C90_844860, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000014, 0x00000064, 0x00000028, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x0000002F, 0x00000002, 0xFD050F8A, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E9FC_8515CC -.word 0x00000043, 0x00000003, SetPlayerFlagBits, 0x20000000, 0x00000000, 0x00000043, 0x00000001, func_80241CEC_8448BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024EA2C_8515FC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024EA94_851664 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000046, 0x00000001, D_8024E840_851410, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_8024EA2C_8515FC, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001AA, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFA6, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x000000D9, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7BE7, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE3E, 0x00000014, 0xFFFFFF60, 0x00000020, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x0000000A, 0x00000002, 0xF8405B84, 0x00000000, 0x00000024, 0x00000002, 0xF8405B84, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x8024F590, 0x00000004, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024F588, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000046, 0x00000001, D_8024E924_8514F4, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFA6, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001AA, 0x00000000, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_8024EA2C_8515FC, 0xFE363C8A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x000000DA, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE20, 0x0000002D, 0xFFFFFFA6, 0x00000019, 0x00000046, 0x00000001, D_8024E9FC_8515CC, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024EED8_851AA8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_8024EA2C_8515FC, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE52, 0x00000014, 0xFFFFFFD3, 0x0000000F, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024EFAC_851B7C -.word 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000044, 0x00000001, D_8024EA94_851664, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_8024EED8_851AA8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024EFF4_851BC4 -.word 0x00000046, 0x00000001, D_80242E48_845A18, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F010_851BE0 -.word 0x00000020, 0x00000000 - -dlabel D_8024F018_851BE8 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x0000009B, 0x00000030, 0xFFFFFE20, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, mac_04_RemovePadlock, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000127, 0xFFFFFE34, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000000E6, 0xFFFFFE20, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000000C8, 0x0000001E, 0xFFFFFDF4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x0000001E, 0xFFFFFDF4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060005, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, mac_04_RemovePadlock, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F278_851E48 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0173, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x0000009B, 0x00000030, 0xFFFFFE20, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EFF4_851BC4, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000003, 0x0000004E, 0x00000006, D_8024F018_851BE8, 0x00000100, 0x00004000, D_8024F010_851BE0, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00020021, 0x00000032, 0x00000028, 0xFFFFFE52, 0x00000000, 0xF8405CA1, 0x00000056, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFA, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405CA1, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFFA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00020081, 0x00000032, 0x00000028, 0xFFFFFECA, 0x00000011, 0xF8405CAF, 0x00000043, 0x00000007, MakeItemEntity, 0x0002008B, 0x00000032, 0x00000028, 0xFFFFFE8E, 0x00000011, 0xF8405CB0, 0x00000043, 0x00000007, MakeItemEntity, 0x0002009A, 0x00000032, 0x00000028, 0xFFFFFE16, 0x00000011, 0xF8405CB1, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFE20, 0x00000014, 0xFFFFFFA6, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EFAC_851B7C, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000002, 0x00000047, 0x00000005, D_8024F278_851E48, 0x00000100, 0x00000043, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8520A0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8520A0.data.s deleted file mode 100644 index 8726bfd7f5..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_04/8520A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel gBadgeMenuElements_8520A0 -.word 0xC3F00000, 0x435C0000, 0x42C80000, 0x42F00000, 0x00000009, 0xFAA2B58A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000043, 0x00000002, func_802D5EE0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_04_MonitorMusicProximityTrigger, gBadgeMenuElements_8520A0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/8562D0.data.s b/ver/us/asm/data/world/area_mac/mac_05/8562D0.data.s deleted file mode 100644 index 5ad8c1a794..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_05/8562D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244160_8562D0 -.word 0x43D50000, 0x00000000, 0xC3D50000, 0x43610000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC2F00000, 0x41C00000, 0x43BB8000, 0x00000000, 0xC38C0000, 0xC1200000, 0x43B98000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80244BB0, D_80244160_8562D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190005, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000008, 0x00000009, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004C, 0x00000000, 0x00000008, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000058, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000047, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000005D, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004C, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s b/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s deleted file mode 100644 index fbb22a27f5..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244370_8564E0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0174, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802443B8_856528 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016C, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF6A, 0x0000003C, 0xFFFFFE89, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFFCE, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CAC, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFE16, 0x00000082, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405CB2, 0x00000047, 0x00000005, D_80244370_8564E0, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802443B8_856528, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/856650.data.s b/ver/us/asm/data/world/area_mac/mac_05/856650.data.s deleted file mode 100644 index acc7f9c56b..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_05/856650.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802444E0_856650 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024457C_8566EC -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, dup_mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000063, 0x00000001, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244648_8567B8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000258, 0xFFFFFF10, 0x00000140, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFE363C80, 0xFFFFFFE7, 0xFFFFFFB5, 0x00000043, 0x00000006, RotateModel, 0x00000061, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF10, 0x00000258, 0x00000140, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFE363C80, 0xFFFFFFE7, 0xFFFFFFB5, 0x00000043, 0x00000006, RotateModel, 0x00000061, 0x000000B4, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802447B4_856924 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802527A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244810_856980 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000009, 0x00000043, 0x00000003, GotoMap, 0x802527A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024487C_8569EC -.word 0x00000047, 0x00000005, D_802447B4_856924, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244810_856980, 0x00000080, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802448C4_856A34 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_8024487C_8569EC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024487C_8569EC, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802496FC, 0x00000044, 0x00000001, D_8024487C_8569EC, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x80248878, 0x00000044, 0x00000001, D_8024487C_8569EC, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF60, 0xFFFFFFF6, 0x00000173, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF60, 0xFFFFFFF6, 0x00000173, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF60, 0xFFFFFF24, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFFFFFFF6, 0x00000173, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFFFFFFF6, 0x00000173, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEE8, 0xFFFFFFF6, 0x00000173, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024487C_8569EC, 0x00000046, 0x00000001, EnterWalk, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF24, 0x0000000A, 0x00000174, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000000, 0x08000000, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000001, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x80250948, 0x00000018, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C80, 0x8025099C, 0x00000018, 0x00000001, 0x00000029, 0x00000043, 0x00000002, GetEntryID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000A, 0x00000002, 0xF8406042, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802509F0, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8025099C, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80250948, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C80, 0x80250948, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80250948, 0x00000023, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0xFE363C80, 0x00000046, 0x00000001, 0x80244400, 0x00000044, 0x00000001, 0x8025194C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000044, 0x00000001, 0x802526E0, 0x00000044, 0x00000001, 0x802441E0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000004, 0x7FFFFE00, 0x00000044, 0x00000001, D_802448C4_856A34, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_8024457C_8566EC, 0x00000043, 0x00000003, SetTexPanner, 0x00000063, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802444E0_856650, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80244648_8567B8, 0x00000044, 0x00000001, 0x80252748, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s deleted file mode 100644 index ba9dd44b0d..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s +++ /dev/null @@ -1,312 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244F00_857070 -.word 0x00000000, 0x00180030, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80244F2C_85709C -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80244F58_8570C8 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80244F84_8570F4 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80244FB4_857124 -.word 0x00000043, 0x00000002, mac_05_PatrolNoAttackAI_Main, D_80244F84_8570F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80244FB4_857124, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80244FB4_857124, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_8024502C_85719C -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00300020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel mac_05_varStash -.word 0x00000000 - -dlabel D_802450B4_857224 -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel mac_05_Quizmo_Answers -.byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01 - -dlabel mac_05_Quizmo_Requirements -.word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040 - -dlabel D_802451A4_857314 -.word 0x00000043, 0x00000001, mac_05_Quizmo_ShouldQuizmoLeave, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AF000C, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245254_8573C4 -.word 0x00000043, 0x00000003, mac_05_Quizmo_GetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000003, mac_05_Quizmo_SetCamVfov, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetCamType, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000172, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFE8E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xF24AAE80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000011, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFFEF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802454EC_85765C -.word 0x00000043, 0x00000003, mac_05_Quizmo_SetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245528_857698 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, mac_05_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000053, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_05_Quizmo_SpinPlayer, 0x00000043, 0x00000004, func_802D2884, 0xF4ACD481, 0xF4ACD483, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802456D8_857848 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, mac_05_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0x0000006C, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xF4ACD482, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, mac_05_Quizmo_UpdatePartnerPosition, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C86, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_05_Quizmo_SpinPartner, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245810_857980 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, mac_05_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0xFFFFFFBA, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024597C_857AEC -.word 0x00000044, 0x00000001, D_80245528_857698, 0x00000044, 0x00000001, D_802456D8_857848, 0x00000046, 0x00000001, D_80245810_857980, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802459F0_857B60 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010016, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245A2C_857B9C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xF4ACD482, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246574_8586E4 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010023, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802465B4_858724 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000006, mac_05_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000019, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C82, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF4ACD483, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xF4ACD481, 0xF4ACD483, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246690_858800 -.word 0x00000045, 0x00000002, D_80245A2C_857B9C, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000049, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802465B4_858724, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246740_8588B0 -.word 0x00000045, 0x00000002, D_80246574_8586E4, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802465B4_858724, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802467F0_858960 -.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_05_Quizmo_HideEntities, 0x00000043, 0x00000001, mac_05_Quizmo_HideWorld, 0x00000044, 0x00000001, D_80245254_8573C4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024597C_857AEC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, mac_05_Quizmo_CreateStage, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802459F0_857B60, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, mac_05_Quizmo_UnkStageEffectMode, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, mac_05_Quizmo_CreateWorker, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, mac_05_Quizmo_UpdateRecords, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_05_Quizmo_SetStageLightsDelay, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, mac_05_Quizmo_SetStageLightsDelay, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, mac_05_Quizmo_SetVannaAnim_Clap, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_05_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_05_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_05_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246690_858800, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, mac_05_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, mac_05_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, mac_05_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, mac_05_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246740_8588B0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_05_Quizmo_UnkStageEffectMode, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_05_Quizmo_SetVannaAnim_Wave, 0x00000043, 0x00000001, mac_05_Quizmo_DestroyEffects, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000044, 0x00000001, D_802454EC_85765C, 0x00000043, 0x00000001, mac_05_Quizmo_FadeInWorld, 0x00000043, 0x00000001, mac_05_Quizmo_ShowEntities, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247520_859690 -.word 0x00000043, 0x00000001, mac_05_Quizmo_ShouldAppear, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_05_Quizmo_RenderInit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247594_859704 -.word 0x0000003C, 0x00000001, 0x802529D8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_802467F0_858960, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247614_859784 -.word 0x00000043, 0x00000001, mac_05_Quizmo_NPC_Aux_Impl, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247630_8597A0 -.word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80247660_8597D0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80247630_8597A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247680_8597F0 -.word 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, 0x00000000, 0x00000000, D_80247614_859784, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, D_80247660_8597D0, 0x00000000, D_80247614_859784, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 - -dlabel mac_05_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel mac_05_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_802476E0_859850 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247824_859994 -.word 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_802476E0_859850, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247874_8599E4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802479A8_859B18 -.word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, mac_05_D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802479F8_859B68 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247A78_859BE8 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247D9C_859F0C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247E0C_859F7C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80247D9C_859F0C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248104_85A274 -.word 0x00000048, 0x00000000 - -dlabel D_8024810C_85A27C -.word 0x00000043, 0x0000000B, mac_05_LetterDelivery_Init, 0x00000002, 0x008D0002, 0x008D0001, 0x00000048, 0x00000049, 0x00070064, 0x00070065, 0x00070066, 0x00070067, D_80248104_85A274, 0x00000046, 0x00000001, D_80247E0C_859F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024815C_85A2CC -.word 0x00000054, 0x00000000 - -dlabel D_80248164_85A2D4 -.word 0x00000043, 0x0000000B, mac_05_LetterDelivery_Init, 0x00000001, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x00070085, 0x00070086, 0x00070087, 0x00070088, D_8024815C_85A2CC, 0x00000046, 0x00000001, D_80247E0C_859F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802481B4_85A324 -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248218_85A388 -.word 0x00000053, 0x00000000 - -dlabel D_80248220_85A390 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x0007008E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x0007008F, 0x00000024, 0x00000002, 0xF8405E92, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802482BC_85A42C -.word 0x0000000A, 0x00000002, 0xF8405E92, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000053, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF97188C4, 0x00000000, 0x00000024, 0x00000002, 0xF97188C4, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E91, 0x00000000, 0x00000024, 0x00000002, 0xF8405E91, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070089, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007008A, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007008B, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, D_80248218_85A388, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80247824_859994, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001B, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80248220_85A390, 0x00000022, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x0007008C, 0x00000024, 0x00000002, 0xFE363C80, D_80248218_85A388, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80247824_859994, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001B, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80248220_85A390, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x0007008D, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802484D8_85A648 -.word 0x00000043, 0x00000002, func_80242C78_854DE8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802484F8_85A668 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C83, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802486EC_85A85C -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C84, 0xFE363C84, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFF6A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C84, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C83, 0xFFFFFF6A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C84, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C84, 0xFE363C84, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF6A, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFFFFFF6A, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF88, 0x00000018, 0x00000177, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x0007009F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60009, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001DB, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF88, 0x00000018, 0x00000177, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000044, 0x00000000, 0x00000043, 0x00000005, PlayerJump1, 0xFFFFFECA, 0xFFFFFFF6, 0x00000174, 0x00000050, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF88, 0x00000018, 0x00000177, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000044, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFEA7, 0x00000000, 0x00000174, 0x00000050, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF88, 0x00000018, 0x00000177, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000044, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFEE8, 0xFFFFFFF6, 0x00000174, 0x0000005A, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000003, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFE84, 0xFFFFFFF6, 0x00000174, 0x00000014, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00410024, 0x00410004, 0x00000005, 0x000700A0, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x000700A1, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001DB, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497C80, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A6680, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00410024, 0x00410004, 0x00000000, 0x00000000, 0x000700A2, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, EndSpeech, 0x00000003, 0x00410024, 0x00410004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFC4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000020D9, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000003, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x000700A3, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5E80, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x000700A4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000700A5, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x000700A6, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000700A7, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x000700A8, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x000700A9, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x000700AA, 0x00000023, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001DB, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497C80, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A6680, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x000700AB, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802496C0_85B830 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000045, 0x00000002, D_802484F8_85A668, 0xFE363C8A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000045, 0x00000002, D_802484D8_85A648, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000045, 0x00000002, D_802484D8_85A648, 0xFE363C8C, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000045, 0x00000002, D_802484D8_85A648, 0xFE363C8D, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242E84_854FF4, 0x00000002, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000049, 0x00000001, 0xFE363C8C, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000028, 0x00000049, 0x00000001, 0xFE363C8D, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60006, 0x00000043, 0x00000005, func_80242A90_854C00, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242A90_854C00, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000044, 0x00000001, D_802496C0_85B830, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000107, 0x00000043, 0x00000005, func_80242A90_854C00, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000015, 0x7FFFFE00, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B6000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000003C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF24, 0x0000000A, 0x00000174, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000F, 0x00000027, 0x0000000A, 0x00000002, 0xF8406042, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000004, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000028, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x802441E0, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249C34_85BDA4 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0xFFFFFECA, 0xFFFFFFF6, 0x00000174, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFEA7, 0xFFFFFFF6, 0x00000174, 0x0000001E, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249D80_85BEF0 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEE3, 0x000001E5, 0x00000028, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFECA, 0x00000174, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEA7, 0x00000174, 0x0000001E, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249E84_85BFF4 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mac_05_GetFloorCollider, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000012, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerTargetYaw, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFC4, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000041, 0x00000000, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x0000000E, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802430B4_855224, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000001D, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A1F8_85C368 -.word 0x00000046, 0x00000001, D_80249E84_85BFF4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x00000041, 0x00000000, 0x00000000, 0x00000000, 0x000001E0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000045, 0x00000002, D_802486EC_85A85C, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000044, 0x00000001, D_80249C34_85BDA4, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60006, 0x00B60006, 0x00000005, 0x00070090, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000044, 0x00000001, D_80249D80_85BEF0, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60005, 0x00000043, 0x00000005, MakeLerp, 0x000001E0, 0x00000174, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFB7, 0xFFFFFFCB, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFB7, 0xFFFFFF24, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFFFFFFCB, 0x00000174, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCB, 0x0000000A, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF24, 0xFE363C80, 0x00000174, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B6000C, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60008, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x00070091, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001DB, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497C80, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A6680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80244314, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60008, 0x00000005, 0x00070092, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x00070093, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001DB, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497C80, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A6680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x00070094, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60002, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024ADA4_85CF14 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000A, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000008, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000009, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00B60002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000008, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60008, 0x00000005, 0x00070097, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60002, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00B60002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000008, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60008, 0x00000005, 0x00070098, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60002, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x000700B0, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x000700B2, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFF24, 0xFFFFFFE2, 0x00000174, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B6000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_802484F8_85A668, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, func_80242A90_854C00, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000044, 0x00000001, D_802496C0_85B830, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242C78_854DE8, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000107, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C83, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000005, func_80242A90_854C00, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242C78_854DE8, 0x00000001, 0x00000057, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000B, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60008, 0x00000000, 0x000700AD, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60006, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C83, 0xFE363C85, 0x00000014, 0x00000043, 0x00000005, func_80242A90_854C00, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242C78_854DE8, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x000700AE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60009, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x000700B1, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242E84_854FF4, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80252964, 0x00000000, 0x00000057, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000B, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x000700AF, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B4BC_85D62C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024ADA4_85CF14, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x01000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000010, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60005, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFFC4, 0x00000122, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60005, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFB7, 0xFFFFFFCB, 0x000001E0, 0x00000044, 0x00000001, D_8024A1F8_85C368, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60008, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF24, 0x0000000A, 0x00000174, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60008, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF24, 0x0000000A, 0x00000174, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF24, 0x0000000A, 0x00000174, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B764_85D8D4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFF6, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8080, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEB1, 0x00000190, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x000700B3, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEAC, 0x0000017C, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000002D, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEE8, 0x00000118, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEAC, 0x00000046, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEFC, 0xFFFFFF74, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000096, 0xFFFFFF74, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000029, 0x0000000A, 0x00000002, 0xF8406042, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000004, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BA44_85DBB4 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000008, 0x0000000A, 0x00000002, 0xF97188B8, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x00070083, 0x00000024, 0x00000002, 0xF97188B8, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x00070084, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x00070095, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x00070096, 0x00000018, 0x00000001, 0x0000000B, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x000700AC, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802482BC_85A42C, 0x00000046, 0x00000001, D_80248164_85A2D4, 0x00000046, 0x00000001, D_802481B4_85A324, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BBD8_85DD48 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000000B, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFE84, 0xFFFFFFF6, 0x00000174, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024BA44_85DBB4, 0x00000016, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024B764_85D8D4, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BCBC_85DE2C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802431B0_855320, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BCF8_85DE68 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000002D, 0x00000044, 0x00000001, 0x80244298, 0x00000043, 0x00000002, PlaySound, 0x80000055, 0x00000045, 0x00000002, D_8024BCBC_85DE2C, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000096, 0xFFFFFFE2, 0x000001EA, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000700B4, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0xFFFFFFF6, 0x000001EA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0xFFFFFFF6, 0x000001EA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002BC, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000C, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFD8, 0x000001EA, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, StopSound, 0x80000055, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000045, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8080, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFF9C, 0xFFFFFFF6, 0x000001EA, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210005, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001D, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210018, 0x00210005, 0x00000000, 0x000700B5, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000E1, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0021001A, 0x00210005, 0x00000000, 0x000700B6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF06, 0xFFFFFFF6, 0x000001EA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210007, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF01, 0x000001EA, 0x0000004B, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210005, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0021000D, 0x0021000D, 0x00000000, 0x000700B7, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_80243254_8553C4, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x0000002D, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C300_85E470 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210014, 0x00210014, 0x00000005, 0x000700BD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C330_85E4A0 -.word 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000024, 0x00000002, 0xF8406042, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEAC, 0xFFFFFFF6, 0x0000017C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFE98, 0xFE363C81, 0x00000186, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFED4, 0xFFFFFFF6, 0x0000017C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000005, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210014, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210014, 0x00210014, 0x00000000, 0x000700BE, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C4C8_85E638 -.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210014, 0x00210014, 0x00000005, 0x000700BD, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C568_85E6D8 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024BCF8_85DE68, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C300_85E470, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_8024C330_85E4A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C5B4_85E724 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_8024C4C8_85E638, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C620_85E790 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007004E, 0x00000024, 0x00000002, 0xFE363C81, 0x0007005B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007004F, 0x00000024, 0x00000002, 0xFE363C81, 0x0007005C, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00070050, 0x00000024, 0x00000002, 0xFE363C81, 0x0007005D, 0x00000023, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x008D0002, 0x008D0001, 0x00000000, 0x00000003, 0xFE363C80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00410024, 0x00410004, 0x00000000, 0x00000002, 0xFE363C81, 0x00000046, 0x00000001, D_8024810C_85A27C, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C750_85E8C0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070051, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070052, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00070053, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00070054, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00070055, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00070056, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00070057, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00070058, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00070059, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0007005A, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008D0002, 0x008D0001, 0x00000000, 0xFE363C80, 0x00000046, 0x00000001, D_8024810C_85A27C, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C8EC_85EA5C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0007005E, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0007005F, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00070060, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00070061, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00070062, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00070063, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00410024, 0x00410004, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C9D8_85EB48 -.word 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000026, 0x00000026, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C620_85E790, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00400000, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C750_85E8C0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CA5C_85EBCC -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C620_85E790, 0x00000018, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00400000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFDC1, 0x00000028, 0x00000078, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C8EC_85EA5C, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CB1C_85EC8C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007001A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007001B, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x0007001C, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007001D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007001E, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0007001F, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00070020, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00070021, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00070022, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00070023, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00070024, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00070025, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00070026, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CCF4_85EE64 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024CB1C_85EC8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CD18_85EE88 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070027, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070028, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00070029, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007002A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007002B, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0007002C, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0007002D, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0007002E, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0007002F, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00070030, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00070031, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00070032, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00070033, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CEF0_85F060 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024CD18_85EE88, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CF14_85F084 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070034, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070035, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00070036, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070037, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070038, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00070039, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0007003A, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0007003B, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0007003C, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0007003D, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0007003E, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0007003F, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00070040, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D0EC_85F25C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024CF14_85F084, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D110_85F280 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070041, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070042, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00070043, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070044, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070045, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00070046, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00070047, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00070048, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00070049, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0007004A, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0007004B, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0007004C, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0007004D, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830304, 0x00830301, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D2E8_85F458 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024D110_85F280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D30C_85F47C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070001, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00070002, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070003, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070004, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00070005, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00070006, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00070007, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00070008, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00070009, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0007000A, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0007000B, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0007000C, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AC0005, 0x00AC0001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D4E4_85F654 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024D30C_85F47C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D508_85F678 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007000D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0007000E, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x0007000F, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x0000000A, 0x00000002, 0xF8405CA2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070010, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00070011, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00070012, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00070013, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00070014, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00070015, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00070016, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00070017, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00070018, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00070019, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D6E0_85F850 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024D508_85F678, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D704_85F874 -.word 0x00000068, 0x00000000 - -dlabel D_8024D70C_85F87C -.word 0x00000024, 0x00000002, 0xF8405CB5, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFCA, 0x0000000A, 0x00000002, 0xF97188BE, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070070, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070071, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA5, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070072, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x008E0003, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x008E0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070073, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070074, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070075, 0x00000024, 0x00000002, 0xFE363C80, 0x00000067, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddKeyItem, 0x00000067, 0x00000024, 0x00000002, 0xF8405CA5, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000001, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070081, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070082, 0x00000024, 0x00000002, 0xF97188BD, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000068, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070076, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070077, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070078, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070079, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024D704_85F874, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000046, 0x00000001, D_80247824_859994, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007A, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007B, 0x00000024, 0x00000002, 0xF8405CA6, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007007C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007007E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000A7, 0xFFFFFDFF, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000070, 0xFFFFFE01, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0x00000046, 0xFFFFFDE4, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000070, 0x00000000, 0xFFFFFE01, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000070, 0x00000000, 0xFFFFFE01, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x802442C4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00830006, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008E0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000008C, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0005, 0x00000008, 0x00000001, 0x00000096, 0x00000008, 0x00000001, 0x00000096, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00830001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008E0001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, 0x802442E8, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFFFFFFAB, 0xFFFFFDF8, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x000000D0, 0xFFFFFDEE, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070080, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000145, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000003, AddBadge, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000003, SetTattleMessage, 0x00000009, 0x001A0058, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E1D0_860340 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024D70C_85F87C, 0x00000024, 0x00000002, 0xF97188BD, 0x00000000, 0x00000024, 0x00000002, 0xF97188BE, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CB5, 0x00000001, 0x00000024, 0x00000002, 0xF97188BE, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E23C_8603AC -.word 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08400000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000008C, 0x00000001, 0x00000008, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0005, 0x00000008, 0x00000001, 0x0000076C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_8024335C_8554CC, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x802442E8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x08400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E3A0_860510 -.word 0x0000000A, 0x00000002, 0xF8405CA5, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070068, 0x00000024, 0x00000002, 0xF97188BF, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070069, 0x00000024, 0x00000002, 0xF97188BF, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006A, 0x00000024, 0x00000002, 0xF97188BF, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006B, 0x00000024, 0x00000002, 0xF97188BF, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006C, 0x00000024, 0x00000002, 0xF97188BF, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006D, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006E, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006F, 0x00000044, 0x00000001, D_8024E23C_8603AC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E5DC_86074C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024E3A0_860510, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000001, 0x00000043, 0x00000003, SetTattleMessage, 0x00000009, 0x001A0058, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E62C_86079C -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000001, func_80243380_8554F0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700BF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802433BC_85552C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627D, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C1, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000046, 0x00000001, D_802479A8_859B18, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C5, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x000000AC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C2, 0x00000024, 0x00000002, 0xFE363C80, 0x000000BB, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C3, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627D, 0x00000000, 0x00000027, 0x00000002, 0xF5DE02E2, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E9A8_860B18 -.word 0x0000000B, 0x00000002, 0xF840627D, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024E62C_86079C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E9FC_860B6C -.word 0x00000000, D_80244F00_857070, 0x00000000, 0xC47A0000, 0x00000000, 0x00400F09, D_8024B4BC_85D62C, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0055 - -dlabel D_8024EBEC_860D5C -.word 0x00000001, D_80244F2C_85709C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D09, D_8024BBD8_85DD48, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_8024EDDC_860F4C -.word 0x00000002, D_8024502C_85719C, 0x43B90000, 0xC1200000, 0xC2E60000, 0x00400D09, D_8024C9D8_85EB48, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x008D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001A0053 - -dlabel D_8024EFCC_86113C -.word 0x00410000, 0x00410004, 0x00410008, 0x0041000A, 0x00410024, 0xFFFFFFFF - -dlabel D_8024EFE4_861154 -.word 0x00000003, D_8024502C_85719C, 0x43A00000, 0xC1200000, 0xC2E60000, 0x00400D09, D_8024CA5C_85EBCC, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00410004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024EFCC_86113C, 0x001A0054 - -dlabel D_8024F1D4_861344 -.word 0x00210000, 0x00210001, 0x00210003, 0x00210005, 0x00210007, 0x0021000A, 0x0021000B, 0x0021000C, 0x0021000D, 0x00210014, 0x00210018, 0x0021001A, 0xFFFFFFFF - -dlabel D_8024F208_861378 -.word 0x00000004, D_80244F58_8570C8, 0x00000000, 0xC47A0000, 0x00000000, 0x00440D0D, D_8024C568_85E6D8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, D_8024F1D4_861344, 0x001A0006, 0x00000005, D_80244F58_8570C8, 0x00000000, 0xC47A0000, 0x00000000, 0x21540F0C, D_8024C5B4_85E724, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, D_8024F1D4_861344, 0x001A0006 - -dlabel D_8024F5E8_861758 -.word 0x0000000C, D_8024502C_85719C, 0x43A00000, 0x00000000, 0xC3960000, 0x00002D09, D_8024CCF4_85EE64, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A005A, 0x0000000D, D_8024502C_85719C, 0xC3A50000, 0xC1200000, 0xC2B40000, 0x00002D09, D_8024CEF0_85F060, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A005B, 0x0000000E, D_8024502C_85719C, 0xC2480000, 0x00000000, 0xC3C80000, 0x00002D09, D_8024D0EC_85F25C, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A005C, 0x0000000F, D_8024502C_85719C, 0x43480000, 0x00000000, 0xC35C0000, 0x00002D09, D_8024D2E8_85F458, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0xFFFFFF88, 0x00000000, 0xFFFFFF24, 0x000000C8, 0x00000000, 0xFFFFFF24, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x000000B4, 0x00000014, 0xFFFFFE4D, 0x0000000A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830301, 0x00830302, 0x00830303, 0x00830303, 0x00830301, 0x00830301, 0x00830306, 0x00830306, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00830303, 0x00000000, 0x00000000, 0x00000000, 0x001A005D - -dlabel D_8024FDA8_861F18 -.word 0x00000007, D_8024502C_85719C, 0xC2AA0000, 0x00000000, 0xC4020000, 0x00002D09, D_8024D4E4_85F654, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00AC0001, 0x00000000, 0x00000000, 0x00000000, 0x001A0052, 0x00000008, D_8024502C_85719C, 0x41F00000, 0x00000000, 0xC40E8000, 0x00002D09, D_8024D6E0_85F850, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0056, 0x00000009, D_8024502C_85719C, 0x43500000, 0x00000000, 0xC4048000, 0x00002D09, D_8024E5DC_86074C, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AD0001, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00AD0000, 0x00000000, 0x00000000, 0x00000000, 0x001A0057, 0x0000000A, D_8024502C_85719C, 0x431E0000, 0x00000000, 0xC40AC000, 0x00002D09, D_8024E1D0_860340, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x008E0001, 0x00000000, 0x00000000, 0x00000000, 0x001A0059, 0x0000000B, D_8024502C_85719C, 0x42B80000, 0x00000000, 0xC3FA0000, 0x00112D09, D_8024E9A8_860B18, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830401, 0x00830402, 0x00830403, 0x00830403, 0x00830401, 0x00830401, 0x00830401, 0x00830406, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00830403, 0x00000000, 0x00000000, 0x00000000, 0x001A0007 - -dlabel D_80250758_8628C8 -.word 0x00000006, D_80247680_8597F0, 0x43EC0000, 0x00000000, 0xC3660000, 0x00006D09, 0x00000000, 0x00000001, 0x00010605, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AF0001, 0x00AF0002, 0x00AF0003, 0x00AF0003, 0x00AF0001, 0x00AF0001, 0x00AF0000, 0x00AF0000, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0002, 0x00000001, D_8024EFE4_861154, 0x00000000, 0x00000001, D_8024EDDC_860F4C, 0x00000000, 0x00000005, D_8024FDA8_861F18, 0x00000000, 0x00000004, D_8024F5E8_861758, 0x00000000, 0x00000001, D_8024E9FC_860B6C, 0x00000000, 0x00000001, D_80250758_8628C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024EBEC_860D5C, 0x00000000, 0x00000001, D_8024EFE4_861154, 0x00000000, 0x00000001, D_8024EDDC_860F4C, 0x00000000, 0x00000005, D_8024FDA8_861F18, 0x00000000, 0x00000004, D_8024F5E8_861758, 0x00000000, 0x00000001, D_8024E9FC_860B6C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_8024F208_861378, 0x02050000, 0x00000001, D_8024EBEC_860D5C, 0x00000000, 0x00000001, D_8024EDDC_860F4C, 0x00000000, 0x00000005, D_8024FDA8_861F18, 0x00000000, 0x00000004, D_8024F5E8_861758, 0x00000000, 0x00000001, D_8024E9FC_860B6C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s b/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s deleted file mode 100644 index 3c8de171a3..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel mac_05_unkAngle1 -.word 0x00000000 - -dlabel mac_05_unkAngle2 -.word 0xFFFFFFFF - -dlabel mac_05_unkAngle3 -.word 0xFFFFFFFF - -dlabel D_80250A5C_862BCC -.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250AD4_862C44 -.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000010, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250D58_862EC8 -.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250FA4_863114 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250FB4_863124 -.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, mac_05_UnkPlayerPosFunc, 0x00000043, 0x00000006, PlaySoundAt, 0x8000004F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, mac_05_CreateWhaleGeyser, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000001, mac_05_UnkPlayerPosFunc, 0x00000043, 0x00000005, mac_05_SetWhaleGeyserPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8025110C_86327C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8025111C_86328C -.word 0x0000000F, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251244_8633B4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802513AC_86351C -.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802514EC_86365C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251654_8637C4 -.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802516CC_86383C -.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, mac_05_unkAngleFunc002, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x0000005B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, mac_05_unkAngleFunc003, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005B, 0x00000002, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, mac_05_UnkAngleFunc001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00B60009, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000443, 0x00000043, 0x00000002, func_802D62E4, 0x00000043, 0x00000043, 0x00000002, mac_05_DisposeWhaleGeyser, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002037, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250D58_862EC8, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250A5C_862BCC, 0x00000016, 0x00000001, 0x00B60002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002036, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250AD4_862C44, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_80251654_8637C4, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_802516CC_86383C, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FA4_863114, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_80251244_8633B4, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_802513AC_86351C, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_802514EC_86365C, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FB4_863124, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_8025110C_86327C, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_8025111C_86328C, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/864450.data.s b/ver/us/asm/data/world/area_mac/mac_05/864450.data.s deleted file mode 100644 index 9089102320..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_05/864450.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802522E0_864450 -.word 0x00000043, 0x00000006, RotateModel, 0x00000025, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80252310_864480 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x0000002F, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000002E, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000030, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000031, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000032, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000033, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000034, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000035, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000038, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000039, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003A, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7680, 0x00000043, 0x00000006, RotateModel, 0x00000027, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000028, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000002A, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000002B, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000002C, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80252580_8646F0 -.word 0x00000043, 0x00000006, RotateModel, 0x00000025, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802525B0_864720 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000005D, 0x00000000, 0x00000008, 0x00000043, 0x00000002, StopSound, 0x80000058, 0x00000043, 0x00000002, func_802D62E4, 0x00000039, 0x00000043, 0x00000003, EnableGroup, 0x00000024, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000024, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x802441E0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802526C8_864838 -.word 0x00000008, 0x00000007, 0x00000009, 0x0000000A, 0x0000000B, 0xFFFFFFFF, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000002, D_802522E0_864450, D_80252310_864480, D_80252580_8646F0, D_802525B0_864720, 0x00000020, 0x00000025, 0x00000043, D_802526C8_864838, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_802525B0_864720, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80252744_8648B4 -.word 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000003, 0x00000036, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000003, func_80243F0C_85607C, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000036, 0x00000003, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s b/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s deleted file mode 100644 index 264c176a00..0000000000 --- a/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240690_7E7A30 -.word 0x00000000, 0x00000000, 0xC3F28000, 0x00000000, 0x43AC8000, 0x00000000, 0xC3AC8000, 0x00000000, 0x43F28000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC3AC8000, 0x00000000, 0x43AC8000, 0x42340000, 0xC3F28000, 0x00000000, 0x00000000, 0x00000000, 0xC3AC8000, 0x00000000, 0xC3AC8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43B10000, 0x00000000, 0x43930000, 0x42EA0000, 0xC3520000, 0x420C0000, 0xC2C80000, 0x43340000, 0xC3160000, 0x420C0000, 0xC2C80000, 0x43340000, 0xC2B40000, 0x420C0000, 0xC2C80000, 0x43340000, 0xC2B40000, 0x420C0000, 0xC3480000, 0x43340000, 0xC1F00000, 0x420C0000, 0xC3480000, 0x43340000, 0x41F00000, 0x420C0000, 0xC3480000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240CF0_7E8090, D_80240690_7E7A30, 0x00000011, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000 - -dlabel D_802407E0_7E7B80 -.word 0x802437B0, 0x00000000, 0x0000000C, 0xF5DE0182, 0x802437A8, 0x0000000C, 0x0000000F, 0xF5DE0191, 0x802437A0, 0x0000001B, 0x0000001D, 0xF5DE01AE, 0x80243798, 0x00000038, 0x0000000B, 0xF5DE01B9, 0x80243790, 0x00000043, 0x0000000A, 0xF5DE01C3, 0x80243788, 0x0000004D, 0x0000000D, 0xF5DE01D0, 0x80243780, 0x0000005A, 0x0000000A, 0xF5DE01DA, 0x80243778, 0x00000064, 0x0000000C, 0xF5DE01E6, 0x80243770, 0x00000070, 0x0000000A, 0xF5DE01F0, 0x80243768, 0x0000007A, 0x0000000C, 0xF5DE01FC, 0x80243760, 0x00000086, 0x0000000C, 0xF5DE0208, 0x80243758, 0x00000092, 0x0000000A, 0xF5DE0212, 0x80243750, 0x0000009C, 0x0000000F, 0xF5DE0221, 0x80243748, 0x000000AB, 0x0000000B, 0xF5DE022C, 0x80243740, 0x000000B6, 0x0000000B, 0xF5DE0237, 0x80243738, 0x000000C1, 0x0000000A, 0xF5DE0241, 0x80243730, 0x000000CB, 0x0000000B, 0xF5DE024C, 0x80243728, 0x000000D6, 0x0000000F, 0xF5DE025B, 0x80243720, 0x000000E5, 0x0000000A, 0xF5DE0265, 0x80243718, 0x000000EF, 0x0000000A, 0xF5DE026F, 0x80243710, 0x000000F9, 0x0000000F, 0xF5DE027E, 0x80243708, 0x00000108, 0x00000013, 0xF5DE0290, 0x80243700, 0x0000011B, 0x0000000E, 0xF5DE029F, 0x802436F8, 0x00000129, 0x00000012, 0xF5DE02B1, 0x802436F0, 0x00000145, 0x0000000B, 0xF5DE02C6, 0x802436E8, 0x0000013B, 0x0000000A, 0xF5DE02BB, 0x802436E0, 0x00000150, 0x0000000A, 0xF5DE02D0, 0x802436D8, 0x0000015A, 0x00000013, 0xF5DE02E3, 0x802436D0, 0x0000016D, 0x00000028, 0xF5DE030B, 0x802436C4, 0x00000195, 0x0000000A, 0xF5DE0315, 0x802436B8, 0x0000019F, 0x0000000A, 0xF5DE031F, 0x802436B0, 0x000001A9, 0x0000000B, 0xF5DE032A, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802409F0_7E7D90 -.word 0x8024392C, 0x00000000, 0x0000001E, 0xF8405B8A, 0x80243920, 0x0000001E, 0x00000064, 0xF8405BEF, 0x80243914, 0x00000082, 0x00000102, 0xF8405CF1, 0x80243908, 0x00000184, 0x00000047, 0xF8405D37, 0x802438FC, 0x000001CB, 0x00000014, 0xF8405D4B, 0x802438F0, 0x000001DF, 0x00000034, 0xF8405D7F, 0x802438E4, 0x00000213, 0x00000023, 0xF8405DA2, 0x802438D8, 0x00000236, 0x00000048, 0xF8405DEA, 0x802438CC, 0x0000027E, 0x00000030, 0xF8405E1B, 0x802438C0, 0x000002AE, 0x0000003C, 0xF8405E53, 0x802438B4, 0x000002EA, 0x00000024, 0xF8405E7A, 0x802438A8, 0x0000030E, 0x00000058, 0xF8405ED2, 0x8024389C, 0x00000366, 0x00000036, 0xF8405F0B, 0x80243890, 0x0000039C, 0x00000020, 0xF8405F28, 0x80243884, 0x000003BC, 0x0000002D, 0xF8405F56, 0x80243878, 0x000003E9, 0x00000027, 0xF8405F7D, 0x8024386C, 0x00000410, 0x0000003A, 0xF8405FB0, 0x80243860, 0x0000044A, 0x00000075, 0xF840602B, 0x80243854, 0x000004BF, 0x0000005D, 0xF8406083, 0x80243848, 0x0000051C, 0x00000036, 0xF84060BC, 0x8024383C, 0x00000552, 0x00000045, 0xF8406105, 0x80243830, 0x00000597, 0x0000003B, 0xF840613E, 0x80243824, 0x000005D2, 0x00000037, 0xF8406171, 0x80243818, 0x00000609, 0x0000004D, 0xF84061B8, 0x8024380C, 0x00000656, 0x00000015, 0xF84061D7, 0x80243800, 0x0000066B, 0x00000015, 0xF84061EC, 0x802437F4, 0x00000680, 0x00000028, 0xF8406215, 0x802437E8, 0x000006A8, 0x0000006D, 0xF8406282, 0x802437DC, 0x00000715, 0x00000019, 0xF840629C, 0x802437D0, 0x0000072E, 0x0000005F, 0xF84062F9, 0x802437C4, 0x0000078D, 0x0000001D, 0xF8406316, 0x802437B8, 0x000007AA, 0x00000036, 0xF840634C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240C00_7E7FA0 -.word 0x00000043, 0x00000003, GotoMap, 0x80243938, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C30_7E7FD0 -.word 0x00000043, 0x00000003, GotoMap, 0x80243940, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C60_7E8000 -.word 0x00000043, 0x00000003, GotoMap, 0x80243948, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C90_7E8030 -.word 0x00000043, 0x00000003, GotoMap, 0x80243950, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CC0_7E8060 -.word 0x00000043, 0x00000003, GotoMap, 0x80243958, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CF0_7E8090 -.word 0x00000043, 0x00000001, func_80240000_7E73A0, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80240E20_7E81C0, 0x00000047, 0x00000005, D_80240C00_7E7FA0, 0x00000040, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C30_7E7FD0, 0x00000040, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C60_7E8000, 0x00000040, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C90_7E8030, 0x00000040, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240CC0_7E8060, 0x00000040, 0x00000012, 0x00000001, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242F6C, 0x00000046, 0x00000001, 0x802410D0, 0x00000044, 0x00000001, 0x802435B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E20_7E81C0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_HugeBlueSwitch, 0x00000116, 0x00000000, 0xFFFFFEC2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x00000044, 0x00000000, 0xFFFFFFA4, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000077, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x000000A9, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HiddenYellowBlock, 0x00000000, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000028, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000050, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000078, 0x00000068, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000A0, 0x0000006C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000C8, 0x0000006E, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000F0, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0xFFFFFF32, 0x00000000, 0xFFFFFE8B, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0xFFFFFF7D, 0x00000000, 0xFFFFFE99, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000046, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000005E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000076, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000008E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x000000A6, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/machi/7E8470.data.s b/ver/us/asm/data/world/area_mac/machi/7E8470.data.s deleted file mode 100644 index 5cb327d212..0000000000 --- a/ver/us/asm/data/world/area_mac/machi/7E8470.data.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410D0_7E8470 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410E0_7E8480 -.word 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024110C_7E84AC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024111C_7E84BC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024112C_7E84CC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024114C_7E84EC -.word 0x00630001, 0x00180018, D_802410E0_7E8480, D_8024110C_7E84AC, D_8024111C_7E84BC, D_8024112C_7E84CC, 0x00000000, 0x00000000, 0x00000D01, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241180_7E8520 -.word 0x009E0005, 0x009E0012, 0x009E0013, 0x009E0001, 0x009E0001, 0x009E0007 - -dlabel D_80241198_7E8538 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802401B0_7E7550, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402EC_7E768C, 0x00000043, 0x00000001, func_80240318_7E76B8, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241200_7E85A0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241210_7E85B0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412E0_7E8680 -.word 0x00000043, 0x00000002, BringPartnerOut, 0x00000004, 0x00000008, 0x00000001, 0x000000C8, 0x00000043, 0x00000001, PutPartnerAway, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241318_7E86B8 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241328_7E86C8 -.word 0x00000043, 0x00000001, func_802403A0_7E7740, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241344_7E86E4 -.word 0x00000043, 0x00000001, func_80240410_7E77B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241360_7E8700 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241370_7E8710 -.word 0x00000043, 0x00000001, func_8024045C_7E77FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024138C_7E872C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024139C_7E873C -.word 0x00D30000, 0x00180018, D_80241328_7E86C8, D_802412E0_7E8680, D_80241318_7E86B8, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_802413C8_7E8768 -.word 0x008F0005, 0x00180018, 0x00000000, D_80241344_7E86E4, D_80241360_7E8700, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_802413F4_7E8794 -.word 0x00B60004, 0x00180018, 0x00000000, D_80241370_7E8710, D_8024138C_7E872C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80241420_7E87C0 -.word 0x009D0002, 0x00180018, D_80241198_7E8538, D_80241200_7E85A0, 0x00000000, D_80241210_7E85B0, 0x00000000, 0x00000000, 0x00100F00, 0x00000000, 0x00000000 - -dlabel D_8024144C_7E87EC -.word 0x00000005, D_8024139C_7E873C, 0x41800000, 0x00000000, 0xC3CD8000, 0x00000000, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_802413C8_7E8768, 0x43C28000, 0x00000000, 0xC38B0000, 0x00000000, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_802413F4_7E8794, 0x43F08000, 0x00000000, 0xC2300000, 0x00000000, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241A1C_7E8DBC -.word 0x0000000A, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000C, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000D, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000E, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, D_80241420_7E87C0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00001F64, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, D_8024114C_7E84EC, 0x41400000, 0x00000000, 0xC1500000, 0x00000000, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_8024144C_7E87EC, 0x00080000, 0x00000001, D_80241A1C_7E8DBC, 0x00080000, 0x00000001, 0x80243258, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/machi/7EA340.data.s b/ver/us/asm/data/world/area_mac/machi/7EA340.data.s deleted file mode 100644 index 075d148159..0000000000 --- a/ver/us/asm/data/world/area_mac/machi/7EA340.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242FA0_7EA340 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FB0_7EA350 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24B1A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8A80, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A6A80, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243090_7EA430 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024319C_7EA53C -.word 0x00000045, 0x00000002, D_80243090_7EA430, 0xFE363C8A, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFE363C80, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000001, func_802404B0_7E7850, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024322C_7EA5CC -.word 0x00160001, 0x00180018, D_80242FA0_7EA340, 0x00000000, D_8024319C_7EA53C, 0x00000000, D_80242FB0_7EA350, 0x00000000, 0x00000F00, 0x00000000, 0x00000000, 0x00000037, D_8024322C_7EA5CC, 0x43A00000, 0x41F00000, 0xC3910000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243450_7EA7F0 -.word 0xC3A60000, 0x41200000, 0x42F00000, 0xC3200000, 0x42480000, 0x43960000, 0xC28E0000, 0x42700000, 0x43020000, 0x42D20000, 0x428C0000, 0x43830000, 0x435D0000, 0x42A00000, 0x42F00000, 0x43CA0000, 0x42820000, 0x43160000, 0x436E0000, 0x42480000, 0xC2640000, 0x427C0000, 0x42480000, 0xC2280000, 0xC3030000, 0x41A00000, 0x43100000, 0xC2960000, 0x42A00000, 0xC2700000, 0x43480000, 0x42200000, 0xC3960000, 0x41A00000, 0x00000000, 0xC38C0000, 0x428C0000, 0x00000000, 0x42A00000, 0xC3A60000, 0x41200000, 0x42F00000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010005, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetAngleToNPC, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C83, 0xF24A8A80, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcBlur, 0xFFFFFFFC, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, LoadPath, 0x000001F4, D_80243450_7EA7F0, 0x0000000E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/machi/7EAA50.data.s b/ver/us/asm/data/world/area_mac/machi/7EAA50.data.s deleted file mode 100644 index 57242eabea..0000000000 --- a/ver/us/asm/data/world/area_mac/machi/7EAA50.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802436B0_7EAA50 -.word 0x47535720, 0x4D415000, 0x47535720, 0x444F4B41, 0x4E000000, 0x47535720, 0x4642544C, 0x00000000, 0x47535720, 0x42544C00, 0x47535720, 0x4E504300, 0x47535720, 0x42415400, 0x47535720, 0x4F535200, 0x47535720, 0x454E4400, 0x47535720, 0x4B504100, 0x47535720, 0x50524100, 0x47535720, 0x53414D00, 0x47535720, 0x464C4F00, 0x47535720, 0x4B5A4E00, 0x47535720, 0x4A414E00, 0x47535720, 0x4F4D4F00, 0x47535720, 0x44474200, 0x47535720, 0x41524E00, 0x47535720, 0x4F424B00, 0x47535720, 0x4D494D00, 0x47535720, 0x49534B00, 0x47535720, 0x53424B00, 0x47535720, 0x44524F00, 0x47535720, 0x49574100, 0x47535720, 0x54524400, 0x47535720, 0x4E4F4B00, 0x47535720, 0x484F5300, 0x47535720, 0x4B4B4A00, 0x47535720, 0x4B475200, 0x47535720, 0x54494B00, 0x47535720, 0x4D414300, 0x47535720, 0x4B4D5200, 0x47535720, 0x45565400, 0x47535746, 0x204D4150, 0x00000000, 0x47535746, 0x20444F4B, 0x414E0000, 0x47535746, 0x20464254, 0x4C000000, 0x47535746, 0x2042544C, 0x00000000, 0x47535746, 0x204E5043, 0x00000000, 0x47535746, 0x20424154, 0x00000000, 0x47535746, 0x204F5352, 0x00000000, 0x47535746, 0x20454E44, 0x00000000, 0x47535746, 0x204B5041, 0x00000000, 0x47535746, 0x20505241, 0x00000000, 0x47535746, 0x2053414D, 0x00000000, 0x47535746, 0x20464C4F, 0x00000000, 0x47535746, 0x204B5A4E, 0x00000000, 0x47535746, 0x204A414E, 0x00000000, 0x47535746, 0x204F4D4F, 0x00000000, 0x47535746, 0x20444742, 0x00000000, 0x47535746, 0x2041524E, 0x00000000, 0x47535746, 0x204F424B, 0x00000000, 0x47535746, 0x204D494D, 0x00000000, 0x47535746, 0x2049534B, 0x00000000, 0x47535746, 0x2053424B, 0x00000000, 0x47535746, 0x2044524F, 0x00000000, 0x47535746, 0x20495741, 0x00000000, 0x47535746, 0x20545244, 0x00000000, 0x47535746, 0x204E4F4B, 0x00000000, 0x47535746, 0x20484F53, 0x00000000, 0x47535746, 0x204B4B4A, 0x00000000, 0x47535746, 0x204B4752, 0x00000000, 0x47535746, 0x2054494B, 0x00000000, 0x47535746, 0x204D4143, 0x00000000, 0x47535746, 0x204B4D52, 0x00000000, 0x47535746, 0x20455654, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s b/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s index 06887d4f2b..6e55382ec1 100644 --- a/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s +++ b/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s @@ -15,4 +15,4 @@ dlabel D_80242AD4_D52AC4 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D511C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80242AD4_D52AC4, 0x00000010, 0x00000000, func_80243CC0_A2DF00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242C68_D52C58 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D51264, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C68_D52C58, 0x00000010, 0x00000000, D_80243E88_846A58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D51264, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C68_D52C58, 0x00000010, 0x00000000, pra_02_80243E88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/1A5830/JumpToGoal.s b/ver/us/asm/nonmatchings/1A5830/JumpToGoal.s deleted file mode 100644 index a8b69953a0..0000000000 --- a/ver/us/asm/nonmatchings/1A5830/JumpToGoal.s +++ /dev/null @@ -1,275 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel JumpToGoal -/* 1A75E8 80278D08 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 1A75EC 80278D0C AFB30024 */ sw $s3, 0x24($sp) -/* 1A75F0 80278D10 0080982D */ daddu $s3, $a0, $zero -/* 1A75F4 80278D14 AFBF0028 */ sw $ra, 0x28($sp) -/* 1A75F8 80278D18 AFB20020 */ sw $s2, 0x20($sp) -/* 1A75FC 80278D1C AFB1001C */ sw $s1, 0x1c($sp) -/* 1A7600 80278D20 AFB00018 */ sw $s0, 0x18($sp) -/* 1A7604 80278D24 F7BE0058 */ sdc1 $f30, 0x58($sp) -/* 1A7608 80278D28 F7BC0050 */ sdc1 $f28, 0x50($sp) -/* 1A760C 80278D2C F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 1A7610 80278D30 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 1A7614 80278D34 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 1A7618 80278D38 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 1A761C 80278D3C 8E71000C */ lw $s1, 0xc($s3) -/* 1A7620 80278D40 54A00001 */ bnel $a1, $zero, .L80278D48 -/* 1A7624 80278D44 AE600070 */ sw $zero, 0x70($s3) -.L80278D48: -/* 1A7628 80278D48 8E620070 */ lw $v0, 0x70($s3) -/* 1A762C 80278D4C 14400096 */ bnez $v0, .L80278FA8 -/* 1A7630 80278D50 00000000 */ nop -/* 1A7634 80278D54 8E250000 */ lw $a1, ($s1) -/* 1A7638 80278D58 26310004 */ addiu $s1, $s1, 4 -/* 1A763C 80278D5C 0C0B1EAF */ jal evt_get_variable -/* 1A7640 80278D60 0260202D */ daddu $a0, $s3, $zero -/* 1A7644 80278D64 0040202D */ daddu $a0, $v0, $zero -/* 1A7648 80278D68 2402FF81 */ addiu $v0, $zero, -0x7f -/* 1A764C 80278D6C 14820002 */ bne $a0, $v0, .L80278D78 -/* 1A7650 80278D70 00000000 */ nop -/* 1A7654 80278D74 8E640148 */ lw $a0, 0x148($s3) -.L80278D78: -/* 1A7658 80278D78 0C09A75B */ jal get_actor -/* 1A765C 80278D7C 00000000 */ nop -/* 1A7660 80278D80 0040802D */ daddu $s0, $v0, $zero -/* 1A7664 80278D84 2612000C */ addiu $s2, $s0, 0xc -/* 1A7668 80278D88 AE700074 */ sw $s0, 0x74($s3) -/* 1A766C 80278D8C 8E250000 */ lw $a1, ($s1) -/* 1A7670 80278D90 26310004 */ addiu $s1, $s1, 4 -/* 1A7674 80278D94 0C0B1EAF */ jal evt_get_variable -/* 1A7678 80278D98 0260202D */ daddu $a0, $s3, $zero -/* 1A767C 80278D9C A6020070 */ sh $v0, 0x70($s0) -/* 1A7680 80278DA0 8E250000 */ lw $a1, ($s1) -/* 1A7684 80278DA4 26310004 */ addiu $s1, $s1, 4 -/* 1A7688 80278DA8 0C0B1EAF */ jal evt_get_variable -/* 1A768C 80278DAC 0260202D */ daddu $a0, $s3, $zero -/* 1A7690 80278DB0 AE620078 */ sw $v0, 0x78($s3) -/* 1A7694 80278DB4 AE60007C */ sw $zero, 0x7c($s3) -/* 1A7698 80278DB8 8E250000 */ lw $a1, ($s1) -/* 1A769C 80278DBC 26310004 */ addiu $s1, $s1, 4 -/* 1A76A0 80278DC0 0C0B1EAF */ jal evt_get_variable -/* 1A76A4 80278DC4 0260202D */ daddu $a0, $s3, $zero -/* 1A76A8 80278DC8 10400004 */ beqz $v0, .L80278DDC -/* 1A76AC 80278DCC 00000000 */ nop -/* 1A76B0 80278DD0 8E62007C */ lw $v0, 0x7c($s3) -/* 1A76B4 80278DD4 34420001 */ ori $v0, $v0, 1 -/* 1A76B8 80278DD8 AE62007C */ sw $v0, 0x7c($s3) -.L80278DDC: -/* 1A76BC 80278DDC 8E250000 */ lw $a1, ($s1) -/* 1A76C0 80278DE0 0C0B1EAF */ jal evt_get_variable -/* 1A76C4 80278DE4 0260202D */ daddu $a0, $s3, $zero -/* 1A76C8 80278DE8 10400004 */ beqz $v0, .L80278DFC -/* 1A76CC 80278DEC 00000000 */ nop -/* 1A76D0 80278DF0 8E62007C */ lw $v0, 0x7c($s3) -/* 1A76D4 80278DF4 34420002 */ ori $v0, $v0, 2 -/* 1A76D8 80278DF8 AE62007C */ sw $v0, 0x7c($s3) -.L80278DFC: -/* 1A76DC 80278DFC C6000148 */ lwc1 $f0, 0x148($s0) -/* 1A76E0 80278E00 C61A0018 */ lwc1 $f26, 0x18($s0) -/* 1A76E4 80278E04 C61C0020 */ lwc1 $f28, 0x20($s0) -/* 1A76E8 80278E08 C614014C */ lwc1 $f20, 0x14c($s0) -/* 1A76EC 80278E0C C618001C */ lwc1 $f24, 0x1c($s0) -/* 1A76F0 80278E10 E6000010 */ swc1 $f0, 0x10($s0) -/* 1A76F4 80278E14 46000786 */ mov.s $f30, $f0 -/* 1A76F8 80278E18 4406D000 */ mfc1 $a2, $f26 -/* 1A76FC 80278E1C 4407E000 */ mfc1 $a3, $f28 -/* 1A7700 80278E20 C6000144 */ lwc1 $f0, 0x144($s0) -/* 1A7704 80278E24 4600A386 */ mov.s $f14, $f20 -/* 1A7708 80278E28 E6140014 */ swc1 $f20, 0x14($s0) -/* 1A770C 80278E2C E600000C */ swc1 $f0, 0xc($s0) -/* 1A7710 80278E30 46000586 */ mov.s $f22, $f0 -/* 1A7714 80278E34 0C00A720 */ jal atan2 -/* 1A7718 80278E38 4600B306 */ mov.s $f12, $f22 -/* 1A771C 80278E3C 4600B306 */ mov.s $f12, $f22 -/* 1A7720 80278E40 4600A386 */ mov.s $f14, $f20 -/* 1A7724 80278E44 4406D000 */ mfc1 $a2, $f26 -/* 1A7728 80278E48 4407E000 */ mfc1 $a3, $f28 -/* 1A772C 80278E4C 461EC781 */ sub.s $f30, $f24, $f30 -/* 1A7730 80278E50 0C00A7B5 */ jal dist2D -/* 1A7734 80278E54 E6000054 */ swc1 $f0, 0x54($s0) -/* 1A7738 80278E58 86020070 */ lh $v0, 0x70($s0) -/* 1A773C 80278E5C 46000106 */ mov.s $f4, $f0 -/* 1A7740 80278E60 14400012 */ bnez $v0, .L80278EAC -/* 1A7744 80278E64 E6040058 */ swc1 $f4, 0x58($s0) -/* 1A7748 80278E68 C600004C */ lwc1 $f0, 0x4c($s0) -/* 1A774C 80278E6C C602004C */ lwc1 $f2, 0x4c($s0) -/* 1A7750 80278E70 46002003 */ div.s $f0, $f4, $f0 -/* 1A7754 80278E74 4600028D */ trunc.w.s $f10, $f0 -/* 1A7758 80278E78 44035000 */ mfc1 $v1, $f10 -/* 1A775C 80278E7C 00000000 */ nop -/* 1A7760 80278E80 00031400 */ sll $v0, $v1, 0x10 -/* 1A7764 80278E84 00021403 */ sra $v0, $v0, 0x10 -/* 1A7768 80278E88 44820000 */ mtc1 $v0, $f0 -/* 1A776C 80278E8C 00000000 */ nop -/* 1A7770 80278E90 46800020 */ cvt.s.w $f0, $f0 -/* 1A7774 80278E94 46020002 */ mul.s $f0, $f0, $f2 -/* 1A7778 80278E98 00000000 */ nop -/* 1A777C 80278E9C 46002086 */ mov.s $f2, $f4 -/* 1A7780 80278EA0 A6030070 */ sh $v1, 0x70($s0) -/* 1A7784 80278EA4 0809E3B8 */ j .L80278EE0 -/* 1A7788 80278EA8 46001201 */ sub.s $f8, $f2, $f0 -.L80278EAC: -/* 1A778C 80278EAC 44821000 */ mtc1 $v0, $f2 -/* 1A7790 80278EB0 00000000 */ nop -/* 1A7794 80278EB4 468010A0 */ cvt.s.w $f2, $f2 -/* 1A7798 80278EB8 86020070 */ lh $v0, 0x70($s0) -/* 1A779C 80278EBC 46022083 */ div.s $f2, $f4, $f2 -/* 1A77A0 80278EC0 44820000 */ mtc1 $v0, $f0 -/* 1A77A4 80278EC4 00000000 */ nop -/* 1A77A8 80278EC8 46800020 */ cvt.s.w $f0, $f0 -/* 1A77AC 80278ECC 46020002 */ mul.s $f0, $f0, $f2 -/* 1A77B0 80278ED0 00000000 */ nop -/* 1A77B4 80278ED4 C6040058 */ lwc1 $f4, 0x58($s0) -/* 1A77B8 80278ED8 E602004C */ swc1 $f2, 0x4c($s0) -/* 1A77BC 80278EDC 46002201 */ sub.s $f8, $f4, $f0 -.L80278EE0: -/* 1A77C0 80278EE0 86420064 */ lh $v0, 0x64($s2) -/* 1A77C4 80278EE4 14400003 */ bnez $v0, .L80278EF4 -/* 1A77C8 80278EE8 00000000 */ nop -/* 1A77CC 80278EEC 0809E436 */ j .L802790D8 -/* 1A77D0 80278EF0 24020002 */ addiu $v0, $zero, 2 -.L80278EF4: -/* 1A77D4 80278EF4 C642003C */ lwc1 $f2, 0x3c($s2) -/* 1A77D8 80278EF8 44823000 */ mtc1 $v0, $f6 -/* 1A77DC 80278EFC 00000000 */ nop -/* 1A77E0 80278F00 468031A0 */ cvt.s.w $f6, $f6 -/* 1A77E4 80278F04 46061082 */ mul.s $f2, $f2, $f6 -/* 1A77E8 80278F08 00000000 */ nop -/* 1A77EC 80278F0C 3C013F00 */ lui $at, 0x3f00 -/* 1A77F0 80278F10 44810000 */ mtc1 $at, $f0 -/* 1A77F4 80278F14 00000000 */ nop -/* 1A77F8 80278F18 46001082 */ mul.s $f2, $f2, $f0 -/* 1A77FC 80278F1C 00000000 */ nop -/* 1A7800 80278F20 86420064 */ lh $v0, 0x64($s2) -/* 1A7804 80278F24 C6440040 */ lwc1 $f4, 0x40($s2) -/* 1A7808 80278F28 44820000 */ mtc1 $v0, $f0 -/* 1A780C 80278F2C 00000000 */ nop -/* 1A7810 80278F30 46800020 */ cvt.s.w $f0, $f0 -/* 1A7814 80278F34 46004003 */ div.s $f0, $f8, $f0 -/* 1A7818 80278F38 46002100 */ add.s $f4, $f4, $f0 -/* 1A781C 80278F3C 4606F183 */ div.s $f6, $f30, $f6 -/* 1A7820 80278F40 46061080 */ add.s $f2, $f2, $f6 -/* 1A7824 80278F44 E6440040 */ swc1 $f4, 0x40($s2) -/* 1A7828 80278F48 E6420044 */ swc1 $f2, 0x44($s2) -/* 1A782C 80278F4C 8E620078 */ lw $v0, 0x78($s3) -/* 1A7830 80278F50 10400005 */ beqz $v0, .L80278F68 -/* 1A7834 80278F54 00000000 */ nop -/* 1A7838 80278F58 86040192 */ lh $a0, 0x192($s0) -/* 1A783C 80278F5C 82050077 */ lb $a1, 0x77($s0) -/* 1A7840 80278F60 0C098F3F */ jal set_animation -/* 1A7844 80278F64 8E060064 */ lw $a2, 0x64($s0) -.L80278F68: -/* 1A7848 80278F68 8E62007C */ lw $v0, 0x7c($s3) -/* 1A784C 80278F6C 30420002 */ andi $v0, $v0, 2 -/* 1A7850 80278F70 1440000C */ bnez $v0, .L80278FA4 -/* 1A7854 80278F74 24020001 */ addiu $v0, $zero, 1 -/* 1A7858 80278F78 8E0201AC */ lw $v0, 0x1ac($s0) -/* 1A785C 80278F7C 10400009 */ beqz $v0, .L80278FA4 -/* 1A7860 80278F80 24020001 */ addiu $v0, $zero, 1 -/* 1A7864 80278F84 C600014C */ lwc1 $f0, 0x14c($s0) -/* 1A7868 80278F88 E7A00010 */ swc1 $f0, 0x10($sp) -/* 1A786C 80278F8C 8E0401AC */ lw $a0, 0x1ac($s0) -/* 1A7870 80278F90 8E060144 */ lw $a2, 0x144($s0) -/* 1A7874 80278F94 8E070148 */ lw $a3, 0x148($s0) -/* 1A7878 80278F98 0C052757 */ jal sfx_play_sound_at_position -/* 1A787C 80278F9C 0000282D */ daddu $a1, $zero, $zero -/* 1A7880 80278FA0 24020001 */ addiu $v0, $zero, 1 -.L80278FA4: -/* 1A7884 80278FA4 AE620070 */ sw $v0, 0x70($s3) -.L80278FA8: -/* 1A7888 80278FA8 8E700074 */ lw $s0, 0x74($s3) -/* 1A788C 80278FAC C6000050 */ lwc1 $f0, 0x50($s0) -/* 1A7890 80278FB0 C6020010 */ lwc1 $f2, 0x10($s0) -/* 1A7894 80278FB4 46000106 */ mov.s $f4, $f0 -/* 1A7898 80278FB8 46001080 */ add.s $f2, $f2, $f0 -/* 1A789C 80278FBC C6000048 */ lwc1 $f0, 0x48($s0) -/* 1A78A0 80278FC0 46002101 */ sub.s $f4, $f4, $f0 -/* 1A78A4 80278FC4 E6020010 */ swc1 $f2, 0x10($s0) -/* 1A78A8 80278FC8 E6040050 */ swc1 $f4, 0x50($s0) -/* 1A78AC 80278FCC 8E620078 */ lw $v0, 0x78($s3) -/* 1A78B0 80278FD0 1040000B */ beqz $v0, .L80279000 -/* 1A78B4 80278FD4 2612000C */ addiu $s2, $s0, 0xc -/* 1A78B8 80278FD8 44800000 */ mtc1 $zero, $f0 -/* 1A78BC 80278FDC 00000000 */ nop -/* 1A78C0 80278FE0 4600203C */ c.lt.s $f4, $f0 -/* 1A78C4 80278FE4 00000000 */ nop -/* 1A78C8 80278FE8 45000005 */ bc1f .L80279000 -/* 1A78CC 80278FEC 00000000 */ nop -/* 1A78D0 80278FF0 86040192 */ lh $a0, 0x192($s0) -/* 1A78D4 80278FF4 82050077 */ lb $a1, 0x77($s0) -/* 1A78D8 80278FF8 0C098F3F */ jal set_animation -/* 1A78DC 80278FFC 8E060068 */ lw $a2, 0x68($s0) -.L80279000: -/* 1A78E0 80279000 C6420044 */ lwc1 $f2, 0x44($s2) -/* 1A78E4 80279004 44800000 */ mtc1 $zero, $f0 -/* 1A78E8 80279008 00000000 */ nop -/* 1A78EC 8027900C 4600103C */ c.lt.s $f2, $f0 -/* 1A78F0 80279010 00000000 */ nop -/* 1A78F4 80279014 45000007 */ bc1f .L80279034 -/* 1A78F8 80279018 00000000 */ nop -/* 1A78FC 8027901C C6400004 */ lwc1 $f0, 4($s2) -/* 1A7900 80279020 C6420010 */ lwc1 $f2, 0x10($s2) -/* 1A7904 80279024 4602003C */ c.lt.s $f0, $f2 -/* 1A7908 80279028 00000000 */ nop -/* 1A790C 8027902C 45030001 */ bc1tl .L80279034 -/* 1A7910 80279030 E6420004 */ swc1 $f2, 4($s2) -.L80279034: -/* 1A7914 80279034 8E450040 */ lw $a1, 0x40($s2) -/* 1A7918 80279038 8E460048 */ lw $a2, 0x48($s2) -/* 1A791C 8027903C 0C09904A */ jal add_xz_vec3f -/* 1A7920 80279040 0240202D */ daddu $a0, $s2, $zero -/* 1A7924 80279044 C6400000 */ lwc1 $f0, ($s2) -/* 1A7928 80279048 E6000144 */ swc1 $f0, 0x144($s0) -/* 1A792C 8027904C C6400004 */ lwc1 $f0, 4($s2) -/* 1A7930 80279050 E6000148 */ swc1 $f0, 0x148($s0) -/* 1A7934 80279054 C6400008 */ lwc1 $f0, 8($s2) -/* 1A7938 80279058 E600014C */ swc1 $f0, 0x14c($s0) -/* 1A793C 8027905C 96420064 */ lhu $v0, 0x64($s2) -/* 1A7940 80279060 2442FFFF */ addiu $v0, $v0, -1 -/* 1A7944 80279064 A6420064 */ sh $v0, 0x64($s2) -/* 1A7948 80279068 00021400 */ sll $v0, $v0, 0x10 -/* 1A794C 8027906C 1C40001A */ bgtz $v0, .L802790D8 -/* 1A7950 80279070 0000102D */ daddu $v0, $zero, $zero -/* 1A7954 80279074 8E62007C */ lw $v0, 0x7c($s3) -/* 1A7958 80279078 30420001 */ andi $v0, $v0, 1 -/* 1A795C 8027907C 10400008 */ beqz $v0, .L802790A0 -/* 1A7960 80279080 00000000 */ nop -/* 1A7964 80279084 C6400048 */ lwc1 $f0, 0x48($s2) -/* 1A7968 80279088 E7A00010 */ swc1 $f0, 0x10($sp) -/* 1A796C 8027908C 8E45000C */ lw $a1, 0xc($s2) -/* 1A7970 80279090 8E460010 */ lw $a2, 0x10($s2) -/* 1A7974 80279094 8E470014 */ lw $a3, 0x14($s2) -/* 1A7978 80279098 0C0990BC */ jal play_movement_dust_effects -/* 1A797C 8027909C 24040002 */ addiu $a0, $zero, 2 -.L802790A0: -/* 1A7980 802790A0 C640000C */ lwc1 $f0, 0xc($s2) -/* 1A7984 802790A4 E6000144 */ swc1 $f0, 0x144($s0) -/* 1A7988 802790A8 C6400010 */ lwc1 $f0, 0x10($s2) -/* 1A798C 802790AC E6000148 */ swc1 $f0, 0x148($s0) -/* 1A7990 802790B0 C6400014 */ lwc1 $f0, 0x14($s2) -/* 1A7994 802790B4 E600014C */ swc1 $f0, 0x14c($s0) -/* 1A7998 802790B8 8E620078 */ lw $v0, 0x78($s3) -/* 1A799C 802790BC 10400006 */ beqz $v0, .L802790D8 -/* 1A79A0 802790C0 24020001 */ addiu $v0, $zero, 1 -/* 1A79A4 802790C4 86040192 */ lh $a0, 0x192($s0) -/* 1A79A8 802790C8 8245006B */ lb $a1, 0x6b($s2) -/* 1A79AC 802790CC 0C098F3F */ jal set_animation -/* 1A79B0 802790D0 8E460060 */ lw $a2, 0x60($s2) -/* 1A79B4 802790D4 24020001 */ addiu $v0, $zero, 1 -.L802790D8: -/* 1A79B8 802790D8 8FBF0028 */ lw $ra, 0x28($sp) -/* 1A79BC 802790DC 8FB30024 */ lw $s3, 0x24($sp) -/* 1A79C0 802790E0 8FB20020 */ lw $s2, 0x20($sp) -/* 1A79C4 802790E4 8FB1001C */ lw $s1, 0x1c($sp) -/* 1A79C8 802790E8 8FB00018 */ lw $s0, 0x18($sp) -/* 1A79CC 802790EC D7BE0058 */ ldc1 $f30, 0x58($sp) -/* 1A79D0 802790F0 D7BC0050 */ ldc1 $f28, 0x50($sp) -/* 1A79D4 802790F4 D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 1A79D8 802790F8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 1A79DC 802790FC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 1A79E0 80279100 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 1A79E4 80279104 03E00008 */ jr $ra -/* 1A79E8 80279108 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index 390aec9397..fb868a6c5d 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -143,7 +143,7 @@ glabel func_802406C8_8EC4E8 /* 8EC6D8 802408B8 24843060 */ addiu $a0, $a0, %lo(D_80253060) /* 8EC6DC 802408BC 0C03D390 */ jal create_popup_menu /* 8EC6E0 802408C0 AC820328 */ sw $v0, 0x328($a0) -/* 8EC6E4 802408C4 0C03A631 */ jal func_800E98C4 +/* 8EC6E4 802408C4 0C03A631 */ jal status_menu_respond_to_changes /* 8EC6E8 802408C8 00000000 */ nop /* 8EC6EC 802408CC 0C03A5EE */ jal close_status_menu /* 8EC6F0 802408D0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s index c0a678f297..49d83a4f09 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s @@ -86,7 +86,7 @@ glabel func_80240B54_8EC974 /* 8ECA9C 80240C7C 02E0202D */ daddu $a0, $s7, $zero /* 8ECAA0 80240C80 0C03D390 */ jal create_popup_menu /* 8ECAA4 80240C84 AC820328 */ sw $v0, 0x328($a0) -/* 8ECAA8 80240C88 0C03A631 */ jal func_800E98C4 +/* 8ECAA8 80240C88 0C03A631 */ jal status_menu_respond_to_changes /* 8ECAAC 80240C8C 00000000 */ nop /* 8ECAB0 80240C90 0C03A5EE */ jal close_status_menu /* 8ECAB4 80240C94 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s deleted file mode 100644 index ae5fa914ba..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A80_825D40 -/* 825D40 80242A80 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825D44 80242A84 AFBF0010 */ sw $ra, 0x10($sp) -/* 825D48 80242A88 10A00003 */ beqz $a1, .L80242A98 -/* 825D4C 80242A8C 8C86000C */ lw $a2, 0xc($a0) -/* 825D50 80242A90 3C018025 */ lui $at, %hi(mac_02_ItemChoice_HasSelectedItem) -/* 825D54 80242A94 AC208778 */ sw $zero, %lo(mac_02_ItemChoice_HasSelectedItem)($at) -.L80242A98: -/* 825D58 80242A98 3C038025 */ lui $v1, %hi(mac_02_ItemChoice_HasSelectedItem) -/* 825D5C 80242A9C 24638778 */ addiu $v1, $v1, %lo(mac_02_ItemChoice_HasSelectedItem) -/* 825D60 80242AA0 8C620000 */ lw $v0, ($v1) -/* 825D64 80242AA4 54400003 */ bnel $v0, $zero, .L80242AB4 -/* 825D68 80242AA8 AC600000 */ sw $zero, ($v1) -/* 825D6C 80242AAC 08090AB2 */ j .L80242AC8 -/* 825D70 80242AB0 0000102D */ daddu $v0, $zero, $zero -.L80242AB4: -/* 825D74 80242AB4 8CC50000 */ lw $a1, ($a2) -/* 825D78 80242AB8 3C068025 */ lui $a2, %hi(mac_02_ItemChoice_SelectedItemID) -/* 825D7C 80242ABC 0C0B2026 */ jal evt_set_variable -/* 825D80 80242AC0 8CC6877C */ lw $a2, %lo(mac_02_ItemChoice_SelectedItemID)($a2) -/* 825D84 80242AC4 24020002 */ addiu $v0, $zero, 2 -.L80242AC8: -/* 825D88 80242AC8 8FBF0010 */ lw $ra, 0x10($sp) -/* 825D8C 80242ACC 03E00008 */ jr $ra -/* 825D90 80242AD0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s deleted file mode 100644 index 28b68233c8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C44_825F04 -/* 825F04 80242C44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 825F08 80242C48 AFB10014 */ sw $s1, 0x14($sp) -/* 825F0C 80242C4C 0080882D */ daddu $s1, $a0, $zero -/* 825F10 80242C50 AFBF0020 */ sw $ra, 0x20($sp) -/* 825F14 80242C54 AFB3001C */ sw $s3, 0x1c($sp) -/* 825F18 80242C58 AFB20018 */ sw $s2, 0x18($sp) -/* 825F1C 80242C5C AFB00010 */ sw $s0, 0x10($sp) -/* 825F20 80242C60 8E30000C */ lw $s0, 0xc($s1) -/* 825F24 80242C64 8E120000 */ lw $s2, ($s0) -/* 825F28 80242C68 26100004 */ addiu $s0, $s0, 4 -/* 825F2C 80242C6C 8E130000 */ lw $s3, ($s0) -/* 825F30 80242C70 26100004 */ addiu $s0, $s0, 4 -/* 825F34 80242C74 8E050000 */ lw $a1, ($s0) -/* 825F38 80242C78 0C0B1EAF */ jal evt_get_variable -/* 825F3C 80242C7C 26100004 */ addiu $s0, $s0, 4 -/* 825F40 80242C80 0220202D */ daddu $a0, $s1, $zero -/* 825F44 80242C84 8E050000 */ lw $a1, ($s0) -/* 825F48 80242C88 0C0B1EAF */ jal evt_get_variable -/* 825F4C 80242C8C 0040802D */ daddu $s0, $v0, $zero -/* 825F50 80242C90 0040282D */ daddu $a1, $v0, $zero -/* 825F54 80242C94 24020096 */ addiu $v0, $zero, 0x96 -/* 825F58 80242C98 1602001E */ bne $s0, $v0, .L80242D14 -/* 825F5C 80242C9C 0000202D */ daddu $a0, $zero, $zero -/* 825F60 80242CA0 0C00A67F */ jal rand_int -/* 825F64 80242CA4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 825F68 80242CA8 284201F4 */ slti $v0, $v0, 0x1f4 -/* 825F6C 80242CAC 10400003 */ beqz $v0, .L80242CBC -/* 825F70 80242CB0 0000802D */ daddu $s0, $zero, $zero -/* 825F74 80242CB4 08090B60 */ j .L80242D80 -/* 825F78 80242CB8 240600C2 */ addiu $a2, $zero, 0xc2 -.L80242CBC: -/* 825F7C 80242CBC 0C00A67F */ jal rand_int -/* 825F80 80242CC0 24042710 */ addiu $a0, $zero, 0x2710 -/* 825F84 80242CC4 3C03B216 */ lui $v1, 0xb216 -/* 825F88 80242CC8 346342C9 */ ori $v1, $v1, 0x42c9 -/* 825F8C 80242CCC 00430018 */ mult $v0, $v1 -/* 825F90 80242CD0 24100004 */ addiu $s0, $zero, 4 -/* 825F94 80242CD4 000227C3 */ sra $a0, $v0, 0x1f -/* 825F98 80242CD8 00003810 */ mfhi $a3 -/* 825F9C 80242CDC 00E21821 */ addu $v1, $a3, $v0 -/* 825FA0 80242CE0 02031807 */ srav $v1, $v1, $s0 -/* 825FA4 80242CE4 00642023 */ subu $a0, $v1, $a0 -/* 825FA8 80242CE8 00041840 */ sll $v1, $a0, 1 -/* 825FAC 80242CEC 00641821 */ addu $v1, $v1, $a0 -/* 825FB0 80242CF0 000318C0 */ sll $v1, $v1, 3 -/* 825FB4 80242CF4 00641823 */ subu $v1, $v1, $a0 -/* 825FB8 80242CF8 00432023 */ subu $a0, $v0, $v1 -/* 825FBC 80242CFC 00041080 */ sll $v0, $a0, 2 -/* 825FC0 80242D00 3C068025 */ lui $a2, %hi(D_8024909C_82C35C) -/* 825FC4 80242D04 00C23021 */ addu $a2, $a2, $v0 -/* 825FC8 80242D08 8CC6909C */ lw $a2, %lo(D_8024909C_82C35C)($a2) -/* 825FCC 80242D0C 08090B61 */ j .L80242D84 -/* 825FD0 80242D10 0220202D */ daddu $a0, $s1, $zero -.L80242D14: -/* 825FD4 80242D14 3C038025 */ lui $v1, %hi(D_80248A98_82BD58) -/* 825FD8 80242D18 24638A98 */ addiu $v1, $v1, %lo(D_80248A98_82BD58) -.L80242D1C: -/* 825FDC 80242D1C 8C620000 */ lw $v0, ($v1) -/* 825FE0 80242D20 10500006 */ beq $v0, $s0, .L80242D3C -/* 825FE4 80242D24 2882001D */ slti $v0, $a0, 0x1d -/* 825FE8 80242D28 24840001 */ addiu $a0, $a0, 1 -/* 825FEC 80242D2C 2882001D */ slti $v0, $a0, 0x1d -/* 825FF0 80242D30 1440FFFA */ bnez $v0, .L80242D1C -/* 825FF4 80242D34 24630004 */ addiu $v1, $v1, 4 -/* 825FF8 80242D38 2882001D */ slti $v0, $a0, 0x1d -.L80242D3C: -/* 825FFC 80242D3C 5040000A */ beql $v0, $zero, .L80242D68 -/* 826000 80242D40 0000202D */ daddu $a0, $zero, $zero -/* 826004 80242D44 10A00005 */ beqz $a1, .L80242D5C -/* 826008 80242D48 00000000 */ nop -/* 82600C 80242D4C 3C018025 */ lui $at, %hi(D_80248CD0_82BF90) -/* 826010 80242D50 00240821 */ addu $at, $at, $a0 -/* 826014 80242D54 08090B5A */ j .L80242D68 -/* 826018 80242D58 80248CD0 */ lb $a0, %lo(D_80248CD0_82BF90)($at) -.L80242D5C: -/* 82601C 80242D5C 3C018025 */ lui $at, %hi(D_80248CB0_82BF70) -/* 826020 80242D60 00240821 */ addu $at, $at, $a0 -/* 826024 80242D64 80248CB0 */ lb $a0, %lo(D_80248CB0_82BF70)($at) -.L80242D68: -/* 826028 80242D68 3C038025 */ lui $v1, %hi(D_80248B10_82BDD0) -/* 82602C 80242D6C 24638B10 */ addiu $v1, $v1, %lo(D_80248B10_82BDD0) -/* 826030 80242D70 000410C0 */ sll $v0, $a0, 3 -/* 826034 80242D74 00431021 */ addu $v0, $v0, $v1 -/* 826038 80242D78 8C500000 */ lw $s0, ($v0) -/* 82603C 80242D7C 8C460004 */ lw $a2, 4($v0) -.L80242D80: -/* 826040 80242D80 0220202D */ daddu $a0, $s1, $zero -.L80242D84: -/* 826044 80242D84 0C0B2026 */ jal evt_set_variable -/* 826048 80242D88 0240282D */ daddu $a1, $s2, $zero -/* 82604C 80242D8C 0220202D */ daddu $a0, $s1, $zero -/* 826050 80242D90 0260282D */ daddu $a1, $s3, $zero -/* 826054 80242D94 0C0B2026 */ jal evt_set_variable -/* 826058 80242D98 0200302D */ daddu $a2, $s0, $zero -/* 82605C 80242D9C 8FBF0020 */ lw $ra, 0x20($sp) -/* 826060 80242DA0 8FB3001C */ lw $s3, 0x1c($sp) -/* 826064 80242DA4 8FB20018 */ lw $s2, 0x18($sp) -/* 826068 80242DA8 8FB10014 */ lw $s1, 0x14($sp) -/* 82606C 80242DAC 8FB00010 */ lw $s0, 0x10($sp) -/* 826070 80242DB0 24020002 */ addiu $v0, $zero, 2 -/* 826074 80242DB4 03E00008 */ jr $ra -/* 826078 80242DB8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s deleted file mode 100644 index b57fcbe0c1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DBC_82607C -/* 82607C 80242DBC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 826080 80242DC0 AFB10014 */ sw $s1, 0x14($sp) -/* 826084 80242DC4 0080882D */ daddu $s1, $a0, $zero -/* 826088 80242DC8 AFBF0020 */ sw $ra, 0x20($sp) -/* 82608C 80242DCC AFB3001C */ sw $s3, 0x1c($sp) -/* 826090 80242DD0 AFB20018 */ sw $s2, 0x18($sp) -/* 826094 80242DD4 AFB00010 */ sw $s0, 0x10($sp) -/* 826098 80242DD8 8E30000C */ lw $s0, 0xc($s1) -/* 82609C 80242DDC 8E120000 */ lw $s2, ($s0) -/* 8260A0 80242DE0 26100004 */ addiu $s0, $s0, 4 -/* 8260A4 80242DE4 8E130000 */ lw $s3, ($s0) -/* 8260A8 80242DE8 26100004 */ addiu $s0, $s0, 4 -/* 8260AC 80242DEC 8E050000 */ lw $a1, ($s0) -/* 8260B0 80242DF0 0C0B1EAF */ jal evt_get_variable -/* 8260B4 80242DF4 26100004 */ addiu $s0, $s0, 4 -/* 8260B8 80242DF8 0220202D */ daddu $a0, $s1, $zero -/* 8260BC 80242DFC 8E050000 */ lw $a1, ($s0) -/* 8260C0 80242E00 0C0B1EAF */ jal evt_get_variable -/* 8260C4 80242E04 0040802D */ daddu $s0, $v0, $zero -/* 8260C8 80242E08 0040302D */ daddu $a2, $v0, $zero -/* 8260CC 80242E0C 0000282D */ daddu $a1, $zero, $zero -/* 8260D0 80242E10 3C038025 */ lui $v1, %hi(D_80248A98_82BD58) -/* 8260D4 80242E14 24638A98 */ addiu $v1, $v1, %lo(D_80248A98_82BD58) -.L80242E18: -/* 8260D8 80242E18 8C620000 */ lw $v0, ($v1) -/* 8260DC 80242E1C 10500006 */ beq $v0, $s0, .L80242E38 -/* 8260E0 80242E20 0000202D */ daddu $a0, $zero, $zero -/* 8260E4 80242E24 24A50001 */ addiu $a1, $a1, 1 -/* 8260E8 80242E28 28A2001D */ slti $v0, $a1, 0x1d -/* 8260EC 80242E2C 1440FFFA */ bnez $v0, .L80242E18 -/* 8260F0 80242E30 24630004 */ addiu $v1, $v1, 4 -/* 8260F4 80242E34 0000202D */ daddu $a0, $zero, $zero -.L80242E38: -/* 8260F8 80242E38 3C038025 */ lui $v1, %hi(D_80248A98_82BD58) -/* 8260FC 80242E3C 24638A98 */ addiu $v1, $v1, %lo(D_80248A98_82BD58) -.L80242E40: -/* 826100 80242E40 8C620000 */ lw $v0, ($v1) -/* 826104 80242E44 10460006 */ beq $v0, $a2, .L80242E60 -/* 826108 80242E48 28A2001D */ slti $v0, $a1, 0x1d -/* 82610C 80242E4C 24840001 */ addiu $a0, $a0, 1 -/* 826110 80242E50 2882001D */ slti $v0, $a0, 0x1d -/* 826114 80242E54 1440FFFA */ bnez $v0, .L80242E40 -/* 826118 80242E58 24630004 */ addiu $v1, $v1, 4 -/* 82611C 80242E5C 28A2001D */ slti $v0, $a1, 0x1d -.L80242E60: -/* 826120 80242E60 10400013 */ beqz $v0, .L80242EB0 -/* 826124 80242E64 0000182D */ daddu $v1, $zero, $zero -/* 826128 80242E68 2882001D */ slti $v0, $a0, 0x1d -/* 82612C 80242E6C 10400010 */ beqz $v0, .L80242EB0 -/* 826130 80242E70 00A4102A */ slt $v0, $a1, $a0 -/* 826134 80242E74 10400006 */ beqz $v0, .L80242E90 -/* 826138 80242E78 000510C0 */ sll $v0, $a1, 3 -/* 82613C 80242E7C 00451023 */ subu $v0, $v0, $a1 -/* 826140 80242E80 00021080 */ sll $v0, $v0, 2 -/* 826144 80242E84 00451021 */ addu $v0, $v0, $a1 -/* 826148 80242E88 08090BA9 */ j .L80242EA4 -/* 82614C 80242E8C 00821021 */ addu $v0, $a0, $v0 -.L80242E90: -/* 826150 80242E90 000410C0 */ sll $v0, $a0, 3 -/* 826154 80242E94 00441023 */ subu $v0, $v0, $a0 -/* 826158 80242E98 00021080 */ sll $v0, $v0, 2 -/* 82615C 80242E9C 00441021 */ addu $v0, $v0, $a0 -/* 826160 80242EA0 00A21021 */ addu $v0, $a1, $v0 -.L80242EA4: -/* 826164 80242EA4 3C038025 */ lui $v1, %hi(D_80248CF0_82BFB0) -/* 826168 80242EA8 00621821 */ addu $v1, $v1, $v0 -/* 82616C 80242EAC 80638CF0 */ lb $v1, %lo(D_80248CF0_82BFB0)($v1) -.L80242EB0: -/* 826170 80242EB0 04620001 */ bltzl $v1, .L80242EB8 -/* 826174 80242EB4 0000182D */ daddu $v1, $zero, $zero -.L80242EB8: -/* 826178 80242EB8 14600015 */ bnez $v1, .L80242F10 -/* 82617C 80242EBC 0220202D */ daddu $a0, $s1, $zero -/* 826180 80242EC0 3C048025 */ lui $a0, %hi(D_8024903C_82C2FC) -/* 826184 80242EC4 2484903C */ addiu $a0, $a0, %lo(D_8024903C_82C2FC) -/* 826188 80242EC8 24870060 */ addiu $a3, $a0, 0x60 -.L80242ECC: -/* 82618C 80242ECC 8C850000 */ lw $a1, ($a0) -/* 826190 80242ED0 14B00004 */ bne $a1, $s0, .L80242EE4 -/* 826194 80242ED4 00000000 */ nop -/* 826198 80242ED8 8C820004 */ lw $v0, 4($a0) -/* 82619C 80242EDC 10460006 */ beq $v0, $a2, .L80242EF8 -/* 8261A0 80242EE0 00000000 */ nop -.L80242EE4: -/* 8261A4 80242EE4 54A60006 */ bnel $a1, $a2, .L80242F00 -/* 8261A8 80242EE8 2484000C */ addiu $a0, $a0, 0xc -/* 8261AC 80242EEC 8C820004 */ lw $v0, 4($a0) -/* 8261B0 80242EF0 54500003 */ bnel $v0, $s0, .L80242F00 -/* 8261B4 80242EF4 2484000C */ addiu $a0, $a0, 0xc -.L80242EF8: -/* 8261B8 80242EF8 8C830008 */ lw $v1, 8($a0) -/* 8261BC 80242EFC 2484000C */ addiu $a0, $a0, 0xc -.L80242F00: -/* 8261C0 80242F00 0087102A */ slt $v0, $a0, $a3 -/* 8261C4 80242F04 1440FFF1 */ bnez $v0, .L80242ECC -/* 8261C8 80242F08 00000000 */ nop -/* 8261CC 80242F0C 0220202D */ daddu $a0, $s1, $zero -.L80242F10: -/* 8261D0 80242F10 3C028025 */ lui $v0, %hi(D_80248B10_82BDD0) -/* 8261D4 80242F14 24428B10 */ addiu $v0, $v0, %lo(D_80248B10_82BDD0) -/* 8261D8 80242F18 000318C0 */ sll $v1, $v1, 3 -/* 8261DC 80242F1C 00621821 */ addu $v1, $v1, $v0 -/* 8261E0 80242F20 8C660004 */ lw $a2, 4($v1) -/* 8261E4 80242F24 8C700000 */ lw $s0, ($v1) -/* 8261E8 80242F28 0C0B2026 */ jal evt_set_variable -/* 8261EC 80242F2C 0240282D */ daddu $a1, $s2, $zero -/* 8261F0 80242F30 0220202D */ daddu $a0, $s1, $zero -/* 8261F4 80242F34 0260282D */ daddu $a1, $s3, $zero -/* 8261F8 80242F38 0C0B2026 */ jal evt_set_variable -/* 8261FC 80242F3C 0200302D */ daddu $a2, $s0, $zero -/* 826200 80242F40 8FBF0020 */ lw $ra, 0x20($sp) -/* 826204 80242F44 8FB3001C */ lw $s3, 0x1c($sp) -/* 826208 80242F48 8FB20018 */ lw $s2, 0x18($sp) -/* 82620C 80242F4C 8FB10014 */ lw $s1, 0x14($sp) -/* 826210 80242F50 8FB00010 */ lw $s0, 0x10($sp) -/* 826214 80242F54 24020002 */ addiu $v0, $zero, 2 -/* 826218 80242F58 03E00008 */ jr $ra -/* 82621C 80242F5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s deleted file mode 100644 index b6c88202e9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s +++ /dev/null @@ -1,75 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024E3A0_831660 -.word 0x000000B0, 0x000000B1, 0x000000B2, 0x000000B3, 0x000000B4, 0x000000B5, 0x000000B6, 0x000000B7, 0x000000B8, 0x000000B9, 0x000000BA, 0x000000BD, 0x000000BB, 0x000000BE, 0x000000BF, 0x000000BC, 0x000000C0, 0x000000C1, 0x000000C2, 0x000000C3, 0x000000C4, 0x000000C5, 0x000000C6, 0x000000C7, 0x000000C8, 0x000000C9, 0x000000CA, 0x000000CB, 0x000000CC, 0x000000CD, 0x000000CE, 0x000000CF, 0x000000D0, 0x000000D1, 0x000000D2, 0x000000D3, 0x000000D4, 0x000000D5, 0x000000D6, 0x000000D7, 0x000000D8, 0x000000D9, 0x000000DA, 0x00000089, 0x0000009A, 0x0000009B, 0x00000097, 0x00000095, 0x0000008B, 0x0000008F, 0x00000082, 0x00000080 - -dlabel D_8024E470_831730 -.word 0xF8405CB6, 0xF8405CB7, 0xF8405CB8, 0xF8405CB9, 0xF8405CBA, 0xF8405CBB, 0xF8405CBC, 0xF8405CBD, 0xF8405CBE, 0xF8405CBF, 0xF8405CC0, 0xF8405CC1, 0xF8405CC2, 0xF8405CC3, 0xF8405CC4, 0xF8405CC5, 0xF8405CC6, 0xF8405CC7, 0xF8405CC8, 0xF8405CC9, 0xF8405CCA, 0xF8405CCB, 0xF8405CCC, 0xF8405CCD, 0xF8405CCE, 0xF8405CCF, 0xF8405CD0, 0xF8405CD1, 0xF8405CD2, 0xF8405CD3, 0xF8405CD4, 0xF8405CD5, 0xF8405CD6, 0xF8405CD7, 0xF8405CD8, 0xF8405CD9, 0xF8405CDA, 0xF8405CDB, 0xF8405CDC, 0xF8405CDD, 0xF8405CDE, 0xF8405CDF, 0xF8405CE0, 0xF8405CE1, 0xF8405CE2, 0xF8405CE3, 0xF8405CE4, 0xF8405CE5, 0xF8405CE6, 0xF8405CE7, 0xF8405CE8, 0xF8405CE9 - -.section .text - -glabel func_80242F60_826220 -/* 826220 80242F60 27BDFE48 */ addiu $sp, $sp, -0x1b8 -/* 826224 80242F64 AFBF01B0 */ sw $ra, 0x1b0($sp) -/* 826228 80242F68 8C82000C */ lw $v0, 0xc($a0) -/* 82622C 80242F6C 0C0B1EAF */ jal evt_get_variable -/* 826230 80242F70 8C450000 */ lw $a1, ($v0) -/* 826234 80242F74 0040302D */ daddu $a2, $v0, $zero -/* 826238 80242F78 27A30010 */ addiu $v1, $sp, 0x10 -/* 82623C 80242F7C 3C028025 */ lui $v0, %hi(D_8024E3A0_831660) -/* 826240 80242F80 2442E3A0 */ addiu $v0, $v0, %lo(D_8024E3A0_831660) -/* 826244 80242F84 244400D0 */ addiu $a0, $v0, 0xd0 -.L80242F88: -/* 826248 80242F88 8C470000 */ lw $a3, ($v0) -/* 82624C 80242F8C 8C480004 */ lw $t0, 4($v0) -/* 826250 80242F90 8C490008 */ lw $t1, 8($v0) -/* 826254 80242F94 8C4A000C */ lw $t2, 0xc($v0) -/* 826258 80242F98 AC670000 */ sw $a3, ($v1) -/* 82625C 80242F9C AC680004 */ sw $t0, 4($v1) -/* 826260 80242FA0 AC690008 */ sw $t1, 8($v1) -/* 826264 80242FA4 AC6A000C */ sw $t2, 0xc($v1) -/* 826268 80242FA8 24420010 */ addiu $v0, $v0, 0x10 -/* 82626C 80242FAC 1444FFF6 */ bne $v0, $a0, .L80242F88 -/* 826270 80242FB0 24630010 */ addiu $v1, $v1, 0x10 -/* 826274 80242FB4 27A300E0 */ addiu $v1, $sp, 0xe0 -/* 826278 80242FB8 3C028025 */ lui $v0, %hi(D_8024E470_831730) -/* 82627C 80242FBC 2442E470 */ addiu $v0, $v0, %lo(D_8024E470_831730) -/* 826280 80242FC0 244400D0 */ addiu $a0, $v0, 0xd0 -.L80242FC4: -/* 826284 80242FC4 8C470000 */ lw $a3, ($v0) -/* 826288 80242FC8 8C480004 */ lw $t0, 4($v0) -/* 82628C 80242FCC 8C490008 */ lw $t1, 8($v0) -/* 826290 80242FD0 8C4A000C */ lw $t2, 0xc($v0) -/* 826294 80242FD4 AC670000 */ sw $a3, ($v1) -/* 826298 80242FD8 AC680004 */ sw $t0, 4($v1) -/* 82629C 80242FDC AC690008 */ sw $t1, 8($v1) -/* 8262A0 80242FE0 AC6A000C */ sw $t2, 0xc($v1) -/* 8262A4 80242FE4 24420010 */ addiu $v0, $v0, 0x10 -/* 8262A8 80242FE8 1444FFF6 */ bne $v0, $a0, .L80242FC4 -/* 8262AC 80242FEC 24630010 */ addiu $v1, $v1, 0x10 -/* 8262B0 80242FF0 0000202D */ daddu $a0, $zero, $zero -/* 8262B4 80242FF4 27A500E0 */ addiu $a1, $sp, 0xe0 -/* 8262B8 80242FF8 27A30010 */ addiu $v1, $sp, 0x10 -.L80242FFC: -/* 8262BC 80242FFC 8C620000 */ lw $v0, ($v1) -/* 8262C0 80243000 54C20007 */ bnel $a2, $v0, .L80243020 -/* 8262C4 80243004 24A50004 */ addiu $a1, $a1, 4 -/* 8262C8 80243008 0000202D */ daddu $a0, $zero, $zero -/* 8262CC 8024300C 8CA50000 */ lw $a1, ($a1) -/* 8262D0 80243010 0C0B2026 */ jal evt_set_variable -/* 8262D4 80243014 24060001 */ addiu $a2, $zero, 1 -/* 8262D8 80243018 08090C0C */ j .L80243030 -/* 8262DC 8024301C 00000000 */ nop -.L80243020: -/* 8262E0 80243020 24840001 */ addiu $a0, $a0, 1 -/* 8262E4 80243024 28820034 */ slti $v0, $a0, 0x34 -/* 8262E8 80243028 1440FFF4 */ bnez $v0, .L80242FFC -/* 8262EC 8024302C 24630004 */ addiu $v1, $v1, 4 -.L80243030: -/* 8262F0 80243030 8FBF01B0 */ lw $ra, 0x1b0($sp) -/* 8262F4 80243034 24020002 */ addiu $v0, $zero, 2 -/* 8262F8 80243038 03E00008 */ jr $ra -/* 8262FC 8024303C 27BD01B8 */ addiu $sp, $sp, 0x1b8 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s deleted file mode 100644 index 54eaa4634c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241720_8442F0 -/* 8442F0 80241720 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8442F4 80241724 AFBF0010 */ sw $ra, 0x10($sp) -/* 8442F8 80241728 10A00003 */ beqz $a1, .L80241738 -/* 8442FC 8024172C 8C86000C */ lw $a2, 0xc($a0) -/* 844300 80241730 3C018024 */ lui $at, %hi(mac_04_ItemChoice_HasSelectedItem) -/* 844304 80241734 AC206610 */ sw $zero, %lo(mac_04_ItemChoice_HasSelectedItem)($at) -.L80241738: -/* 844308 80241738 3C038024 */ lui $v1, %hi(mac_04_ItemChoice_HasSelectedItem) -/* 84430C 8024173C 24636610 */ addiu $v1, $v1, %lo(mac_04_ItemChoice_HasSelectedItem) -/* 844310 80241740 8C620000 */ lw $v0, ($v1) -/* 844314 80241744 54400003 */ bnel $v0, $zero, .L80241754 -/* 844318 80241748 AC600000 */ sw $zero, ($v1) -/* 84431C 8024174C 080905DA */ j .L80241768 -/* 844320 80241750 0000102D */ daddu $v0, $zero, $zero -.L80241754: -/* 844324 80241754 8CC50000 */ lw $a1, ($a2) -/* 844328 80241758 3C068024 */ lui $a2, %hi(mac_04_ItemChoice_SelectedItemID) -/* 84432C 8024175C 0C0B2026 */ jal evt_set_variable -/* 844330 80241760 8CC66614 */ lw $a2, %lo(mac_04_ItemChoice_SelectedItemID)($a2) -/* 844334 80241764 24020002 */ addiu $v0, $zero, 2 -.L80241768: -/* 844338 80241768 8FBF0010 */ lw $ra, 0x10($sp) -/* 84433C 8024176C 03E00008 */ jr $ra -/* 844340 80241770 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s deleted file mode 100644 index 0ae1e650d8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425E0_854750 -/* 854750 802425E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 854754 802425E4 AFBF0010 */ sw $ra, 0x10($sp) -/* 854758 802425E8 10A00003 */ beqz $a1, .L802425F8 -/* 85475C 802425EC 8C86000C */ lw $a2, 0xc($a0) -/* 854760 802425F0 3C018024 */ lui $at, %hi(mac_05_ItemChoice_HasSelectedItem) -/* 854764 802425F4 AC2076D8 */ sw $zero, %lo(mac_05_ItemChoice_HasSelectedItem)($at) -.L802425F8: -/* 854768 802425F8 3C038024 */ lui $v1, %hi(mac_05_ItemChoice_HasSelectedItem) -/* 85476C 802425FC 246376D8 */ addiu $v1, $v1, %lo(mac_05_ItemChoice_HasSelectedItem) -/* 854770 80242600 8C620000 */ lw $v0, ($v1) -/* 854774 80242604 54400003 */ bnel $v0, $zero, .L80242614 -/* 854778 80242608 AC600000 */ sw $zero, ($v1) -/* 85477C 8024260C 0809098A */ j .L80242628 -/* 854780 80242610 0000102D */ daddu $v0, $zero, $zero -.L80242614: -/* 854784 80242614 8CC50000 */ lw $a1, ($a2) -/* 854788 80242618 3C068024 */ lui $a2, %hi(mac_05_ItemChoice_SelectedItemID) -/* 85478C 8024261C 0C0B2026 */ jal evt_set_variable -/* 854790 80242620 8CC676DC */ lw $a2, %lo(mac_05_ItemChoice_SelectedItemID)($a2) -/* 854794 80242624 24020002 */ addiu $v0, $zero, 2 -.L80242628: -/* 854798 80242628 8FBF0010 */ lw $ra, 0x10($sp) -/* 85479C 8024262C 03E00008 */ jr $ra -/* 8547A0 80242630 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s b/ver/us/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s deleted file mode 100644 index b9ca4533bd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_7E73A0 -/* 7E73A0 80240000 3C038024 */ lui $v1, %hi(D_802407E0_7E7B80) -/* 7E73A4 80240004 246307E0 */ addiu $v1, $v1, %lo(D_802407E0_7E7B80) -.L80240008: -/* 7E73A8 80240008 8C620000 */ lw $v0, ($v1) -/* 7E73AC 8024000C 1440FFFE */ bnez $v0, .L80240008 -/* 7E73B0 80240010 24630010 */ addiu $v1, $v1, 0x10 -/* 7E73B4 80240014 3C038024 */ lui $v1, %hi(D_802409F0_7E7D90) -/* 7E73B8 80240018 246309F0 */ addiu $v1, $v1, %lo(D_802409F0_7E7D90) -.L8024001C: -/* 7E73BC 8024001C 8C620000 */ lw $v0, ($v1) -/* 7E73C0 80240020 1440FFFE */ bnez $v0, .L8024001C -/* 7E73C4 80240024 24630010 */ addiu $v1, $v1, 0x10 -/* 7E73C8 80240028 03E00008 */ jr $ra -/* 7E73CC 8024002C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/script_api/7E0E80/shop_open_item_select_popup.s b/ver/us/asm/nonmatchings/world/script_api/7E0E80/shop_open_item_select_popup.s index 7b8ee6a5f8..22256836fd 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E0E80/shop_open_item_select_popup.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E0E80/shop_open_item_select_popup.s @@ -84,7 +84,7 @@ glabel shop_open_item_select_popup /* 7E18F0 80280A70 AC930324 */ sw $s3, 0x324($a0) /* 7E18F4 80280A74 0C03D3F1 */ jal func_800F4FC4 /* 7E18F8 80280A78 AC800328 */ sw $zero, 0x328($a0) -/* 7E18FC 80280A7C 0C03A625 */ jal func_800E9894 +/* 7E18FC 80280A7C 0C03A625 */ jal status_menu_ignore_changes /* 7E1900 80280A80 00000000 */ nop /* 7E1904 80280A84 0C03A63B */ jal func_800E98EC /* 7E1908 80280A88 00000000 */ nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 234b710180..8b70a3c76a 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -8957,13 +8957,15 @@ segments: start: 0x7E73A0 vram: 0x80240000 subsegments: - - [0x7E73A0, c] - - [0x7E7550, c] - - [0x7E7850, c] - - [0x7E7A30, data] - - [0x7E8470, data] - - [0x7EA340, data] - - [0x7EAA50] + - [0x7E73A0, c, machi_0_header] + - [0x7E73A0, c, machi_1_tables] + - [0x7E73A0, c, machi_2_main] + - [0x7E73D0, c, machi_3_entity] + - [0x7E7550, c, machi_4_goomba_king] + - [0x7E7550, c, machi_5_npc] + - [0x7E7850, c, machi_6_misstar] + - [0x7E7A30, c, machi_7_partner] + - [0x7E7A30] - name: mac_00 dir: world/area_mac/mac_00 type: code @@ -9013,18 +9015,15 @@ segments: start: 0x8232C0 vram: 0x80240000 subsegments: - - [0x8232C0, c] - - [0x8238B0, c] - - [0x823970, c] - - [0x823BB0, c] - - [0x823BF0, c] - - [0x8267E0, data] - - [0x8268F0, data] - - [0x827E70, data] - - [0x8282E0, data] - - [0x828F10, data] - - [0x8313E0, data] - - [0x831490] + - [0x8232C0, c, mac_02_0_header] + - [0x8232C0, c, mac_02_1_music] + - [0x8232C0, c, mac_02_2_main] + - [0x8238B0, c, mac_02_3_rooms] + - [0x823970, c, mac_02_4_foliage] + - [0x823BB0, c, mac_02_5_entity] + - [0x823BF0, c, mac_02_6_npc] + - [0x8266B0, c, mac_02_7_music_mix] + - [0x8267E0] - name: mac_03 dir: world/area_mac/mac_03 type: code @@ -9047,48 +9046,42 @@ segments: start: 0x842BD0 vram: 0x80240000 subsegments: - - [0x842BD0, c] - - [0x842C20, c] - - [0x842D90, c] - - [0x842DF0, c] - - [0x843030, c] - - [0x844860, c] - - [0x844AC0, c] - - [0x844BF0, data] - - [0x844D50, data] - - [0x845280, data] - - [0x845CA0, data] - - [0x8467E0, data] - - [0x8469B0, data] - - [0x8508F0, data] - - [0x851410, data] - - [0x8520A0, data] - - [0x852120] + - [0x842BD0, c, mac_04_0_header] + - [0x842C20, c, mac_04_1_music] + - [0x842C20, c, mac_04_2_main] + - [0x842D90, c, mac_04_3_rooms] + - [0x842DF0, c, mac_04_4_foliage] + - [0x843030, c, mac_04_5_shop] + - [0x843030, c, mac_04_6_npc] + - [0x844860, c, mac_04_7_wish_scene] + - [0x844860, c, mac_04_8_entity] + - [0x844AC0, c, mac_04_9_music_mix] + - [0x844BF0] - name: mac_05 dir: world/area_mac/mac_05 type: code start: 0x852170 vram: 0x80240000 subsegments: - - [0x852170, c] - - [0x855560, c] - - [0x855F20, c] - - [0x8562D0, data] - - [0x8564E0, data] - - [0x856650, data] - - [0x857070, data] - - [0x862BC0, data] - - [0x864450, data] - - [0x864910] + - [0x852170, c, mac_05_0_header] + - [0x852170, c, mac_05_1_music] + - [0x852170, c, mac_05_2_entity] + - [0x852170, c, mac_05_3_main] + - [0x852600, c, mac_05_4_npc] + - [0x855560, c, mac_05_5_whale] + - [0x855F20, c, mac_05_6_rooms] + - [0x855F20, c, mac_05_7_club64_sign] + - [0x8562D0] - name: mac_06 dir: world/area_mac/mac_06 type: code start: 0x864B40 vram: 0x80240000 subsegments: + - [0x864B40, c, mac_06_0_header] - [0x864B40, c, mac_06_1_main] - - [0x865000, c, mac_06_2] - - [0x8659C0, c, mac_06_3] + - [0x865000, c, mac_06_2_whale] + - [0x8659C0, c, mac_06_3_npc] - [0x8661D0] - name: tik_01 dir: world/area_tik/tik_01 @@ -10271,51 +10264,50 @@ segments: start: 0x978140 vram: 0x80240000 subsegments: - - [0x978140, c] - - [0x978140, data] - - [0x978360, data] - - [0x9785C0, data] - - [0x978700] + - [0x978140, c, isk_01_0_header] + - [0x978140, c, isk_01_1_music] + - [0x978140, c, isk_01_2_main] + - [0x978140, c, isk_01_3_haze] + - [0x978140, c, isk_01_4_entity] + - [0x978140] - name: isk_02 dir: world/area_isk/isk_02 type: code start: 0x978710 vram: 0x80240000 subsegments: - - [0x978710, c] - - [0x978750, c] - - [0x978800, c] - - [0x978820, data] - - [0x978B80, data] - - [0x978DE0, data] - - [0x979390, data] - - [0x9793F0, data] - - [0x979E40] + - [0x978710, c, isk_02_0_header] + - [0x978710, c, isk_02_1_main] + - [0x978710, c, isk_02_2_lock] + - [0x978750, c, isk_02_3_ambush] + - [0x978800, c, isk_02_4_entity] + - [0x978800, c, isk_02_5_npc] + - [0x978820] - name: isk_03 dir: world/area_isk/isk_03 type: code start: 0x979E50 vram: 0x80240000 subsegments: - - [0x979E50, c] - - [0x979E50, data] - - [0x97A210, data] - - [0x97B340, data] - - [0x97B620] + - [0x979E50, c, isk_03_0_header] + - [0x979E50, c, isk_03_1_main] + - [0x979E50, c, isk_03_2_sand] + - [0x979E50, c, isk_03_3_entity] + - [0x979E50, c, isk_03_4_switch] + - [0x979E50] - name: isk_04 dir: world/area_isk/isk_04 type: code start: 0x97B630 vram: 0x80240000 subsegments: - - [0x97B630, c] - - [0x97B670, c] - - [0x97BF60, c] - - [0x97C0A0, data] - - [0x97C300, data] - - [0x97CA70, data] - - [0x97CB60, data] - - [0x97D2F0, data] + - [0x97B630, c, isk_04_0_header] + - [0x97B630, c, isk_04_1_music] + - [0x97B630, c, isk_04_2_main] + - [0x97B630, c, isk_04_3_obstructions] + - [0x97B670, c, isk_04_4_entity] + - [0x97B670, c, isk_04_5_npc] + - [0x97BF60, c, isk_04_6_demo] - [0x97DA40] - name: isk_05 dir: world/area_isk/isk_05 @@ -10323,37 +10315,37 @@ segments: start: 0x97DAD0 vram: 0x80240000 subsegments: - - [0x97DAD0, c] - - [0x97F990, data] - - [0x97FCE0, data] - - [0x97FE50, data] - - [0x980970] + - [0x97DAD0, c, isk_05_0_header] + - [0x97DAD0, c, isk_05_1_main] + - [0x97DAD0, c, isk_05_2_entity] + - [0x97DAD0, c, isk_05_3_npc] + - [0x97F990] - name: isk_06 dir: world/area_isk/isk_06 type: code start: 0x980A20 vram: 0x80240000 subsegments: - - [0x980A20, c] - - [0x980A20, data] - - [0x980D40, data] - - [0x982150, data] - - [0x982430] + - [0x980A20, c, isk_06_0_header] + - [0x980A20, c, isk_06_1_main] + - [0x980A20, c, isk_06_2_entity] + - [0x980A20, c, isk_06_3_sand] + - [0x980A20, c, isk_06_4_switch] + - [0x980A20] - name: isk_07 dir: world/area_isk/isk_07 type: code start: 0x982440 vram: 0x80240000 subsegments: - - [0x982440, c] - - [0x9824F0, c] - - [0x982530, c] - - [0x982550, data] - - [0x982860, data] - - [0x982CA0, data] - - [0x983AD0, data] - - [0x984390, data] - - [0x9845D0, data] + - [0x982440, c, isk_07_0_header] + - [0x982440, c, isk_07_1_main] + - [0x982440, c, isk_07_2_entity] + - [0x982440, c, isk_07_3_npc] + - [0x9824F0, c, isk_07_4_stairs] + - [0x9824F0, c, isk_07_5_lock] + - [0x982530, c, isk_07_6_switch] + - [0x984E20, c, isk_07_7_ambush] - [0x984E20] - name: isk_08 dir: world/area_isk/isk_08 @@ -10361,24 +10353,23 @@ segments: start: 0x984E30 vram: 0x80240000 subsegments: - - [0x984E30, c] - - [0x985720, data] - - [0x985B00, data] - - [0x986090, data] - - [0x986460] + - [0x984E30, c, isk_08_0_header] + - [0x984E30, c, isk_08_1_main] + - [0x984E30, c, isk_08_2_npc] + - [0x986090, c, isk_08_3_entity] + - [0x986090] - name: isk_09 dir: world/area_isk/isk_09 type: code start: 0x9864E0 vram: 0x80240000 subsegments: - - [0x9864E0, c] - - [0x9867D0, c] - - [0x986810, data] - - [0x986A60, data] - - [0x986BD0, data] - - [0x987560, data] - - [0x988290, data] + - [0x9864E0, c, isk_09_0_header] + - [0x9864E0, c, isk_09_1_music] + - [0x9864E0, c, isk_09_2_main] + - [0x9864E0, c, isk_09_3_entity] + - [0x9867D0, c, isk_09_4_stairs] + - [0x9867D0, c, isk_09_5_switch] - [0x988B50] - name: isk_10 dir: world/area_isk/isk_10 @@ -10386,9 +10377,10 @@ segments: start: 0x988B60 vram: 0x80240000 subsegments: - - [0x988B60, c] - - [0x989910, data] - - [0x98A580, data] + - [0x988B60, c, isk_10_0_header] + - [0x988B60, c, isk_10_1_main] + - [0x988B60, c, isk_10_2_entity] + - [0x98A9E0, c, isk_10_3_bombable] - [0x98A9E0] - name: isk_11 dir: world/area_isk/isk_11 @@ -10396,26 +10388,25 @@ segments: start: 0x98AA10 vram: 0x80240000 subsegments: - - [0x98AA10, c] - - [0x98AAC0, c] - - [0x98AB30, c] - - [0x98AB70, data] - - [0x98ADB0, data] - - [0x98B330, data] - - [0x98B620, data] - - [0x98D3C0, data] - - [0x98D620] + - [0x98AA10, c, isk_11_0_header] + - [0x98AA10, c, isk_11_1_music] + - [0x98AA10, c, isk_11_2_main] + - [0x98AA10, c, isk_11_3_entity] + - [0x98AA10, c, isk_11_4_scene] + - [0x98AAC0, c, isk_11_5_puzzle] + - [0x98AB30, c, isk_11_6_lock] + - [0x98AB70] - name: isk_12 dir: world/area_isk/isk_12 type: code start: 0x98D640 vram: 0x80240000 subsegments: - - [0x98D640, c] - - [0x98D640, data] - - [0x98DA70, data] - - [0x98DCB0, data] - - [0x98ED40, data] + - [0x98D640, c, isk_12_0_header] + - [0x98D640, c, isk_12_1_main] + - [0x98D640, c, isk_12_2_entity] + - [0x98D640, c, isk_12_3_sand] + - [0x98D640, c, isk_12_4_switch] - [0x98F7C0] - name: isk_13 dir: world/area_isk/isk_13 @@ -10423,9 +10414,10 @@ segments: start: 0x98F7E0 vram: 0x80240000 subsegments: - - [0x98F7E0, c] - - [0x991850, data] - - [0x991A90, data] + - [0x98F7E0, c, isk_13_0_header] + - [0x98F7E0, c, isk_13_1_main] + - [0x98F7E0, c, isk_13_2_entity] + - [0x98F7E0, c, isk_13_3_npc] - [0x992680] - name: isk_14 dir: world/area_isk/isk_14 @@ -10433,23 +10425,22 @@ segments: start: 0x992730 vram: 0x80240000 subsegments: - - [0x992730, c] - - [0x994490, data] - - [0x9946D0, data] - - [0x994860, data] - - [0x995150] + - [0x992730, c, isk_14_0_header] + - [0x992730, c, isk_14_1_main] + - [0x992730, c, isk_14_2_entity] + - [0x992730, c, isk_14_3_npc] + - [0x994490] - name: isk_16 dir: world/area_isk/isk_16 type: code start: 0x9951F0 vram: 0x80240000 subsegments: - - [0x9951F0, c] - - [0x9959F0, c] - - [0x995CF0, data] - - [0x996410, data] - - [0x996C40, data] - - [0x997E20, data] + - [0x9951F0, c, isk_16_0_header] + - [0x9951F0, c, isk_16_1_main] + - [0x9959F0, c, isk_16_2_npc] + - [0x9959F0, c, isk_16_3_boss] + - [0x997F40, c, isk_16_4_entity] - [0x997F40] - name: isk_18 dir: world/area_isk/isk_18 @@ -10457,10 +10448,10 @@ segments: start: 0x997F70 vram: 0x80240000 subsegments: - - [0x997F70, c] - - [0x998860, data] - - [0x998B90, data] - - [0x999520, data] + - [0x997F70, c, isk_18_0_header] + - [0x997F70, c, isk_18_1_main] + - [0x997F70, c, isk_18_2_npc] + - [0x9996D0, c, isk_18_3_entity] - [0x9996D0] - name: isk_19 dir: world/area_isk/isk_19 @@ -10468,11 +10459,11 @@ segments: start: 0x999740 vram: 0x80240000 subsegments: - - [0x999740, c] - - [0x999740, data] - - [0x999960, data] - - [0x999BA0, data] - - [0x999C60] + - [0x999740, c, isk_19_0_header] + - [0x999740, c, isk_19_1_music] + - [0x999740, c, isk_19_2_main] + - [0x999740, c, isk_19_3_entity] + - [0x999740] - name: trd_00 dir: world/area_trd/trd_00 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index e4b939946a..c6c7762036 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2370,7 +2370,7 @@ gPartnerIconHudScripts = 0x8008EFF8; // type:data rom:0x6A3F8 gMoveTable = 0x8008F060; // type:data rom:0x6A460 pad_after_move_table = 0x8008FED4; // type:data rom:0x6B2D4 gMessageBoxFrameParts = 0x8008FEE0; // type:data rom:0x6B2E0 -D_8008FF60 = 0x8008FF60; // type:data rom:0x6B360 +WorldReverbModeMapping = 0x8008FF60; // type:data rom:0x6B360 gEntityColliderFaces = 0x8008FF70; // type:data rom:0x6B370 gEntityColliderNormals = 0x8008FFB8; // type:data rom:0x6B3B8 mac_maps = 0x80090050; // type:data rom:0x6B450 @@ -2726,7 +2726,7 @@ gLogosImage2 = 0x800A091C; // type:data rom:0x7BD1C D_800A0920 = 0x800A0920; // type:data rom:0x7BD20 D_800A0921 = 0x800A0921; // type:data rom:0x7BD21 D_800A0922 = 0x800A0922; // type:data rom:0x7BD22 -D_800A0924 = 0x800A0924; // type:data rom:0x7BD24 +SavedReverbMode = 0x800A0924; // type:data rom:0x7BD24 D_800A0928 = 0x800A0928; // type:data rom:0x7BD28 D_800A0930 = 0x800A0930; // type:data rom:0x7BD30 D_800A0931 = 0x800A0931; // type:data rom:0x7BD31 @@ -2924,9 +2924,9 @@ func_800E9810 = 0x800E9810; // type:func rom:0x82CC0 func_800E983C = 0x800E983C; // type:func rom:0x82CEC func_800E984C = 0x800E984C; // type:func rom:0x82CFC func_800E9860 = 0x800E9860; // type:func rom:0x82D10 -func_800E9894 = 0x800E9894; // type:func rom:0x82D44 +status_menu_ignore_changes = 0x800E9894; // type:func rom:0x82D44 func_800E98A8 = 0x800E98A8; // type:func rom:0x82D58 -func_800E98C4 = 0x800E98C4; // type:func rom:0x82D74 +status_menu_respond_to_changes = 0x800E98C4; // type:func rom:0x82D74 func_800E98D4 = 0x800E98D4; // type:func rom:0x82D84 func_800E98EC = 0x800E98EC; // type:func rom:0x82D9C func_800E9900 = 0x800E9900; // type:func rom:0x82DB0 @@ -4458,8 +4458,8 @@ sfx_reset_door_sounds = 0x80149600; // type:func rom:0xDFD00 sfx_clear_sounds = 0x80149618; // type:func rom:0xDFD18 sfx_clear_env_sounds = 0x80149670; // type:func rom:0xDFD70 sfx_update_looping_sound_params = 0x80149734; // type:func rom:0xDFE34 -func_801497FC = 0x801497FC; // type:func rom:0xDFEFC -func_80149828 = 0x80149828; // type:func rom:0xDFF28 +sfx_set_reverb_mode = 0x801497FC; // type:func rom:0xDFEFC +sfx_get_reverb_mode = 0x80149828; // type:func rom:0xDFF28 sfx_stop_env_sounds = 0x80149838; // type:func rom:0xDFF38 sfx_get_env_sound_instance = 0x801498C4; // type:func rom:0xDFFC4 sfx_play_sound_looping = 0x80149908; // type:func rom:0xE0008 @@ -5523,7 +5523,7 @@ RegisterMusicEvents = 0x802D5C70; // type:func rom:0xFA620 FadeOutMusic = 0x802D5CE0; // type:func rom:0xFA690 SetMusicTrack = 0x802D5D4C; // type:func rom:0xFA6FC FadeInMusic = 0x802D5DF4; // type:func rom:0xFA7A4 -func_802D5EE0 = 0x802D5EE0; // type:func rom:0xFA890 +EnableMusicProximityMix = 0x802D5EE0; // type:func rom:0xFA890 AdjustMusicProximityMix = 0x802D5F28; // type:func rom:0xFA8D8 SetMusicTrackVolumes = 0x802D5FA4; // type:func rom:0xFA954 PopSong = 0x802D5FD8; // type:func rom:0xFA988 @@ -15060,21 +15060,21 @@ ShopEndSpeech = 0x80283F2C; // type:data rom:0x7E4DAC D_80283F58_7E4DD8 = 0x80283F58; // type:data rom:0x7E4DD8 BadgeShopInteract = 0x80284034; // type:data rom:0x7E4EB4 ItemShopInteract = 0x80284054; // type:data rom:0x7E4ED4 -func_80240000_7E73A0 = 0x80240000; // type:func rom:0x7E73A0 -machi_80240030_7E73D0 = 0x80240030; // type:func rom:0x7E73D0 -func_80240038_7E73D8 = 0x80240038; // type:func rom:0x7E73D8 -func_80240040_7E73E0 = 0x80240040; // type:func rom:0x7E73E0 -func_80240048_7E73E8 = 0x80240048; // type:func rom:0x7E73E8 -func_802400C8_7E7468 = 0x802400C8; // type:func rom:0x7E7468 -func_80240114_7E74B4 = 0x80240114; // type:func rom:0x7E74B4 -func_802401B0_7E7550 = 0x802401B0; // type:func rom:0x7E7550 -func_802402EC_7E768C = 0x802402EC; // type:func rom:0x7E768C -func_80240318_7E76B8 = 0x80240318; // type:func rom:0x7E76B8 -func_80240344_7E76E4 = 0x80240344; // type:func rom:0x7E76E4 -func_802403A0_7E7740 = 0x802403A0; // type:func rom:0x7E7740 -func_80240410_7E77B0 = 0x80240410; // type:func rom:0x7E77B0 -func_8024045C_7E77FC = 0x8024045C; // type:func rom:0x7E77FC -func_802404B0_7E7850 = 0x802404B0; // type:func rom:0x7E7850 +machi_CheckGameVarRanges = 0x80240000; // type:func rom:0x7E73A0 +machi_DoNothing1 = 0x80240030; // type:func rom:0x7E73D0 +machi_DoNothing2 = 0x80240038; // type:func rom:0x7E73D8 +machi_DoNothing3 = 0x80240040; // type:func rom:0x7E73E0 +machi_func_80240048_7E73E8 = 0x80240048; // type:func rom:0x7E73E8 +machi_func_802400C8_7E7468 = 0x802400C8; // type:func rom:0x7E7468 +machi_func_80240114_7E74B4 = 0x80240114; // type:func rom:0x7E74B4 +machi_func_802401B0_7E7550 = 0x802401B0; // type:func rom:0x7E7550 +machi_func_802402EC_7E768C = 0x802402EC; // type:func rom:0x7E768C +machi_func_80240318_7E76B8 = 0x80240318; // type:func rom:0x7E76B8 +machi_SetupChapter0 = 0x80240344; // type:func rom:0x7E76E4 +machi_SetupStarRodPaletteCycling = 0x802403A0; // type:func rom:0x7E7740 +machi_SetupChapter1 = 0x80240410; // type:func rom:0x7E77B0 +machi_SetupChapter2 = 0x8024045C; // type:func rom:0x7E77FC +machi_MisstarFlyAway = 0x802404B0; // type:func rom:0x7E7850 D_802407E0_7E7B80 = 0x802407E0; // type:data rom:0x7E7B80 D_802409F0_7E7D90 = 0x802409F0; // type:data rom:0x7E7D90 D_80241180_7E8520 = 0x80241180; // type:data rom:0x7E8520 @@ -15317,7 +15317,7 @@ mac_02_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x823490 mac_02_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x8234FC mac_02_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8235A0 mac_02_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8236C4 -func_802405F0_8238B0 = 0x802405F0; // type:func rom:0x8238B0 +mac_02_InitEntryFromTunnels = 0x802405F0; // type:func rom:0x8238B0 mac_02_foliage_setup_shear_mtx = 0x802406B0; // type:func rom:0x823970 mac_02_TransformFoliage = 0x80240720; // type:func rom:0x8239E0 mac_02_RemovePadlock = 0x802408F0; // type:func rom:0x823BB0 @@ -15362,16 +15362,16 @@ mac_02_Quizmo_CreateReactionEffect = 0x802427B8; // type:func rom:0x825A78 mac_02_Quizmo_CreateWorker = 0x80242824; // type:func rom:0x825AE4 mac_02_GetNpcCollisionHeight = 0x80242854; // type:func rom:0x825B14 mac_02_AddPlayerHandsOffset = 0x802428B0; // type:func rom:0x825B70 -func_80242A80_825D40 = 0x80242A80; // type:func rom:0x825D40 -func_80242AD4_825D94 = 0x80242AD4; // type:func rom:0x825D94 -func_80242B0C_825DCC = 0x80242B0C; // type:func rom:0x825DCC -func_80242BA8_825E68 = 0x80242BA8; // type:func rom:0x825E68 -func_80242C44_825F04 = 0x80242C44; // type:func rom:0x825F04 -func_80242DBC_82607C = 0x80242DBC; // type:func rom:0x82607C -func_80242F60_826220 = 0x80242F60; // type:func rom:0x826220 -func_80243040_826300 = 0x80243040; // type:func rom:0x826300 -func_80243088_826348 = 0x80243088; // type:func rom:0x826348 -func_802430D0_826390 = 0x802430D0; // type:func rom:0x826390 +mac_02_func_80242A80_825D40 = 0x80242A80; // type:func rom:0x825D40 +mac_02_func_80242AD4_825D94 = 0x80242AD4; // type:func rom:0x825D94 +mac_02_func_80242B0C_825DCC = 0x80242B0C; // type:func rom:0x825DCC +mac_02_func_80242BA8_825E68 = 0x80242BA8; // type:func rom:0x825E68 +mac_02_GetCookResultForSingleRecipe = 0x80242C44; // type:func rom:0x825F04 +mac_02_GetCookResultForDoubleRecipe = 0x80242DBC; // type:func rom:0x82607C +mac_02_SetRecipeDiscovered = 0x80242F60; // type:func rom:0x826220 +mac_02_GetItemCount = 0x80243040; // type:func rom:0x826300 +mac_02_CheckItemsHasRoom = 0x80243088; // type:func rom:0x826348 +mac_02_TayceT_MakeItemList = 0x802430D0; // type:func rom:0x826390 mac_02_LetterDelivery_Init = 0x80243104; // type:func rom:0x8263C4 mac_02_LetterDelivery_CalcLetterPos = 0x802431F4; // type:func rom:0x8264B4 mac_02_LetterDelivery_SaveNpcAnim = 0x80243380; // type:func rom:0x826640 @@ -15379,20 +15379,20 @@ mac_02_LetterDelivery_RestoreNpcAnim = 0x802433C4; // type:func rom:0x826684 mac_02_MonitorMusicProximityTrigger = 0x802433F0; // type:func rom:0x8266B0 mac_02_varStash = 0x80246150; // type:data rom:0x829410 mac_02_Quizmo_Answers = 0x802461B4; // type:data rom:0x829474 -D_802461F4_8294B4 = 0x802461F4; // type:data rom:0x8294B4 +mac_02_D_802461F4_8294B4 = 0x802461F4; // type:data rom:0x8294B4 mac_02_ItemChoice_HasSelectedItem = 0x80248778; // type:data rom:0x82BA38 mac_02_ItemChoice_SelectedItemID = 0x8024877C; // type:data rom:0x82BA3C -D_80248A98_82BD58 = 0x80248A98; // type:data rom:0x82BD58 -D_80248B10_82BDD0 = 0x80248B10; // type:data rom:0x82BDD0 -D_80248CB0_82BF70 = 0x80248CB0; // type:data rom:0x82BF70 -D_80248CD0_82BF90 = 0x80248CD0; // type:data rom:0x82BF90 -D_80248CF0_82BFB0 = 0x80248CF0; // type:data rom:0x82BFB0 -D_8024903C_82C2FC = 0x8024903C; // type:data rom:0x82C2FC -D_8024909C_82C35C = 0x8024909C; // type:data rom:0x82C35C -D_8024E200_8314C0 = 0x8024E200; // type:data rom:0x8314C0 -D_8024E208_8314C8 = 0x8024E208; // type:data rom:0x8314C8 -D_8024E3A0_831660 = 0x8024E3A0; // type:data rom:0x831660 -D_8024E470_831730 = 0x8024E470; // type:data rom:0x831730 +mac_02_CookingIngredients = 0x80248A98; // type:data rom:0x82BD58 +mac_02_CookingResults = 0x80248B10; // type:data rom:0x82BDD0 +mac_02_SingleRecipesWithoutCookbook = 0x80248CB0; // type:data rom:0x82BF70 +mac_02_SingleRecipesWithCookbook = 0x80248CD0; // type:data rom:0x82BF90 +mac_02_DoubleRecipesMatrix = 0x80248CF0; // type:data rom:0x82BFB0 +mac_02_ExtraDoubleRecipes = 0x8024903C; // type:data rom:0x82C2FC +mac_02_MysteryResultOptions = 0x8024909C; // type:data rom:0x82C35C +mac_02_D_8024E200_8314C0 = 0x8024E200; // type:data rom:0x8314C0 +mac_02_D_8024E208_8314C8 = 0x8024E208; // type:data rom:0x8314C8 +mac_02_CookableItemIDs = 0x8024E3A0; // type:data rom:0x831660 +mac_02_CookableDiscoveredFlags = 0x8024E470; // type:data rom:0x831730 mac_03_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x831800 mac_03_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x831820 mac_03_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x831834 @@ -15459,10 +15459,10 @@ D_802466E8_837EE8 = 0x802466E8; // type:data rom:0x837EE8 mac_03_ItemChoice_HasSelectedItem = 0x80248C6C; // type:data rom:0x83A46C mac_03_ItemChoice_SelectedItemID = 0x80248C70; // type:data rom:0x83A470 D_8024F800_841000 = 0x8024F800; // type:data rom:0x841000 -func_80240000_842BD0 = 0x80240000; // type:func rom:0x842BD0 -func_80240050_842C20 = 0x80240050; // type:func rom:0x842C20 -func_80240194_842D64 = 0x80240194; // type:func rom:0x842D64 -func_802401C0_842D90 = 0x802401C0; // type:func rom:0x842D90 +mac_04_func_80240000_842BD0 = 0x80240000; // type:func rom:0x842BD0 +mac_04_SetNightFogParams = 0x80240050; // type:func rom:0x842C20 +mac_04_SetNightFogMode = 0x80240194; // type:func rom:0x842D64 +mac_04_InitEntryFromToybox = 0x802401C0; // type:func rom:0x842D90 mac_04_foliage_setup_shear_mtx = 0x80240220; // type:func rom:0x842DF0 mac_04_TransformFoliage = 0x80240290; // type:func rom:0x842E60 mac_04_StashVars = 0x80240460; // type:func rom:0x843030 @@ -15494,35 +15494,35 @@ mac_04_Quizmo_CreateReactionEffect = 0x80241458; // type:func rom:0x844028 mac_04_Quizmo_CreateWorker = 0x802414C4; // type:func rom:0x844094 mac_04_GetNpcCollisionHeight = 0x802414F4; // type:func rom:0x8440C4 mac_04_AddPlayerHandsOffset = 0x80241550; // type:func rom:0x844120 -func_80241720_8442F0 = 0x80241720; // type:func rom:0x8442F0 -func_80241774_844344 = 0x80241774; // type:func rom:0x844344 -func_802417AC_84437C = 0x802417AC; // type:func rom:0x84437C -func_80241848_844418 = 0x80241848; // type:func rom:0x844418 -func_802418AC_84447C = 0x802418AC; // type:func rom:0x84447C -PostChapter4StatUpdate = 0x80241944; // type:func rom:0x844514 +mac_04_func_80241720_8442F0 = 0x80241720; // type:func rom:0x8442F0 +mac_04_func_80241774_844344 = 0x80241774; // type:func rom:0x844344 +mac_04_func_802417AC_84437C = 0x802417AC; // type:func rom:0x84437C +mac_04_get_total_equipped_bp_cost = 0x80241848; // type:func rom:0x844418 +mac_04_EnforceNewStatLimits = 0x802418AC; // type:func rom:0x84447C +mac_04_UpgradeStarPowerCh4 = 0x80241944; // type:func rom:0x844514 mac_04_GetFloorCollider = 0x80241980; // type:func rom:0x844550 -func_802419AC_84457C = 0x802419AC; // type:func rom:0x84457C +mac_04_func_802419AC_84457C = 0x802419AC; // type:func rom:0x84457C mac_04_GetPlayerCoins = 0x802419D0; // type:func rom:0x8445A0 -func_802419E4_8445B4 = 0x802419E4; // type:func rom:0x8445B4 -func_80241A64_844634 = 0x80241A64; // type:func rom:0x844634 -func_80241B90_844760 = 0x80241B90; // type:func rom:0x844760 +mac_04_GetCurrentStatMaxima = 0x802419E4; // type:func rom:0x8445B4 +mac_04_AdjustStatMaxima = 0x80241A64; // type:func rom:0x844634 +mac_04_GetCurrentStatValues = 0x80241B90; // type:func rom:0x844760 mac_04_SetNpcShadowScale = 0x80241BB8; // type:func rom:0x844788 -mac_04_80241C20_8447F0 = 0x80241C20; // type:func rom:0x8447F0 -func_80241C40_844810 = 0x80241C40; // type:func rom:0x844810 -func_80241C60_844830 = 0x80241C60; // type:func rom:0x844830 -func_80241C90_844860 = 0x80241C90; // type:func rom:0x844860 -func_80241CEC_8448BC = 0x80241CEC; // type:func rom:0x8448BC -func_80241D30_844900 = 0x80241D30; // type:func rom:0x844900 -func_80241DAC_84497C = 0x80241DAC; // type:func rom:0x84497C +mac_04_SetStatusMenuIgnoreChanges = 0x80241C20; // type:func rom:0x8447F0 +mac_04_SetStatusMenuRespondToChanges = 0x80241C40; // type:func rom:0x844810 +mac_04_ForceStatusMenuToAppear = 0x80241C60; // type:func rom:0x844830 +mac_04_CreateShrinkingWorker = 0x80241C90; // type:func rom:0x844860 +mac_04_DestroyShrinkingWorker = 0x80241CEC; // type:func rom:0x8448BC +mac_04_render_shrunk_player = 0x80241D30; // type:func rom:0x844900 +mac_04_appendGfx_shrunk_player = 0x80241DAC; // type:func rom:0x84497C mac_04_RemovePadlock = 0x80241EB0; // type:func rom:0x844A80 mac_04_MonitorMusicProximityTrigger = 0x80241EF0; // type:func rom:0x844AC0 mac_04_varStash = 0x80243FE8; // type:data rom:0x846BB8 mac_04_Quizmo_Answers = 0x8024404C; // type:data rom:0x846C1C -D_8024408C_846C5C = 0x8024408C; // type:data rom:0x846C5C +mac_04_D_8024408C_846C5C = 0x8024408C; // type:data rom:0x846C5C mac_04_ItemChoice_HasSelectedItem = 0x80246610; // type:data rom:0x8491E0 mac_04_ItemChoice_SelectedItemID = 0x80246614; // type:data rom:0x8491E4 -D_8024F550_852120 = 0x8024F550; // type:data rom:0x852120 -D_8024F580_852150 = 0x8024F580; // type:data rom:0x852150 +mac_04_D_8024F550_852120 = 0x8024F550; // type:data rom:0x852120 +mac_04_D_8024F580_852150 = 0x8024F580; // type:data rom:0x852150 mac_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x852170 mac_05_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x852294 dup_mac_05_UnkFloatFunc001 = 0x8024030C; // type:func rom:0x85247C @@ -15568,24 +15568,24 @@ mac_05_Quizmo_CreateReactionEffect = 0x80242318; // type:func rom:0x854488 mac_05_Quizmo_CreateWorker = 0x80242384; // type:func rom:0x8544F4 mac_05_GetNpcCollisionHeight = 0x802423B4; // type:func rom:0x854524 mac_05_AddPlayerHandsOffset = 0x80242410; // type:func rom:0x854580 -func_802425E0_854750 = 0x802425E0; // type:func rom:0x854750 -func_80242634_8547A4 = 0x80242634; // type:func rom:0x8547A4 -func_8024266C_8547DC = 0x8024266C; // type:func rom:0x8547DC -func_80242708_854878 = 0x80242708; // type:func rom:0x854878 +mac_05_func_802425E0_854750 = 0x802425E0; // type:func rom:0x854750 +mac_05_func_80242634_8547A4 = 0x80242634; // type:func rom:0x8547A4 +mac_05_func_8024266C_8547DC = 0x8024266C; // type:func rom:0x8547DC +mac_05_func_80242708_854878 = 0x80242708; // type:func rom:0x854878 mac_05_LetterDelivery_Init = 0x802427A4; // type:func rom:0x854914 mac_05_LetterDelivery_CalcLetterPos = 0x80242894; // type:func rom:0x854A04 mac_05_LetterDelivery_SaveNpcAnim = 0x80242A20; // type:func rom:0x854B90 mac_05_LetterDelivery_RestoreNpcAnim = 0x80242A64; // type:func rom:0x854BD4 func_80242A90_854C00 = 0x80242A90; // type:func rom:0x854C00 -func_80242C78_854DE8 = 0x80242C78; // type:func rom:0x854DE8 -func_80242E84_854FF4 = 0x80242E84; // type:func rom:0x854FF4 +mac_05_func_80242C78_854DE8 = 0x80242C78; // type:func rom:0x854DE8 +mac_05_func_80242E84_854FF4 = 0x80242E84; // type:func rom:0x854FF4 mac_05_GetFloorCollider = 0x80243088; // type:func rom:0x8551F8 -func_802430B4_855224 = 0x802430B4; // type:func rom:0x855224 -func_802431B0_855320 = 0x802431B0; // type:func rom:0x855320 -func_80243254_8553C4 = 0x80243254; // type:func rom:0x8553C4 -func_8024335C_8554CC = 0x8024335C; // type:func rom:0x8554CC -func_80243380_8554F0 = 0x80243380; // type:func rom:0x8554F0 -func_802433BC_85552C = 0x802433BC; // type:func rom:0x85552C +mac_05_func_802430B4_855224 = 0x802430B4; // type:func rom:0x855224 +mac_05_func_802431B0_855320 = 0x802431B0; // type:func rom:0x855320 +mac_05_func_80243254_8553C4 = 0x80243254; // type:func rom:0x8553C4 +mac_05_func_8024335C_8554CC = 0x8024335C; // type:func rom:0x8554CC +mac_05_CheckTradeEventTime = 0x80243380; // type:func rom:0x8554F0 +mac_05_GetTradeEventItemCount = 0x802433BC; // type:func rom:0x85552C mac_05_resolve_npc = 0x802433F0; // type:func rom:0x855560 mac_05_UnkAngleFunc001 = 0x8024343C; // type:func rom:0x8555AC mac_05_unkVtxFunc001 = 0x80243588; // type:func rom:0x8556F8 @@ -15597,7 +15597,7 @@ mac_05_CreateWhaleGeyser = 0x80243BA4; // type:func rom:0x855D14 mac_05_SetWhaleGeyserPos = 0x80243CD4; // type:func rom:0x855E44 mac_05_DisposeWhaleGeyser = 0x80243D78; // type:func rom:0x855EE8 func_80243DB0_855F20 = 0x80243DB0; // type:func rom:0x855F20 -func_80243F0C_85607C = 0x80243F0C; // type:func rom:0x85607C +mac_05_gfx_build_club_64 = 0x80243F0C; // type:func rom:0x85607C mac_05_varStash = 0x802450B0; // type:data rom:0x857220 mac_05_Quizmo_Answers = 0x80245114; // type:data rom:0x857284 D_80245154_8572C4 = 0x80245154; // type:data rom:0x8572C4 @@ -15606,7 +15606,7 @@ mac_05_ItemChoice_SelectedItemID = 0x802476DC; // type:data rom:0x85984C D_80250A50_862BC0 = 0x80250A50; // type:data rom:0x862BC0 D_80250A54_862BC4 = 0x80250A54; // type:data rom:0x862BC4 D_80250A58_862BC8 = 0x80250A58; // type:data rom:0x862BC8 -D_80252744_8648B4 = 0x80252744; // type:data rom:0x8648B4 +mac_05_Club64SignAlphaModulus = 0x80252744; // type:data rom:0x8648B4 D_802527B0_864920 = 0x802527B0; // type:data rom:0x864920 D_802527B8_864928 = 0x802527B8; // type:data rom:0x864928 D_802529C8_864B38 = 0x802529C8; // type:data rom:0x864B38 @@ -16696,9 +16696,9 @@ func_80240970_92AC20 = 0x80240970; // type:func rom:0x92AC20 func_802409A8_92AC58 = 0x802409A8; // type:func rom:0x92AC58 sbk_02_StashVars = 0x80240A44; // type:func rom:0x92ACF4 sbk_02_GetItemName = 0x80240AF8; // type:func rom:0x92ADA8 -UpgradeStarPower = 0x80240B5C; // type:func rom:0x92AE0C +sbk_02_UpgradeStarPowerCh2 = 0x80240B5C; // type:func rom:0x92AE0C sbk_02_CheckTradeEventTime = 0x80240B98; // type:func rom:0x92AE48 -GetItemCount = 0x80240BD4; // type:func rom:0x92AE84 +GetTradeEventItemCount = 0x80240BD4; // type:func rom:0x92AE84 D_8024404C_92E2FC = 0x8024404C; // type:data rom:0x92E2FC D_80244050_92E300 = 0x80244050; // type:data rom:0x92E300 sbk_02_varStash = 0x802441D8; // type:data rom:0x92E488 @@ -17309,7 +17309,7 @@ D_8024EF68_978128 = 0x8024EF68; // type:data rom:0x978128 D_8024EF70_978130 = 0x8024EF70; // type:data rom:0x978130 D_8024EF78_978138 = 0x8024EF78; // type:data rom:0x978138 isk_02_RemovePadlock = 0x80240000; // type:func rom:0x978710 -func_80240040_978750 = 0x80240040; // type:func rom:0x978750 +isk_02_AwaitPlayerMummyAmbush = 0x80240040; // type:func rom:0x978750 isk_02_SetNpcB5_3 = 0x802400F0; // type:func rom:0x978800 isk_04_RemovePadlock = 0x80240000; // type:func rom:0x97B630 isk_04_set_script_owner_npc_anim = 0x80240040; // type:func rom:0x97B670 @@ -17321,9 +17321,9 @@ isk_04_func_80240814_97BE44 = 0x80240814; // type:func rom:0x97BE44 isk_04_AwaitPlayerNearNpc = 0x8024085C; // type:func rom:0x97BE8C isk_04_func_802408B4_97BEE4 = 0x802408B4; // type:func rom:0x97BEE4 isk_04_SwitchToPartner = 0x80240930; // type:func rom:0x97BF60 -func_8024095C_97BF8C = 0x8024095C; // type:func rom:0x97BF8C -D_80242288_97D8B8 = 0x80242288; // type:data rom:0x97D8B8 -D_80242430_97DA60 = 0x80242430; // type:data rom:0x97DA60 +isk_04_SetupDemoScene = 0x8024095C; // type:func rom:0x97BF8C +isk_04_DemoSceneState = 0x80242288; // type:data rom:0x97D8B8 +isk_04_D_80242430_97DA60 = 0x80242430; // type:data rom:0x97DA60 isk_05_HoppingAI_HopInit = 0x80240000; // type:func rom:0x97DAD0 isk_05_HoppingAI_Hop = 0x80240230; // type:func rom:0x97DD00 isk_05_HoppingAI_LoiterInit = 0x80240568; // type:func rom:0x97E038 @@ -17338,13 +17338,13 @@ isk_05_StoneChompAI_Main = 0x80240F3C; // type:func rom:0x97EA0C isk_05_StoneChompFXA = 0x80241108; // type:func rom:0x97EBD8 isk_05_StoneChompFXB = 0x802411F8; // type:func rom:0x97ECC8 isk_05_StoneChompFXC = 0x802415C0; // type:func rom:0x97F090 -func_80241610_97F0E0 = 0x80241610; // type:func rom:0x97F0E0 -func_80241B28_97F5F8 = 0x80241B28; // type:func rom:0x97F5F8 -func_80241C34_97F704 = 0x80241C34; // type:func rom:0x97F704 -func_80241C5C_97F72C = 0x80241C5C; // type:func rom:0x97F72C -func_80241D44_97F814 = 0x80241D44; // type:func rom:0x97F814 -func_80241DF8_97F8C8 = 0x80241DF8; // type:func rom:0x97F8C8 -func_80241E24_97F8F4 = 0x80241E24; // type:func rom:0x97F8F4 +isk_05_func_80241610_97F0E0 = 0x80241610; // type:func rom:0x97F0E0 +isk_05_func_80241B28_97F5F8 = 0x80241B28; // type:func rom:0x97F5F8 +isk_05_DestroyAmbushWorker = 0x80241C34; // type:func rom:0x97F704 +isk_05_func_80241C5C_97F72C = 0x80241C5C; // type:func rom:0x97F72C +isk_05_func_80241D44_97F814 = 0x80241D44; // type:func rom:0x97F814 +isk_05_func_80241DF8_97F8C8 = 0x80241DF8; // type:func rom:0x97F8C8 +isk_05_func_80241E24_97F8F4 = 0x80241E24; // type:func rom:0x97F8F4 isk_05_ChompAmbush = 0x80242614; // type:data rom:0x9800E4 D_80242618_9800E8 = 0x80242618; // type:data rom:0x9800E8 D_8024264C_98011C = 0x8024264C; // type:data rom:0x98011C @@ -17352,9 +17352,9 @@ D_80242EB0_980980 = 0x80242EB0; // type:data rom:0x980980 D_80242F38_980A08 = 0x80242F38; // type:data rom:0x980A08 D_80242F40_980A10 = 0x80242F40; // type:data rom:0x980A10 isk_07_SetNpcB5_3 = 0x80240000; // type:func rom:0x982440 -func_80240014_982454 = 0x80240014; // type:func rom:0x982454 +isk_07_IsLastEnemy = 0x80240014; // type:func rom:0x982454 isk_07_RemovePadlock = 0x802400B0; // type:func rom:0x9824F0 -func_802400F0_982530 = 0x802400F0; // type:func rom:0x982530 +isk_07_WaitForPlayerTouchingGround = 0x802400F0; // type:func rom:0x982530 isk_08_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x984E30 isk_08_UnkDistFunc = 0x8024007C; // type:func rom:0x984EAC isk_08_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x984FE0 @@ -17368,8 +17368,8 @@ isk_09_StashVars = 0x80240000; // type:func rom:0x9864E0 isk_09_GetItemName = 0x802400B4; // type:func rom:0x986594 isk_09_SomeItemEntityFunc = 0x80240118; // type:func rom:0x9865F8 isk_09_IsItemBadge = 0x80240268; // type:func rom:0x986748 -func_802402BC_98679C = 0x802402BC; // type:func rom:0x98679C -func_802402F0_9867D0 = 0x802402F0; // type:func rom:0x9867D0 +isk_09_DismissGotItem = 0x802402BC; // type:func rom:0x98679C +isk_09_WaitForPlayerTouchingGround = 0x802402F0; // type:func rom:0x9867D0 D_802406F0_986BD0 = 0x802406F0; // type:data rom:0x986BD0 isk_10_SuperBlock_SetOverride40 = 0x80240000; // type:func rom:0x988B60 isk_10_SuperBlock_ClearOverride40 = 0x8024001C; // type:func rom:0x988B7C @@ -17389,15 +17389,15 @@ isk_10_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0x989698 isk_10_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0x9897D8 isk_10_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0x989820 isk_10_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0x989868 -func_80240D38_989898 = 0x80240D38; // type:func rom:0x989898 +isk_10_MonitorPlayerLastFloor = 0x80240D38; // type:func rom:0x989898 isk_10_SuperBlock_CantUpgradeMessages = 0x80241100; // type:data rom:0x989C60 isk_10_SuperBlock_PartnerIDs = 0x80241108; // type:data rom:0x989C68 isk_10_SuperBlock_UpgradeDescMessages = 0x80241118; // type:data rom:0x989C78 isk_10_SuperBlock_UpgradeOrbAngles = 0x80241158; // type:data rom:0x989CB8 -D_80241EA0_98AA00 = 0x80241EA0; // type:data rom:0x98AA00 -D_80241EA8_98AA08 = 0x80241EA8; // type:data rom:0x98AA08 -func_80240000_98AA10 = 0x80240000; // type:func rom:0x98AA10 -func_802400B0_98AAC0 = 0x802400B0; // type:func rom:0x98AAC0 +isk_10_D_80241EA0_98AA00 = 0x80241EA0; // type:data rom:0x98AA00 +isk_10_D_80241EA8_98AA08 = 0x80241EA8; // type:data rom:0x98AA08 +isk_11_SpawnLensFlare = 0x80240000; // type:func rom:0x98AA10 +isk_11_GetItemNameInSocket = 0x802400B0; // type:func rom:0x98AAC0 isk_11_RemovePadlock = 0x80240120; // type:func rom:0x98AB30 isk_13_HoppingAI_HopInit = 0x80240000; // type:func rom:0x98F7E0 isk_13_HoppingAI_Hop = 0x80240230; // type:func rom:0x98FA10 @@ -17413,16 +17413,16 @@ isk_13_StoneChompAI_Main = 0x80240F3C; // type:func rom:0x99071C isk_13_StoneChompFXA = 0x80241108; // type:func rom:0x9908E8 isk_13_StoneChompFXB = 0x802411F8; // type:func rom:0x9909D8 isk_13_StoneChompFXC = 0x802415C0; // type:func rom:0x990DA0 -func_80241610_990DF0 = 0x80241610; // type:func rom:0x990DF0 -func_80241BA8_991388 = 0x80241BA8; // type:func rom:0x991388 -func_80241D08_9914E8 = 0x80241D08; // type:func rom:0x9914E8 -func_80241D38_991518 = 0x80241D38; // type:func rom:0x991518 -func_80241E34_991614 = 0x80241E34; // type:func rom:0x991614 -func_80241EF8_9916D8 = 0x80241EF8; // type:func rom:0x9916D8 -func_80242044_991824 = 0x80242044; // type:func rom:0x991824 -D_80242EB0_992690 = 0x80242EB0; // type:data rom:0x992690 -D_80242F38_992718 = 0x80242F38; // type:data rom:0x992718 -D_80242F40_992720 = 0x80242F40; // type:data rom:0x992720 +isk_13_func_80241610_990DF0 = 0x80241610; // type:func rom:0x990DF0 +isk_13_func_80241BA8_991388 = 0x80241BA8; // type:func rom:0x991388 +isk_13_DestroyAmbushWorker = 0x80241D08; // type:func rom:0x9914E8 +isk_13_func_80241D38_991518 = 0x80241D38; // type:func rom:0x991518 +isk_13_func_80241E34_991614 = 0x80241E34; // type:func rom:0x991614 +isk_13_func_80241EF8_9916D8 = 0x80241EF8; // type:func rom:0x9916D8 +isk_13_func_80242044_991824 = 0x80242044; // type:func rom:0x991824 +isk_13_D_80242EB0_992690 = 0x80242EB0; // type:data rom:0x992690 +isk_13_D_80242F38_992718 = 0x80242F38; // type:data rom:0x992718 +isk_13_D_80242F40_992720 = 0x80242F40; // type:data rom:0x992720 isk_14_HoppingAI_HopInit = 0x80240000; // type:func rom:0x992730 isk_14_HoppingAI_Hop = 0x80240230; // type:func rom:0x992960 isk_14_HoppingAI_LoiterInit = 0x80240568; // type:func rom:0x992C98 @@ -17439,7 +17439,7 @@ isk_14_StoneChompFXB = 0x802411F8; // type:func rom:0x993928 isk_14_StoneChompFXC = 0x802415C0; // type:func rom:0x993CF0 func_80241610_993D40 = 0x80241610; // type:func rom:0x993D40 func_80241AF0_994220 = 0x80241AF0; // type:func rom:0x994220 -func_80241BC4_9942F4 = 0x80241BC4; // type:func rom:0x9942F4 +DestroyAmbushWorker = 0x80241BC4; // type:func rom:0x9942F4 func_80241BEC_99431C = 0x80241BEC; // type:func rom:0x99431C func_80241CA0_9943D0 = 0x80241CA0; // type:func rom:0x9943D0 D_80242A30_995160 = 0x80242A30; // type:data rom:0x995160 @@ -17465,7 +17465,7 @@ trd_00_StashVars = 0x80240310; // type:func rom:0x999F80 trd_00_GetItemName = 0x802403C4; // type:func rom:0x99A034 trd_00_SomeItemEntityFunc = 0x80240428; // type:func rom:0x99A098 trd_00_IsItemBadge = 0x80240578; // type:func rom:0x99A1E8 -trd_00_UpgradeStarPower = 0x802405D0; // type:func rom:0x99A240 +trd_00_UpgradeStarPowerCh1 = 0x802405D0; // type:func rom:0x99A240 trd_00_SyncStatusMenu = 0x8024060C; // type:func rom:0x99A27C trd_00_varStash = 0x80241340; // type:data rom:0x99AFB0 trd_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x99C990 @@ -20327,7 +20327,7 @@ arn_07_FlyingAI_Chase = 0x80241744; // type:func rom:0xBEE534 arn_07_FlyingAI_LosePlayer = 0x802417A8; // type:func rom:0xBEE598 arn_07_FlyingAI_Init = 0x80241B38; // type:func rom:0xBEE928 arn_07_FlyingAI_Main = 0x80241C5C; // type:func rom:0xBEEA4C -UpgradeStarPower = 0x80241E48; // type:func rom:0xBEEC38 +arn_07_UpgradeStarPowerCh3 = 0x80241E48; // type:func rom:0xBEEC38 arn_07_entryList = 0x80241E90; // type:data rom:0xBEEC80 arn_07_settings = 0x80241ED0; // type:data rom:0xBEECC0 arn_07_80241F10 = 0x80241F10; // type:data rom:0xBEED00 @@ -22487,7 +22487,7 @@ flo_00_PatrolAI_Chase = 0x8024098C; // type:func rom:0xC9E8AC flo_00_PatrolAI_LosePlayer = 0x80240AAC; // type:func rom:0xC9E9CC flo_00_PatrolNoAttackAI_15 = 0x80240B14; // type:func rom:0xC9EA34 flo_00_PatrolNoAttackAI_Main = 0x80240BD4; // type:func rom:0xC9EAF4 -flo_00_UpgradeStarPower = 0x80240ED0; // type:func rom:0xC9EDF0 +flo_00_UpgradeStarPowerCh6 = 0x80240ED0; // type:func rom:0xC9EDF0 flo_00_GetPlayerAngles = 0x80240F10; // type:func rom:0xC9EE30 flo_00_PlayerRideBeanstalk = 0x80240F80; // type:func rom:0xC9EEA0 flo_00_PartnerRideBeanstalk = 0x802410B4; // type:func rom:0xC9EFD4 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 3f6890594f..8a2c4acd84 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -932,3 +932,4 @@ func_80126734 = 0x80126734; func_800F2E98 = 0x800F2E98; func_8004D8E0 = 0x8004D8E0; func_80059AC8 = 0x80059AC8; +pra_02_80243E88 = 0x80243E88;