diff --git a/include/common_structs.h b/include/common_structs.h index 4dd64c8565..8bda978a65 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -879,7 +879,7 @@ typedef struct BattleStatus { /* 0x08E */ s8 initialEnemyCount; /* used for SP award bonus */ /* 0x08F */ char unk_8F[1]; /* 0x090 */ s16 unk_90; - /* 0x092 */ s8 unk_92; + /* 0x092 */ s8 reflectFlags; /* 0x093 */ s8 unk_93; /* 0x094 */ s8 unk_94; /* 0x095 */ s8 unk_95; @@ -2478,15 +2478,6 @@ typedef struct PartnerDMAData { /* 0x10 */ s32 y; } PartnerDMAData; // size = 0x14 -typedef struct UnkOmo { - /* 0x00 */ f32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ s32 treeIndex; -} UnkOmo; // size = 0x18 - typedef struct struct_D_802EB620 { /* 0x00 */ s32 unk_00; /* 0x04 */ s32 unk_04; diff --git a/include/dead.h b/include/dead.h index 9c51423b79..46870c7971 100644 --- a/include/dead.h +++ b/include/dead.h @@ -298,7 +298,7 @@ #define SetModelCustomGfx dead_SetModelCustomGfx #define SetCustomGfxBuilders dead_SetCustomGfxBuilders #define FindItem dead_FindItem -#define func_802CDE68 dead_func_802CDE68 +#define SetNpcRotationPivot dead_SetNpcRotationPivot #define SetNpcPaletteSwapMode dead_SetNpcPaletteSwapMode #define SetNpcPaletteSwapping dead_SetNpcPaletteSwapping #define BindNpcAux dead_BindNpcAux diff --git a/include/enums.h b/include/enums.h index b6135e8914..b9d98553ce 100644 --- a/include/enums.h +++ b/include/enums.h @@ -476,7 +476,7 @@ enum Emoters { EMOTER_NPC = 1 }; -enum Easings { +enum EasingType { EASING_LINEAR = 0, EASING_QUADRATIC_IN = 1, EASING_CUBIC_IN = 2, @@ -831,6 +831,7 @@ enum SoundIDs { SOUND_234 = 0x00000234, SOUND_23D = 0x0000023D, SOUND_241 = 0x00000241, + SOUND_245 = 0x00000245, SOUND_246 = 0x00000246, SOUND_247 = 0x00000247, SOUND_248 = 0x00000248, @@ -999,6 +1000,7 @@ enum SoundIDs { SOUND_368 = 0x00000368, SOUND_369 = 0x00000369, SOUND_36B = 0x0000036B, + SOUND_36D = 0x0000036D, SOUND_36E = 0x0000036E, SOUND_36F = 0x0000036F, SOUND_370 = 0x00000370, @@ -3518,9 +3520,9 @@ enum RenderMode { }; enum RenderTaskFlags { - RENDER_TASK_FLAG_ENABLED = 0x01, - RENDER_TASK_FLAG_2 = 0x02, - RENDER_TASK_FLAG_20 = 0x20, + RENDER_TASK_FLAG_ENABLED = 0x01, + RENDER_TASK_FLAG_REFLECT_FLOOR = 0x02, + RENDER_TASK_FLAG_20 = 0x20, }; enum ActorFlags { @@ -3642,15 +3644,15 @@ enum PartnerAnimIndices { }; enum AnyPartnerAnims { - PARTNER_ANIM_WALK = 0x101, - PARTNER_ANIM_JUMP = 0x102, - PARTNER_ANIM_FALL = 0x103, - PARTNER_ANIM_FLY = 0x104, - PARTNER_ANIM_IDLE = 0x105, - PARTNER_ANIM_RUN = 0x106, - PARTNER_ANIM_TALK = 0x107, - PARTNER_ANIM_HURT = 0x108, - PARTNER_ANIM_9 = 0x109, + PARTNER_ANIM_STILL = 0x101, + PARTNER_ANIM_WALK = 0x102, + PARTNER_ANIM_JUMP = 0x103, + PARTNER_ANIM_FALL = 0x104, + PARTNER_ANIM_FLY = 0x105, + PARTNER_ANIM_IDLE = 0x106, + PARTNER_ANIM_RUN = 0x107, + PARTNER_ANIM_TALK = 0x108, + PARTNER_ANIM_HURT = 0x109, }; enum EnemyAnimIndices { @@ -4094,6 +4096,10 @@ enum BattleStatusFlags2 { BS_FLAGS2_DROP_WHACKA_BUMP = 0x10000000, }; +enum BattleStatusReflectionFlags { + BS_REFLECT_FLOOR = 1, +}; + enum BattleStates { BATTLE_STATE_NEGATIVE_1 = -1, BATTLE_STATE_0 = 0, @@ -4705,7 +4711,7 @@ enum GlobalOverrides { GLOBAL_OVERRIDES_10 = 0x00000010, GLOBAL_OVERRIDES_ENABLE_TRANSITION_STENCIL = 0x00000020, GLOBAL_OVERRIDES_40 = 0x00000040, - GLOBAL_OVERRIDES_80 = 0x00000080, + GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION = 0x00000080, GLOBAL_OVERRIDES_DISABLE_BATTLES = 0x00000100, GLOBAL_OVERRIDES_200 = 0x00000200, GLOBAL_OVERRIDES_400 = 0x00000400, diff --git a/include/functions.h b/include/functions.h index 7b9d7c8fbf..c95c2532da 100644 --- a/include/functions.h +++ b/include/functions.h @@ -124,13 +124,13 @@ void update_hero_shadows(void); void appendGfx_background_texture(void); void appendGfx_enemy_actor(void*); void appendGfx_enemy_actor_blur(void*); -void appendGfx_enemy_actor_decorations(void*); +void appendGfx_enemy_actor_reflection(void*); void appendGfx_partner_actor(void*); void appendGfx_partner_actor_blur(void*); -void func_80257B88(void*); +void appendGfx_partner_actor_reflection(void*); void appendGfx_player_actor(void*); void appendGfx_player_actor_blur(Actor*); -void func_80258E14(void*); +void appendGfx_player_actor_reflection(void*); void func_80254610(Actor*); diff --git a/include/npc.h b/include/npc.h index 1bcdebabd3..4c7d2be6e9 100644 --- a/include/npc.h +++ b/include/npc.h @@ -98,17 +98,17 @@ typedef struct MobileAISettings { /* 0x2C */ s32 unk_AI_2C; // probably a boolean for enable loitering after a wander movement } MobileAISettings; // size = 0x30 -typedef struct StationaryAISettings { - /* 0x00 */ f32 unk_00; // probably equivalent to alertRadius in MobileAISettings - /* 0x04 */ f32 unk_04; // probably equivalent to alertOffsetDist in MobileAISettings +typedef struct GuardAISettings { + /* 0x00 */ f32 alertRadius; + /* 0x04 */ f32 alertOffsetDist; // offset along npc->yaw of the test point for alert volume overlap, creates directionality to enemy 'sight' /* 0x08 */ s32 playerSearchInterval; // how often to search for player (frames) /* 0x0C */ f32 chaseSpeed; /* 0x10 */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing /* 0x14 */ s32 chaseUpdateInterval; // how often to re-run chase init and re-acquire player position (frames) /* 0x18 */ f32 chaseRadius; /* 0x1C */ f32 chaseOffsetDist; // offset along npc->yaw of the test point for alert volume overlap, creates directionality to enemy 'sight' - /* 0x20 */ s32 unk_20; // probably equivalent to unk_AI_2C in MobileAISettings -} StationaryAISettings; // size = 0x24 + /* 0x20 */ s32 unk_AI_20; // probably equivalent to unk_AI_2C in MobileAISettings +} GuardAISettings; // size = 0x24 struct FireBarData; typedef void (*FireBarCallback)(struct FireBarData*, s32); diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 873d42c813..7c67e3aa84 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -34,7 +34,7 @@ ApiStatus EndActorSpeech(Evt* script, s32 isInitialCall); ApiStatus ShowBattleChoice(Evt* script, s32 isInitialCall); ApiStatus OverrideBattleDmaDest(Evt* script, s32 isInitialCall); ApiStatus LoadBattleDmaData(Evt* script, s32 isInitialCall); -ApiStatus func_802536A8(Evt* script, s32 isInitialCall); +ApiStatus EnableBattleFloorReflections(Evt* script, s32 isInitialCall); ApiStatus func_80253734(Evt* script, s32 isInitialCall); ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall); ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall); diff --git a/include/script_api/common.h b/include/script_api/common.h index a328b47a4a..7474b0d28d 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 SetBattleAsScripted(Evt* script, s32 isInitialCall); +ApiStatus GetEncounterTriggerHitTier(Evt* script, s32 isInitialCall); ApiStatus SetOwnerInstigatorValue(Evt* script, s32 isInitialCall); ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall); ApiStatus MakeEntity(Evt* script, s32 isInitialCall); @@ -319,7 +320,7 @@ ApiStatus func_80045838(Evt* script, s32 isInitialCall); ApiStatus ModifyGlobalOverrideFlags(Evt* script, s32 isInitialCall); ApiStatus func_802CF56C(Evt* script, s32 isInitialCall); ApiStatus func_802CA988(Evt* script, s32 isInitialCall); -ApiStatus func_802CDE68(Evt* script, s32 isInitialCall); +ApiStatus SetNpcRotationPivot(Evt* script, s32 isInitialCall); ApiStatus SetSleepBubbleTimeLeft(Evt* script, s32 isInitialCall); ApiStatus func_802D286C(Evt* script, s32 isInitialCall); ApiStatus func_802D2520(Evt* script, s32 isInitialCall); diff --git a/src/16F740.c b/src/16F740.c index 7e24bff092..bb72dd764a 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -284,7 +284,7 @@ void btl_state_update_normal_start(void) { battleStatus->cloudNineTurnsLeft = 0; battleStatus->cloudNineDodgeChance = 0; battleStatus->cloudNineEffect = NULL; - battleStatus->unk_92 = 0; + battleStatus->reflectFlags = 0; battleStatus->turboChargeTurnsLeft = 0; battleStatus->turboChargeAmount = 0; battleStatus->unk_8C = 0; diff --git a/src/16c8e0.c b/src/16c8e0.c index 79ee09d040..07bca1e498 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -162,9 +162,9 @@ void initialize_battle(void) { gBattleStatus.flags2 = 0; gBattleStatus.flags1 = 0; bSavedOverrideFlags = gOverrideFlags; - gOverrideFlags &= ~GLOBAL_OVERRIDES_80; + gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; gBattleStatus.inputBitmask = -1; - gOverrideFlags &= ~GLOBAL_OVERRIDES_80; + gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; for (i = 0; i < 16; i++) { battleStatus->pushInputBuffer[i] = 0; // @bug? why just 16 @@ -648,9 +648,9 @@ void btl_render_actors(void) { queue_render_task(renderTaskPtr); } - if (battleStatus->unk_92 & 1) { + if (battleStatus->reflectFlags & BS_REFLECT_FLOOR) { renderTaskPtr->appendGfxArg = actor; - renderTaskPtr->appendGfx = appendGfx_enemy_actor_decorations; + renderTaskPtr->appendGfx = appendGfx_enemy_actor_reflection; renderTaskPtr->distance = actor->currentPos.z; renderTaskPtr->renderMode = actor->renderMode; queue_render_task(renderTaskPtr); @@ -674,9 +674,9 @@ void btl_render_actors(void) { queue_render_task(renderTaskPtr); } - if (battleStatus->unk_92 & 1) { + if (battleStatus->reflectFlags & BS_REFLECT_FLOOR) { renderTaskPtr->appendGfxArg = NULL; - renderTaskPtr->appendGfx = func_80257B88; + renderTaskPtr->appendGfx = appendGfx_partner_actor_reflection; renderTaskPtr->distance = actor->currentPos.z; renderTaskPtr->renderMode = actor->renderMode; queue_render_task(renderTaskPtr); @@ -699,9 +699,9 @@ void btl_render_actors(void) { queue_render_task(renderTaskPtr); } - if (battleStatus->unk_92 & 1) { + if (battleStatus->reflectFlags & BS_REFLECT_FLOOR) { renderTaskPtr->appendGfxArg = NULL; - renderTaskPtr->appendGfx = func_80258E14; + renderTaskPtr->appendGfx = appendGfx_player_actor_reflection; renderTaskPtr->distance = actor->currentPos.z; renderTaskPtr->renderMode = actor->renderMode; queue_render_task(renderTaskPtr); @@ -1092,10 +1092,10 @@ void btl_restore_world_cameras(void) { playerStatus->position.y = D_8029EFB4; playerStatus->position.z = D_8029EFB8; - if (bSavedOverrideFlags & GLOBAL_OVERRIDES_80) { - gOverrideFlags |= GLOBAL_OVERRIDES_80; + if (bSavedOverrideFlags & GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION) { + gOverrideFlags |= GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; } else { - gOverrideFlags &= ~GLOBAL_OVERRIDES_80; + gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; } if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) { diff --git a/src/181810.c b/src/181810.c index 10f1e90e53..4f6add8bf3 100644 --- a/src/181810.c +++ b/src/181810.c @@ -324,16 +324,16 @@ ApiStatus LoadBattleDmaData(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802536A8(Evt* script, s32 isInitialCall) { +ApiStatus EnableBattleFloorReflections(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; - if (evt_get_variable(script, *args++) != 0) { - battleStatus->unk_92 |= 1; - gOverrideFlags |= GLOBAL_OVERRIDES_80; + if (evt_get_variable(script, *args++)) { + battleStatus->reflectFlags |= BS_REFLECT_FLOOR; + gOverrideFlags |= GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; } else { - battleStatus->unk_92 &= ~1; - gOverrideFlags &= ~GLOBAL_OVERRIDES_80; + battleStatus->reflectFlags &= ~BS_REFLECT_FLOOR; + gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; } return ApiStatus_DONE2; diff --git a/src/182B30.c b/src/182B30.c index da8076a43f..f765ce45d5 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -1283,13 +1283,13 @@ void appendGfx_partner_actor(void* data) { appendGfx_npc_actor(TRUE, (s32) data); } -void appendGfx_enemy_actor_decorations(void* data) { +void appendGfx_enemy_actor_reflection(void* data) { Actor* actor = data; func_802571F0(0, actor); } -void func_80257B88(void* data) { +void appendGfx_partner_actor_reflection(void* data) { func_802571F0(1, gBattleStatus.partnerActor); } @@ -1791,7 +1791,7 @@ end: _add_part_decoration(playerParts); } -void func_80258E14(void* arg0) { +void appendGfx_player_actor_reflection(void* arg0) { Matrix4f mtxRotX, mtxRotY, mtxRotZ, mtxRotation, mtxScale; Matrix4f mtxPivotOn, mtxPivotOff, mtxTranslate; Matrix4f mtxTemp, mtxTransform, mtxMirror; diff --git a/src/1AF120.c b/src/1AF120.c index 0930fee9fd..8e0ce2c8d9 100644 --- a/src/1AF120.c +++ b/src/1AF120.c @@ -693,7 +693,7 @@ EvtScript D_802975C8 = { EVT_END_LOOP EVT_WAIT(45) EVT_LOOP(5) - EVT_SUBF(LVar0, EVT_FLOAT(0.220703125)) + EVT_SUBF(LVar0, EVT_FLOAT(0.22)) EVT_ADDF(LVar1, EVT_FLOAT(0.2)) EVT_CALL(SetActorScale, ACTOR_PARTNER, LVar0, LVar1, EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -912,7 +912,7 @@ EvtScript D_80298374 = { EVT_END_LOOP EVT_WAIT(45) EVT_LOOP(5) - EVT_SUBF(LVar0, EVT_FLOAT(0.220703125)) + EVT_SUBF(LVar0, EVT_FLOAT(0.22)) EVT_ADDF(LVar1, EVT_FLOAT(0.2)) EVT_CALL(SetActorScale, ACTOR_PLAYER, LVar0, LVar1, EVT_FLOAT(1.0)) EVT_WAIT(1) diff --git a/src/C50A0.c b/src/C50A0.c index 8c6a1f772d..cbbb258254 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -1535,7 +1535,7 @@ void draw_item_entities(void) { rtPtr->distance = 0; retTask = queue_render_task(rtPtr); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } do {} while (0); // required to match diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 91509f241e..b622bb2900 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -6144,7 +6144,7 @@ void execute_render_tasks(void) { D_8014B7F0 = taskCount; taskList = mdl_renderTaskLists[mdl_renderTaskQueueIdx]; - if (gOverrideFlags & GLOBAL_OVERRIDES_80) { + if (gOverrideFlags & GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION) { Mtx* dispMtx; Gfx* savedGfxPos = NULL; @@ -6155,13 +6155,13 @@ void execute_render_tasks(void) { task = &taskList[sorted[i]]; appendGfx = task->appendGfx; - if (task->renderMode & RENDER_TASK_FLAG_2) { + if (task->renderMode & RENDER_TASK_FLAG_REFLECT_FLOOR) { savedGfxPos = gMasterGfxPos++; } appendGfx(task->appendGfxArg); - if (task->renderMode & RENDER_TASK_FLAG_2) { + if (task->renderMode & RENDER_TASK_FLAG_REFLECT_FLOOR) { gSPEndDisplayList(gMasterGfxPos++); gSPBranchList(savedGfxPos, gMasterGfxPos); gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); diff --git a/src/battle/area_flo/stage/flo_03.c b/src/battle/area_flo/stage/flo_03.c index 02043b0cad..e9e62a3fb9 100644 --- a/src/battle/area_flo/stage/flo_03.c +++ b/src/battle/area_flo/stage/flo_03.c @@ -56,10 +56,10 @@ EvtScript N(80232C48) = { EVT_MULF(LVar6, EVT_FLOAT(1.01)) EVT_ADDF(LVar7, EVT_FLOAT(0.01)) EVT_SETF(LVar8, LVar6) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0) EVT_ADDF(LVar8, LVarA) EVT_SETF(LVar9, LVar7) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 20, 0, 90) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90) EVT_ADDF(LVar9, LVarA) EVT_SETF(LVarA, LVar0) EVT_MULF(LVarA, EVT_FLOAT(10.0)) @@ -155,8 +155,8 @@ EvtScript N(beforeBattle) = { EVT_DIVF(LVar3, EVT_FLOAT(200.0)) EVT_SETF(LVar4, EVT_FLOAT(1.0)) EVT_SETF(LVar5, 0) - EVT_SETF(LVar6, EVT_FLOAT(0.296875)) - EVT_SETF(LVar7, EVT_FLOAT(0.296875)) + EVT_SETF(LVar6, EVT_FLOAT(0.296)) + EVT_SETF(LVar7, EVT_FLOAT(0.296)) EVT_SET(LVarF, LVarE) EVT_ADD(LVarF, 10000) EVT_EXEC(N(80232C48)) diff --git a/src/battle/area_flo/stage/flo_04.c b/src/battle/area_flo/stage/flo_04.c index f4b7aecd55..c74d478811 100644 --- a/src/battle/area_flo/stage/flo_04.c +++ b/src/battle/area_flo/stage/flo_04.c @@ -10,8 +10,8 @@ EvtScript N(80233470) = { EVT_SET(LVarA, LVar0) EVT_SET(LVarF, 0) EVT_LOOP(0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1) EVT_ADD(LVarF, 1) EVT_IF_GE(LVarF, 30) diff --git a/src/battle/area_flo2/actor/huff_n_puff.c b/src/battle/area_flo2/actor/huff_n_puff.c index 21a6a4619d..6fc41ae5c3 100644 --- a/src/battle/area_flo2/actor/huff_n_puff.c +++ b/src/battle/area_flo2/actor/huff_n_puff.c @@ -2489,8 +2489,8 @@ EvtScript N(attackDirectLightning) = { EVT_ADD(LVar5, 1) EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar6) - EVT_SETF(LVar7, EVT_FLOAT(0.7255859375)) - EVT_SETF(LVar8, EVT_FLOAT(0.2421875)) + EVT_SETF(LVar7, EVT_FLOAT(0.725)) + EVT_SETF(LVar8, EVT_FLOAT(0.242)) EVT_MULF(LVar7, LVar6) EVT_MULF(LVar8, LVar6) EVT_SUBF(LVar0, LVar7) @@ -2539,8 +2539,8 @@ EvtScript N(attackDirectLightning) = { EVT_ADD(LVar5, 1) EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar6) - EVT_SETF(LVar7, EVT_FLOAT(0.7255859375)) - EVT_SETF(LVar8, EVT_FLOAT(0.2421875)) + EVT_SETF(LVar7, EVT_FLOAT(0.725)) + EVT_SETF(LVar8, EVT_FLOAT(0.242)) EVT_MULF(LVar7, LVar6) EVT_MULF(LVar8, LVar6) EVT_SUBF(LVar0, LVar7) diff --git a/src/battle/area_flo2/stage/flo_03.c b/src/battle/area_flo2/stage/flo_03.c index 6ce8a1781b..e479f135db 100644 --- a/src/battle/area_flo2/stage/flo_03.c +++ b/src/battle/area_flo2/stage/flo_03.c @@ -56,10 +56,10 @@ EvtScript N(80232C48) = { EVT_MULF(LVar6, EVT_FLOAT(1.01)) EVT_ADDF(LVar7, EVT_FLOAT(0.01)) EVT_SETF(LVar8, LVar6) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0) EVT_ADDF(LVar8, LVarA) EVT_SETF(LVar9, LVar7) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 20, 0, 90) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90) EVT_ADDF(LVar9, LVarA) EVT_SETF(LVarA, LVar0) EVT_MULF(LVarA, EVT_FLOAT(10.0)) @@ -155,8 +155,8 @@ EvtScript N(beforeBattle) = { EVT_DIVF(LVar3, EVT_FLOAT(200.0)) EVT_SETF(LVar4, EVT_FLOAT(1.0)) EVT_SETF(LVar5, 0) - EVT_SETF(LVar6, EVT_FLOAT(0.296875)) - EVT_SETF(LVar7, EVT_FLOAT(0.296875)) + EVT_SETF(LVar6, EVT_FLOAT(0.296)) + EVT_SETF(LVar7, EVT_FLOAT(0.296)) EVT_SET(LVarF, LVarE) EVT_ADD(LVarF, 10000) EVT_EXEC(N(80232C48)) diff --git a/src/battle/area_flo2/stage/flo_04.c b/src/battle/area_flo2/stage/flo_04.c index d9f15c19a5..fae23130a1 100644 --- a/src/battle/area_flo2/stage/flo_04.c +++ b/src/battle/area_flo2/stage/flo_04.c @@ -10,8 +10,8 @@ EvtScript N(80233470) = { EVT_SET(LVarA, LVar0) EVT_SET(LVarF, 0) EVT_LOOP(0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1) EVT_ADD(LVarF, 1) EVT_IF_GE(LVarF, 30) diff --git a/src/battle/area_hos/actor/magikoopa.c b/src/battle/area_hos/actor/magikoopa.c index ee7eeb6e01..ff912d68d7 100644 --- a/src/battle/area_hos/actor/magikoopa.c +++ b/src/battle/area_hos/actor/magikoopa.c @@ -762,7 +762,7 @@ EvtScript N(healOne) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) @@ -776,7 +776,7 @@ EvtScript N(healOne) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) @@ -842,7 +842,7 @@ EvtScript N(healAll) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) @@ -856,7 +856,7 @@ EvtScript N(healAll) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) @@ -1513,7 +1513,7 @@ EvtScript N(boostAttack) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) @@ -1527,7 +1527,7 @@ EvtScript N(boostAttack) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) @@ -1625,7 +1625,7 @@ EvtScript N(boostDefense) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) @@ -1639,7 +1639,7 @@ EvtScript N(boostDefense) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) @@ -1737,7 +1737,7 @@ EvtScript N(electrify) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) @@ -1751,7 +1751,7 @@ EvtScript N(electrify) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) @@ -1854,7 +1854,7 @@ EvtScript N(vanish) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) @@ -1868,7 +1868,7 @@ EvtScript N(vanish) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.1201171875), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) diff --git a/src/battle/area_kgr/actor/fuzzipede.c b/src/battle/area_kgr/actor/fuzzipede.c index 69255812e5..e57f158b12 100644 --- a/src/battle/area_kgr/actor/fuzzipede.c +++ b/src/battle/area_kgr/actor/fuzzipede.c @@ -519,7 +519,7 @@ EvtScript N(8021A2E8) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim04) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 180) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.001953125)) + EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.002)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_SHRINK) @@ -752,7 +752,7 @@ EvtScript N(8021B22C) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim11) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.001953125)) + EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.002)) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SET(LVar1, 0) @@ -803,7 +803,7 @@ EvtScript N(8021B22C) = { EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim11) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.001953125)) + EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.002)) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 1) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area_kpa2/actor/bowser_phase_2.c b/src/battle/area_kpa2/actor/bowser_phase_2.c index 58a3e70bf6..9d58fefad6 100644 --- a/src/battle/area_kpa2/actor/bowser_phase_2.c +++ b/src/battle/area_kpa2/actor/bowser_phase_2.c @@ -447,7 +447,7 @@ EvtScript N(useStarRod) = { EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) EVT_ADD(LVar2, 10) - EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.0751953125)) + EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.075)) EVT_END_THREAD EVT_ELSE EVT_ADD(LVar0, 9) diff --git a/src/battle/area_kpa2/actor/bowser_phase_3.c b/src/battle/area_kpa2/actor/bowser_phase_3.c index 4b88c3b3c9..db53993469 100644 --- a/src/battle/area_kpa2/actor/bowser_phase_3.c +++ b/src/battle/area_kpa2/actor/bowser_phase_3.c @@ -706,7 +706,7 @@ EvtScript N(useStarRod) = { EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) EVT_ADD(LVar2, 10) - EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.0751953125)) + EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.075)) EVT_END_THREAD EVT_ELSE EVT_ADD(LVar0, 9) diff --git a/src/battle/area_kzn2/actor/lava_piranha.c b/src/battle/area_kzn2/actor/lava_piranha.c index aafe6dc26c..e8ca404304 100644 --- a/src/battle/area_kzn2/actor/lava_piranha.c +++ b/src/battle/area_kzn2/actor/lava_piranha.c @@ -752,42 +752,42 @@ EvtScript N(initVines) = { EVT_CALL(N(SetVineBonePos), VINE_0, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 7, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 8, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_ENEMY1, 1, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 8) @@ -806,32 +806,32 @@ EvtScript N(initVines) = { EVT_CALL(N(SetVineBonePos), VINE_1, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_ENEMY2, 1, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_ENEMY2, 2, LVar0, LVar1, LVar2) @@ -849,57 +849,57 @@ EvtScript N(initVines) = { EVT_CALL(N(SetVineBonePos), VINE_2, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 0, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 0, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 10, LVar1, LVar2, LVar3) diff --git a/src/battle/area_mac/actor/lee.c b/src/battle/area_mac/actor/lee.c index cf439981cd..d76e22d386 100644 --- a/src/battle/area_mac/actor/lee.c +++ b/src/battle/area_mac/actor/lee.c @@ -743,7 +743,7 @@ EvtScript N(8021F5F8) = { EVT_SET(LVarB, LVarC) EVT_END_IF EVT_SUB(LVarB, 20) - EVT_DIVF(LVarB, EVT_FLOAT(10.5888671875)) + EVT_DIVF(LVarB, EVT_FLOAT(10.588)) EVT_ADDF(LVarB, 15) EVT_SET(LVarA, LVarB) EVT_RETURN @@ -3162,7 +3162,7 @@ EvtScript N(takeTurn_80226004) = { EVT_IF_FLAG(LVar0, 0x80000) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, 0x33, 8, LVar0, LVar1, LVar2, EVT_FLOAT(0.5205), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, 0x33, 8, LVar0, LVar1, LVar2, EVT_FLOAT(0.52), LVarA, 0, 0, 0, 0, 0, 0, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) @@ -3613,7 +3613,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_WAIT(1) EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.4)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.55078125), EVT_FLOAT(1.55078125), EVT_FLOAT(1.55078125)) + EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.55), EVT_FLOAT(1.55), EVT_FLOAT(1.55)) EVT_CASE_EQ(2) EVT_WAIT(13) EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) diff --git a/src/battle/area_mac/stage/mac_02.c b/src/battle/area_mac/stage/mac_02.c index 6d475cb580..ffc9de74dc 100644 --- a/src/battle/area_mac/stage/mac_02.c +++ b/src/battle/area_mac/stage/mac_02.c @@ -5,15 +5,15 @@ #define NAMESPACE b_area_mac_mac_02 EvtScript N(beforeBattle_80232930) = { - EVT_CALL(SetSpriteShading, -1) + EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_802536A8, 1) + EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; EvtScript N(afterBattle_8023297C) = { - EVT_CALL(func_802536A8, 0) + EVT_CALL(EnableBattleFloorReflections, FALSE) EVT_RETURN EVT_END }; diff --git a/src/battle/area_omo/actor/spy_guy.c b/src/battle/area_omo/actor/spy_guy.c index 9e98032d20..f95412c9a1 100644 --- a/src/battle/area_omo/actor/spy_guy.c +++ b/src/battle/area_omo/actor/spy_guy.c @@ -373,7 +373,7 @@ EvtScript N(slingshotAttack) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -100, 0, 0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.001953125)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.002)) EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) EVT_CALL(YieldTurn) @@ -389,7 +389,7 @@ EvtScript N(slingshotAttack) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.001953125)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.002)) EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) diff --git a/src/battle/area_pra/stage/pra_01.c b/src/battle/area_pra/stage/pra_01.c index d23ccf4462..3c032d2f6d 100644 --- a/src/battle/area_pra/stage/pra_01.c +++ b/src/battle/area_pra/stage/pra_01.c @@ -8,7 +8,7 @@ EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_802536A8, 1) + EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; diff --git a/src/battle/area_pra/stage/pra_02.c b/src/battle/area_pra/stage/pra_02.c index ebeed86641..e72d99b4f4 100644 --- a/src/battle/area_pra/stage/pra_02.c +++ b/src/battle/area_pra/stage/pra_02.c @@ -61,7 +61,7 @@ EvtScript N(80231CFC) = { EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_802536A8, 1) + EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_SET(LVar0, 17) EVT_SET(LVar1, 0) EVT_SET(LVar2, 3000) diff --git a/src/battle/area_pra/stage/pra_04.c b/src/battle/area_pra/stage/pra_04.c index be6609fe0c..546541986c 100644 --- a/src/battle/area_pra/stage/pra_04.c +++ b/src/battle/area_pra/stage/pra_04.c @@ -70,7 +70,7 @@ EvtScript N(beforeBattle) = { EVT_SET(LVar2, 3000) EVT_SET(LVar3, 0) EVT_EXEC(N(802320D0)) - EVT_CALL(func_802536A8, 1) + EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; diff --git a/src/battle/area_pra3/stage/pra_01.c b/src/battle/area_pra3/stage/pra_01.c index 402c4611a3..738de2e3fc 100644 --- a/src/battle/area_pra3/stage/pra_01.c +++ b/src/battle/area_pra3/stage/pra_01.c @@ -8,7 +8,7 @@ EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_802536A8, 1) + EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; diff --git a/src/battle/area_pra3/stage/pra_02.c b/src/battle/area_pra3/stage/pra_02.c index 5502e08cb2..875d1bbc2e 100644 --- a/src/battle/area_pra3/stage/pra_02.c +++ b/src/battle/area_pra3/stage/pra_02.c @@ -61,7 +61,7 @@ EvtScript N(80231CFC) = { EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_802536A8, 1) + EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_SET(LVar0, 17) EVT_SET(LVar1, 0) EVT_SET(LVar2, 3000) diff --git a/src/battle/area_pra3/stage/pra_04.c b/src/battle/area_pra3/stage/pra_04.c index 7b6813a3ea..fe306d8651 100644 --- a/src/battle/area_pra3/stage/pra_04.c +++ b/src/battle/area_pra3/stage/pra_04.c @@ -70,7 +70,7 @@ EvtScript N(beforeBattle) = { EVT_SET(LVar2, 3000) EVT_SET(LVar3, 0) EVT_EXEC(N(802320D0)) - EVT_CALL(func_802536A8, 1) + EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index c4098c312b..f895a06afc 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -315,7 +315,7 @@ EvtScript N(goombario_8021C7FC) = { EVT_SET(LVarB, LVarC) EVT_END_IF EVT_SUB(LVarB, 20) - EVT_DIVF(LVarB, EVT_FLOAT(10.5888671875)) + EVT_DIVF(LVarB, EVT_FLOAT(10.588)) EVT_ADDF(LVarB, 15) EVT_SET(LVarA, LVarB) EVT_RETURN diff --git a/src/battle/item/egg_missile.c b/src/battle/item/egg_missile.c index 7a71f04da9..d677f8ab44 100644 --- a/src/battle/item/egg_missile.c +++ b/src/battle/item/egg_missile.c @@ -177,7 +177,7 @@ EvtScript N(main) = { EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.5)) EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.2)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.4501953125)) + EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.45)) EVT_END_THREAD EVT_CALL(GetItemPower, 200, LVar0, LVar1) EVT_CALL(ItemDamageEnemy, LVar0, 402653698, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) diff --git a/src/battle/item/hustle_drink.c b/src/battle/item/hustle_drink.c index 85a27609d8..7cd537011f 100644 --- a/src/battle/item/hustle_drink.c +++ b/src/battle/item/hustle_drink.c @@ -37,7 +37,7 @@ ApiStatus N(func_802A12C4_726224)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000091) + EVT_SET_CONST(LVarA, ITEM_HUSTLE_DRINK) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(DrinkItem)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Squish) diff --git a/src/battle/item/sleepy_sheep.c b/src/battle/item/sleepy_sheep.c index 342111edf8..9a29a16787 100644 --- a/src/battle/item/sleepy_sheep.c +++ b/src/battle/item/sleepy_sheep.c @@ -363,7 +363,7 @@ EvtScript N(main) = { EVT_SET(LVar8, 0) EVT_SET(LVar9, 0) EVT_CALL(SetVirtualEntityPosition, LVarA, LVar7, LVar8, LVar9) - EVT_CALL(SetVirtualEntityScale, LVarA, EVT_FLOAT(0.7101), EVT_FLOAT(0.7101), EVT_FLOAT(0.7101)) + EVT_CALL(SetVirtualEntityScale, LVarA, EVT_FLOAT(0.711), EVT_FLOAT(0.711), EVT_FLOAT(0.711)) EVT_CALL(SetVirtualEntityMoveSpeed, LVarA, EVT_FLOAT(7.0)) EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(1.4)) EVT_CALL(SetOwnerTarget, 0, 0) diff --git a/src/battle/move/auto_jump/auto_jump.c b/src/battle/move/auto_jump/auto_jump.c index 0d26874b8b..d9fd8f17c4 100644 --- a/src/battle/move/auto_jump/auto_jump.c +++ b/src/battle/move/auto_jump/auto_jump.c @@ -63,7 +63,7 @@ EvtScript D_802A1320_765F40 = { EVT_SET(LVar6, LVar7) EVT_END_IF EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(10.5888671875)) + EVT_DIVF(LVar6, EVT_FLOAT(10.588)) EVT_ADDF(LVar6, 15) EVT_SET(LVarA, LVar6) EVT_RETURN diff --git a/src/battle/move/auto_multibounce/auto_multibounce.c b/src/battle/move/auto_multibounce/auto_multibounce.c index 30fc016d19..033c1fae56 100644 --- a/src/battle/move/auto_multibounce/auto_multibounce.c +++ b/src/battle/move/auto_multibounce/auto_multibounce.c @@ -63,7 +63,7 @@ EvtScript N(D_802A1320) = { EVT_SET(LVar6, LVar7) EVT_END_IF EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(10.5888671875)) + EVT_DIVF(LVar6, EVT_FLOAT(10.588)) EVT_ADDF(LVar6, 15) EVT_SET(LVarA, LVar6) EVT_RETURN diff --git a/src/battle/move/jump/jump.c b/src/battle/move/jump/jump.c index 95916ab73e..686aaca8eb 100644 --- a/src/battle/move/jump/jump.c +++ b/src/battle/move/jump/jump.c @@ -72,7 +72,7 @@ EvtScript D_802A1370_73DBD0 = { EVT_SET(LVar6, LVar7) EVT_END_IF EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(10.5888671875)) + EVT_DIVF(LVar6, EVT_FLOAT(10.588)) EVT_ADDF(LVar6, 15) EVT_SET(LVarA, LVar6) EVT_RETURN @@ -616,7 +616,7 @@ EvtScript D_802A3188_73F9E8 = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_SUB(LVar0, LVar3) EVT_SUB(LVar0, 20) - EVT_DIVF(LVar0, EVT_FLOAT(10.5888671875)) + EVT_DIVF(LVar0, EVT_FLOAT(10.588)) EVT_ADDF(LVar0, 15) EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) diff --git a/src/battle/move/quake_hammer/quake_hammer.c b/src/battle/move/quake_hammer/quake_hammer.c index 3d5f683798..fb2a3d948d 100644 --- a/src/battle/move/quake_hammer/quake_hammer.c +++ b/src/battle/move/quake_hammer/quake_hammer.c @@ -675,7 +675,7 @@ EvtScript D_802A3168_0073D038 = { EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(0.35)) EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.2)) EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.05)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.025390625)) + EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.025)) EVT_END_CHILD_THREAD EVT_END_SWITCH EVT_CALL(DidActionSucceed, LVar0) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index f12a577f23..2ed879a151 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -916,7 +916,7 @@ EvtScript N(calcJumpTime) = { EVT_SET(LVarB, LVar7) EVT_END_IF EVT_SUB(LVarB, 20) - EVT_DIVF(LVarB, EVT_FLOAT(10.5888671875)) + EVT_DIVF(LVarB, EVT_FLOAT(10.588)) EVT_ADDF(LVarB, 15) EVT_SET(LVarA, LVarB) EVT_RETURN diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 8a83c36da3..6247cb30a5 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -722,7 +722,7 @@ EvtScript N(getJumpTime) = { EVT_SET(LVarB, LVarC) EVT_END_IF EVT_SUB(LVarB, 20) - EVT_DIVF(LVarB, EVT_FLOAT(10.5888671875)) + EVT_DIVF(LVarB, EVT_FLOAT(10.588)) EVT_ADDF(LVarB, 15) EVT_SET(LVarA, LVarB) EVT_RETURN diff --git a/src/battle/star/smooch/791D90.c b/src/battle/star/smooch/791D90.c index 86b86631fe..c71e85029b 100644 --- a/src/battle/star/smooch/791D90.c +++ b/src/battle/star/smooch/791D90.c @@ -295,7 +295,7 @@ EvtScript N(usePower) = { EVT_ADD(LVar1, 15) EVT_ADD(LVar2, -5) EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 10, 0, 10) - EVT_CALL(PlaySound, 0x245) + EVT_CALL(PlaySound, SOUND_245) EVT_THREAD EVT_CALL(PlayEffect, 0x40, 2, LVar0, LVar1, LVar2, 1, 0, 0, 0, 0, 0, 0, 0, 0) EVT_WAIT(2) diff --git a/src/effects/aura.c b/src/effects/aura.c index c1e124021c..847aa40403 100644 --- a/src/effects/aura.c +++ b/src/effects/aura.c @@ -254,7 +254,7 @@ void aura_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E007684C(void) { diff --git a/src/effects/balloon.c b/src/effects/balloon.c index 3b1f4ffda6..37d05bdfaa 100644 --- a/src/effects/balloon.c +++ b/src/effects/balloon.c @@ -80,7 +80,7 @@ void balloon_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_OPA; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void balloon_appendGfx(void* effect) { diff --git a/src/effects/big_smoke_puff.c b/src/effects/big_smoke_puff.c index f041140a50..cf24523ed9 100644 --- a/src/effects/big_smoke_puff.c +++ b/src/effects/big_smoke_puff.c @@ -116,7 +116,7 @@ void big_smoke_puff_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void big_smoke_puff_appendGfx(void* effect) { diff --git a/src/effects/big_snowflakes.c b/src/effects/big_snowflakes.c index 37fbd36326..57fcb4bcfc 100644 --- a/src/effects/big_snowflakes.c +++ b/src/effects/big_snowflakes.c @@ -104,7 +104,7 @@ void big_snowflakes_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void big_snowflakes_appendGfx(void* effect) { diff --git a/src/effects/blast.c b/src/effects/blast.c index f7e946de28..1d76900c87 100644 --- a/src/effects/blast.c +++ b/src/effects/blast.c @@ -89,7 +89,7 @@ void blast_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } #ifdef NON_MATCHING diff --git a/src/effects/bombette_breaking.c b/src/effects/bombette_breaking.c index fec840b8cd..a857f1dbc3 100644 --- a/src/effects/bombette_breaking.c +++ b/src/effects/bombette_breaking.c @@ -199,7 +199,7 @@ void bombette_breaking_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void bombette_breaking_appendGfx(void* effect) { diff --git a/src/effects/breaking_junk.c b/src/effects/breaking_junk.c index 7a29e305c6..77aece5616 100644 --- a/src/effects/breaking_junk.c +++ b/src/effects/breaking_junk.c @@ -128,7 +128,7 @@ void breaking_junk_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void breaking_junk_appendGfx(void* effect) { diff --git a/src/effects/bulb_glow.c b/src/effects/bulb_glow.c index a8a2605dcc..79d1d47da1 100644 --- a/src/effects/bulb_glow.c +++ b/src/effects/bulb_glow.c @@ -145,7 +145,7 @@ void bulb_glow_render(EffectInstance* effect) { } retTask = shim_queue_render_task(renderTaskPtr); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E0078274(void) { diff --git a/src/effects/butterflies.c b/src/effects/butterflies.c index 8ed997c9fd..e7954ec1cd 100644 --- a/src/effects/butterflies.c +++ b/src/effects/butterflies.c @@ -157,7 +157,7 @@ void butterflies_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } diff --git a/src/effects/chapter_change.c b/src/effects/chapter_change.c index dc7ca2eb1b..ce7daf3786 100644 --- a/src/effects/chapter_change.c +++ b/src/effects/chapter_change.c @@ -208,7 +208,7 @@ void chapter_change_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void chapter_change_appendGfx(void* effect) { diff --git a/src/effects/chomp_drop.c b/src/effects/chomp_drop.c index e1122c8c40..9541e7fed8 100644 --- a/src/effects/chomp_drop.c +++ b/src/effects/chomp_drop.c @@ -128,7 +128,7 @@ void chomp_drop_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void chomp_drop_appendGfx(void* effect) { diff --git a/src/effects/cloud_puff.c b/src/effects/cloud_puff.c index 7f9e749559..be02fbb152 100644 --- a/src/effects/cloud_puff.c +++ b/src/effects/cloud_puff.c @@ -109,7 +109,7 @@ void cloud_puff_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void cloud_puff_appendGfx(void* effect) { diff --git a/src/effects/cloud_trail.c b/src/effects/cloud_trail.c index c1b8f372e2..3a810add47 100644 --- a/src/effects/cloud_trail.c +++ b/src/effects/cloud_trail.c @@ -110,7 +110,7 @@ void cloud_trail_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void cloud_trail_appendGfx(void* effect) { diff --git a/src/effects/cold_breath.c b/src/effects/cold_breath.c index ddda974f0e..bee4bdcd32 100644 --- a/src/effects/cold_breath.c +++ b/src/effects/cold_breath.c @@ -173,7 +173,7 @@ void cold_breath_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void cold_breath_appendGfx(void* effect) { diff --git a/src/effects/damage_stars.c b/src/effects/damage_stars.c index 3758411913..9eb8f46c91 100644 --- a/src/effects/damage_stars.c +++ b/src/effects/damage_stars.c @@ -236,7 +236,7 @@ void damage_stars_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void damage_stars_appendGfx(void* effect) { diff --git a/src/effects/debuff.c b/src/effects/debuff.c index a09dd46c1c..6d9c9a4325 100644 --- a/src/effects/debuff.c +++ b/src/effects/debuff.c @@ -127,7 +127,7 @@ void debuff_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void debuff_appendGfx(void* effect) { diff --git a/src/effects/drop_leaves.c b/src/effects/drop_leaves.c index d40f2e9689..0fc9384b9d 100644 --- a/src/effects/drop_leaves.c +++ b/src/effects/drop_leaves.c @@ -123,7 +123,7 @@ void drop_leaves_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void drop_leaves_appendGfx(void* effect) { diff --git a/src/effects/dust.c b/src/effects/dust.c index cdb7f18c20..40cfeefdfb 100644 --- a/src/effects/dust.c +++ b/src/effects/dust.c @@ -122,7 +122,7 @@ void dust_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void dust_appendGfx(void* effect) { diff --git a/src/effects/effect_3D.c b/src/effects/effect_3D.c index b898f70944..8598b83dec 100644 --- a/src/effects/effect_3D.c +++ b/src/effects/effect_3D.c @@ -208,7 +208,7 @@ void fx_3D_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E007A884(void) { diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c index a2df02d1a2..28ea521749 100644 --- a/src/effects/effect_46.c +++ b/src/effects/effect_46.c @@ -194,7 +194,7 @@ void fx_46_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void fx_46_appendGfx(void* effect) { diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c index ce04fa0b9f..5df7e51f0b 100644 --- a/src/effects/effect_63.c +++ b/src/effects/effect_63.c @@ -204,7 +204,7 @@ void fx_63_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void fx_63_appendGfx(void* effect) { diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c index b6ac90902a..4c4b88c056 100644 --- a/src/effects/effect_65.c +++ b/src/effects/effect_65.c @@ -200,7 +200,7 @@ void fx_65_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } // floats and more diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index dcbeebaf3f..e20b66ca90 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -183,7 +183,7 @@ void fx_75_render(EffectInstance* effect) { renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(renderTaskPtr); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00EA664(void) { diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c index abe691a97b..7bb383222c 100644 --- a/src/effects/effect_86.c +++ b/src/effects/effect_86.c @@ -104,7 +104,7 @@ void fx_86_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void fx_86_appendGfx(void* effect) { diff --git a/src/effects/embers.c b/src/effects/embers.c index e289945dd6..90a91750af 100644 --- a/src/effects/embers.c +++ b/src/effects/embers.c @@ -179,7 +179,7 @@ void embers_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00E05F8(void) { diff --git a/src/effects/emote.c b/src/effects/emote.c index 7f3a8c3b04..bb3f5fbcee 100644 --- a/src/effects/emote.c +++ b/src/effects/emote.c @@ -198,7 +198,7 @@ void emote_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void emote_appendGfx(void* effect) { diff --git a/src/effects/ending_decals.c b/src/effects/ending_decals.c index 9d9aee0ff1..4131e2ddcc 100644 --- a/src/effects/ending_decals.c +++ b/src/effects/ending_decals.c @@ -126,7 +126,7 @@ void ending_decals_render(EffectInstance* effect) { } retTask = shim_queue_render_task(renderTaskPtr); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void ending_decals_appendGfx(void* effect) { diff --git a/src/effects/energy_orb_wave.c b/src/effects/energy_orb_wave.c index e9e042e7ae..7e05f935ba 100644 --- a/src/effects/energy_orb_wave.c +++ b/src/effects/energy_orb_wave.c @@ -218,7 +218,7 @@ void energy_orb_wave_render(EffectInstance* effect) { } retTask = shim_queue_render_task(renderTaskPointer); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00A4648(void) { diff --git a/src/effects/energy_shockwave.c b/src/effects/energy_shockwave.c index a29d94b151..f08162e198 100644 --- a/src/effects/energy_shockwave.c +++ b/src/effects/energy_shockwave.c @@ -132,7 +132,7 @@ void energy_shockwave_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void energy_shockwave_appendGfx(void* effect) { diff --git a/src/effects/falling_leaves.c b/src/effects/falling_leaves.c index 948c7ded5c..99bd78fd9f 100644 --- a/src/effects/falling_leaves.c +++ b/src/effects/falling_leaves.c @@ -118,7 +118,7 @@ void falling_leaves_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void falling_leaves_appendGfx(void* effect) { diff --git a/src/effects/fire_breath.c b/src/effects/fire_breath.c index 857d92c143..7ba6582a59 100644 --- a/src/effects/fire_breath.c +++ b/src/effects/fire_breath.c @@ -175,7 +175,7 @@ void fire_breath_render(EffectInstance* effect) { renderTaskPointer->renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(renderTaskPointer); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void fire_breath_appendGfx(void* effect) { diff --git a/src/effects/fire_flower.c b/src/effects/fire_flower.c index 13d1374204..090764b6bd 100644 --- a/src/effects/fire_flower.c +++ b/src/effects/fire_flower.c @@ -195,7 +195,7 @@ void fire_flower_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void fire_flower_appendGfx(void* effect) { diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index abb274e620..3de5599e40 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -217,7 +217,7 @@ void firework_rocket_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_OPA; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void firework_rocket_appendGfx(void* effect) { diff --git a/src/effects/floating_cloud_puff.c b/src/effects/floating_cloud_puff.c index 91cf03f4b5..3352c9cac9 100644 --- a/src/effects/floating_cloud_puff.c +++ b/src/effects/floating_cloud_puff.c @@ -107,7 +107,7 @@ void floating_cloud_puff_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00D227C(void) { diff --git a/src/effects/floating_flower.c b/src/effects/floating_flower.c index 09e7438a58..e7a47f7173 100644 --- a/src/effects/floating_flower.c +++ b/src/effects/floating_flower.c @@ -137,7 +137,7 @@ void floating_flower_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void floating_flower_appendGfx(void* effect) { diff --git a/src/effects/floating_rock.c b/src/effects/floating_rock.c index 4f28ed3100..0843bd15b8 100644 --- a/src/effects/floating_rock.c +++ b/src/effects/floating_rock.c @@ -103,7 +103,7 @@ void floating_rock_render(EffectInstance *effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void floating_rock_appendGfx(void* effect) { diff --git a/src/effects/flower_splash.c b/src/effects/flower_splash.c index ca703fe28c..c3f2b9cfd5 100644 --- a/src/effects/flower_splash.c +++ b/src/effects/flower_splash.c @@ -135,7 +135,7 @@ void flower_splash_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void flower_splash_dispose(EffectInstance* effect) { diff --git a/src/effects/flower_trail.c b/src/effects/flower_trail.c index 1ce0cf1d16..44a8fc93b8 100644 --- a/src/effects/flower_trail.c +++ b/src/effects/flower_trail.c @@ -151,7 +151,7 @@ void flower_trail_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; queuedTaskPtr = shim_queue_render_task(&renderTask); - queuedTaskPtr->renderMode |= RENDER_TASK_FLAG_2; + queuedTaskPtr->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void flower_trail_dispose(EffectInstance* effect) { diff --git a/src/effects/footprint.c b/src/effects/footprint.c index 6d30a99d35..18e24e2e4e 100644 --- a/src/effects/footprint.c +++ b/src/effects/footprint.c @@ -107,7 +107,7 @@ void footprint_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00183BC(EffectInstance* effect) { diff --git a/src/effects/fright_jar.c b/src/effects/fright_jar.c index 4746c8235c..7b74379e7e 100644 --- a/src/effects/fright_jar.c +++ b/src/effects/fright_jar.c @@ -106,7 +106,7 @@ void fright_jar_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00C2214(void) { diff --git a/src/effects/gather_energy_pink.c b/src/effects/gather_energy_pink.c index 6b3838dc13..c5e95ba856 100644 --- a/src/effects/gather_energy_pink.c +++ b/src/effects/gather_energy_pink.c @@ -154,7 +154,7 @@ void gather_energy_pink_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void gather_energy_pink_appendGfx(void* effect) { diff --git a/src/effects/gather_magic.c b/src/effects/gather_magic.c index 9fe3151deb..b2f913fc09 100644 --- a/src/effects/gather_magic.c +++ b/src/effects/gather_magic.c @@ -148,7 +148,7 @@ void gather_magic_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void gather_magic_appendGfx(void* effect) { diff --git a/src/effects/got_item_outline.c b/src/effects/got_item_outline.c index f401584640..de7bc37978 100644 --- a/src/effects/got_item_outline.c +++ b/src/effects/got_item_outline.c @@ -101,7 +101,7 @@ void got_item_outline_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E003621C(void) { diff --git a/src/effects/hieroglyphs.c b/src/effects/hieroglyphs.c index 70fa16f871..82785bf2d3 100644 --- a/src/effects/hieroglyphs.c +++ b/src/effects/hieroglyphs.c @@ -106,7 +106,7 @@ void hieroglyphs_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00E2210(void) { diff --git a/src/effects/ice_pillar.c b/src/effects/ice_pillar.c index 229e69ec23..6af8c6bd11 100644 --- a/src/effects/ice_pillar.c +++ b/src/effects/ice_pillar.c @@ -144,7 +144,7 @@ void ice_pillar_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void ice_pillar_appendGfx(void* effect) { diff --git a/src/effects/ice_shard.c b/src/effects/ice_shard.c index 46abb41d52..fa3f72ca59 100644 --- a/src/effects/ice_shard.c +++ b/src/effects/ice_shard.c @@ -127,7 +127,7 @@ void ice_shard_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void ice_shard_appendGfx(void* effect) { diff --git a/src/effects/landing_dust.c b/src/effects/landing_dust.c index 4ab40b2f46..160b9413e2 100644 --- a/src/effects/landing_dust.c +++ b/src/effects/landing_dust.c @@ -254,7 +254,7 @@ void landing_dust_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void landing_dust_appendGfx(void* effect) { diff --git a/src/effects/lens_flare.c b/src/effects/lens_flare.c index 49d7857c4a..dbcacedf0f 100644 --- a/src/effects/lens_flare.c +++ b/src/effects/lens_flare.c @@ -101,7 +101,7 @@ void lens_flare_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void lens_flare_appendGfx(void* effect) { diff --git a/src/effects/light_rays.c b/src/effects/light_rays.c index e9ebfa7f1d..79a9526856 100644 --- a/src/effects/light_rays.c +++ b/src/effects/light_rays.c @@ -254,7 +254,7 @@ void light_rays_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E006A85C(LightRaysFXData* part) { diff --git a/src/effects/lightning.c b/src/effects/lightning.c index a1eb629f6a..f8b9fd1c0c 100644 --- a/src/effects/lightning.c +++ b/src/effects/lightning.c @@ -209,7 +209,7 @@ void lightning_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void lightning_appendGfx(void* effect) { diff --git a/src/effects/lightning_bolt.c b/src/effects/lightning_bolt.c index 954a8167a2..8a26094246 100644 --- a/src/effects/lightning_bolt.c +++ b/src/effects/lightning_bolt.c @@ -163,7 +163,7 @@ void lightning_bolt_render(EffectInstance *effect) { renderTaskPointer->renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(renderTaskPointer); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00BC36C(void) { diff --git a/src/effects/lil_oink.c b/src/effects/lil_oink.c index 035492351f..908d90c8a8 100644 --- a/src/effects/lil_oink.c +++ b/src/effects/lil_oink.c @@ -165,7 +165,7 @@ void lil_oink_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void lil_oink_appendGfx(void* effect) { diff --git a/src/effects/merlin_house_stars.c b/src/effects/merlin_house_stars.c index 94b876007e..098e66c2bc 100644 --- a/src/effects/merlin_house_stars.c +++ b/src/effects/merlin_house_stars.c @@ -120,7 +120,7 @@ void merlin_house_stars_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00A639C(void) { diff --git a/src/effects/misc_particles.c b/src/effects/misc_particles.c index f3b4f8f1cc..f662774845 100644 --- a/src/effects/misc_particles.c +++ b/src/effects/misc_particles.c @@ -292,7 +292,7 @@ void misc_particles_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00E4954(void) { diff --git a/src/effects/motion_blur_flame.c b/src/effects/motion_blur_flame.c index 9df771fadd..7efd653483 100644 --- a/src/effects/motion_blur_flame.c +++ b/src/effects/motion_blur_flame.c @@ -99,7 +99,7 @@ void motion_blur_flame_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00A2234(void) { diff --git a/src/effects/moving_cloud.c b/src/effects/moving_cloud.c index 7494cf022f..8036185021 100644 --- a/src/effects/moving_cloud.c +++ b/src/effects/moving_cloud.c @@ -173,7 +173,7 @@ void moving_cloud_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void moving_cloud_appendGfx(void* effect) { diff --git a/src/effects/music_note.c b/src/effects/music_note.c index 31ce46bc38..1290eb82c0 100644 --- a/src/effects/music_note.c +++ b/src/effects/music_note.c @@ -125,7 +125,7 @@ void music_note_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void music_note_appendGfx(void* data) { diff --git a/src/effects/peach_star_beam.c b/src/effects/peach_star_beam.c index a1f2bc56d2..2975b96589 100644 --- a/src/effects/peach_star_beam.c +++ b/src/effects/peach_star_beam.c @@ -159,7 +159,7 @@ void peach_star_beam_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void peach_star_beam_appendGfx(void* effect) { diff --git a/src/effects/purple_ring.c b/src/effects/purple_ring.c index bcf7c18ad9..8e20783dd8 100644 --- a/src/effects/purple_ring.c +++ b/src/effects/purple_ring.c @@ -185,7 +185,7 @@ void purple_ring_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void purple_ring_appendGfx(void* effect) { diff --git a/src/effects/quizmo_assistant.c b/src/effects/quizmo_assistant.c index beae5ccd66..8f4209005d 100644 --- a/src/effects/quizmo_assistant.c +++ b/src/effects/quizmo_assistant.c @@ -94,7 +94,7 @@ void quizmo_assistant_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void quizmo_assistant_appendGfx(void* effect) { diff --git a/src/effects/quizmo_audience.c b/src/effects/quizmo_audience.c index 84a45997f9..b726a9da4b 100644 --- a/src/effects/quizmo_audience.c +++ b/src/effects/quizmo_audience.c @@ -174,7 +174,7 @@ void quizmo_audience_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00A8318(void) { diff --git a/src/effects/quizmo_stage.c b/src/effects/quizmo_stage.c index ed545e7f72..dcbfa1d9a7 100644 --- a/src/effects/quizmo_stage.c +++ b/src/effects/quizmo_stage.c @@ -102,7 +102,7 @@ void quizmo_stage_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_OPA; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void quizmo_stage_appendGfx(void* effect) { diff --git a/src/effects/radial_shimmer.c b/src/effects/radial_shimmer.c index 40bd40ac33..582123b17f 100644 --- a/src/effects/radial_shimmer.c +++ b/src/effects/radial_shimmer.c @@ -281,7 +281,7 @@ void radial_shimmer_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void radial_shimmer_appendGfx(void* effect) { diff --git a/src/effects/radiating_energy_orb.c b/src/effects/radiating_energy_orb.c index aed27314d4..0de1f80dd5 100644 --- a/src/effects/radiating_energy_orb.c +++ b/src/effects/radiating_energy_orb.c @@ -125,7 +125,7 @@ void radiating_energy_orb_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void radiating_energy_orb_appendGfx(void* effect) { diff --git a/src/effects/red_impact.c b/src/effects/red_impact.c index 0e62ff2aa7..afcdabfcdb 100644 --- a/src/effects/red_impact.c +++ b/src/effects/red_impact.c @@ -137,7 +137,7 @@ void red_impact_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void red_impact_appendGfx(void* effect) { diff --git a/src/effects/ring_blast.c b/src/effects/ring_blast.c index 854d2f34f5..9282c6ddcc 100644 --- a/src/effects/ring_blast.c +++ b/src/effects/ring_blast.c @@ -80,7 +80,7 @@ void ring_blast_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void ring_blast_appendGfx(void* effect) { diff --git a/src/effects/rising_bubble.c b/src/effects/rising_bubble.c index 1b302a9c9c..0bf9e45d36 100644 --- a/src/effects/rising_bubble.c +++ b/src/effects/rising_bubble.c @@ -102,7 +102,7 @@ void rising_bubble_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void rising_bubble_appendGfx(void* effect) { diff --git a/src/effects/shape_spell.c b/src/effects/shape_spell.c index 1277f5a1e2..c5f7ab9672 100644 --- a/src/effects/shape_spell.c +++ b/src/effects/shape_spell.c @@ -130,7 +130,7 @@ void shape_spell_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } s32 func_E0024324(s32 arg0, s32 arg1) { diff --git a/src/effects/shattering_stones.c b/src/effects/shattering_stones.c index 09400fa148..75e7c9ec7c 100644 --- a/src/effects/shattering_stones.c +++ b/src/effects/shattering_stones.c @@ -135,7 +135,7 @@ void shattering_stones_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void shattering_stones_appendGfx(void* effect) { diff --git a/src/effects/shimmer_burst.c b/src/effects/shimmer_burst.c index 4b55f63cf0..0a74b4df72 100644 --- a/src/effects/shimmer_burst.c +++ b/src/effects/shimmer_burst.c @@ -193,7 +193,7 @@ void shimmer_burst_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E0070738(void) { diff --git a/src/effects/shimmer_wave.c b/src/effects/shimmer_wave.c index 8358806d14..468f79af8c 100644 --- a/src/effects/shimmer_wave.c +++ b/src/effects/shimmer_wave.c @@ -181,7 +181,7 @@ void shimmer_wave_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void shimmer_wave_appendGfx(void* effect) { diff --git a/src/effects/shiny_flare.c b/src/effects/shiny_flare.c index 9a0d5f9473..81ea707183 100644 --- a/src/effects/shiny_flare.c +++ b/src/effects/shiny_flare.c @@ -91,7 +91,7 @@ void shiny_flare_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00DA228(void) { diff --git a/src/effects/shockwave.c b/src/effects/shockwave.c index 930beda121..de62e177e9 100644 --- a/src/effects/shockwave.c +++ b/src/effects/shockwave.c @@ -262,7 +262,7 @@ void shockwave_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void shockwave_appendGfx(void* effect) { diff --git a/src/effects/sleep_bubble.c b/src/effects/sleep_bubble.c index 6f8b970174..20078ddad5 100644 --- a/src/effects/sleep_bubble.c +++ b/src/effects/sleep_bubble.c @@ -121,7 +121,7 @@ void sleep_bubble_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void sleep_bubble_appendGfx(void* effect) { diff --git a/src/effects/small_gold_sparkle.c b/src/effects/small_gold_sparkle.c index 004015fe94..0607162fee 100644 --- a/src/effects/small_gold_sparkle.c +++ b/src/effects/small_gold_sparkle.c @@ -106,7 +106,7 @@ void small_gold_sparkle_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void small_gold_sparkle_appendGfx(void* effect) { diff --git a/src/effects/smoke_burst.c b/src/effects/smoke_burst.c index b87db24beb..4358e23325 100644 --- a/src/effects/smoke_burst.c +++ b/src/effects/smoke_burst.c @@ -95,7 +95,7 @@ void smoke_burst_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void smoke_burst_appendGfx(void* effect) { diff --git a/src/effects/smoke_impact.c b/src/effects/smoke_impact.c index 86d073f139..26568e2c68 100644 --- a/src/effects/smoke_impact.c +++ b/src/effects/smoke_impact.c @@ -113,7 +113,7 @@ void smoke_impact_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void smoke_impact_appendGfx(void* effect) { diff --git a/src/effects/snaking_static.c b/src/effects/snaking_static.c index b1604843c0..0c452632e0 100644 --- a/src/effects/snaking_static.c +++ b/src/effects/snaking_static.c @@ -152,7 +152,7 @@ void snaking_static_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00AE544(void) { diff --git a/src/effects/snowfall.c b/src/effects/snowfall.c index fcde1f6af0..2d322ef610 100644 --- a/src/effects/snowfall.c +++ b/src/effects/snowfall.c @@ -157,7 +157,7 @@ void snowfall_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void snowfall_appendGfx(void* effect) { diff --git a/src/effects/snowflake.c b/src/effects/snowflake.c index ded2fc9232..c149fa7323 100644 --- a/src/effects/snowflake.c +++ b/src/effects/snowflake.c @@ -114,7 +114,7 @@ void snowflake_render(EffectInstance* effect) { renderTaskPtr->renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(renderTaskPtr); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void snowflake_appendGfx(void* effect) { diff --git a/src/effects/snowman_doll.c b/src/effects/snowman_doll.c index 1ddacabb88..8b651e8a7d 100644 --- a/src/effects/snowman_doll.c +++ b/src/effects/snowman_doll.c @@ -280,7 +280,7 @@ void snowman_doll_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00C0758(void) { diff --git a/src/effects/something_rotating.c b/src/effects/something_rotating.c index e750da7423..c61c779ce2 100644 --- a/src/effects/something_rotating.c +++ b/src/effects/something_rotating.c @@ -249,7 +249,7 @@ void something_rotating_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E01166E8(s32 arg0, SomethingRotatingFXData* part) { diff --git a/src/effects/spiky_white_aura.c b/src/effects/spiky_white_aura.c index 26fbca5e2e..e2b5e7f01b 100644 --- a/src/effects/spiky_white_aura.c +++ b/src/effects/spiky_white_aura.c @@ -172,7 +172,7 @@ void spiky_white_aura_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void spiky_white_aura_appendGfx(void* effect) { diff --git a/src/effects/spirit_card.c b/src/effects/spirit_card.c index a952e33b0f..26fed76565 100644 --- a/src/effects/spirit_card.c +++ b/src/effects/spirit_card.c @@ -122,7 +122,7 @@ void spirit_card_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E0112330(s32 arg0, SpiritCardFXData* data) { diff --git a/src/effects/squirt.c b/src/effects/squirt.c index b96115c605..3fac0cc289 100644 --- a/src/effects/squirt.c +++ b/src/effects/squirt.c @@ -147,7 +147,7 @@ void squirt_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00B24A8(void) { diff --git a/src/effects/star_outline.c b/src/effects/star_outline.c index 7ab5413817..3bec6feb77 100644 --- a/src/effects/star_outline.c +++ b/src/effects/star_outline.c @@ -141,7 +141,7 @@ void star_outline_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void star_outline_appendGfx(void* effect) { diff --git a/src/effects/star_spirits_energy.c b/src/effects/star_spirits_energy.c index c3dea84471..c1fa2ae2ae 100644 --- a/src/effects/star_spirits_energy.c +++ b/src/effects/star_spirits_energy.c @@ -332,7 +332,7 @@ void star_spirits_energy_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void star_spirits_energy_appendGfx(void* effect) { diff --git a/src/effects/stars_burst.c b/src/effects/stars_burst.c index 1af24bd56e..abfacd068e 100644 --- a/src/effects/stars_burst.c +++ b/src/effects/stars_burst.c @@ -125,7 +125,7 @@ void stars_burst_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void stars_burst_appendGfx(void* effect) { diff --git a/src/effects/stars_spread.c b/src/effects/stars_spread.c index 9e53cbe5d9..0b692d01e2 100644 --- a/src/effects/stars_spread.c +++ b/src/effects/stars_spread.c @@ -116,7 +116,7 @@ void stars_spread_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void stars_spread_appendGfx(void* effect) { diff --git a/src/effects/static_status.c b/src/effects/static_status.c index 2323642206..9ec1244a94 100644 --- a/src/effects/static_status.c +++ b/src/effects/static_status.c @@ -182,7 +182,7 @@ void static_status_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_OPA; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00E651C(void) { diff --git a/src/effects/steam_burst.c b/src/effects/steam_burst.c index 50fd28b7d7..440e1fd2ac 100644 --- a/src/effects/steam_burst.c +++ b/src/effects/steam_burst.c @@ -104,7 +104,7 @@ void steam_burst_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void steam_burst_appendGfx(void* effect) { diff --git a/src/effects/sun.c b/src/effects/sun.c index 8911043ed3..b8dc7e496d 100644 --- a/src/effects/sun.c +++ b/src/effects/sun.c @@ -142,7 +142,7 @@ void sun_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void sun_appendGfx(void* argEffect) { diff --git a/src/effects/sweat.c b/src/effects/sweat.c index b3c787c85b..b082c52a39 100644 --- a/src/effects/sweat.c +++ b/src/effects/sweat.c @@ -78,7 +78,7 @@ void sweat_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void sweat_appendGfx(void* effect) { diff --git a/src/effects/throw_spiny.c b/src/effects/throw_spiny.c index ed31c9fa91..c52aeb9737 100644 --- a/src/effects/throw_spiny.c +++ b/src/effects/throw_spiny.c @@ -150,7 +150,7 @@ void throw_spiny_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00C844C(void) { diff --git a/src/effects/tubba_heart_attack.c b/src/effects/tubba_heart_attack.c index 17bde75a58..0cddc1a83e 100644 --- a/src/effects/tubba_heart_attack.c +++ b/src/effects/tubba_heart_attack.c @@ -288,7 +288,7 @@ void tubba_heart_attack_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00CC9C8(void) { diff --git a/src/effects/walking_dust.c b/src/effects/walking_dust.c index 246215086e..d1f2ae0e7b 100644 --- a/src/effects/walking_dust.c +++ b/src/effects/walking_dust.c @@ -89,7 +89,7 @@ void walking_dust_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void walking_dust_appendGfx(void* effect) { diff --git a/src/effects/water_block.c b/src/effects/water_block.c index 8b542b6b64..3e26060af2 100644 --- a/src/effects/water_block.c +++ b/src/effects/water_block.c @@ -209,7 +209,7 @@ void water_block_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00B4574(void) { diff --git a/src/effects/water_fountain.c b/src/effects/water_fountain.c index b49c5c0f87..25ab6cda3a 100644 --- a/src/effects/water_fountain.c +++ b/src/effects/water_fountain.c @@ -199,7 +199,7 @@ void water_fountain_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00B8200(void) { diff --git a/src/effects/whirlwind.c b/src/effects/whirlwind.c index 4f2082c20f..e9e4394f02 100644 --- a/src/effects/whirlwind.c +++ b/src/effects/whirlwind.c @@ -140,7 +140,7 @@ void whirlwind_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; queuedTask = shim_queue_render_task(&renderTask); - queuedTask->renderMode |= RENDER_TASK_FLAG_2; + queuedTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } void func_E00CE470(void) { diff --git a/src/effects/windy_leaves.c b/src/effects/windy_leaves.c index 76f00153d3..d844817bef 100644 --- a/src/effects/windy_leaves.c +++ b/src/effects/windy_leaves.c @@ -223,7 +223,7 @@ void windy_leaves_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_TASK_FLAG_2; + retTask->renderMode |= RENDER_TASK_FLAG_REFLECT_FLOOR; } extern Gfx D_09001180_33E790[]; diff --git a/src/encounter_api.c b/src/encounter_api.c index 3a34506039..a77afc8034 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -6,12 +6,12 @@ ApiStatus SetEncounterStatusFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EncounterStatus* currentEncounter = &gCurrentEncounter; - s32 a0 = *args++; + s32 flagBits = *args++; if (evt_get_variable(script, *args)) { - currentEncounter->flags |= a0; + currentEncounter->flags |= flagBits; } else { - currentEncounter->flags &= ~a0; + currentEncounter->flags &= ~flagBits; } return ApiStatus_DONE2; diff --git a/src/evt/f8f60_len_1560.c b/src/evt/f8f60_len_1560.c index b9519bc858..7cf466702e 100644 --- a/src/evt/f8f60_len_1560.c +++ b/src/evt/f8f60_len_1560.c @@ -1,5 +1,6 @@ #include "common.h" +// args: start, end, duration, EasingType ApiStatus MakeLerp(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index 9885ac292e..3a2a91f4c0 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -18,9 +18,9 @@ Npc* resolve_npc(Evt* script, s32 npcIdOrPtr) { void set_npc_animation(Npc* npc, u32 animID) { PlayerData* playerData = &gPlayerData; - if (animID - PARTNER_ANIM_WALK < 9) { - npc->currentAnim = gPartnerAnimations[playerData->currentPartner].anims[animID - PARTNER_ANIM_WALK]; - } else if ((animID - ENEMY_ANIM_IDLE) < 0x10) { + if (PARTNER_ANIM_STILL <= animID && animID <= PARTNER_ANIM_HURT) { + npc->currentAnim = gPartnerAnimations[playerData->currentPartner].anims[animID - PARTNER_ANIM_STILL]; + } else if (ENEMY_ANIM_IDLE <= animID && animID <= ENEMY_ANIM_F) { npc->currentAnim = get_enemy(npc->npcID)->animList[animID - ENEMY_ANIM_IDLE]; } else { npc->currentAnim = animID; @@ -107,7 +107,7 @@ ApiStatus SetNpcRotation(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802CDE68(Evt* script, s32 isInitialCall) { +ApiStatus SetNpcRotationPivot(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 npcId = evt_get_variable(script, *args++); f32 value = evt_get_float_variable(script, *args++); diff --git a/src/npc.c b/src/npc.c index 6336be58b6..68699548d3 100644 --- a/src/npc.c +++ b/src/npc.c @@ -1921,7 +1921,7 @@ Npc* npc_find_closest_simple(f32 x, f32 y, f32 z, f32 radius) { } s32 npc_find_standing_on_entity(s32 entityIndex) { - s32 idx = entityIndex | 0x4000; + s32 idx = entityIndex | COLLISION_WITH_ENTITY_BIT; s32 y = get_entity_by_index(idx)->position.y - 10.0f; Npc* npc; s32 i; @@ -1956,7 +1956,7 @@ s32 npc_find_standing_on_entity(s32 entityIndex) { } } else { var_v1 = npc->currentFloor; - if (npc->currentFloor & 0x4000) { // TODO required to match (can't use var_v1) + if (npc->currentFloor & COLLISION_WITH_ENTITY_BIT) { // TODO required to match (can't use var_v1) if (idx == var_v1) { npc->pos = npc->pos; // TODO required to match return i; diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c index b4cc46107d..ceed185cdc 100644 --- a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c +++ b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c @@ -545,7 +545,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_CALL(DisablePartnerAI, 0) EVT_WAIT(1) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_TALK) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) EVT_WAIT(85) EVT_CALL(func_802CF56C, 2) EVT_WAIT(1) @@ -599,17 +599,17 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_CALL(GetCurrentPartnerID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PARTNER_GOOMBARIO) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH3_00D6) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH3_00D6) EVT_CASE_EQ(PARTNER_KOOPER) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH3_00D7) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH3_00D7) EVT_CASE_EQ(PARTNER_BOMBETTE) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH3_00D8) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH3_00D8) EVT_CASE_EQ(PARTNER_PARAKARRY) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH3_00D9) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH3_00D9) EVT_CASE_EQ(PARTNER_BOW) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH3_00DA) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH3_00DA) EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH3_00D6) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH3_00D6) EVT_END_SWITCH EVT_CALL(EnablePartnerAI) EVT_WAIT(5) diff --git a/src/world/area_dgb/dgb_06/dgb_06_3_entity.c b/src/world/area_dgb/dgb_06/dgb_06_3_entity.c index 2aa19de974..50c2737d5b 100644 --- a/src/world/area_dgb/dgb_06/dgb_06_3_entity.c +++ b/src/world/area_dgb/dgb_06/dgb_06_3_entity.c @@ -3,12 +3,12 @@ #include "world/common/atomic/Chest.inc.c" -EvtScript N(EVS_Chest_Interact) = EVT_OPEN_CHEST_KEY(ITEM_TUBBA_CASTLE_KEY, GF_DGB06_Chest_CastleKey1); +EvtScript N(EVS_OpenChest_TubbaKey) = EVT_OPEN_CHEST_KEY(ITEM_TUBBA_CASTLE_KEY, GF_DGB06_Chest_CastleKey1); EvtScript N(EVS_MakeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), -300, 50, -200, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignChestFlag, GF_DGB06_Chest_CastleKey1) - EVT_CALL(AssignScript, EVT_PTR(N(EVS_Chest_Interact))) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_TubbaKey))) EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -125, 60, 175, 0, MAKE_ENTITY_END) EVT_RETURN EVT_END diff --git a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c index 155125d560..345dcbd912 100644 --- a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c +++ b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c @@ -198,7 +198,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_CALL(MakeLerp, 0, 50, 18, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(func_802CDE68, -1, LVar0) + EVT_CALL(SetNpcRotationPivot, NPC_SELF, LVar0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP @@ -221,7 +221,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_CALL(FadeOutMusic, 0, 1000) EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(1.25), EVT_FLOAT(1.25), EVT_FLOAT(1.25)) EVT_CALL(SetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) - EVT_CALL(func_802CDE68, -1, 0) + EVT_CALL(SetNpcRotationPivot, NPC_SELF, 0) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim02) EVT_WAIT(15) @@ -264,7 +264,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(1.25), EVT_FLOAT(1.25), EVT_FLOAT(1.25)) EVT_CALL(SetNpcPos, NPC_SELF, 600, 50, 115) - EVT_CALL(func_802CDE68, -1, 0) + EVT_CALL(SetNpcRotationPivot, NPC_SELF, 0) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim02) EVT_WAIT(15) diff --git a/src/world/area_dro/dro_02/dro_02_3_main.c b/src/world/area_dro/dro_02/dro_02_3_main.c index 8ca4f60792..bb7ef3a9f7 100644 --- a/src/world/area_dro/dro_02/dro_02_3_main.c +++ b/src/world/area_dro/dro_02/dro_02_3_main.c @@ -92,7 +92,7 @@ EvtScript N(EVS_Main) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3339844)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.334)) EVT_RETURN EVT_END }; diff --git a/src/world/area_dro/dro_02/dro_02_4_building.c b/src/world/area_dro/dro_02/dro_02_4_building.c index 722e247c53..b99e140fa3 100644 --- a/src/world/area_dro/dro_02/dro_02_4_building.c +++ b/src/world/area_dro/dro_02/dro_02_4_building.c @@ -81,7 +81,7 @@ EvtScript N(EVS_SetupCamSpeed) = { EVT_CASE_EQ(0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) EVT_CASE_EQ(3) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3339844)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.334)) EVT_END_SWITCH EVT_RETURN EVT_END @@ -94,7 +94,7 @@ EvtScript N(EVS_ToggleVis_ToadHouse) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) EVT_CASE_EQ(3) EVT_CALL(SetGroupEnabled, MODEL_ie4_naka, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3339844)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.334)) EVT_END_SWITCH EVT_RETURN EVT_END @@ -122,7 +122,7 @@ EvtScript N(EVS_ToggleVis_Hideout) = { EVT_CASE_EQ(3) EVT_CALL(SetGroupEnabled, MODEL_ie5_naka, 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3339844)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.334)) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index 4f92776976..ac194ff3e0 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -774,7 +774,7 @@ EvtScript N(EVS_NpcInteract_Merlee) = { EVT_END_IF EVT_IF_EQ(LVar0, 3) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DC) - EVT_SET(LVar0, 39) + EVT_SET(LVar0, ITEM_CRYSTAL_BALL) EVT_SET(LVar1, 1) EVT_EXEC_WAIT(N(GiveKeyReward)) EVT_CALL(AddKeyItem, ITEM_CRYSTAL_BALL) @@ -812,7 +812,7 @@ EvtScript N(EVS_NpcInteract_Merlee) = { EVT_CALL(ContinueSpeech, -1, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DA) EVT_CALL(SetMusicTrack, 0, SONG_MERLEE_SPELL, 0, 8) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_EXEC_GET_TID(N(EVS_PerformRitual), LVar9) EVT_LOOP(0) EVT_IS_THREAD_RUNNING(LVar9, LVar1) diff --git a/src/world/area_end/end_01/end_01_6_shyguy_float.c b/src/world/area_end/end_01/end_01_6_shyguy_float.c index c278cc11d6..badea4be33 100644 --- a/src/world/area_end/end_01/end_01_6_shyguy_float.c +++ b/src/world/area_end/end_01/end_01_6_shyguy_float.c @@ -348,7 +348,7 @@ EvtScript N(EVS_ParadePhase_ShyGuyFormation) = { EVT_CALL(GetNpcPos, NPC_Pratfaller, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -180) EVT_CALL(NpcMoveTo, NPC_Pratfaller, LVar0, LVar2, 45) - EVT_CALL(func_802CDE68, NPC_Pratfaller, 10) + EVT_CALL(SetNpcRotationPivot, NPC_Pratfaller, 10) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(10) @@ -366,7 +366,7 @@ EvtScript N(EVS_ParadePhase_ShyGuyFormation) = { EVT_SET(LVar0, NPC_Pratfaller) EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarA) EVT_WAIT(80) - EVT_CALL(func_802CDE68, NPC_Pratfaller, 0) + EVT_CALL(SetNpcRotationPivot, NPC_Pratfaller, 0) EVT_KILL_THREAD(LVarA) EVT_CALL(SetNpcAnimation, NPC_Pratfaller, ANIM_ShyGuy_Red_Anim01) EVT_CALL(GetNpcPos, NPC_Pratfaller, LVar0, LVar1, LVar2) diff --git a/src/world/area_end/end_01/end_01_7_peach_float.c b/src/world/area_end/end_01/end_01_7_peach_float.c index db8f066116..b4f445de9e 100644 --- a/src/world/area_end/end_01/end_01_7_peach_float.c +++ b/src/world/area_end/end_01/end_01_7_peach_float.c @@ -315,7 +315,7 @@ EvtScript N(EVS_MarioPeachExit) = { EVT_SETF(LVar1, EVT_FLOAT(0.0)) EVT_LOOP(0) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) - EVT_ADDF(LVar1, EVT_FLOAT(0.333333)) + EVT_ADDF(LVar1, EVT_FLOAT(0.334)) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN diff --git a/src/world/area_flo/flo_00/flo_00_4_epilogue.c b/src/world/area_flo/flo_00/flo_00_4_epilogue.c index a25b38c73a..27567c1499 100644 --- a/src/world/area_flo/flo_00/flo_00_4_epilogue.c +++ b/src/world/area_flo/flo_00/flo_00_4_epilogue.c @@ -6,12 +6,7 @@ NpcSettings N(NpcSettings_Lakilester_Epilogue) = { .level = 99, }; -NpcSettings N(NpcSettings_Parakarry_Epilogue) = { - .height = 35, - .radius = 24, - .level = 99, - .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, -}; +#include "world/common/npc/Parakarry.inc.c" Vec3f N(D_80245E88_CA3DA8)[] = { { 266.0f, 20.0f, 322.0f }, @@ -145,7 +140,7 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { }, { .id = NPC_Parakarry_Epilogue, - .settings = &N(NpcSettings_Parakarry_Epilogue), + .settings = &N(NpcSettings_Parakarry), .pos = { 266.0f, 0.0f, 322.0f }, .yaw = 0, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, @@ -155,24 +150,7 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { - .idle = ANIM_WorldParakarry_Idle, - .walk = ANIM_WorldParakarry_Walk, - .run = ANIM_WorldParakarry_Run, - .chase = ANIM_WorldParakarry_Run, - .anim_4 = ANIM_WorldParakarry_Idle, - .anim_5 = ANIM_WorldParakarry_Idle, - .death = ANIM_WorldParakarry_Still, - .hit = ANIM_WorldParakarry_Still, - .anim_8 = ANIM_WorldParakarry_Idle, - .anim_9 = ANIM_WorldParakarry_Idle, - .anim_A = ANIM_WorldParakarry_Idle, - .anim_B = ANIM_WorldParakarry_Idle, - .anim_C = ANIM_WorldParakarry_Idle, - .anim_D = ANIM_WorldParakarry_Idle, - .anim_E = ANIM_WorldParakarry_Idle, - .anim_F = ANIM_WorldParakarry_Idle, - }, + .animations = PARAKARRY_ANIMS, }, }; diff --git a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c index 2ad20e9b0b..9f7a5d7134 100644 --- a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c @@ -121,22 +121,22 @@ EvtScript N(EVS_SetExteriorVineGrowth) = { EVT_CALL(RotateModel, MODEL_o182, LVar1, 0, 1, 0) EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 1, 0) EVT_CALL(RotateModel, MODEL_o181, LVar1, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o117, EVT_FLOAT(8.1220703125), EVT_FLOAT(56.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o141, EVT_FLOAT(-6.8779296875), EVT_FLOAT(91.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o140, EVT_FLOAT(13.1220703125), EVT_FLOAT(106.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o138, EVT_FLOAT(-9.8779296875), EVT_FLOAT(136.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o139, EVT_FLOAT(-7.8779296875), EVT_FLOAT(201.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o143, EVT_FLOAT(13.1220703125), EVT_FLOAT(221.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o144, EVT_FLOAT(8.126953125), EVT_FLOAT(261.2294921875), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o145, EVT_FLOAT(-12.8779296875), EVT_FLOAT(266.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o146, EVT_FLOAT(8.1220703125), EVT_FLOAT(316.1533203125), EVT_FLOAT(-13.833984375)) - EVT_CALL(TranslateModel, MODEL_o188, EVT_FLOAT(-10.943359375), EVT_FLOAT(391.1533203125), EVT_FLOAT(10.56640625)) - EVT_CALL(TranslateModel, MODEL_o187, EVT_FLOAT(-7.001953125), EVT_FLOAT(456.1533203125), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o186, EVT_FLOAT(12.998046875), EVT_FLOAT(471.1533203125), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o185, EVT_FLOAT(-10.001953125), EVT_FLOAT(501.1533203125), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o182, EVT_FLOAT(8.0029296875), EVT_FLOAT(536.2294921875), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o183, EVT_FLOAT(12.998046875), EVT_FLOAT(586.1533203125), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o181, EVT_FLOAT(-13.001953125), EVT_FLOAT(631.1533203125), EVT_FLOAT(0.947265625)) + EVT_CALL(TranslateModel, MODEL_o117, EVT_FLOAT(8.122), EVT_FLOAT(56.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o141, EVT_FLOAT(-6.8779296875), EVT_FLOAT(91.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o140, EVT_FLOAT(13.122), EVT_FLOAT(106.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o138, EVT_FLOAT(-9.8779296875), EVT_FLOAT(136.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o139, EVT_FLOAT(-7.8779296875), EVT_FLOAT(201.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o143, EVT_FLOAT(13.122), EVT_FLOAT(221.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o144, EVT_FLOAT(8.127), EVT_FLOAT(261.229), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o145, EVT_FLOAT(-12.8779296875), EVT_FLOAT(266.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o146, EVT_FLOAT(8.122), EVT_FLOAT(316.153), EVT_FLOAT(-13.833984375)) + EVT_CALL(TranslateModel, MODEL_o188, EVT_FLOAT(-10.943359375), EVT_FLOAT(391.153), EVT_FLOAT(10.566)) + EVT_CALL(TranslateModel, MODEL_o187, EVT_FLOAT(-7.001953125), EVT_FLOAT(456.153), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o186, EVT_FLOAT(12.998), EVT_FLOAT(471.153), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o185, EVT_FLOAT(-10.001953125), EVT_FLOAT(501.153), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o182, EVT_FLOAT(8.003), EVT_FLOAT(536.229), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o183, EVT_FLOAT(12.998), EVT_FLOAT(586.153), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o181, EVT_FLOAT(-13.001953125), EVT_FLOAT(631.153), EVT_FLOAT(0.947)) EVT_SETF(LVar1, LVar0) EVT_SUBF(LVar1, EVT_FLOAT(-700.0)) EVT_DIVF(LVar1, EVT_FLOAT(300.0)) @@ -162,21 +162,21 @@ EvtScript N(EVS_SetExteriorVineGrowth) = { EVT_CALL(ScaleModel, MODEL_o183, LVar1, LVar1, LVar1) EVT_CALL(ScaleModel, MODEL_o181, LVar1, LVar1, LVar1) EVT_CALL(TranslateModel, MODEL_o117, EVT_FLOAT(-8.12109375), EVT_FLOAT(-56.15234375), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o141, EVT_FLOAT(6.87890625), EVT_FLOAT(-91.15234375), EVT_FLOAT(-1.1650390625)) + EVT_CALL(TranslateModel, MODEL_o141, EVT_FLOAT(6.879), EVT_FLOAT(-91.15234375), EVT_FLOAT(-1.1650390625)) EVT_CALL(TranslateModel, MODEL_o140, EVT_FLOAT(-13.12109375), EVT_FLOAT(-106.15234375), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o138, EVT_FLOAT(9.87890625), EVT_FLOAT(-136.15234375), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o139, EVT_FLOAT(7.87890625), EVT_FLOAT(-201.15234375), EVT_FLOAT(-1.1650390625)) + EVT_CALL(TranslateModel, MODEL_o138, EVT_FLOAT(9.879), EVT_FLOAT(-136.15234375), EVT_FLOAT(-1.1650390625)) + EVT_CALL(TranslateModel, MODEL_o139, EVT_FLOAT(7.879), EVT_FLOAT(-201.15234375), EVT_FLOAT(-1.1650390625)) EVT_CALL(TranslateModel, MODEL_o143, EVT_FLOAT(-13.12109375), EVT_FLOAT(-221.15234375), EVT_FLOAT(-1.1650390625)) EVT_CALL(TranslateModel, MODEL_o144, EVT_FLOAT(-8.1259765625), EVT_FLOAT(-261.228515625), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o145, EVT_FLOAT(12.87890625), EVT_FLOAT(-266.15234375), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o146, EVT_FLOAT(-8.12109375), EVT_FLOAT(-316.15234375), EVT_FLOAT(13.8349609375)) - EVT_CALL(TranslateModel, MODEL_o188, EVT_FLOAT(10.9443359375), EVT_FLOAT(-391.15234375), EVT_FLOAT(-10.5654296875)) - EVT_CALL(TranslateModel, MODEL_o187, EVT_FLOAT(7.0029296875), EVT_FLOAT(-456.15234375), EVT_FLOAT(-0.9462890625)) + EVT_CALL(TranslateModel, MODEL_o145, EVT_FLOAT(12.879), EVT_FLOAT(-266.15234375), EVT_FLOAT(-1.1650390625)) + EVT_CALL(TranslateModel, MODEL_o146, EVT_FLOAT(-8.12109375), EVT_FLOAT(-316.15234375), EVT_FLOAT(13.835)) + EVT_CALL(TranslateModel, MODEL_o188, EVT_FLOAT(10.944), EVT_FLOAT(-391.15234375), EVT_FLOAT(-10.5654296875)) + EVT_CALL(TranslateModel, MODEL_o187, EVT_FLOAT(7.003), EVT_FLOAT(-456.15234375), EVT_FLOAT(-0.9462890625)) EVT_CALL(TranslateModel, MODEL_o186, EVT_FLOAT(-12.9970703125), EVT_FLOAT(-471.15234375), EVT_FLOAT(-0.9462890625)) - EVT_CALL(TranslateModel, MODEL_o185, EVT_FLOAT(10.0029296875), EVT_FLOAT(-501.15234375), EVT_FLOAT(-0.9462890625)) + EVT_CALL(TranslateModel, MODEL_o185, EVT_FLOAT(10.003), EVT_FLOAT(-501.15234375), EVT_FLOAT(-0.9462890625)) EVT_CALL(TranslateModel, MODEL_o182, EVT_FLOAT(-8.001953125), EVT_FLOAT(-536.228515625), EVT_FLOAT(-0.9462890625)) EVT_CALL(TranslateModel, MODEL_o183, EVT_FLOAT(-12.9970703125), EVT_FLOAT(-586.15234375), EVT_FLOAT(-0.9462890625)) - EVT_CALL(TranslateModel, MODEL_o181, EVT_FLOAT(13.0029296875), EVT_FLOAT(-631.15234375), EVT_FLOAT(-0.9462890625)) + EVT_CALL(TranslateModel, MODEL_o181, EVT_FLOAT(13.003), EVT_FLOAT(-631.15234375), EVT_FLOAT(-0.9462890625)) EVT_RETURN EVT_END }; @@ -230,7 +230,7 @@ EvtScript N(EVS_SetBigLeafGrowth) = { EvtScript N(EVS_SetBigLeafPosition) = { EVT_SETF(LVar1, LVar0) EVT_MULF(LVar1, EVT_FLOAT(-3.0)) - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), LVar0, EVT_FLOAT(1.4775391)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), LVar0, EVT_FLOAT(1.477)) EVT_CALL(RotateModel, MODEL_o142, LVar1, 0, 1, 0) EVT_CALL(UpdateColliderTransform, COLLIDER_o240) EVT_RETURN @@ -253,7 +253,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) EVT_CALL(PlaySound, SOUND_19C) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) EVT_CALL(N(GetPlayerAngles), LVar3, LVar4) EVT_SWITCH(LVar4) @@ -266,7 +266,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_SWITCH - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), EVT_FLOAT(2.0), EVT_FLOAT(1.4775391)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), EVT_FLOAT(2.0), EVT_FLOAT(1.477)) EVT_CALL(UpdateColliderTransform, COLLIDER_o240) EVT_SET(MV_BeanstalkSceneSync, FALSE) EVT_THREAD @@ -316,7 +316,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_SET(LVarE, EVT_FLOAT(145.0)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) EVT_SWITCH(AF_FLO_BeanstalkFacingRight) EVT_CASE_EQ(0) @@ -327,7 +327,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), EVT_FLOAT(2.0), EVT_FLOAT(1.4775391)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), EVT_FLOAT(2.0), EVT_FLOAT(1.477)) EVT_CALL(UpdateColliderTransform, COLLIDER_o240) EVT_SET(LVarF, 0) EVT_LOOP(120) diff --git a/src/world/area_flo/flo_10/flo_10_4_fountain.c b/src/world/area_flo/flo_10/flo_10_4_fountain.c index ab8b89bad5..0e5f778c57 100644 --- a/src/world/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/area_flo/flo_10/flo_10_4_fountain.c @@ -27,7 +27,7 @@ EvtScript N(EVS_GrowFountain) = { EVT_SETF(LVar3, LVar0) EVT_DIVF(LVar2, EVT_FLOAT(333.0)) EVT_DIVF(LVar3, EVT_FLOAT(100.0)) - EVT_ADDF(LVar2, EVT_FLOAT(0.703125)) + EVT_ADDF(LVar2, EVT_FLOAT(0.703)) EVT_CALL(ScaleGroup, MODEL_g22, LVar2, LVar3, LVar2) EVT_IF_EQ(LVar1, 1) EVT_WAIT(1) @@ -156,7 +156,7 @@ EvtScript N(EVS_ShrinkFountain) = { EVT_SETF(LVar3, LVar0) EVT_DIVF(LVar2, EVT_FLOAT(333.0)) EVT_DIVF(LVar3, EVT_FLOAT(100.0)) - EVT_ADDF(LVar2, EVT_FLOAT(0.703125)) + EVT_ADDF(LVar2, EVT_FLOAT(0.703)) EVT_CALL(ScaleGroup, MODEL_g22, LVar2, LVar3, LVar2) EVT_IF_EQ(LVar1, 1) EVT_WAIT(1) diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/area_flo/flo_14/flo_14_3_bubbles.c index 0cbfb459b4..189ef3bf6c 100644 --- a/src/world/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/area_flo/flo_14/flo_14_3_bubbles.c @@ -327,17 +327,17 @@ EvtScript N(EVS_ManageBlownBubble) = { EVT_LOOP(LVar8) EVT_SETF(LVarE, LVar2) EVT_SUBF(LVarE, LVar0) - EVT_MULF(LVarE, EVT_FLOAT(0.046875)) + EVT_MULF(LVarE, EVT_FLOAT(0.046)) EVT_ADDF(LVar0, LVarE) EVT_SETF(LVarE, LVar3) EVT_SUBF(LVarE, LVar1) - EVT_MULF(LVarE, EVT_FLOAT(0.046875)) + EVT_MULF(LVarE, EVT_FLOAT(0.046)) EVT_ADDF(LVar1, LVarE) EVT_ADDF(LVar4, LVar0) EVT_ADDF(LVar5, LVar1) EVT_SETF(LVarE, LVar7) EVT_SUBF(LVarE, LVar9) - EVT_MULF(LVarE, EVT_FLOAT(0.203125)) + EVT_MULF(LVarE, EVT_FLOAT(0.203)) EVT_ADDF(LVar9, LVarE) EVT_CALL(TranslateModel, LVarF, LVar4, LVar5, LVar6) EVT_CALL(ScaleModel, LVarF, LVar9, LVar9, LVar9) diff --git a/src/world/area_flo/flo_15/flo_15_3_npc.c b/src/world/area_flo/flo_15/flo_15_3_npc.c index 0e4f94989f..22a590605c 100644 --- a/src/world/area_flo/flo_15/flo_15_3_npc.c +++ b/src/world/area_flo/flo_15/flo_15_3_npc.c @@ -71,7 +71,7 @@ EvtScript N(EVS_Scene_SunReturns) = { }; EvtScript N(EVS_NpcAux_Sun_02) = { - EVT_CALL(func_802CDE68, 11, 48) + EVT_CALL(SetNpcRotationPivot, NPC_Sun_02, 48) EVT_LOOP(0) EVT_CALL(MakeLerp, -30, 30, 20, EASING_SIN_OUT) EVT_LOOP(0) diff --git a/src/world/area_flo/flo_18/flo_18_3_machine.c b/src/world/area_flo/flo_18/flo_18_3_machine.c index 0c31372aef..7c63ce2cdf 100644 --- a/src/world/area_flo/flo_18/flo_18_3_machine.c +++ b/src/world/area_flo/flo_18/flo_18_3_machine.c @@ -64,10 +64,10 @@ EvtScript N(EVS_UpdateSmokeParticle) = { EVT_MULF(LVar6, EVT_FLOAT(1.01)) EVT_ADDF(LVar7, EVT_FLOAT(0.01)) EVT_SETF(LVar8, LVar6) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0) EVT_ADDF(LVar8, LVarA) EVT_SETF(LVar9, LVar7) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 20, 0, 90) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90) EVT_ADDF(LVar9, LVarA) EVT_SETF(LVarA, LVar0) EVT_MULF(LVarA, EVT_FLOAT(10.0)) @@ -95,8 +95,8 @@ EvtScript N(EVS_ManageSmoke) = { EVT_DIVF(LVar3, EVT_FLOAT(200.0)) EVT_SETF(LVar4, EVT_FLOAT(1.0)) EVT_SETF(LVar5, 0) - EVT_SETF(LVar6, EVT_FLOAT(0.296875)) - EVT_SETF(LVar7, EVT_FLOAT(0.296875)) + EVT_SETF(LVar6, EVT_FLOAT(0.296)) + EVT_SETF(LVar7, EVT_FLOAT(0.296)) EVT_SET(LVarF, LVarE) EVT_ADD(LVarF, CLONED_MODEL(0)) EVT_EXEC(N(EVS_UpdateSmokeParticle)) @@ -124,8 +124,8 @@ EvtScript N(EVS_ShakeMachine) = { EVT_SUB(LVar2, 25) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 5, 10, 1, 1) EVT_ADD(LVarF, 1) - EVT_CALL(N(CosInterpMinMax), LVarF, LVarE, EVT_FLOAT(1.0), EVT_FLOAT(1.09375), 2, 0, 0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVarD, EVT_FLOAT(1.09375), EVT_FLOAT(1.0), 2, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVarE, EVT_FLOAT(1.0), EVT_FLOAT(1.093), 2, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVarD, EVT_FLOAT(1.093), EVT_FLOAT(1.0), 2, 0, 0) EVT_SETF(LVar0, LVarE) EVT_SETF(LVar1, LVarD) EVT_SETF(LVar2, LVarE) @@ -163,7 +163,7 @@ EvtScript N(EVS_ShakeMachine) = { EVT_CALL(ScaleModel, MODEL_o95, LVar0, LVar1, LVar2) EVT_CALL(ScaleModel, MODEL_o91, LVar0, LVar1, LVar2) EVT_CALL(ScaleModel, MODEL_o114, LVar0, LVar1, LVar2) - EVT_SUBF(LVar0, EVT_FLOAT(1.046875)) + EVT_SUBF(LVar0, EVT_FLOAT(1.046)) EVT_MULF(LVar0, EVT_FLOAT(100.0)) EVT_IF_EQ(GB_FLO18_MachineDamage_Left, 0) EVT_CALL(RotateModel, MODEL_o115, LVar0, 0, 0, 1) @@ -257,7 +257,7 @@ EvtScript N(EVS_DamagedLeftOnce) = { EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) - EVT_ADDF(LVar5, EVT_FLOAT(0.09375)) + EVT_ADDF(LVar5, EVT_FLOAT(0.093)) EVT_ADDF(LVar0, LVar3) EVT_ADDF(LVar1, LVar4) EVT_ADDF(LVar2, LVar5) @@ -421,7 +421,7 @@ EvtScript N(EVS_BreakSmokestack) = { EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) - EVT_ADDF(LVar5, EVT_FLOAT(0.09375)) + EVT_ADDF(LVar5, EVT_FLOAT(0.093)) EVT_ADDF(LVar0, LVar3) EVT_ADDF(LVar1, LVar4) EVT_ADDF(LVar2, LVar5) @@ -722,7 +722,7 @@ EvtScript N(EVS_SetupMachine) = { EVT_SETF(LVarE, EVT_FLOAT(1.0)) EVT_LABEL(0) EVT_IF_GE(GB_FLO18_MachineDamage_Right, 3) - EVT_MULF(LVarE, EVT_FLOAT(0.953125)) + EVT_MULF(LVarE, EVT_FLOAT(0.953)) EVT_END_IF EVT_ADDF(LVarF, LVarE) EVT_IF_EQ(LVarF, 1080) diff --git a/src/world/area_flo/flo_19/flo_19_4_clouds.c b/src/world/area_flo/flo_19/flo_19_4_clouds.c index 474c112ff1..318a56891c 100644 --- a/src/world/area_flo/flo_19/flo_19_4_clouds.c +++ b/src/world/area_flo/flo_19/flo_19_4_clouds.c @@ -29,27 +29,27 @@ EvtScript N(EVS_AnimatePlatforms) = { EVT_SET(LVarF, 0) EVT_LABEL(0) EVT_SETF(LVar0, EVT_FLOAT(-215.4375)) - EVT_SETF(LVar1, EVT_FLOAT(128.59375)) + EVT_SETF(LVar1, EVT_FLOAT(128.593)) EVT_SETF(LVar2, EVT_FLOAT(-200.0)) EVT_ADDF(LVar1, MV_Distortion_Platform_01) EVT_CALL(TranslateGroup, MODEL_g17, LVar0, LVar1, LVar2) EVT_SETF(LVar0, EVT_FLOAT(-79.86)) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(5.0), EVT_FLOAT(136.76562), 300, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(5.0), EVT_FLOAT(136.765), 300, 0, 0) EVT_SETF(LVar2, EVT_FLOAT(-200.0)) EVT_ADDF(LVar1, MV_Distortion_Platform_02) EVT_CALL(TranslateGroup, MODEL_g21, LVar0, LVar1, LVar2) EVT_SETF(LVar0, EVT_FLOAT(-364.265625)) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(5.0), EVT_FLOAT(106.765625), 300, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(5.0), EVT_FLOAT(106.765), 300, 0, 0) EVT_SETF(LVar2, EVT_FLOAT(10.0)) EVT_ADDF(LVar1, MV_Distortion_Platform_03) EVT_CALL(TranslateGroup, MODEL_g22, LVar0, LVar1, LVar2) - EVT_SETF(LVar0, EVT_FLOAT(295.73438)) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(65.0), EVT_FLOAT(86.984375), 200, 0, 0) + EVT_SETF(LVar0, EVT_FLOAT(295.734)) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(65.0), EVT_FLOAT(86.984), 200, 0, 0) EVT_SETF(LVar2, EVT_FLOAT(-80.0)) EVT_ADDF(LVar1, MV_Distortion_Platform_04) EVT_CALL(TranslateGroup, MODEL_g23, LVar0, LVar1, LVar2) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar2, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar3, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar2, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar3, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) EVT_SETF(LVar0, MV_Distortion_Platform_01) EVT_SETF(LVar1, MV_Distortion_Platform_01) EVT_MULF(LVar0, EVT_FLOAT(-0.02)) @@ -98,10 +98,10 @@ EvtScript N(EVS_AnimatePlatforms) = { EVT_ADDF(MV_Distortion_Platform_02, LVar1) EVT_ADDF(MV_Distortion_Platform_03, LVar2) EVT_ADDF(MV_Distortion_Platform_04, LVar3) - EVT_MULF(MV_Distortion_Platform_01, EVT_FLOAT(0.84375)) - EVT_MULF(MV_Distortion_Platform_02, EVT_FLOAT(0.84375)) - EVT_MULF(MV_Distortion_Platform_03, EVT_FLOAT(0.84375)) - EVT_MULF(MV_Distortion_Platform_04, EVT_FLOAT(0.84375)) + EVT_MULF(MV_Distortion_Platform_01, EVT_FLOAT(0.843)) + EVT_MULF(MV_Distortion_Platform_02, EVT_FLOAT(0.843)) + EVT_MULF(MV_Distortion_Platform_03, EVT_FLOAT(0.843)) + EVT_MULF(MV_Distortion_Platform_04, EVT_FLOAT(0.843)) EVT_ADDF(LVarA, MV_Distortion_Platform_01) EVT_ADDF(LVarB, MV_Distortion_Platform_02) EVT_ADDF(LVarC, MV_Distortion_Platform_03) @@ -169,8 +169,8 @@ EvtScript N(EVS_SetupClouds) = { EVT_THREAD EVT_SET(LVarF, 0) EVT_LABEL(0) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar0, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) EVT_CALL(ScaleModel, MODEL_o73, LVar1, LVar0, 1) EVT_CALL(ScaleModel, MODEL_o74, LVar1, LVar0, 1) EVT_CALL(ScaleModel, MODEL_o75, LVar0, LVar1, 1) diff --git a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c index 3ff13dff6f..2ed998de2a 100644 --- a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c @@ -133,7 +133,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_SET(LVarE, EVT_FLOAT(10.0)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) EVT_SWITCH(AF_FLO_BeanstalkFacingRight) EVT_CASE_EQ(0) @@ -144,7 +144,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.3134766), EVT_FLOAT(3.0), EVT_FLOAT(-0.56640625)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.313), EVT_FLOAT(3.0), EVT_FLOAT(-0.56640625)) EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_THREAD EVT_SET(AF_FLO_BeanstalkFadedOut, FALSE) @@ -177,7 +177,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, -210, 0, 344, 0, 0) EVT_SETF(LVar1, LVar0) EVT_MULF(LVar1, EVT_FLOAT(-3.0)) - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.3134766), LVar0, EVT_FLOAT(-0.56640625)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.313), LVar0, EVT_FLOAT(-0.56640625)) EVT_CALL(RotateModel, MODEL_o142, LVar1, 0, 1, 0) EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_SETF(LVar2, LVar0) @@ -229,7 +229,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) EVT_CALL(PlaySound, SOUND_19D) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) EVT_CALL(N(GetPlayerAngles), LVar3, LVar4) EVT_SWITCH(LVar4) @@ -242,7 +242,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_SWITCH - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.3134766), EVT_FLOAT(3.0), EVT_FLOAT(-0.56640625)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.313), EVT_FLOAT(3.0), EVT_FLOAT(-0.56640625)) EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_SET(MV_BeanstalkSceneSync, FALSE) EVT_THREAD @@ -277,7 +277,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, 0, -210, 344, 0, 0) EVT_SETF(LVar1, LVar0) EVT_MULF(LVar1, EVT_FLOAT(-3.0)) - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.3134766), LVar0, EVT_FLOAT(-0.56640625)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.313), LVar0, EVT_FLOAT(-0.56640625)) EVT_CALL(RotateModel, MODEL_o142, LVar1, 0, 1, 0) EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_SETF(LVar2, LVar0) diff --git a/src/world/area_flo/flo_21/flo_21_3_clouds.c b/src/world/area_flo/flo_21/flo_21_3_clouds.c index fecbc53489..19a4a4bd04 100644 --- a/src/world/area_flo/flo_21/flo_21_3_clouds.c +++ b/src/world/area_flo/flo_21/flo_21_3_clouds.c @@ -51,8 +51,8 @@ EvtScript N(EVS_SetupCloudPuffs) = { EVT_THREAD EVT_SET(LVarF, 0) EVT_LABEL(0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) EVT_CALL(ScaleModel, MODEL_o1, LVar1, LVar0, 1) EVT_CALL(ScaleModel, MODEL_o2, LVar1, LVar0, 1) EVT_CALL(ScaleModel, MODEL_o3, LVar0, LVar1, 1) diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c index 19a3a221ab..6b047de691 100644 --- a/src/world/area_flo/flo_21/flo_21_4_npc.c +++ b/src/world/area_flo/flo_21/flo_21_4_npc.c @@ -213,7 +213,7 @@ EvtScript N(EVS_HuffNPuff_AnimateBodyScale) = { EVT_CALL(SetNpcScale, NPC_HuffNPuff_01, LVar0, LVar1, 1) EVT_CALL(SetNpcScale, NPC_HuffNPuff_02, LVar0, LVar1, 1) EVT_CALL(SetNpcScale, NPC_HuffNPuff_03, LVar0, LVar1, 1) - EVT_ADDF(LVar0, EVT_FLOAT(0.015625)) + EVT_ADDF(LVar0, EVT_FLOAT(0.015)) EVT_SUBF(LVar1, EVT_FLOAT(0.01)) EVT_WAIT(LVar2) EVT_END_LOOP @@ -222,7 +222,7 @@ EvtScript N(EVS_HuffNPuff_AnimateBodyScale) = { EVT_CALL(SetNpcScale, NPC_HuffNPuff_01, LVar0, LVar1, 1) EVT_CALL(SetNpcScale, NPC_HuffNPuff_02, LVar0, LVar1, 1) EVT_CALL(SetNpcScale, NPC_HuffNPuff_03, LVar0, LVar1, 1) - EVT_SUBF(LVar0, EVT_FLOAT(0.015625)) + EVT_SUBF(LVar0, EVT_FLOAT(0.015)) EVT_ADDF(LVar1, EVT_FLOAT(0.01)) EVT_WAIT(LVar2) EVT_END_LOOP diff --git a/src/world/area_hos/hos.h b/src/world/area_hos/hos.h index 35ba4da531..0c96b8ff5d 100644 --- a/src/world/area_hos/hos.h +++ b/src/world/area_hos/hos.h @@ -2,22 +2,22 @@ #define _WORLD_AREA_HOS_HOS_H_ enum { - AB_HOS_0 = AreaByte(0), - AB_HOS_1 = AreaByte(1), - AB_HOS_2 = AreaByte(2), - AB_HOS_3 = AreaByte(3), - AB_HOS_4 = AreaByte(4), - AB_HOS_5 = AreaByte(5), - AB_HOS_6 = AreaByte(6), - AB_HOS_7 = AreaByte(7), - AB_HOS_8 = AreaByte(8), - AB_HOS_9 = AreaByte(9), - AB_HOS_A = AreaByte(10), - AB_HOS_B = AreaByte(11), - AB_HOS_C = AreaByte(12), - AB_HOS_D = AreaByte(13), - AB_HOS_E = AreaByte(14), - AB_HOS_F = AreaByte(15), + AB_HOS_Unused_0 = AreaByte(0), + AB_HOS_Unused_1 = AreaByte(1), + AB_HOS_Unused_2 = AreaByte(2), + AB_HOS_Unused_3 = AreaByte(3), + AB_HOS_Unused_4 = AreaByte(4), + AB_HOS_Unused_5 = AreaByte(5), + AB_HOS_Unused_6 = AreaByte(6), + AB_HOS_Unused_7 = AreaByte(7), + AB_HOS_Unused_8 = AreaByte(8), + AB_HOS_Unused_9 = AreaByte(9), + AB_HOS_Unused_A = AreaByte(10), + AB_HOS_Unused_B = AreaByte(11), + AB_HOS_Unused_C = AreaByte(12), + AB_HOS_Unused_D = AreaByte(13), + AB_HOS_Unused_E = AreaByte(14), + AB_HOS_Unused_F = AreaByte(15), }; extern MapSettings hos_00_settings; diff --git a/src/world/area_hos/hos_05/A2A240.c b/src/world/area_hos/hos_05/A2A240.c index 28a2892fbd..736dd136d1 100644 --- a/src/world/area_hos/hos_05/A2A240.c +++ b/src/world/area_hos/hos_05/A2A240.c @@ -31,9 +31,9 @@ ApiStatus func_80240690_A2A8D0(Evt* script, s32 isInitialCall) { f32 temp_f20; f32 temp_f26; - script->varTable[2] = EVT_FLOAT(0); - script->varTable[3] = EVT_FLOAT(100); - script->varTable[4] = EVT_FLOAT(0); + script->varTable[2] = EVT_FLOAT(0.0); + script->varTable[3] = EVT_FLOAT(100.0); + script->varTable[4] = EVT_FLOAT(0.0); temp_f26 = (script->varTable[1] * 180.0f) / PI; temp_f20 = (rand_int(10) / vt2) + 3.0f; diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/isk_13_3_npc.c index c95a192895..a202f52281 100644 --- a/src/world/area_isk/isk_13/isk_13_3_npc.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -205,14 +205,14 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_THREAD EVT_SETF(LVar0, 0) EVT_LOOP(10) - EVT_ADDF(LVar0, EVT_FLOAT(12.796875)) + EVT_ADDF(LVar0, EVT_FLOAT(12.796)) 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_ADDF(LVar0, EVT_FLOAT(6.343)) EVT_CALL(N(func_80241EF8_9916D8), 255, LVar0, 255, LVar0) EVT_WAIT(1) EVT_END_LOOP diff --git a/src/world/area_iwa/iwa_10/iwa_10.h b/src/world/area_iwa/iwa_10/iwa_10.h index 2de256d7f3..77dd14f285 100644 --- a/src/world/area_iwa/iwa_10/iwa_10.h +++ b/src/world/area_iwa/iwa_10/iwa_10.h @@ -9,12 +9,12 @@ #include "mapfs/iwa_10_shape.h" #include "mapfs/iwa_10_hit.h" -#include "sprite/npc/TrainStationToad.h" +#include "sprite/npc/TrainToad.h" #include "sprite/npc/WorldParakarry.h" enum { - NPC_TrainStationToad_01 = 0, - NPC_TrainStationToad_02 = 1, + NPC_TrainToad_01 = 0, + NPC_TrainToad_02 = 1, NPC_Dryite = 2, NPC_ThreeSisters_01 = 3, NPC_Parakarry = 4, diff --git a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c b/src/world/area_iwa/iwa_10/iwa_10_3_npc.c index 05026c2487..eb9c140728 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c +++ b/src/world/area_iwa/iwa_10/iwa_10_3_npc.c @@ -1,19 +1,19 @@ #include "iwa_10.h" -#include "world/common/npc/TrainConductorToad.inc.c" +#include "world/common/npc/TrainToad.inc.c" #include "world/common/npc/Toad_Stationary.inc.c" #include "world/common/npc/Dryite_Stationary.inc.c" #include "world/common/complete/GiveReward.inc.c" -EvtScript N(EVS_NpcInteract_TrainStationToad_01) = { +EvtScript N(EVS_NpcInteract_TrainToad_01) = { EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, iwa_10_ENTRY_0) - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_CH2_0001) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_CH2_0001) EVT_ELSE - EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_CH2_0002) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_CH2_0002) EVT_CALL(ShowChoice, MSG_Choice_000C) - EVT_CALL(EndSpeech, NPC_SELF, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0) + EVT_CALL(EndSpeech, NPC_SELF, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0) EVT_IF_EQ(LVar0, 0) EVT_EXEC(N(EVS_DepartForToadTown)) EVT_ELSE @@ -23,13 +23,13 @@ EvtScript N(EVS_NpcInteract_TrainStationToad_01) = { EVT_END }; -EvtScript N(EVS_NpcInit_TrainStationToad_01) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainStationToad_01))) +EvtScript N(EVS_NpcInit_TrainToad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainToad_01))) EVT_RETURN EVT_END }; -EvtScript N(EVS_NpcInit_TrainStationToad_02) = { +EvtScript N(EVS_NpcInit_TrainToad_02) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, iwa_10_ENTRY_0) @@ -122,25 +122,25 @@ EvtScript N(EVS_NpcInit_ThreeSisters_01) = { EVT_END }; -StaticNpc N(NpcData_TrainConductorToad)[] = { +StaticNpc N(NpcData_TrainToad)[] = { { - .id = NPC_TrainStationToad_01, - .settings = &N(NpcSettings_TrainConductorToad), + .id = NPC_TrainToad_01, + .settings = &N(NpcSettings_TrainToad), .pos = { -440.0f, 20.0f, 110.0f }, .yaw = 90, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_TrainStationToad_01), + .init = &N(EVS_NpcInit_TrainToad_01), .drops = TRAIN_CONDUCTOR_DROPS, - .animations = TRAIN_CONDUCTOR_WHITE_ANIMS, + .animations = TRAIN_TOAD_WHITE_ANIMS, .tattle = MSG_NpcTattle_IWA_StationMaster, }, { - .id = NPC_TrainStationToad_02, - .settings = &N(NpcSettings_TrainConductorToad), + .id = NPC_TrainToad_02, + .settings = &N(NpcSettings_TrainToad), .pos = { -425.0f, 70.0f, -20.0f }, .yaw = 0, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_TrainStationToad_02), + .init = &N(EVS_NpcInit_TrainToad_02), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }, @@ -224,7 +224,7 @@ StaticNpc N(NpcData_Dryite)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_TrainConductorToad)), + NPC_GROUP(N(NpcData_TrainToad)), NPC_GROUP(N(NpcData_Toad)), NPC_GROUP(N(NpcData_ThreeSisters)), NPC_GROUP(N(NpcData_Dryite)), diff --git a/src/world/area_iwa/iwa_10/iwa_10_4_train.c b/src/world/area_iwa/iwa_10/iwa_10_4_train.c index f97c744c07..4b19c1e4c1 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_4_train.c +++ b/src/world/area_iwa/iwa_10/iwa_10_4_train.c @@ -20,8 +20,8 @@ EvtScript N(EVS_SpawnSmoke) = { EVT_CALL(TranslateModel, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ScaleModel, LVarB, LVar3, LVar3, 1) EVT_ADDF(LVar1, LVar4) - EVT_ADDF(LVar3, EVT_FLOAT(0.046875)) - EVT_MULF(LVar4, EVT_FLOAT(0.90625)) + EVT_ADDF(LVar3, EVT_FLOAT(0.046)) + EVT_MULF(LVar4, EVT_FLOAT(0.906)) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(EnableModel, LVarB, FALSE) @@ -174,17 +174,17 @@ EvtScript N(EVS_AnimateTrain) = { EVT_END_IF EVT_END_IF EVT_IF_LE(LVarD, 20) - EVT_CALL(N(CosInterpMinMax), LVarD, LVar0, EVT_FLOAT(0.703125), EVT_FLOAT(1.0), 10, 0, 180) - EVT_CALL(N(CosInterpMinMax), LVarD, LVar2, EVT_FLOAT(0.0), EVT_FLOAT(0.296875), 10, 0, 180) - EVT_SETF(LVar1, EVT_FLOAT(0.296875)) + EVT_CALL(N(CosInterpMinMax), LVarD, LVar0, EVT_FLOAT(0.703), EVT_FLOAT(1.0), 10, 0, 180) + EVT_CALL(N(CosInterpMinMax), LVarD, LVar2, EVT_FLOAT(0.0), EVT_FLOAT(0.296), 10, 0, 180) + EVT_SETF(LVar1, EVT_FLOAT(0.296)) EVT_SUBF(LVar1, LVar2) EVT_ADDF(LVar1, EVT_FLOAT(1.0)) EVT_CALL(ScaleModel, MODEL_07, LVar1, LVar0, LVar1) EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) EVT_ELSE EVT_SETF(LVar0, EVT_FLOAT(1.0)) - EVT_SETF(LVar2, EVT_FLOAT(0.296875)) - EVT_SETF(LVar1, EVT_FLOAT(0.296875)) + EVT_SETF(LVar2, EVT_FLOAT(0.296)) + EVT_SETF(LVar1, EVT_FLOAT(0.296)) EVT_SUBF(LVar1, LVar2) EVT_ADDF(LVar1, EVT_FLOAT(1.0)) EVT_CALL(ScaleModel, MODEL_07, LVar1, LVar0, LVar1) @@ -308,7 +308,7 @@ EvtScript N(EVS_UpdatePassengerPos) = { EVT_END_IF EVT_ADD(LVar1, -6) EVT_ADD(LVar2, -40) - EVT_CALL(SetNpcPos, NPC_TrainStationToad_02, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_TrainToad_02, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -344,7 +344,7 @@ EvtScript N(EVS_ArriveFromToadTown) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) @@ -394,13 +394,13 @@ EvtScript N(EVS_ArriveFromToadTown) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar0, -440) EVT_SET(LVar1, 45) EVT_SET(LVar2, 20) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_KILL_THREAD(LVar9) EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) EVT_CALL(HidePlayerShadow, FALSE) @@ -428,7 +428,7 @@ EvtScript N(EVS_ArriveFromToadTown) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o273, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(MF_TrainArrivePlayerDisembark, TRUE) EVT_WAIT(20) - EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_CH2_0000) + EVT_CALL(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_CH2_0000) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) @@ -440,7 +440,7 @@ EvtScript N(EVS_DepartForToadTown) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_SET(MV_TrainMoveDist, -90) EVT_SET(MV_TrainMoveSpeed, 0) EVT_SET(MF_TrainReverseDir, TRUE) @@ -463,9 +463,9 @@ EvtScript N(EVS_DepartForToadTown) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(NpcMoveTo, NPC_PARTNER, -425, 70, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) EVT_SET(LVar0, -425) EVT_SET(LVar1, 45) @@ -488,13 +488,13 @@ EvtScript N(EVS_DepartForToadTown) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_SET(MF_TrainMoving, TRUE) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 57) EVT_ADD(LVar1, -31) EVT_ADD(LVar2, 0) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_EXEC(N(EVS_UpdatePassengerPos)) EVT_EXEC(N(EVS_CloseCrossingGates)) @@ -509,11 +509,11 @@ EvtScript N(EVS_DepartForToadTown) = { 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(SpeakToPlayer, NPC_TrainStationToad_02, ANIM_TrainStationToad_Talk, ANIM_TrainStationToad_Still, 5, MSG_CH2_0003) + EVT_CALL(SpeakToPlayer, NPC_TrainToad_02, ANIM_TrainToad_Talk, ANIM_TrainToad_Still, 5, MSG_CH2_0003) EVT_CALL(PlaySound, SOUND_82) EVT_THREAD EVT_LOOP(1000) - EVT_SUBF(MV_TrainMoveSpeed, EVT_FLOAT(0.03125)) + EVT_SUBF(MV_TrainMoveSpeed, EVT_FLOAT(0.031)) EVT_IF_LT(MV_TrainMoveSpeed, -10) EVT_SETF(MV_TrainMoveSpeed, EVT_FLOAT(-10.0)) EVT_END_IF diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c index 0405769914..0440cfe886 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c @@ -1,12 +1,7 @@ #include "iwa_10.h" #include "effects.h" -NpcSettings N(NpcSettings_Parakarry) = { - .height = 35, - .radius = 24, - .level = 99, - .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, -}; +#include "world/common/npc/Parakarry.inc.c" #include "world/common/util/ChangeNpcToPartner.inc.c" @@ -27,7 +22,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) - EVT_CALL(ShowEmote, NPC_TrainStationToad_01, EMOTE_QUESTION, 0, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_TrainToad_01, EMOTE_QUESTION, 0, 20, FALSE, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, 300, EVT_FLOAT(15.0), EVT_FLOAT(-9.5)) EVT_THREAD @@ -322,23 +317,6 @@ StaticNpc N(NpcData_Parakarry) = { .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, - .animations = { - .idle = ANIM_WorldParakarry_Idle, - .walk = ANIM_WorldParakarry_Walk, - .run = ANIM_WorldParakarry_Run, - .chase = ANIM_WorldParakarry_Run, - .anim_4 = ANIM_WorldParakarry_Idle, - .anim_5 = ANIM_WorldParakarry_Idle, - .death = ANIM_WorldParakarry_Still, - .hit = ANIM_WorldParakarry_Still, - .anim_8 = ANIM_WorldParakarry_Idle, - .anim_9 = ANIM_WorldParakarry_Idle, - .anim_A = ANIM_WorldParakarry_Idle, - .anim_B = ANIM_WorldParakarry_Idle, - .anim_C = ANIM_WorldParakarry_Idle, - .anim_D = ANIM_WorldParakarry_Idle, - .anim_E = ANIM_WorldParakarry_Idle, - .anim_F = ANIM_WorldParakarry_Idle, - }, + .animations = PARAKARRY_ANIMS, .tattle = MSG_NpcTattle_IWA_Parakarry, }; diff --git a/src/world/area_iwa/iwa_11/iwa_11.h b/src/world/area_iwa/iwa_11/iwa_11.h index b561a4e8b8..f2d60a0a74 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_TrainToad = 0, }; enum { diff --git a/src/world/area_iwa/iwa_11/iwa_11_3_train.c b/src/world/area_iwa/iwa_11/iwa_11_3_train.c index 992d4657db..f4c8951f1c 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_3_train.c +++ b/src/world/area_iwa/iwa_11/iwa_11_3_train.c @@ -34,8 +34,8 @@ EvtScript N(EVS_SpawnSmoke) = { EVT_CALL(TranslateModel, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ScaleModel, LVarB, LVar3, LVar3, 1) EVT_ADDF(LVar1, LVar4) - EVT_ADDF(LVar3, EVT_FLOAT(0.046875)) - EVT_MULF(LVar4, EVT_FLOAT(0.90625)) + EVT_ADDF(LVar3, EVT_FLOAT(0.046)) + EVT_MULF(LVar4, EVT_FLOAT(0.906)) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(EnableModel, LVarB, FALSE) @@ -151,17 +151,17 @@ EvtScript N(EVS_AnimateTrain) = { EVT_END_IF EVT_END_IF EVT_IF_LE(LVarD, 20) - EVT_CALL(N(CosInterpMinMax), LVarD, LVar0, EVT_FLOAT(0.703125), EVT_FLOAT(1.0), 10, 0, 180) - EVT_CALL(N(CosInterpMinMax), LVarD, LVar2, EVT_FLOAT(0.0), EVT_FLOAT(0.296875), 10, 0, 180) - EVT_SETF(LVar1, EVT_FLOAT(0.296875)) + EVT_CALL(N(CosInterpMinMax), LVarD, LVar0, EVT_FLOAT(0.703), EVT_FLOAT(1.0), 10, 0, 180) + EVT_CALL(N(CosInterpMinMax), LVarD, LVar2, EVT_FLOAT(0.0), EVT_FLOAT(0.296), 10, 0, 180) + EVT_SETF(LVar1, EVT_FLOAT(0.296)) EVT_SUBF(LVar1, LVar2) EVT_ADDF(LVar1, EVT_FLOAT(1.0)) EVT_CALL(ScaleModel, MODEL_07, LVar1, LVar0, LVar1) EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) EVT_ELSE EVT_SETF(LVar0, EVT_FLOAT(1.0)) - EVT_SETF(LVar2, EVT_FLOAT(0.296875)) - EVT_SETF(LVar1, EVT_FLOAT(0.296875)) + EVT_SETF(LVar2, EVT_FLOAT(0.296)) + EVT_SETF(LVar1, EVT_FLOAT(0.296)) EVT_SUBF(LVar1, LVar2) EVT_ADDF(LVar1, EVT_FLOAT(1.0)) EVT_CALL(ScaleModel, MODEL_07, LVar1, LVar0, LVar1) @@ -279,7 +279,7 @@ EvtScript N(EVS_UpdatePassengerPos) = { EVT_END_IF EVT_ADD(LVar1, -6) EVT_ADD(LVar2, -40) - EVT_CALL(SetNpcPos, NPC_TrainConductorToad, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_TrainToad, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -315,7 +315,7 @@ EvtScript N(EVS_TravelToToadTown) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) @@ -351,7 +351,7 @@ EvtScript N(EVS_TravelToMtRugged) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) diff --git a/src/world/area_iwa/iwa_11/iwa_11_5_npc.c b/src/world/area_iwa/iwa_11/iwa_11_5_npc.c index 12adc9b673..9415067e55 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_5_npc.c +++ b/src/world/area_iwa/iwa_11/iwa_11_5_npc.c @@ -1,10 +1,10 @@ #include "iwa_11.h" -#include "world/common/npc/TrainConductorToad.inc.c" +#include "world/common/npc/TrainToad.inc.c" #include "world/common/npc/Toad_Stationary.inc.c" #include "world/common/npc/Dryite_Stationary.inc.c" -EvtScript N(EVS_NpcInit_TrainConductorToad) = { +EvtScript N(EVS_NpcInit_TrainToad) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, iwa_11_ENTRY_0) @@ -18,18 +18,18 @@ EvtScript N(EVS_NpcInit_TrainConductorToad) = { EVT_END }; -StaticNpc N(NpcData_TrainConductorToad) = { - .id = NPC_TrainConductorToad, - .settings = &N(NpcSettings_TrainConductorToad), +StaticNpc N(NpcData_TrainToad) = { + .id = NPC_TrainToad, + .settings = &N(NpcSettings_TrainToad), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_TrainConductorToad), + .init = &N(EVS_NpcInit_TrainToad), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_TrainConductorToad)), + NPC_GROUP(N(NpcData_TrainToad)), {} }; diff --git a/src/world/area_kkj/kkj.h b/src/world/area_kkj/kkj.h index 7c1323d066..d5b6973dd8 100644 --- a/src/world/area_kkj/kkj.h +++ b/src/world/area_kkj/kkj.h @@ -2,24 +2,47 @@ #define _WORLD_AREA_KKJ_KKJ_H_ enum { - AB_KKJ_0 = AreaByte(0), - AB_KKJ_1 = AreaByte(1), - AB_KKJ_2 = AreaByte(2), - AB_KKJ_3 = AreaByte(3), - AB_KKJ_4 = AreaByte(4), - AB_KKJ_5 = AreaByte(5), - AB_KKJ_6 = AreaByte(6), - AB_KKJ_7 = AreaByte(7), - AB_KKJ_8 = AreaByte(8), - AB_KKJ_9 = AreaByte(9), - AB_KKJ_A = AreaByte(10), - AB_KKJ_B = AreaByte(11), - AB_KKJ_C = AreaByte(12), - AB_KKJ_D = AreaByte(13), - AB_KKJ_E = AreaByte(14), - AB_KKJ_F = AreaByte(15), + AB_KKJ_Unused_0 = AreaByte(0), + AB_KKJ_Unused_1 = AreaByte(1), + AB_KKJ_Unused_2 = AreaByte(2), + AB_KKJ_Unused_3 = AreaByte(3), + AB_KKJ_Unused_4 = AreaByte(4), + AB_KKJ_Unused_5 = AreaByte(5), + AB_KKJ_Unused_6 = AreaByte(6), + AB_KKJ_Unused_7 = AreaByte(7), + AB_KKJ_Unused_8 = AreaByte(8), + AB_KKJ_Unused_9 = AreaByte(9), + AB_KKJ_Unused_A = AreaByte(10), + AB_KKJ_Unused_B = AreaByte(11), + AB_KKJ_Unused_C = AreaByte(12), + AB_KKJ_Unused_D = AreaByte(13), + AB_KKJ_Unused_E = AreaByte(14), + AB_KKJ_Unused_F = AreaByte(15), }; -#define AF_KKJ(index) AreaFlag(index) +extern MapConfig kkj_00_settings; +extern MapConfig kkj_01_settings; +extern MapConfig kkj_02_settings; +extern MapConfig kkj_03_settings; +extern MapConfig kkj_10_settings; +extern MapConfig kkj_11_settings; +extern MapConfig kkj_12_settings; +extern MapConfig kkj_13_settings; +extern MapConfig kkj_14_settings; +extern MapConfig kkj_15_settings; +extern MapConfig kkj_16_settings; +extern MapConfig kkj_17_settings; +extern MapConfig kkj_18_settings; +extern MapConfig kkj_19_settings; +extern MapConfig kkj_20_settings; +extern MapConfig kkj_21_settings; +extern MapConfig kkj_22_settings; +extern MapConfig kkj_23_settings; +extern MapConfig kkj_24_settings; +extern MapConfig kkj_25_settings; +extern MapConfig kkj_26_settings; +extern MapConfig kkj_27_settings; +extern MapConfig kkj_28_settings; +extern MapConfig kkj_29_settings; #endif diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index c74891ce49..e2d0a16bd5 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -34,14 +34,14 @@ API_CALLABLE(N(func_80242014_8B2084)) { #include "world/common/enemy/complete/Kammy.h" -StationaryAISettings N(AISettings_Kammy) = { +GuardAISettings N(AISettings_Kammy) = { .playerSearchInterval = -1, .chaseRadius = 300.0f, - .unk_20 = 30, + .unk_AI_20 = 30, }; EvtScript N(EVS_NpcAI_Kammy) = { - EVT_CALL(N(StationaryAI_Main), EVT_PTR(N(AISettings_Kammy))) + EVT_CALL(N(GuardAI_Main), EVT_PTR(N(AISettings_Kammy))) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c index 217beab94d..c9fb1c725b 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c +++ b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c @@ -101,14 +101,14 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_WAIT(10) EVT_THREAD EVT_SET(LVar0, 0) - EVT_CALL(func_802CDE68, -4, 10) + EVT_CALL(SetNpcRotationPivot, NPC_PARTNER, 10) EVT_LOOP(60) EVT_ADD(LVar0, 53) EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, LVar0) EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(func_802CDE68, -4, 0) + EVT_CALL(SetNpcRotationPivot, NPC_PARTNER, 0) EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, 0) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c index b84e069e76..7c7555e5a3 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c +++ b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c @@ -109,9 +109,9 @@ API_CALLABLE(N(CreateSticker)) { sticker->folderID = func_8013A704(1); sticker->workerID = create_worker_world(NULL, N(worker_render_sticker)); - evt_set_variable(script, MapVar(10), (s32) sticker); - evt_set_variable(script, MapVar(11), (s32) iconImg); - evt_set_variable(script, MapVar(12), (s32) iconPal); + evt_set_variable(script, MV_StickerData, (s32) sticker); + evt_set_variable(script, MV_StickerImage, (s32) iconImg); + evt_set_variable(script, MV_StickerPalette, (s32) iconPal); return ApiStatus_DONE2; } diff --git a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c index 04753e27fc..a24db3c4b7 100644 --- a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c +++ b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c @@ -1,7 +1,7 @@ #include "kmr_07.h" #include "animation_script.h" -#include "world/common/enemy/complete/GoombaBros_Stationary.inc.c" +#include "world/common/enemy/complete/GoombaBros_Guard.inc.c" extern AnimScript Entity_SimpleSpring_AnimLaunch; @@ -209,7 +209,7 @@ EvtScript N(EVS_NpcInit_GoombaBros_Blue) = { StaticNpc N(NpcData_GoombaBros_Red)[] = { { .id = NPC_GoombaBros_Red, - .settings = &N(NpcSettings_GoombaBros_Stationary), + .settings = &N(NpcSettings_GoombaBros_Guard), .pos = { 526.0f, 80.0f, 0.0f }, .yaw = 270, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, @@ -231,7 +231,7 @@ StaticNpc N(NpcData_GoombaBros_Red)[] = { }, { .id = NPC_GoombaBros_Blue, - .settings = &N(NpcSettings_GoombaBros_Stationary), + .settings = &N(NpcSettings_GoombaBros_Guard), .pos = { 498.0f, 80.0f, -10.0f }, .yaw = 270, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, diff --git a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c index aa4e4e052e..d42826393b 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c +++ b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c @@ -1,6 +1,6 @@ #include "kmr_11.h" -#include "world/common/enemy/complete/GoombaBros_Stationary.inc.c" +#include "world/common/enemy/complete/GoombaBros_Guard.inc.c" EvtScript N(EVS_NpcIdle_GoombaBros_01) = { EVT_RETURN @@ -294,7 +294,7 @@ NpcSettings N(NpcSettings_Kammy) = { StaticNpc N(NpcData_Enemies)[] = { { .id = NPC_BlueGoombaBro, - .settings = &N(NpcSettings_GoombaBros_Stationary), + .settings = &N(NpcSettings_GoombaBros_Guard), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, @@ -337,7 +337,7 @@ StaticNpc N(NpcData_Enemies)[] = { }, { .id = NPC_RedGoombaBro, - .settings = &N(NpcSettings_GoombaBros_Stationary), + .settings = &N(NpcSettings_GoombaBros_Guard), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, @@ -380,7 +380,7 @@ StaticNpc N(NpcData_Enemies)[] = { }, { .id = NPC_GoombaKing, - .settings = &N(NpcSettings_GoombaBros_Stationary), + .settings = &N(NpcSettings_GoombaBros_Guard), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c index 39575f55ac..e7b1967483 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -171,9 +171,9 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_THREAD EVT_CALL(DisablePartnerAI, 0) EVT_WAIT(15) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(NpcMoveTo, NPC_PARTNER, 554, -195, 28) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_END_THREAD EVT_WAIT(3) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 495, 30, -115) @@ -216,15 +216,15 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_CALL(GetCurrentPartnerID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PARTNER_GOOMBARIO) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH0_00DF) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH0_00DF) EVT_CASE_EQ(PARTNER_KOOPER) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH0_00E0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH0_00E0) EVT_CASE_EQ(PARTNER_BOMBETTE) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH0_00E1) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH0_00E1) EVT_CASE_EQ(PARTNER_PARAKARRY) - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH0_00E2) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 5, MSG_CH0_00E2) EVT_CASE_DEFAULT - EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_WALK, PARTNER_ANIM_9, 5, MSG_CH0_00DB) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_STILL, PARTNER_ANIM_HURT, 5, MSG_CH0_00DB) EVT_END_SWITCH EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00E3) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, FALSE) diff --git a/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c b/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c index aa8e2c9353..2b049e5b98 100644 --- a/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c +++ b/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c @@ -29,42 +29,42 @@ EvtScript N(EVS_NpcAux_LavaPiranhaHead) = { EVT_CALL(N(SetVineBonePos), VINE_0, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 7, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 8, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_LavaBud_01, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2) @@ -80,32 +80,32 @@ EvtScript N(EVS_NpcAux_LavaPiranhaHead) = { EVT_CALL(N(SetVineBonePos), VINE_1, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_LavaBud_02, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2) @@ -121,57 +121,57 @@ EvtScript N(EVS_NpcAux_LavaPiranhaHead) = { EVT_CALL(N(SetVineBonePos), VINE_2, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 0, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 0, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN diff --git a/src/world/area_kpa/kpa_130/kpa_130_3_npc.c b/src/world/area_kpa/kpa_130/kpa_130_3_npc.c index 37aefa626b..03872e2a72 100644 --- a/src/world/area_kpa/kpa_130/kpa_130_3_npc.c +++ b/src/world/area_kpa/kpa_130/kpa_130_3_npc.c @@ -4,7 +4,7 @@ #include "world/common/enemy/ai/BulletBillAI.inc.c" -StationaryAISettings N(D_80240B50_AA3870) = { +GuardAISettings N(D_80240B50_AA3870) = { .playerSearchInterval = 30, }; @@ -28,7 +28,7 @@ EvtScript N(D_80240BC4_AA38E4) = { EVT_END }; -StationaryAISettings N(AISettings_BillBlaster) = { +GuardAISettings N(AISettings_BillBlaster) = { .playerSearchInterval = 10, }; diff --git a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c index bc9ad82201..e78415017d 100644 --- a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c +++ b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c @@ -116,7 +116,7 @@ EvtScript N(EVS_Starship_Depart) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 1) EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 15) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_SET(MV_PartnerOnBoard, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c index 64c2bc2fff..50a86f405f 100644 --- a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c +++ b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c @@ -1077,11 +1077,11 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_CALL(NpcMoveTo, NPC_PARTNER, 205, 236, 20) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_SELF, 0) EVT_END_THREAD EVT_SET(AB_KPA82_QuizRound, 0) diff --git a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c index 4f86bf80d8..ffb2da99d7 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c +++ b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c @@ -99,7 +99,7 @@ EvtScript N(EVS_RideZipline) = { EVT_ADD(LVar1, -5) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) EVT_CALL(NpcJump0, NPC_PARTNER, ArrayVar(3), LVar0, LVar1, 8) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_END_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.2)) EVT_CALL(PlayerJump, ArrayVar(3), ArrayVar(4), ArrayVar(5), 5) diff --git a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c index 4375e2e6dc..0999048b28 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c +++ b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c @@ -93,7 +93,7 @@ EvtScript N(EVS_RideZipline) = { EVT_ADD(LVar1, -5) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) EVT_CALL(NpcJump0, NPC_PARTNER, ArrayVar(3), LVar0, LVar1, 8) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_END_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.2)) EVT_CALL(PlayerJump, ArrayVar(3), ArrayVar(4), ArrayVar(5), 5) diff --git a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c index 570cc401f6..35c3c97264 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c @@ -42,7 +42,7 @@ EvtScript N(EVS_Kolorado_TrompPanic) = { EvtScript N(EVS_Kolorado_TrompImpact) = { EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) - EVT_CALL(func_802CDE68, 0, 13) + EVT_CALL(SetNpcRotationPivot, NPC_Kolorado, 13) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) @@ -67,7 +67,7 @@ EvtScript N(EVS_Kolorado_HurtInit) = { EVT_CALL(SetNpcPos, NPC_Kolorado, 447, 0, 70) EVT_CALL(SetNpcYaw, NPC_Kolorado, 270) EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) - EVT_CALL(func_802CDE68, 0, 13) + EVT_CALL(SetNpcRotationPivot, NPC_Kolorado, 13) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) diff --git a/src/world/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/area_kzn/kzn_19/kzn_19_2_main.c index 8adac649e6..bbc9cbae0b 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/area_kzn/kzn_19/kzn_19_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CASE_DEFAULT EVT_RETURN EVT_END_SWITCH - EVT_IF_EQ(LVar0, 0) + EVT_IF_EQ(LVar0, FALSE) // card appearing scene EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 185, 110, -30) diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c index 4c739de4e3..d5505cefe0 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c @@ -388,42 +388,42 @@ EvtScript N(EVS_NpcAux_LavaPiranha) = { EVT_CALL(N(SetVineBonePos), VINE_0, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 7, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 8, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_LavaBud_01, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2) @@ -439,32 +439,32 @@ EvtScript N(EVS_NpcAux_LavaPiranha) = { EVT_CALL(N(SetVineBonePos), VINE_1, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_LavaBud_02, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2) @@ -480,57 +480,57 @@ EvtScript N(EVS_NpcAux_LavaPiranha) = { EVT_CALL(N(SetVineBonePos), VINE_2, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 0, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 0, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN diff --git a/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c b/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c index 9a12cc1421..8952b3539d 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c +++ b/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c @@ -7,7 +7,7 @@ EvtScript N(EVS_CrackFloor) = { EVT_SETF(LVar0, 0) EVT_THREAD EVT_LOOP(60) - EVT_ADDF(LVar0, EVT_FLOAT(0.33398438)) + EVT_ADDF(LVar0, EVT_FLOAT(0.334)) EVT_CALL(RotateModel, MODEL_o2, LVar0, 0, 0, -1) EVT_WAIT(1) EVT_END_LOOP diff --git a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c index 406c97759b..74273cf544 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c @@ -191,7 +191,7 @@ EvtScript N(EVS_NpcIdle_Misstar) = { EVT_GOTO(10) EVT_END_IF EVT_SET(AF_KZN23_GrabbedKolorado, TRUE) - EVT_CALL(func_802CDE68, 0, 10) + EVT_CALL(SetNpcRotationPivot, NPC_Kolorado, 10) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 180) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Panic) EVT_THREAD diff --git a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c index ad287a6438..b8a7f82808 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c @@ -81,7 +81,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EvtScript N(EVS_NpcInit_Kolorado) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_WAIT(1) - EVT_CALL(func_802CDE68, -1, 10) + EVT_CALL(SetNpcRotationPivot, NPC_SELF, 10) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 180) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado))) diff --git a/src/world/area_mac/mac_00/mac_00_4_rooms.c b/src/world/area_mac/mac_00/mac_00_4_rooms.c index e7c526cba2..4261622f57 100644 --- a/src/world/area_mac/mac_00/mac_00_4_rooms.c +++ b/src/world/area_mac/mac_00/mac_00_4_rooms.c @@ -24,7 +24,7 @@ EvtScript N(EVS_MoveWalls_RussHouse) = { EVT_CALL(RotateModel, MODEL_o460, LVar1, 0, 1, 0) EVT_CALL(RotateModel, MODEL_o461, LVar1, 0, 1, 0) EVT_SET(LVar1, LVar0) - EVT_MULF(LVar1, EVT_FLOAT(2.21875)) + EVT_MULF(LVar1, EVT_FLOAT(2.218)) EVT_CALL(RotateModel, MODEL_o213, LVar1, 0, 1, 0) EVT_CALL(RotateModel, MODEL_o215, LVar1, 0, 1, 0) EVT_RETURN diff --git a/src/world/area_mac/mac_00/mac_00_5_npc.c b/src/world/area_mac/mac_00/mac_00_5_npc.c index a7802a7291..215de43db8 100644 --- a/src/world/area_mac/mac_00/mac_00_5_npc.c +++ b/src/world/area_mac/mac_00/mac_00_5_npc.c @@ -2,7 +2,7 @@ #include "effects.h" #include "world/common/npc/Toad_Stationary.inc.c" -#include "world/common/enemy/complete/ShyGuy_NoAI.inc.c" +#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" #include "world/common/npc/Dummy.inc.c" #define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo @@ -187,7 +187,7 @@ EvtScript N(EVS_NpcInit_Toad_02) = { StaticNpc N(NpcData_ShyGuy_01)[] = { { .id = NPC_ShyGuyThief, - .settings = &N(NpcSettings_ShyGuy_NoAI), + .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, @@ -197,7 +197,7 @@ StaticNpc N(NpcData_ShyGuy_01)[] = { }, { .id = NPC_ShyGuy_02, - .settings = &N(NpcSettings_ShyGuy_NoAI), + .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, @@ -208,7 +208,7 @@ StaticNpc N(NpcData_ShyGuy_01)[] = { }, { .id = NPC_GardenShyGuy1, - .settings = &N(NpcSettings_ShyGuy_NoAI), + .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH, diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 6b0bb8572c..3934c2a0b6 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -8,7 +8,7 @@ extern EvtScript N(EVS_MerlonBargeOut); #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/enemy/complete/ShyGuy_NoAI.inc.c" +#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" NpcSettings N(NpcSettings_Ninji) = { .height = 24, @@ -2356,7 +2356,7 @@ StaticNpc N(NpcData_Twink) = { StaticNpc N(NpcData_ShyGuys)[] = { { .id = NPC_PostOfficeShyGuy, - .settings = &N(NpcSettings_ShyGuy_NoAI), + .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, @@ -2366,7 +2366,7 @@ StaticNpc N(NpcData_ShyGuys)[] = { }, { .id = NPC_ToadHouseShyGuy, - .settings = &N(NpcSettings_ShyGuy_NoAI), + .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, @@ -2376,7 +2376,7 @@ StaticNpc N(NpcData_ShyGuys)[] = { }, { .id = NPC_GardenShyGuy1, - .settings = &N(NpcSettings_ShyGuy_NoAI), + .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, @@ -2386,7 +2386,7 @@ StaticNpc N(NpcData_ShyGuys)[] = { }, { .id = NPC_GardenShyGuy2, - .settings = &N(NpcSettings_ShyGuy_NoAI), + .settings = &N(NpcSettings_ShyGuy_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, diff --git a/src/world/area_mac/mac_03/mac_03.h b/src/world/area_mac/mac_03/mac_03.h index 9e8ff3531e..b4be517996 100644 --- a/src/world/area_mac/mac_03/mac_03.h +++ b/src/world/area_mac/mac_03/mac_03.h @@ -9,13 +9,13 @@ #include "mapfs/mac_03_shape.h" #include "mapfs/mac_03_hit.h" -#include "sprite/npc/TrainStationToad.h" +#include "sprite/npc/TrainToad.h" #include "sprite/npc/Toad.h" #include "sprite/npc/ShyGuy.h" enum { - NPC_TrainStationToad_01 = 0, - NPC_TrainStationToad_02 = 1, + NPC_TrainToad_01 = 0, + NPC_TrainToad_02 = 1, NPC_Toad_01 = 2, NPC_ThreeSisters_01 = 3, NPC_Toad_02 = 4, diff --git a/src/world/area_mac/mac_03/mac_03_3_train.c b/src/world/area_mac/mac_03/mac_03_3_train.c index a94fc5d6ec..73585c59c5 100644 --- a/src/world/area_mac/mac_03/mac_03_3_train.c +++ b/src/world/area_mac/mac_03/mac_03_3_train.c @@ -60,8 +60,8 @@ EvtScript N(EVS_SpawnSmoke) = { EVT_CALL(TranslateModel, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ScaleModel, LVarB, LVar3, LVar3, 1) EVT_ADDF(LVar1, LVar4) - EVT_ADDF(LVar3, EVT_FLOAT(0.046875)) - EVT_MULF(LVar4, EVT_FLOAT(0.90625)) + EVT_ADDF(LVar3, EVT_FLOAT(0.046)) + EVT_MULF(LVar4, EVT_FLOAT(0.906)) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(EnableModel, LVarB, FALSE) @@ -179,17 +179,17 @@ EvtScript N(EVS_AnimateTrain) = { EVT_END_IF EVT_END_IF EVT_IF_LE(LVarD, 20) - EVT_CALL(N(CosInterpMinMax), LVarD, LVar0, EVT_FLOAT(0.703125), EVT_FLOAT(1.0), 10, 0, 180) - EVT_CALL(N(CosInterpMinMax), LVarD, LVar2, EVT_FLOAT(0.0), EVT_FLOAT(0.296875), 10, 0, 180) - EVT_SETF(LVar1, EVT_FLOAT(0.296875)) + EVT_CALL(N(CosInterpMinMax), LVarD, LVar0, EVT_FLOAT(0.703), EVT_FLOAT(1.0), 10, 0, 180) + EVT_CALL(N(CosInterpMinMax), LVarD, LVar2, EVT_FLOAT(0.0), EVT_FLOAT(0.296), 10, 0, 180) + EVT_SETF(LVar1, EVT_FLOAT(0.296)) EVT_SUBF(LVar1, LVar2) EVT_ADDF(LVar1, EVT_FLOAT(1.0)) EVT_CALL(ScaleModel, MODEL_07, LVar1, LVar0, LVar1) EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) EVT_ELSE EVT_SETF(LVar0, EVT_FLOAT(1.0)) - EVT_SETF(LVar2, EVT_FLOAT(0.296875)) - EVT_SETF(LVar1, EVT_FLOAT(0.296875)) + EVT_SETF(LVar2, EVT_FLOAT(0.296)) + EVT_SETF(LVar1, EVT_FLOAT(0.296)) EVT_SUBF(LVar1, LVar2) EVT_ADDF(LVar1, EVT_FLOAT(1.0)) EVT_CALL(ScaleModel, MODEL_07, LVar1, LVar0, LVar1) @@ -333,7 +333,7 @@ EvtScript N(EVS_UpdatePassengerPos) = { EVT_END_IF EVT_ADD(LVar1, -6) EVT_ADD(LVar2, -40) - EVT_CALL(SetNpcPos, NPC_TrainStationToad_02, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_TrainToad_02, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -369,7 +369,7 @@ EvtScript N(EVS_ArriveFromMtRugged) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) @@ -421,13 +421,13 @@ EvtScript N(EVS_ArriveFromMtRugged) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar0, -410) EVT_SET(LVar1, 45) EVT_SET(LVar2, 20) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_KILL_THREAD(LVar9) EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) EVT_CALL(HidePlayerShadow, FALSE) @@ -453,7 +453,7 @@ EvtScript N(EVS_ArriveFromMtRugged) = { EVT_CALL(EnablePartnerAI) EVT_SET(MF_TrainArrivePlayerDisembark, TRUE) EVT_WAIT(20) - EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_MAC_Station_0005) + EVT_CALL(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_MAC_Station_0005) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) @@ -472,7 +472,7 @@ EvtScript N(EVS_DepartForMtRugged) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_SET(MV_TrainMoveDist, 0) EVT_SET(MV_TrainMoveSpeed, 0) EVT_SET(MF_TrainReverseDir, FALSE) @@ -484,7 +484,7 @@ EvtScript N(EVS_DepartForMtRugged) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya3, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_humikiri, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_fumikiri, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetNpcFlagBits, NPC_TrainStationToad_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_TrainToad_01, NPC_FLAG_100, TRUE) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -425, 70, 0) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) @@ -496,9 +496,9 @@ EvtScript N(EVS_DepartForMtRugged) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(NpcMoveTo, NPC_PARTNER, -425, 70, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) EVT_SET(LVar0, -425) EVT_SET(LVar1, 45) @@ -521,13 +521,13 @@ EvtScript N(EVS_DepartForMtRugged) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_SET(MF_TrainMoving, TRUE) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -57) EVT_ADD(LVar1, -31) EVT_ADD(LVar2, 0) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_EXEC(N(EVS_UpdatePassengerPos)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) @@ -542,11 +542,11 @@ EvtScript N(EVS_DepartForMtRugged) = { 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(SpeakToPlayer, NPC_TrainStationToad_02, ANIM_TrainStationToad_Talk, ANIM_TrainStationToad_Still, 5, MSG_MAC_Station_0009) + EVT_CALL(SpeakToPlayer, NPC_TrainToad_02, ANIM_TrainToad_Talk, ANIM_TrainToad_Still, 5, MSG_MAC_Station_0009) EVT_CALL(PlaySound, SOUND_82) EVT_THREAD EVT_LOOP(1000) - EVT_ADDF(MV_TrainMoveSpeed, EVT_FLOAT(0.03125)) + EVT_ADDF(MV_TrainMoveSpeed, EVT_FLOAT(0.031)) EVT_IF_GT(MV_TrainMoveSpeed, 10) EVT_SETF(MV_TrainMoveSpeed, EVT_FLOAT(10.0)) EVT_END_IF diff --git a/src/world/area_mac/mac_03/mac_03_4_npc.c b/src/world/area_mac/mac_03/mac_03_4_npc.c index 1954398c4b..55901ccde4 100644 --- a/src/world/area_mac/mac_03/mac_03_4_npc.c +++ b/src/world/area_mac/mac_03/mac_03_4_npc.c @@ -1,7 +1,7 @@ #include "mac_03.h" #include "effects.h" -#include "world/common/npc/TrainConductorToad.inc.c" +#include "world/common/npc/TrainToad.inc.c" #include "world/common/npc/Toad_Wander.inc.c" #include "world/common/npc/Toad_Stationary.inc.c" @@ -107,21 +107,21 @@ EvtScript N(EVS_ToadKid1_LetterRewardB) = { EVT_END }; -EvtScript N(EVS_NpcInteract_TrainStationToad_01) = { +EvtScript N(EVS_NpcInteract_TrainToad_01) = { EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) - EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_SadTalk, ANIM_TrainStationToad_White_SadIdle, 0, MSG_MAC_Station_0000) + EVT_CALL(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_SadTalk, ANIM_TrainToad_White_SadIdle, 0, MSG_MAC_Station_0000) EVT_RETURN EVT_END_IF EVT_SWITCH(GB_StoryProgress) EVT_CASE_RANGE(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) - EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_SadTalk, ANIM_TrainStationToad_White_SadIdle, 0, MSG_MAC_Station_0007) + EVT_CALL(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_SadTalk, ANIM_TrainToad_White_SadIdle, 0, MSG_MAC_Station_0007) EVT_RETURN EVT_END_IF EVT_END_SWITCH EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, mac_03_ENTRY_1) - EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_MAC_Station_0006) + EVT_CALL(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_MAC_Station_0006) EVT_RETURN EVT_END_IF EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) @@ -139,20 +139,20 @@ EvtScript N(EVS_NpcInteract_TrainStationToad_01) = { EVT_SET(LVar0, MSG_MAC_Station_0002) EVT_END_IF EVT_END_IF - EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, LVar0) + EVT_CALL(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, LVar0) EVT_CALL(ShowChoice, MSG_Choice_000C) EVT_IF_EQ(LVar0, 0) - EVT_CALL(ContinueSpeech, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_MAC_Station_0003) + EVT_CALL(ContinueSpeech, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_MAC_Station_0003) EVT_EXEC(N(EVS_DepartForMtRugged)) EVT_ELSE - EVT_CALL(ContinueSpeech, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_MAC_Station_0004) + EVT_CALL(ContinueSpeech, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_MAC_Station_0004) EVT_END_IF EVT_RETURN EVT_END }; -EvtScript N(EVS_NpcInit_TrainStationToad_01) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainStationToad_01))) +EvtScript N(EVS_NpcInit_TrainToad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainToad_01))) EVT_RETURN EVT_END }; @@ -609,19 +609,19 @@ EvtScript N(EVS_NpcInit_Toad_04) = { StaticNpc N(NpcData_Toads)[] = { { - .id = NPC_TrainStationToad_01, - .settings = &N(NpcSettings_TrainConductorToad), + .id = NPC_TrainToad_01, + .settings = &N(NpcSettings_TrainToad), .pos = { -370.0f, 20.0f, 90.0f }, .yaw = 90, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, - .init = &N(EVS_NpcInit_TrainStationToad_01), + .init = &N(EVS_NpcInit_TrainToad_01), .drops = TRAIN_CONDUCTOR_DROPS, - .animations = TRAIN_CONDUCTOR_WHITE_ANIMS, + .animations = TRAIN_TOAD_WHITE_ANIMS, .tattle = MSG_NpcTattle_MAC_StationMaster, }, { - .id = NPC_TrainStationToad_02, - .settings = &N(NpcSettings_TrainConductorToad), + .id = NPC_TrainToad_02, + .settings = &N(NpcSettings_TrainToad), .pos = { -424.0f, 74.0f, 2.0f }, .yaw = 90, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, diff --git a/src/world/area_mac/mac_03/mac_03_8_demo.c b/src/world/area_mac/mac_03/mac_03_8_demo.c index b21fd1c706..4a260be7ef 100644 --- a/src/world/area_mac/mac_03/mac_03_8_demo.c +++ b/src/world/area_mac/mac_03/mac_03_8_demo.c @@ -53,7 +53,7 @@ EvtScript N(EVS_DemoUpdatePassengerPos) = { EVT_END_IF EVT_ADD(LVar1, -6) EVT_ADD(LVar2, -40) - EVT_CALL(SetNpcPos, NPC_TrainStationToad_02, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_TrainToad_02, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -65,7 +65,7 @@ EvtScript N(EVS_DemoDepartForMtRugged) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_SET(MV_TrainMoveDist, 0) EVT_SET(MV_TrainMoveSpeed, 0) EVT_SET(MF_TrainReverseDir, FALSE) @@ -103,7 +103,7 @@ EvtScript N(EVS_DemoDepartForMtRugged) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD EVT_LOOP(1000) - EVT_ADDF(MV_TrainMoveSpeed, EVT_FLOAT(0.03125)) + EVT_ADDF(MV_TrainMoveSpeed, EVT_FLOAT(0.031)) EVT_IF_GT(MV_TrainMoveSpeed, 10) EVT_SETF(MV_TrainMoveSpeed, EVT_FLOAT(10.0)) EVT_END_IF 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 index d22419778a..bb33e97966 100644 --- a/src/world/area_mac/mac_04/mac_04_3_rooms.c +++ b/src/world/area_mac/mac_04/mac_04_3_rooms.c @@ -87,7 +87,7 @@ EvtScript N(EVS_SetDoorRot_Storeroom) = { EvtScript N(EVS_MoveWalls_Storeroom) = { EVT_SET(LVar1, LVar0) - EVT_MULF(LVar1, EVT_FLOAT(2.78125)) + EVT_MULF(LVar1, EVT_FLOAT(2.781)) EVT_CALL(TranslateModel, MODEL_skk1, 0, 0, LVar1) EVT_CALL(TranslateModel, MODEL_skk2, 0, 0, LVar1) EVT_CALL(TranslateModel, MODEL_skk3, 0, 0, LVar1) 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 index a592d8d731..5bb67a9b57 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -275,7 +275,7 @@ API_CALLABLE(N(func_80242E84_854FF4)) { } break; case 1: - if (evt_get_variable(NULL, MapFlag(1)) != 0) { + if (evt_get_variable(NULL, MF_Unk_01)) { npc->pos.x += 3.0f; script->functionTemp[1]--; if (script->functionTemp[1] <= 0) { @@ -406,7 +406,7 @@ EvtScript N(EVS_80248878) = { 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_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) @@ -576,7 +576,7 @@ EvtScript N(EVS_802496FC) = { 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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetNpcYaw, NPC_PARTNER, 270) EVT_SET(LVar0, 0) EVT_EXEC_GET_TID(N(D_802484D8_85A648), LVarB) @@ -607,11 +607,11 @@ EvtScript N(EVS_802496FC) = { 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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) EVT_CALL(N(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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) 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) @@ -655,7 +655,7 @@ EvtScript N(D_80249C34_85BDA4) = { 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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) 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) @@ -676,7 +676,7 @@ EvtScript N(D_80249D80_85BEF0) = { 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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) EVT_CALL(EnablePartnerAI) EVT_RETURN @@ -991,7 +991,7 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { 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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_CALL(N(func_80242A90_854C00), 0, LVar0, LVar1, LVar2) EVT_EXEC(N(D_802496C0_85B830)) @@ -1002,12 +1002,12 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { EVT_THREAD EVT_CALL(N(func_80242C78_854DE8), 0) EVT_END_THREAD - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_TALK) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar3, LVar5, 10) EVT_CALL(N(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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_THREAD EVT_CALL(N(func_80242C78_854DE8), 1) @@ -1319,7 +1319,7 @@ EvtScript N(EVS_NpcDefeat_JrTroopa_01) = { 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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) 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) @@ -1760,7 +1760,7 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { EVT_END_IF EVT_IF_EQ(GF_MAC05_SimonGaveLyrics, FALSE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) 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) @@ -1793,7 +1793,7 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { EVT_END_IF EVT_ELSE EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) 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) diff --git a/src/world/area_mac/mac_06/mac_06_3_npc.c b/src/world/area_mac/mac_06/mac_06_3_npc.c index 30103c1fae..d68cedc9b3 100644 --- a/src/world/area_mac/mac_06/mac_06_3_npc.c +++ b/src/world/area_mac/mac_06/mac_06_3_npc.c @@ -301,7 +301,7 @@ EvtScript N(EVS_NpcInit_Whale) = { 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(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_THREAD EVT_CALL(N(func_80240E80_8659C0), 0) EVT_END_THREAD diff --git a/src/world/area_mim/mim_06/mim_06_4_hint.c b/src/world/area_mim/mim_06/mim_06_4_hint.c index 07fa6a55cc..f51b1e1c90 100644 --- a/src/world/area_mim/mim_06/mim_06_4_hint.c +++ b/src/world/area_mim/mim_06/mim_06_4_hint.c @@ -71,7 +71,7 @@ EvtScript N(EVS_FlowersWither) = { EVT_CALL(N(GetFlowerNormal), LVarA, LVar7, LVar8, LVar9) EVT_CALL(RotateModel, LVarB, LVar0, LVar7, LVar8, LVar9) EVT_CALL(ScaleModel, LVarB, LVar3, LVar3, LVar3) - EVT_MULF(LVar3, EVT_FLOAT(0.9658203)) + EVT_MULF(LVar3, EVT_FLOAT(0.965)) EVT_WAIT(2) EVT_END_LOOP EVT_CALL(EnableModel, LVarA, FALSE) diff --git a/src/world/area_mim/mim_11/mim_11_3_gate.c b/src/world/area_mim/mim_11/mim_11_3_gate.c index 73e00afd1b..13a4b1c267 100644 --- a/src/world/area_mim/mim_11/mim_11_3_gate.c +++ b/src/world/area_mim/mim_11/mim_11_3_gate.c @@ -45,7 +45,7 @@ EvtScript N(D_80242560_BB95D0) = { EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, 0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(90) - EVT_ADDF(LVar0, EVT_FLOAT(2.6669922)) + EVT_ADDF(LVar0, EVT_FLOAT(2.667)) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP @@ -68,7 +68,7 @@ EvtScript N(D_80242560_BB95D0) = { EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, 0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(90) - EVT_SUBF(LVar0, EVT_FLOAT(2.6669922)) + EVT_SUBF(LVar0, EVT_FLOAT(2.667)) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 8719aa06b0..ad4e8e06fa 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -6,7 +6,7 @@ static char* N(exit_str_1) = "nok_02"; #define CHUCK_QUIZMO_NPC_ID 15 -#include "world/common/enemy/ai/StationaryAI.inc.c" +#include "world/common/enemy/ai/GuardAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_obk/obk_07/obk_07_4_fireplace.c b/src/world/area_obk/obk_07/obk_07_4_fireplace.c index ce348cf244..cb5ac776b1 100644 --- a/src/world/area_obk/obk_07/obk_07_4_fireplace.c +++ b/src/world/area_obk/obk_07/obk_07_4_fireplace.c @@ -34,7 +34,7 @@ Vec3i N(ExplosionPositions3)[] = { EvtScript N(EVS_PlayExplosionFX) = { EVT_USE_BUF(LVar0) EVT_BUF_READ3(LVarA, LVarB, LVarC) - EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVarA, LVarB, LVarC, EVT_FLOAT(1.203125), 20) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVarA, LVarB, LVarC, EVT_FLOAT(1.203), 20) EVT_WAIT(1) EVT_BUF_READ3(LVarA, LVarB, LVarC) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVarA, LVarB, LVarC, EVT_FLOAT(1.5), 20) diff --git a/src/world/area_omo/common/RockingHorse.inc.c b/src/world/area_omo/common/RockingHorse.inc.c new file mode 100644 index 0000000000..698173fedd --- /dev/null +++ b/src/world/area_omo/common/RockingHorse.inc.c @@ -0,0 +1,69 @@ +#include "common.h" +#include "model.h" + +typedef struct RockingHorse { + /* 0x00 */ f32 posX; + /* 0x04 */ f32 posZ; + /* 0x08 */ f32 lastRockAngle; + /* 0x0C */ f32 rockPhaseAngularVel; + /* 0x10 */ f32 rockPhase; + /* 0x14 */ s32 modelID; +} RockingHorse; // size = 0x18 + +API_CALLABLE(N(UpdateRockingHorses)) { + Matrix4f mtxPivot, mtxRotate; + RockingHorse* horse; + Model* model; + f32 rockAngle; + f32 offsetY; + u32 i; + + if (isInitialCall) { + horse = heap_malloc(sizeof(*horse) * ARRAY_COUNT(N(RockingHorseModels))); + script->functionTempPtr[0] = horse; + + for (i = 0; i < ARRAY_COUNT(N(RockingHorseModels)); i++, horse++) { + s32 modelID = N(RockingHorseModels)[i]; + + horse->modelID = modelID; + model = get_model_from_list_index(get_model_list_index_from_tree_index(modelID)); + horse->posX = model->center.x; + horse->posZ = model->center.z; + horse->rockPhaseAngularVel = 3.5f; + horse->rockPhase = 0; + horse->lastRockAngle = 0; + } + } + + horse = script->functionTempPtr[0]; + for (i = 0; i < ARRAY_COUNT(N(RockingHorseModels)); i++, horse++) { + horse->rockPhase += horse->rockPhaseAngularVel; + horse->rockPhase = clamp_angle(horse->rockPhase); + #ifdef ROCKING_USE_SIN_DEG + rockAngle = sin_deg(horse->rockPhase) * 20.0f; + #else + rockAngle = sin_rad((horse->rockPhase * 3.14f) / 180.0f) * 20.0f; + #endif + offsetY = SQ(rockAngle) / 90.0f; + if (i == 0) { + if ((horse->lastRockAngle >= 0.0f && rockAngle < 0.0f) || (horse->lastRockAngle < 0.0f && rockAngle >= 0.0f)) { + sfx_play_sound_at_position(SOUND_CREAKY_ROCKING_CHAIR, 0, ROCKING_SOUND_LOCATION); + } + horse->lastRockAngle = rockAngle; + } + model = get_model_from_list_index(get_model_list_index_from_tree_index(horse->modelID)); + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; + guTranslateF(mtxPivot, -horse->posX, 0.0f, -horse->posZ); + guRotateF(mtxRotate, rockAngle, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxPivot, mtxRotate, model->transformMatrix); + guTranslateF(mtxPivot, horse->posX, offsetY, horse->posZ); + guMtxCatF(model->transformMatrix, mtxPivot, model->transformMatrix); + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_Gizmos_RockingHorses) = { + EVT_CALL(N(UpdateRockingHorses)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/common/ToyTrain.inc.c b/src/world/area_omo/common/ToyTrain.inc.c new file mode 100644 index 0000000000..bebe29c33a --- /dev/null +++ b/src/world/area_omo/common/ToyTrain.inc.c @@ -0,0 +1,618 @@ +#include "common.h" + +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" + +#include "common/SetAngleClamped.inc.c" + +#include "common/CompareFloats.inc.c" + +#include "common/AdvanceBuffer.inc.c" + +#include "common/SetPlayerStatusPosYaw.inc.c" + +#include "common/SetNpcPosYaw.inc.c" + +#include "common/CosInterpMinMax.inc.c" + +#include "common/IsAOrBPressed.inc.c" + +EvtScript N(EVS_Scene_RideTrain) = { + EVT_MALLOC_ARRAY(20, LVar0) + EVT_USE_ARRAY(LVar0) + EVT_SETF(ArrayVar(2), EVT_FLOAT(0.0)) + EVT_SETF(ArrayVar(3), EVT_FLOAT(0.0)) + EVT_SETF(ArrayVar(7), EVT_FLOAT(0.0)) + EVT_SETF(ArrayVar(8), EVT_FLOAT(0.0)) + EVT_SETF(ArrayVar(14), EVT_FLOAT(0.0)) + EVT_SETF(ArrayVar(15), EVT_FLOAT(0.0)) + EVT_SETF(ArrayVar(16), EVT_FLOAT(0.0)) + EVT_SET(AF_OMO_03, FALSE) + EVT_LABEL(0) + EVT_SWITCH(MV_TrainUnk_00) + EVT_CASE_EQ(0) + EVT_USE_BUF(MV_TrainUnk_01) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_SETF(ArrayVar(0), LVar0) + EVT_SETF(ArrayVar(1), LVar1) + EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), EVT_FLOAT(40.0), LVar2) + EVT_SETF(ArrayVar(5), LVar0) + EVT_SETF(ArrayVar(6), LVar1) + EVT_SETF(LVar3, LVar2) + EVT_ADDF(LVar3, EVT_FLOAT(180.0)) + EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), EVT_FLOAT(40.0), LVar3) + EVT_SETF(ArrayVar(11), LVar0) + EVT_SETF(ArrayVar(12), LVar1) + EVT_SETF(MV_TrainPos, ArrayVar(11)) + EVT_SETF(MV_TrainUnk_0C, ArrayVar(12)) + EVT_SETF(MV_TrainUnk_0D, LVar2) + EVT_SETF(ArrayVar(17), EVT_FLOAT(0.0)) + EVT_LABEL(11) + EVT_BUF_READ2(LVar2, LVar3) + EVT_IF_EQ(LVar2, -1) + EVT_GOTO(12) + EVT_END_IF + EVT_CALL(GetDist2D, LVar4, LVar0, LVar1, LVar2, LVar3) + EVT_ADDF(ArrayVar(17), LVar4) + EVT_SETF(LVar0, LVar2) + EVT_SETF(LVar1, LVar3) + EVT_GOTO(11) + EVT_LABEL(12) + EVT_SUBF(ArrayVar(17), EVT_FLOAT(40.0)) + EVT_SETF(ArrayVar(10), EVT_FLOAT(0.0)) + EVT_SETF(ArrayVar(13), EVT_FLOAT(0.0)) + EVT_SET(ArrayVar(18), 0) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_SET(MV_TrainUnk_00, 1) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_USE_BUF(MV_TrainUnk_01) + EVT_CALL(N(AdvanceBuffer), 3, 0, 0) + EVT_BUF_READ2(LVar0, LVar1) + EVT_IF_EQ(LVar0, -1) + EVT_SET(MV_TrainUnk_00, 100) + EVT_SET(MF_TrainUnk_00, FALSE) + EVT_ELSE + EVT_SETF(ArrayVar(2), LVar0) + EVT_SETF(ArrayVar(3), LVar1) + EVT_SET(ArrayVar(4), 1) + EVT_SETF(ArrayVar(7), LVar0) + EVT_SETF(ArrayVar(8), LVar1) + EVT_SET(ArrayVar(9), 1) + EVT_SET(MV_TrainUnk_00, 10) + EVT_END_IF + EVT_CASE_EQ(10) + EVT_SWITCH(MV_TrainUnk_02) + EVT_CASE_EQ(0) + EVT_SETF(ArrayVar(10), EVT_FLOAT(10.0)) + EVT_CASE_EQ(1) + EVT_CALL(N(CosInterpMinMax), ArrayVar(18), ArrayVar(10), EVT_FLOAT(0.0), EVT_FLOAT(10.0), 100, 1, EVT_FLOAT(0.0)) + EVT_ADD(ArrayVar(18), 1) + EVT_CASE_EQ(2) + EVT_SET(LVar0, ArrayVar(13)) + EVT_SET(LVar1, ArrayVar(17)) + EVT_CALL(N(CosInterpMinMax), LVar0, ArrayVar(10), EVT_FLOAT(10.0), EVT_FLOAT(2.0), LVar1, 0, EVT_FLOAT(0.0)) + EVT_CASE_EQ(3) + EVT_SET(LVar0, ArrayVar(13)) + EVT_SET(LVar1, ArrayVar(17)) + EVT_DIV(LVar1, 2) + EVT_CALL(N(CosInterpMinMax), LVar0, ArrayVar(10), EVT_FLOAT(1.0), EVT_FLOAT(10.0), LVar1, 0, EVT_FLOAT(0.0)) + EVT_END_SWITCH + EVT_CALL(GetDist2D, LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(2), ArrayVar(3)) + EVT_CALL(N(CompareFloats), LVar0, ArrayVar(10), LVar2) + EVT_IF_EQ(LVar2, 1) + EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(2), ArrayVar(3)) + EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), ArrayVar(10), LVar0) + EVT_ELSE + EVT_SETF(LVar1, ArrayVar(10)) + EVT_SUBF(LVar1, LVar0) + EVT_SETF(ArrayVar(0), ArrayVar(2)) + EVT_SETF(ArrayVar(1), ArrayVar(3)) + EVT_USE_BUF(MV_TrainUnk_01) + EVT_CALL(N(AdvanceBuffer), 3, 2, ArrayVar(4)) + EVT_BUF_READ2(ArrayVar(2), ArrayVar(3)) + EVT_ADD(ArrayVar(4), 1) + EVT_IF_EQ(ArrayVar(2), -1) + EVT_SET(MV_TrainUnk_00, 100) + EVT_SET(MF_TrainUnk_00, FALSE) + EVT_SET(LocalFlag(1), TRUE) + EVT_ELSE + EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(2), ArrayVar(3)) + EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), LVar1, LVar0) + EVT_END_IF + EVT_END_IF + EVT_CALL(GetDist2D, LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(7), ArrayVar(8)) + EVT_CALL(N(CompareFloats), LVar0, ArrayVar(10), LVar2) + EVT_IF_EQ(LVar2, 1) + EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(7), ArrayVar(8)) + EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), ArrayVar(10), LVar0) + EVT_ELSE + EVT_SETF(LVar1, ArrayVar(10)) + EVT_SUBF(LVar1, LVar0) + EVT_SETF(ArrayVar(5), ArrayVar(7)) + EVT_SETF(ArrayVar(6), ArrayVar(8)) + EVT_USE_BUF(MV_TrainUnk_01) + EVT_CALL(N(AdvanceBuffer), 3, 2, ArrayVar(9)) + EVT_BUF_READ2(ArrayVar(7), ArrayVar(8)) + EVT_ADD(ArrayVar(9), 1) + EVT_IF_EQ(ArrayVar(7), -1) + EVT_SET(MV_TrainUnk_00, 100) + EVT_SET(MF_TrainUnk_00, FALSE) + EVT_SET(LocalFlag(1), FALSE) + EVT_ELSE + EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(7), ArrayVar(8)) + EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), LVar1, LVar0) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_TrainUnk_00, 100) + EVT_IF_EQ(LocalFlag(1), TRUE) + EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(5), ArrayVar(6)) + EVT_SETF(ArrayVar(5), ArrayVar(0)) + EVT_SETF(ArrayVar(6), ArrayVar(1)) + EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), EVT_FLOAT(80.0), LVar0) + EVT_ELSE + EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(0), ArrayVar(1)) + EVT_SETF(ArrayVar(0), ArrayVar(5)) + EVT_SETF(ArrayVar(1), ArrayVar(6)) + EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), EVT_FLOAT(80.0), LVar0) + EVT_END_IF + EVT_END_IF + EVT_SETF(LVar0, ArrayVar(0)) + EVT_SETF(LVar1, ArrayVar(1)) + EVT_ADDF(LVar0, ArrayVar(5)) + EVT_ADDF(LVar1, ArrayVar(6)) + EVT_DIVF(LVar0, EVT_FLOAT(2.0)) + EVT_DIVF(LVar1, EVT_FLOAT(2.0)) + EVT_CALL(N(SetAngleClamped), LVar2, ArrayVar(5), ArrayVar(6), ArrayVar(0), ArrayVar(1)) + EVT_SETF(MV_TrainPos, LVar0) + EVT_SETF(MV_TrainUnk_0C, LVar1) + EVT_SETF(MV_TrainUnk_0D, LVar2) + EVT_CALL(GetDist2D, LVar3, LVar0, LVar1, ArrayVar(11), ArrayVar(12)) + EVT_ADDF(ArrayVar(13), LVar3) + EVT_SETF(ArrayVar(14), ArrayVar(13)) + EVT_MULF(ArrayVar(14), EVT_FLOAT(1.432)) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_SETF(LVar0, ArrayVar(10)) + EVT_IF_LT(LVar0, 1) + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_DIVF(LVar0, EVT_FLOAT(3.0)) + EVT_SUBF(ArrayVar(15), LVar0) + EVT_IF_LT(ArrayVar(15), -10) + EVT_SETF(ArrayVar(15), EVT_FLOAT(-10.0)) + EVT_SET(LocalFlag(0), TRUE) + EVT_IF_EQ(AF_OMO_03, FALSE) + EVT_CALL(PlaySound, SOUND_1FF) + EVT_ELSE + EVT_CALL(PlaySound, SOUND_84) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_SETF(LVar0, ArrayVar(10)) + EVT_IF_LT(LVar0, 1) + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_DIVF(LVar0, EVT_FLOAT(3.0)) + EVT_ADDF(ArrayVar(15), LVar0) + EVT_IF_GT(ArrayVar(15), 10) + EVT_SETF(ArrayVar(15), EVT_FLOAT(10.0)) + EVT_SET(LocalFlag(0), FALSE) + EVT_IF_EQ(AF_OMO_03, FALSE) + EVT_CALL(PlaySound, SOUND_1FE) + EVT_SET(AF_OMO_03, TRUE) + EVT_ELSE + EVT_CALL(PlaySound, SOUND_1FE) + EVT_SET(AF_OMO_03, FALSE) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_SETF(LVar0, MV_TrainPos) + EVT_SETF(LVar1, MV_TrainUnk_0C) + EVT_SETF(LVar2, MV_TrainUnk_0D) + EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(15.0), LVar2) + EVT_CALL(N(SetPlayerStatusPosYaw), LVar0, 50, LVar1, MV_TrainUnk_0D) + EVT_SETF(LVar0, MV_TrainPos) + EVT_SETF(LVar1, MV_TrainUnk_0C) + EVT_SETF(LVar2, MV_TrainUnk_0D) + EVT_ADDF(LVar2, EVT_FLOAT(180.0)) + EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(15.0), LVar2) + EVT_CALL(N(SetNpcPosYaw), -4, LVar0, 50, LVar1, MV_TrainUnk_0D) + EVT_SETF(LVar0, MV_TrainPos) + EVT_SETF(LVar1, MV_TrainUnk_0C) + EVT_SETF(LVar2, MV_TrainUnk_0D) + EVT_IF_LT(LVar2, 180) + EVT_ADDF(LVar2, EVT_FLOAT(90.0)) + EVT_ELSE + EVT_SUBF(LVar2, EVT_FLOAT(90.0)) + EVT_END_IF + EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(20.0), LVar2) + EVT_CALL(N(SetNpcPosYaw), 0, LVar0, 50, LVar1, MV_TrainUnk_0D) + EVT_CASE_EQ(100) + EVT_END_SWITCH + EVT_CALL(TranslateGroup, MODEL_p2, EVT_FLOAT(79.1), EVT_FLOAT(-27.93), EVT_FLOAT(-29.53)) + EVT_CALL(TranslateGroup, MODEL_p3, EVT_FLOAT(-35.1), EVT_FLOAT(-27.93), EVT_FLOAT(-29.53)) + EVT_CALL(RotateGroup, MODEL_p2, EVT_FLOAT(-45.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) + EVT_CALL(RotateGroup, MODEL_p3, EVT_FLOAT(45.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) + EVT_CALL(TranslateGroup, MODEL_p5, EVT_FLOAT(40.5), EVT_FLOAT(-20.0), EVT_FLOAT(-0.4)) + EVT_CALL(TranslateGroup, MODEL_p6, EVT_FLOAT(-39.5), EVT_FLOAT(-20.0), EVT_FLOAT(-0.4)) + EVT_CALL(TranslateGroup, MODEL_popo, MV_TrainPos, EVT_FLOAT(10.0), MV_TrainUnk_0C) + EVT_IF_LT(MV_TrainUnk_0D, 180) + EVT_SETF(LVar1, MV_TrainUnk_0D) + EVT_SUBF(LVar1, EVT_FLOAT(90.0)) + EVT_CALL(RotateGroup, MODEL_popo, LVar1, EVT_FLOAT(0.0), EVT_FLOAT(-1.0), EVT_FLOAT(0.0)) + EVT_ELSE + EVT_SETF(LVar1, MV_TrainUnk_0D) + EVT_SUBF(LVar1, EVT_FLOAT(180.0)) + EVT_SUBF(LVar1, EVT_FLOAT(90.0)) + EVT_CALL(RotateGroup, MODEL_popo, LVar1, EVT_FLOAT(0.0), EVT_FLOAT(-1.0), EVT_FLOAT(0.0)) + EVT_END_IF + EVT_CALL(RotateGroup, MODEL_p2, EVT_FLOAT(45.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) + EVT_CALL(RotateGroup, MODEL_p3, EVT_FLOAT(-45.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) + EVT_CALL(TranslateGroup, MODEL_p2, EVT_FLOAT(-79.1), EVT_FLOAT(27.93), EVT_FLOAT(29.53)) + EVT_CALL(TranslateGroup, MODEL_p3, EVT_FLOAT(35.1), EVT_FLOAT(27.93), EVT_FLOAT(29.53)) + EVT_CALL(TranslateGroup, MODEL_p5, EVT_FLOAT(-40.5), EVT_FLOAT(20.0), EVT_FLOAT(0.4)) + EVT_CALL(TranslateGroup, MODEL_p6, EVT_FLOAT(39.5), EVT_FLOAT(20.0), EVT_FLOAT(0.4)) + EVT_IF_LT(MV_TrainUnk_0D, 180) + EVT_CALL(RotateGroup, MODEL_p5, ArrayVar(14), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(-1.0)) + EVT_CALL(RotateGroup, MODEL_p6, ArrayVar(14), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(-1.0)) + EVT_ELSE + EVT_CALL(RotateGroup, MODEL_p5, ArrayVar(14), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) + EVT_CALL(RotateGroup, MODEL_p6, ArrayVar(14), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) + EVT_END_IF + EVT_CALL(TranslateGroup, MODEL_p2, EVT_FLOAT(0.0), ArrayVar(15), EVT_FLOAT(0.0)) + EVT_SETF(LVar0, ArrayVar(15)) + EVT_MULF(LVar0, EVT_FLOAT(-1.0)) + EVT_CALL(TranslateGroup, MODEL_p3, EVT_FLOAT(0.0), LVar0, EVT_FLOAT(0.0)) + EVT_SETF(LVar0, ArrayVar(10)) + EVT_IF_LT(LVar0, 1) + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_ADDF(ArrayVar(16), LVar0) + EVT_IF_GT(ArrayVar(16), 360) + EVT_SUBF(ArrayVar(16), EVT_FLOAT(360.0)) + EVT_END_IF + EVT_CALL(RotateGroup, MODEL_p4, ArrayVar(16), EVT_FLOAT(0.0), EVT_FLOAT(1.0), EVT_FLOAT(0.0)) + EVT_SETF(ArrayVar(11), MV_TrainPos) + EVT_SETF(ArrayVar(12), MV_TrainUnk_0C) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TrainUnk_A) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TrainUnk_B) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(MakeLerp, 0, LVar1, 45, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TrainUnk_C) = { + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(MakeLerp, LVar1, 0, 40, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TrainUnk_D) = { + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_THREAD + EVT_USE_BUF(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(15.0), LVar3) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(0.7)) + EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) + EVT_CALL(SetPlayerPos, LVar1, 50, LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(InterpPlayerYaw, LVar3, 0) + EVT_END_THREAD + EVT_WAIT(5) + EVT_USE_BUF(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_SETF(LVarA, LVar3) + EVT_ADDF(LVar3, EVT_FLOAT(180.0)) + EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(15.0), LVar3) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, 50, LVar2, 10) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(0.5)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar1, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVarA, 0) + EVT_WAIT(5) + EVT_USE_BUF(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_SETF(LVarA, LVar3) + EVT_IF_LT(LVar3, 180) + EVT_ADDF(LVar3, EVT_FLOAT(90.0)) + EVT_ELSE + EVT_SUBF(LVar3, EVT_FLOAT(90.0)) + EVT_END_IF + EVT_SETF(LVar4, LVar1) + EVT_SETF(LVar5, LVar2) + EVT_SETF(LVar6, LVar3) + EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(100.0), LVar3) + EVT_CALL(SetNpcSpeed, NPC_Conductor, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Walk) + EVT_CALL(NpcMoveTo, NPC_Conductor, LVar1, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Idle) + EVT_CALL(AddVectorPolar, LVar4, LVar5, EVT_FLOAT(20.0), LVar6) + EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_Conductor, LVar4, 50, LVar5, 10) + EVT_CALL(InterpNpcYaw, NPC_Conductor, LVarA, 0) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_0009) + EVT_CALL(PlaySound, SOUND_83) + EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +#ifdef INCLUDE_ALTERNATES +EvtScript N(EVS_TrainUnk_AltD) = { + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_SET(AF_OMO_06, FALSE) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_IF_LT(LVar2, 50) + EVT_USE_BUF(LVar9) + EVT_BUF_READ4(LVar3, LVar4, LVar5, LVar6) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.5)) + EVT_CALL(PlayerMoveTo, LVar3, LVar4, 0) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, LVar5, 50, LVar6, 15) + EVT_END_IF + EVT_THREAD + EVT_USE_BUF(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(15.0), LVar3) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(0.7)) + EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) + EVT_CALL(SetPlayerPos, LVar1, 50, LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(InterpPlayerYaw, LVar3, 0) + EVT_END_THREAD + EVT_WAIT(5) + EVT_USE_BUF(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_SETF(LVarA, LVar3) + EVT_ADDF(LVar3, EVT_FLOAT(180.0)) + EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(15.0), LVar3) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, 50, LVar2, 10) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(0.1)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar1, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVarA, 0) + EVT_WAIT(5) + EVT_USE_BUF(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_SETF(LVarA, LVar3) + EVT_ADDF(LVar3, EVT_FLOAT(90.0)) + EVT_SETF(LVar4, LVar1) + EVT_SETF(LVar5, LVar2) + EVT_SETF(LVar6, LVar3) + EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(60.0), LVar3) + EVT_CALL(SetNpcSpeed, NPC_Conductor, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Walk) + EVT_CALL(NpcMoveTo, NPC_Conductor, LVar1, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Idle) + EVT_CALL(AddVectorPolar, LVar4, LVar5, EVT_FLOAT(20.0), LVar6) + EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_Conductor, LVar4, 50, LVar5, 10) + EVT_CALL(InterpNpcYaw, NPC_Conductor, LVarA, 0) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_0009) + EVT_CALL(PlaySound, SOUND_83) + EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; +#endif + +EvtScript N(EVS_TrainUnk_E) = { + EVT_CALL(StopSound, SOUND_83) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_SETF(LVar0, MV_TrainPos) + EVT_SETF(LVar1, MV_TrainUnk_0C) + EVT_SETF(LVar2, MV_TrainUnk_0D) + EVT_IF_LT(LVar2, 180) + EVT_ADDF(LVar2, EVT_FLOAT(90.0)) + EVT_ELSE + EVT_SUBF(LVar2, EVT_FLOAT(90.0)) + EVT_END_IF + EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(100.0), LVar2) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Conductor, LVar0, 50, LVar1, 10) + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Walk) + EVT_CALL(SetNpcSpeed, NPC_Conductor, EVT_FLOAT(2.0)) + EVT_USE_BUF(LVar9) + EVT_BUF_READ2(LVar3, LVar4) + EVT_CALL(NpcMoveTo, NPC_Conductor, LVar3, LVar4, 0) + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Idle) + EVT_CALL(InterpNpcYaw, NPC_Conductor, 270, 15) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, FALSE) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_ADDF(LVar2, EVT_FLOAT(60.0)) + EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(20.0), LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, LVar0, LVar1, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_WAIT(10) + EVT_SUB(LVar1, 30) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar1, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, FALSE) + EVT_RETURN + EVT_END +}; + +#ifdef INCLUDE_ALTERNATES +EvtScript N(EVS_TrainUnk_AltE) = { + EVT_CALL(StopSound, SOUND_83) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_SET(AF_OMO_06, TRUE) + EVT_SETF(LVar0, MV_TrainPos) + EVT_SETF(LVar1, MV_TrainUnk_0C) + EVT_SETF(LVar2, MV_TrainUnk_0D) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Walk) + EVT_CALL(SetNpcSpeed, NPC_Conductor, EVT_FLOAT(3.5)) + EVT_USE_BUF(LVar9) + EVT_BUF_READ2(LVar3, LVar4) + EVT_CALL(NpcMoveTo, NPC_Conductor, LVar3, LVar4, 0) + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_SadIdle) + EVT_CALL(InterpNpcYaw, NPC_Conductor, 90, 0) + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, FALSE) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_ADDF(LVar2, EVT_FLOAT(85.0)) + EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(80.0), LVar2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, LVar0, LVar1, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_WAIT(10) + EVT_ADDF(LVar2, EVT_FLOAT(50.0)) + EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(85.0), LVar2) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000102) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar1, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000106) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, FALSE) + EVT_RETURN + EVT_END +}; +#endif + +EvtScript N(EVS_TrainUnk_F) = { + EVT_SWITCH(AB_OMO_6) + EVT_CASE_EQ(0) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_3, TRANSITION_1) + EVT_CASE_EQ(1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_3, TRANSITION_1) + EVT_CASE_EQ(2) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_2, TRANSITION_1) + EVT_CASE_EQ(3) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_3, TRANSITION_1) + EVT_END_SWITCH + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TrainUnk_G) = { + EVT_SWITCH(AB_OMO_5) + EVT_CASE_RANGE(0, 1) + EVT_SWITCH(AB_OMO_6) + EVT_CASE_EQ(0) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CASE_EQ(1) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) + EVT_CASE_EQ(2) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_1, TRANSITION_1) + EVT_CASE_EQ(3) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_2, TRANSITION_1) + EVT_END_SWITCH + EVT_CASE_EQ(2) + EVT_SWITCH(AB_OMO_6) + EVT_CASE_EQ(0) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CASE_EQ(1) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) + EVT_ELSE + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_END_IF + EVT_CASE_EQ(3) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_2, TRANSITION_1) + EVT_END_SWITCH + EVT_CASE_EQ(3) + EVT_SWITCH(AB_OMO_6) + EVT_CASE_EQ(0) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_CASE_EQ(1) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) + EVT_ELSE + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_END_IF + EVT_CASE_EQ(2) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_1, TRANSITION_1) + EVT_ELSE + EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) + EVT_END_IF + EVT_END_SWITCH + EVT_END_SWITCH + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TrainUnk_H) = { + EVT_LABEL(10) + EVT_WAIT(1) + EVT_CALL(N(IsAOrBPressed)) + EVT_IF_NE(LVar0, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) + EVT_EXEC_WAIT(N(EVS_TrainUnk_F)) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_TrainUnk_G)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/common/TrainStationSwitches.inc.c b/src/world/area_omo/common/TrainStationSwitches.inc.c new file mode 100644 index 0000000000..42db695d55 --- /dev/null +++ b/src/world/area_omo/common/TrainStationSwitches.inc.c @@ -0,0 +1,190 @@ +#include "common.h" + +// controls the large arrow hovering in front of the train station +EvtScript N(EVS_UpdateDirectionArrow) = { + EVT_CALL(SetTexPanner, MODEL_y_a, TEX_PANNER_2) + EVT_CALL(EnableTexPanning, MODEL_y_a, TRUE) + // adjust color with a UV offset into a color palette texture + EVT_SET(MV_ArrowTexUOffset, 0x4000 * 2) + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, MV_ArrowTexUOffset, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_SET(LVar5, 0) + // slowly rotate the arrow + EVT_LABEL(0) + EVT_ADD(LVar5, 2) + EVT_IF_GT(LVar5, 360) + EVT_SUB(LVar5, 360) + EVT_END_IF + EVT_CALL(RotateModel, MODEL_y_a, LVar5, 0, 0, -1) + EVT_WAIT(1) + EVT_IF_EQ(MF_EitherSwitchPressed, TRUE) + EVT_GOTO(10) + EVT_END_IF + EVT_GOTO(0) + EVT_LABEL(10) + EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) + EVT_SET(LVar2, 270) + EVT_CALL(EnableTexPanning, MODEL_y_c2, FALSE) + EVT_CALL(EnableTexPanning, MODEL_y_b2, TRUE) + EVT_ELSE + EVT_SET(LVar2, 90) + EVT_CALL(EnableTexPanning, MODEL_y_b2, FALSE) + EVT_CALL(EnableTexPanning, MODEL_y_c2, TRUE) + EVT_END_IF + EVT_IF_LT(LVar2, LVar5) + EVT_ADD(LVar2, 360) + EVT_END_IF + EVT_SET(LVar6, AF_OMO_UsingRightSwitch) + EVT_CALL(MakeLerp, LVar5, LVar2, 60, EASING_COS_FAST_OVERSHOOT) + EVT_CALL(UpdateLerp) + EVT_SET(LVar4, -1) + EVT_LABEL(11) + EVT_CALL(UpdateLerp) + EVT_IF_LT(LVar2, LVar0) + EVT_SET(LVar3, 0) + EVT_ELSE + EVT_SET(LVar3, 1) + EVT_END_IF + EVT_IF_NE(LVar4, -1) + EVT_IF_NE(LVar3, LVar4) + EVT_CALL(PlaySound, SOUND_1F9) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar4, LVar3) + EVT_CALL(RotateModel, MODEL_y_a, LVar0, 0, 0, -1) + EVT_WAIT(1) + EVT_IF_NE(AF_OMO_UsingRightSwitch, LVar6) + EVT_GOTO(21) + EVT_END_IF + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(11) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_1FA) + EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) + EVT_SET(MV_ArrowTexUOffset, 0x4000) + EVT_ELSE + EVT_SET(MV_ArrowTexUOffset, 0x4000 * 3) + EVT_END_IF + EVT_LABEL(20) + EVT_WAIT(1) + EVT_IF_EQ(AF_OMO_UsingRightSwitch, LVar6) + EVT_GOTO(20) + EVT_END_IF + EVT_LABEL(21) + EVT_SET(LVar5, LVar0) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PressSwitch_Left) = { + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_PARAKARRY) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MF_EitherSwitchPressed, TRUE) + EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_SET(MF_EitherSwitchPressed, TRUE) + EVT_SET(AF_OMO_UsingRightSwitch, FALSE) + EVT_CALL(MakeLerp, 0, -18, 15, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_y_b1, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_y_b2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o920) + EVT_CALL(UpdateColliderTransform, COLLIDER_o921) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(MakeLerp, -18, 0, 15, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_y_b1, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_y_b2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o920) + EVT_CALL(UpdateColliderTransform, COLLIDER_o921) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PressSwitch_Right) = { + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_PARAKARRY) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MF_EitherSwitchPressed, TRUE) + EVT_IF_EQ(AF_OMO_UsingRightSwitch, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_SET(MF_EitherSwitchPressed, TRUE) + EVT_SET(AF_OMO_UsingRightSwitch, TRUE) + EVT_CALL(MakeLerp, 0, -18, 15, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_y_c1, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_y_c2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o923) + EVT_CALL(UpdateColliderTransform, COLLIDER_o924) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(MakeLerp, -18, 0, 15, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_y_c1, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_y_c2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o923) + EVT_CALL(UpdateColliderTransform, COLLIDER_o924) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_SetupSwitches) = { + EVT_SET(MF_EitherSwitchPressed, FALSE) + EVT_SET(MF_Unk_0A, FALSE) + EVT_EXEC(N(EVS_UpdateDirectionArrow)) + EVT_CALL(ParentColliderToModel, COLLIDER_o920, MODEL_y_b1) + EVT_CALL(ParentColliderToModel, COLLIDER_o921, MODEL_y_b2) + EVT_CALL(ParentColliderToModel, COLLIDER_o923, MODEL_y_c1) + EVT_CALL(ParentColliderToModel, COLLIDER_o924, MODEL_y_c2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PressSwitch_Left)), TRIGGER_FLOOR_TOUCH, COLLIDER_o920, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PressSwitch_Left)), TRIGGER_WALL_HAMMER, COLLIDER_o921, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PressSwitch_Right)), TRIGGER_FLOOR_TOUCH, COLLIDER_o923, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PressSwitch_Right)), TRIGGER_WALL_HAMMER, COLLIDER_o924, 1, 0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP(-1100, 0, 0, 0) + 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_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo.h b/src/world/area_omo/omo.h index 220b5ba1d0..a794ba2224 100644 --- a/src/world/area_omo/omo.h +++ b/src/world/area_omo/omo.h @@ -1,33 +1,55 @@ #ifndef _WORLD_AREA_OMO_OMO_H_ #define _WORLD_AREA_OMO_OMO_H_ +// "CrowdScript" used in omo_02 and omo_15 +enum { + op_CS_MOVE = 0, + op_CS_JUMP = 1, + op_CS_FALL = 2, + op_CS_END = -1, +}; + +#define CS_MOVE(x, y) op_CS_MOVE, x, y, +#define CS_JUMP(x, y, z) op_CS_JUMP, x, y, z, +#define CS_FALL() op_CS_FALL, +#define CS_END op_CS_END, + enum { AB_OMO_0 = AreaByte(0), - AB_OMO_1 = AreaByte(1), - AB_OMO_2 = AreaByte(2), - AB_OMO_3 = AreaByte(3), - AB_OMO_4 = AreaByte(4), + AB_OMO12_LightSource = AreaByte(1), + AB_OMO12_LightPowerMod = AreaByte(2), + AB_OMO09_IsPlayerNearSlotMachine = AreaByte(3), + AB_OMO_CurrentPeachChoice = AreaByte(4), AB_OMO_5 = AreaByte(5), AB_OMO_6 = AreaByte(6), - AB_OMO_7 = AreaByte(7), - AB_OMO_8 = AreaByte(8), - AB_OMO_9 = AreaByte(9), - AB_OMO_A = AreaByte(10), - AB_OMO_B = AreaByte(11), - AB_OMO_C = AreaByte(12), - AB_OMO_D = AreaByte(13), - AB_OMO_E = AreaByte(14), - AB_OMO_F = AreaByte(15), + AB_OMO_Unused_7 = AreaByte(7), + AB_OMO_Unused_8 = AreaByte(8), + AB_OMO_Unused_9 = AreaByte(9), + AB_OMO_Unused_A = AreaByte(10), + AB_OMO_Unused_B = AreaByte(11), + AB_OMO_Unused_C = AreaByte(12), + AB_OMO_Unused_D = AreaByte(13), + AB_OMO_Unused_E = AreaByte(14), + AB_OMO_Unused_F = AreaByte(15), }; enum { - AF_OMO_02 = AreaFlag(2), - AF_OMO_03 = AreaFlag(3), - AF_OMO07_NpcPool0 = AreaFlag(7), - AF_OMO07_NpcPool1 = AreaFlag(8), - AF_OMO07_NpcPool2 = AreaFlag(9), - AF_OMO07_NpcPool3 = AreaFlag(10), - AF_OMO07_DoorOpening = AreaFlag(15), + AF_OMO_UsingRightSwitch = AreaFlag(2), + AF_OMO_03 = AreaFlag(3), + AF_OMO_04 = AreaFlag(4), + AF_OMO_05 = AreaFlag(5), + AF_OMO_06 = AreaFlag(6), + AF_OMO07_NpcPool0 = AreaFlag(7), + AF_OMO07_NpcPool1 = AreaFlag(8), + AF_OMO07_NpcPool2 = AreaFlag(9), + AF_OMO07_NpcPool3 = AreaFlag(10), + AF_OMO09_StartBlock_DontBlink = AreaFlag(11), + AF_OMO09_Block1_DontBlink = AreaFlag(12), + AF_OMO09_Block2_DontBlink = AreaFlag(13), + AF_OMO09_Block3_DontBlink = AreaFlag(14), + AF_OMO07_DoorOpening = AreaFlag(15), + AF_OMO_10 = AreaFlag(16), + AF_OMO_11 = AreaFlag(17), }; extern MapSettings omo_01_settings; diff --git a/src/world/area_omo/omo_01/D9AEF0.c b/src/world/area_omo/omo_01/D9AEF0.c deleted file mode 100644 index bd47ce6126..0000000000 --- a/src/world/area_omo/omo_01/D9AEF0.c +++ /dev/null @@ -1,52 +0,0 @@ -#include "omo_01.h" -#include "model.h" - -extern s32 D_802412A0_D9C190[]; - -ApiStatus func_80240000_D9AEF0(Evt* script, s32 isInitialCall) { - Matrix4f sp18, sp58; - UnkOmo* it; - Model* model; - f32 temp_f20; - f32 temp_f24; - u32 i; - - if (isInitialCall) { - it = heap_malloc(sizeof(*it) * 2); - script->functionTempPtr[0] = it; - - for (i = 0; i < 2; i++, it++) { - s32 treeIndex = D_802412A0_D9C190[i]; - - it->treeIndex = treeIndex; - model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); - it->unk_00 = model->center.x; - it->unk_04 = model->center.z; - it->unk_0C = 3.5f; - it->unk_10 = 0; - it->unk_08 = 0; - } - } - - it = script->functionTempPtr[0]; - for (i = 0; i < 2; i++, it++) { - it->unk_10 += it->unk_0C; - it->unk_10 = clamp_angle(it->unk_10); - temp_f20 = sin_deg(it->unk_10) * 20.0f; - temp_f24 = SQ(temp_f20) / 90.0f; - if (i == 0) { - if ((it->unk_08 >= 0.0f && temp_f20 < 0.0f) || (it->unk_08 < 0.0f && temp_f20 >= 0.0f)) { - sfx_play_sound_at_position(SOUND_CREAKY_ROCKING_CHAIR, 0, -185.0f, 0.0f, 160.0f); - } - it->unk_08 = temp_f20; - } - model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex)); - model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; - guTranslateF(sp18, -it->unk_00, 0.0f, -it->unk_04); - guRotateF(sp58, temp_f20, 0.0f, 0.0f, 1.0f); - guMtxCatF(sp18, sp58, model->transformMatrix); - guTranslateF(sp18, it->unk_00, temp_f24, it->unk_04); - guMtxCatF(model->transformMatrix, sp18, model->transformMatrix); - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_omo/omo_01/D9B150.c b/src/world/area_omo/omo_01/D9B150.c deleted file mode 100644 index af27794ba0..0000000000 --- a/src/world/area_omo/omo_01/D9B150.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "omo_01.h" -#include "common.h" -#include "npc.h" - -static char* N(exit_str_0) = "omo_13"; - -// TODO rename UnkFloAI since it's not exclusive to flo -#include "world/common/enemy/ai/UnkFloAI.inc.c" diff --git a/src/world/area_omo/omo_01/omo_01.h b/src/world/area_omo/omo_01/omo_01.h index 80188e8457..066422dcf6 100644 --- a/src/world/area_omo/omo_01/omo_01.h +++ b/src/world/area_omo/omo_01/omo_01.h @@ -2,8 +2,25 @@ /// @brief Shy Guy's Toybox - BLU Large Playroom #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_01_shape.h" +#include "mapfs/omo_01_hit.h" + +enum { + NPC_ShyGuy_01 = 0, + NPC_ShyGuy_02 = 1, + NPC_ShyGuy_03 = 2, + NPC_ShyGuy_04 = 3, + NPC_ShyGuy_05 = 4, +}; + #define NAMESPACE omo_01 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGizmos); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_01/omo_01_0_header.c b/src/world/area_omo/omo_01/omo_01_0_header.c new file mode 100644 index 0000000000..fb9f72bd99 --- /dev/null +++ b/src/world/area_omo/omo_01/omo_01_0_header.c @@ -0,0 +1,13 @@ +#include "omo_01.h" + +EntryList N(Entrances) = { + [omo_01_ENTRY_0] { 350.0, 0.0, -330.0, 225.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_01 }, +}; diff --git a/src/world/area_omo/omo_01/omo_01_1_music.c b/src/world/area_omo/omo_01/omo_01_1_music.c new file mode 100644 index 0000000000..ed917e8bf8 --- /dev/null +++ b/src/world/area_omo/omo_01/omo_01_1_music.c @@ -0,0 +1,7 @@ +#include "omo_01.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_01/omo_01_2_main.c b/src/world/area_omo/omo_01/omo_01_2_main.c new file mode 100644 index 0000000000..5f97ee4e84 --- /dev/null +++ b/src/world/area_omo/omo_01/omo_01_2_main.c @@ -0,0 +1,27 @@ +#include "omo_01.h" + +EvtScript N(EVS_ExitWalk_omo_13_0) = EVT_EXIT_WALK(60, omo_01_ENTRY_0, "omo_13", omo_13_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_13_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_SET(GF_MAP_ShyGuysToybox, TRUE) + EVT_SET(GF_OMO01_Visited, TRUE) + EVT_SET(GF_MAC01_CalculatorStolen, TRUE) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupGizmos)) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_01/omo_01_3_gizmos.c b/src/world/area_omo/omo_01/omo_01_3_gizmos.c new file mode 100644 index 0000000000..bc2e1a6a18 --- /dev/null +++ b/src/world/area_omo/omo_01/omo_01_3_gizmos.c @@ -0,0 +1,88 @@ +#include "omo_01.h" +#include "model.h" + +EvtScript N(EVS_Gizmos_Wheels) = { + EVT_LOOP(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_ha1, LVar0, 1, 0, 1) + EVT_CALL(RotateModel, MODEL_ha2, LVar0, 1, 0, 1) + EVT_CALL(RotateModel, MODEL_ha3, LVar0, 1, 0, 1) + EVT_CALL(RotateModel, MODEL_ha4, LVar0, 1, 0, 1) + 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_Gizmos_Shutters) = { + EVT_LOOP(0) + EVT_CALL(MakeLerp, 0, 160, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m4_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m4_2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 160, 0, 60, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m4_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m4_2, LVar0, 0, 1, 0) + EVT_WAIT(2) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Clocks) = { + EVT_LOOP(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_hari1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_hari2, LVar0, 1, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +s32 N(RockingHorseModels)[] = { + MODEL_o353, + MODEL_o355, +}; + +#define ROCKING_SOUND_LOCATION -185.0f, 0.0f, 160.0f +#define ROCKING_USE_SIN_DEG 1 +#import "../common/RockingHorse.inc.c" + +EvtScript N(EVS_SetupGizmos) = { + EVT_EXEC(N(EVS_Gizmos_Wheels)) + EVT_EXEC(N(EVS_Gizmos_Shutters)) + EVT_EXEC(N(EVS_Gizmos_Clocks)) + EVT_EXEC(N(EVS_Gizmos_RockingHorses)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_01/omo_01_4_npc.c b/src/world/area_omo/omo_01/omo_01_4_npc.c new file mode 100644 index 0000000000..7b0c0d327f --- /dev/null +++ b/src/world/area_omo/omo_01/omo_01_4_npc.c @@ -0,0 +1,251 @@ +#include "omo_01.h" + +#include "world/common/enemy/complete/ShyGuy_AvoidPlayer.inc.c" + +EvtScript N(EVS_ShyGuy_CarryItem) = { + EVT_SET(LVarA, LVar0) // npcID + EVT_SET(LVarB, LVar1) // itemID + EVT_SET(LVarD, LVar2) // item type + EVT_SET(LVarE, LVar3) // pickup flag + EVT_CALL(SetNpcVar, LVarA, 10, 0) + EVT_CALL(GetNpcPos, LVarA, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 26) + EVT_CALL(MakeItemEntity, LVarB, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(LVar9, LVar0) + EVT_WAIT(1) + EVT_LABEL(10) + EVT_CALL(GetNpcPos, LVarA, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 26) + EVT_SUB(LVar4, 1) + EVT_CALL(SetItemPos, LVar9, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, LVarA, 10, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(RemoveItemEntity, LVar9) + EVT_SWITCH(LVarD) + EVT_CASE_EQ(ITEM_TYPE_CONSUMABLE) + EVT_CALL(MakeItemEntity, LVarB, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS, LVarE) + EVT_CASE_EQ(ITEM_TYPE_KEY) + EVT_CALL(DropItemEntity, LVarB, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, LVarE) + EVT_CASE_EQ(ITEM_TYPE_BADGE) + EVT_CALL(DropItemEntity, LVarB, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_FALL, LVarE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_ShyGuy) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_OMO09_Defeated_CalculatorThief, TRUE) + EVT_CALL(SetSelfVar, 10, 1) + EVT_WAIT(2) + 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_FLAG_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_CALL(SetSelfVar, 10, 1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShyGuy) = { + EVT_IF_EQ(GF_OMO09_Defeated_CalculatorThief, TRUE) + EVT_IF_EQ(GF_OMO01_Item_Calculator, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_END_IF + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_ShyGuy))) + EVT_SET(LVar0, NPC_ShyGuy_01) + EVT_IF_EQ(GF_OMO01_Item_Calculator, FALSE) + EVT_SET(LVar1, ITEM_CALCULATOR) + EVT_SET(LVar2, ITEM_TYPE_KEY) + EVT_SET_CONST(LVar3, GF_OMO01_Item_Calculator) + EVT_ELSE + EVT_SET(LVar1, ITEM_MAPLE_SYRUP) + EVT_SET(LVar2, ITEM_TYPE_CONSUMABLE) + EVT_SET(LVar3, 0) + EVT_END_IF + EVT_EXEC(N(EVS_ShyGuy_CarryItem)) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy_01) = { + .id = NPC_ShyGuy_01, + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .pos = { -165.0f, 0.0f, -50.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = SHY_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -165, 0, -50 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -165, 0, -50 }, + .detectSize = { 300 }, + } + }, + .animations = RED_AVOID_SHY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +EvtScript N(EVS_NpcInit_ShyGuy_02) = { + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_ShyGuy))) + EVT_SET(LVar0, NPC_ShyGuy_02) + EVT_SET(LVar1, ITEM_CAKE_MIX) + EVT_SET(LVar2, ITEM_TYPE_CONSUMABLE) + EVT_SET(LVar3, 0) + EVT_EXEC(N(EVS_ShyGuy_CarryItem)) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy_02) = { + .id = NPC_ShyGuy_02, + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .pos = { -25.0f, 0.0f, -160.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_02), + .drops = SHY_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -25, 0, -160 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -25, 0, -160 }, + .detectSize = { 300 }, + } + }, + .animations = YELLOW_AVOID_SHY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +EvtScript N(EVS_NpcInit_ShyGuy_03) = { + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_ShyGuy))) + EVT_SET(LVar0, NPC_ShyGuy_03) + EVT_SET(LVar1, ITEM_CAKE_MIX) + EVT_SET(LVar2, ITEM_TYPE_CONSUMABLE) + EVT_SET(LVar3, 0) + EVT_EXEC(N(EVS_ShyGuy_CarryItem)) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy_03) = { + .id = NPC_ShyGuy_03, + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .pos = { -60.0f, 0.0f, 390.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_03), + .drops = SHY_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -60, 0, 390 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -60, 0, 390 }, + .detectSize = { 300 }, + } + }, + .animations = YELLOW_AVOID_SHY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +EvtScript N(EVS_NpcInit_ShyGuy_04) = { + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_ShyGuy))) + EVT_SET(LVar0, NPC_ShyGuy_04) + EVT_SET(LVar1, ITEM_MUSHROOM) + EVT_SET(LVar2, ITEM_TYPE_CONSUMABLE) + EVT_SET(LVar3, 0) + EVT_EXEC(N(EVS_ShyGuy_CarryItem)) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy_04) = { + .id = NPC_ShyGuy_04, + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .pos = { 50.0f, 0.0f, 230.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_04), + .drops = SHY_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 50, 0, 230 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 50, 0, 230 }, + .detectSize = { 300 }, + } + }, + .animations = BLUE_AVOID_SHY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +EvtScript N(EVS_NpcInit_ShyGuy_05) = { + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_ShyGuy))) + EVT_SET(LVar0, NPC_ShyGuy_05) + EVT_SET(LVar1, ITEM_FIRE_FLOWER) + EVT_SET(LVar2, ITEM_TYPE_CONSUMABLE) + EVT_SET(LVar3, 0) + EVT_EXEC(N(EVS_ShyGuy_CarryItem)) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy_05) = { + .id = NPC_ShyGuy_05, + .settings = &N(NpcSettings_ShyGuy_AvoidPlayer), + .pos = { 340.0f, 0.0f, 120.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_05), + .drops = SHY_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 340, 0, 120 }, + .wanderSize = { 40 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 340, 0, 120 }, + .detectSize = { 300 }, + } + }, + .animations = GREEN_AVOID_SHY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_ShyGuy_01), BTL_OMO_FORMATION_00, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_ShyGuy_02), BTL_OMO_FORMATION_02, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_ShyGuy_03), BTL_OMO_FORMATION_02, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_ShyGuy_04), BTL_OMO_FORMATION_01, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_ShyGuy_05), BTL_OMO_FORMATION_05, BTL_OMO_STAGE_00), + {} +}; diff --git a/src/world/area_omo/omo_01/omo_01_5_entity.c b/src/world/area_omo/omo_01/omo_01_5_entity.c new file mode 100644 index 0000000000..18e543e242 --- /dev/null +++ b/src/world/area_omo/omo_01/omo_01_5_entity.c @@ -0,0 +1,16 @@ +#include "omo_01.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_OMO09_Defeated_CalculatorThief, TRUE) + EVT_IF_EQ(GF_OMO01_Item_Calculator, FALSE) + EVT_CALL(MakeItemEntity, ITEM_CALCULATOR, -93, 0, 35, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO01_Item_Calculator) + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -80, 60, -235, 0, ITEM_MYSTERY, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO01_HiddenItem_Mystery) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -30, 60, -235, 0, ITEM_FRIGHT_JAR, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO01_HiddenItem_FrightJar) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_02/D9D4D0.c b/src/world/area_omo/omo_02/D9D4D0.c deleted file mode 100644 index f66e908b21..0000000000 --- a/src/world/area_omo/omo_02/D9D4D0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "omo_02.h" - -static char* N(exit_str_0) = "omo_10"; -static char* N(exit_str_1) = "omo_14"; - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -#include "world/common/todo/SetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c deleted file mode 100644 index ab2729c529..0000000000 --- a/src/world/area_omo/omo_02/D9D510.c +++ /dev/null @@ -1,220 +0,0 @@ -#include "omo_02.h" -#include "model.h" - -extern s32 D_802434F8_DA09C8[2]; // TODO: remove hard-coded size once the data is migrated -extern s32 D_80243580_DA0A50[12]; // TODO: remove hard-coded size once the data is migrated -extern s32 D_802435B0_DA0A80[]; - -ApiStatus func_80240040_D9D510(Evt* script, s32 isInitialCall) { - Matrix4f sp18, sp58; - UnkOmo* it; - Model* model; - f32 temp_f20; - f32 temp_f24; - u32 i; - - if (isInitialCall) { - it = heap_malloc(sizeof(*it) * 2); - script->functionTempPtr[0] = it; - - for (i = 0; i < ARRAY_COUNT(D_802434F8_DA09C8); i++, it++) { - s32 treeIndex = D_802434F8_DA09C8[i]; - - it->treeIndex = treeIndex; - model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); - it->unk_00 = model->center.x; - it->unk_04 = model->center.z; - it->unk_0C = 3.5f; - it->unk_10 = 0; - it->unk_08 = 0; - } - } - - it = script->functionTempPtr[0]; - for (i = 0; i < ARRAY_COUNT(D_802434F8_DA09C8); i++, it++) { - it->unk_10 += it->unk_0C; - it->unk_10 = clamp_angle(it->unk_10); - temp_f20 = sin_rad((it->unk_10 * 3.14f) / 180.0f) * 20.0f; - temp_f24 = SQ(temp_f20) / 90.0f; - if (i == 0) { - if ((it->unk_08 >= 0.0f && temp_f20 < 0.0f) || (it->unk_08 < 0.0f && temp_f20 >= 0.0f)) { - sfx_play_sound_at_position(SOUND_CREAKY_ROCKING_CHAIR, 0, -706.0f, 0.0f, 102.0f); - } - it->unk_08 = temp_f20; - } - model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex)); - model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; - guTranslateF(sp18, -it->unk_00, 0.0f, -it->unk_04); - guRotateF(sp58, temp_f20, 0.0f, 0.0f, 1.0f); - guMtxCatF(sp18, sp58, model->transformMatrix); - guTranslateF(sp18, it->unk_00, temp_f24, it->unk_04); - guMtxCatF(model->transformMatrix, sp18, model->transformMatrix); - } - return ApiStatus_BLOCK; -} - -void func_802402C0_D9D790(Gfx* displayList, s32* outDist) { - char pad[0x8]; - Gfx* dlist = displayList; - u8 cmd; - - do { - u32 temp_s2 = dlist->words.w0; - u32 temp_s3 = dlist->words.w1; - - cmd = temp_s2 >> 0x18; - if (cmd == G_DL) { - func_802402C0_D9D790((Gfx*) temp_s3, outDist); - } - if (cmd == G_VTX) { - s32 numVertices = (temp_s2 >> 0xC) & 0xFF; - Vtx* vtx = (Vtx*) temp_s3; - f32 subX, subY, subZ; - s32 i; - - subX = subY = subZ = 0.0f; - - *outDist = -1; - - for (i = 0; i < numVertices; i++) { - f32 x = vtx[i].v.ob[0] - subX; - f32 y = vtx[i].v.ob[1] - subY; - f32 z = vtx[i].v.ob[2] - subZ; - f32 dist = sqrtf(SQ(x) + SQ(y) + SQ(z)); - - if (*outDist < dist) { - *outDist = dist; - } - } - } - dlist++; - } while (cmd != G_ENDDL); -} - -typedef struct UnkOmoThing { - /* 0x00 */ s32 unk_00; - /* 0x04 */ Vec3f center; - /* 0x10 */ Vec3f unk_10; - /* 0x1C */ Vec3f rot; - /* 0x28 */ Vec3f unk_28; - /* 0x34 */ f32 unk_34; - /* 0x38 */ f32 unk_38; - /* 0x3C */ f32 unk_3C; - /* 0x40 */ s32 treeIndex; - /* 0x44 */ s32 colliderID; - /* 0x48 */ Matrix4f transformMatrix; - /* 0x88 */ s32 unk_88; -} UnkOmoThing; // size = 0x8C - -ApiStatus func_8024043C_D9D90C(Evt* script, s32 isInitialCall) { - Matrix4f sp18, sp58, sp98, spD8; - Model* model; - UnkOmoThing* data; - UnkOmoThing* it; - u32 i; - s32 j, k; - - if (isInitialCall) { - script->functionTempPtr[0] = heap_malloc(sizeof(*data) * 12); - script->functionTemp[1] = 0; - - it = (UnkOmoThing*) script->functionTempPtr[0]; - for (i = 0; i < ARRAY_COUNT(D_80243580_DA0A50); i++, it++) { - it->treeIndex = D_80243580_DA0A50[i]; - it->colliderID = D_802435B0_DA0A80[i]; - model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex)); - it->unk_00 = 0; - it->center.x = model->center.x; - it->center.y = model->center.y; - it->center.z = model->center.z; - it->rot.x = 0.0f; - it->rot.y = 0.0f; - it->rot.z = 0.0f; - it->unk_10.x = it->center.x; - it->unk_10.y = it->center.y; - it->unk_10.z = it->center.z; - it->unk_28.x = rand_int(20) - 10; - it->unk_28.y = rand_int(20) - 10; - it->unk_28.z = rand_int(20) - 10; - it->unk_34 = (rand_int(40) + 100.0f) / 10.0f; - it->unk_38 = (rand_int(30) + 60.0f) / 10.0f; - it->unk_3C = ((rand_int(100) % 2) * 180.0f) + 90.0f; - func_802402C0_D9D790(model->modelNode->displayData->displayList, &it->unk_88); - - for (j = 0; j < 4; j++) { - for (k = 0; k < 4; k++) { - it->transformMatrix[j][k] = model->transformMatrix[j][k]; - } - } - } - } - - it = script->functionTempPtr[0]; - for (i = 0; i < ARRAY_COUNT(D_80243580_DA0A50); i++, it++) { - model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex)); - if (it->unk_00 != 100) { - if (it->unk_00 < 101) { - if (it->unk_00 == 0) { - add_vec2D_polar(&it->center.x, &it->center.z, it->unk_38, it->unk_3C); - it->unk_34 -= 0.8f; - it->center.y += it->unk_34; - if (it->unk_34 <= 0.0f && it->center.y < it->unk_88) { - it->center.y = it->unk_88; - it->unk_34 *= -0.7f; - if (it->unk_34 < 1.0f) { - it->unk_00 = 100; - it->unk_28.x = 0.0f; - it->unk_28.y = 0.0f; - it->unk_28.z = 0.0f; - } - if (i & 1) { - exec_ShakeCam1(0, 0, 1); - } - } - } - } - } else { - update_collider_transform(it->colliderID); - script->functionTemp[1]++; - it->unk_00 = 101; - } - - for (j = 0; j < 4; j++) { - for (k = 0; k < 4; k++) { - model->transformMatrix[j][k] = it->transformMatrix[j][k]; - } - } - - model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; - guTranslateF(sp18, it->center.x - it->unk_10.x, it->center.y - it->unk_10.y, it->center.z - it->unk_10.z); - it->rot.x += it->unk_28.x; - it->rot.y += it->unk_28.y; - it->rot.z += it->unk_28.z; - it->rot.x = clamp_angle(it->rot.x); - it->rot.y = clamp_angle(it->rot.y); - it->rot.z = clamp_angle(it->rot.z); - guRotateF(sp58, it->rot.x, 1.0f, 0.0f, 0.0f); - guRotateF(sp98, it->rot.y, 0.0f, 1.0f, 0.0f); - guRotateF(spD8, it->rot.z, 0.0f, 0.0f, 1.0f); - guMtxCatF(spD8, sp58, sp58); - guMtxCatF(sp58, sp98, sp98); - guMtxCatF(sp98, sp18, sp18); - guMtxCatF(model->transformMatrix, sp18, model->transformMatrix); - } - - if ((u32) script->functionTemp[1] >= ARRAY_COUNT(D_80243580_DA0A50)) { - heap_free(script->functionTempPtr[0]); - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} - -#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" - -#include "world/common/enemy/ai/StationaryAI.inc.c" - -#include "world/common/enemy/ai/RangedAttackAI.inc.c" - -#include "world/common/todo/SetInstigatorValue_3.inc.c" - -#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_omo/omo_02/omo_02.h b/src/world/area_omo/omo_02/omo_02.h index a16dd03aaf..c7d8f80163 100644 --- a/src/world/area_omo/omo_02/omo_02.h +++ b/src/world/area_omo/omo_02/omo_02.h @@ -2,8 +2,54 @@ /// @brief Shy Guy's Toybox - RED Boss Barricade #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_02_shape.h" +#include "mapfs/omo_02_hit.h" + +#include "sprite/npc/ShyGuy.h" +#include "sprite/npc/SpyGuy.h" + +enum { + NPC_ShyGuy_01 = 0, + NPC_ShyGuy_02 = 1, + NPC_ShyGuy_03 = 2, + NPC_ShyGuy_04 = 3, + NPC_ShyGuy_05 = 4, + NPC_ShyGuy_06 = 5, + NPC_ShyGuy_07 = 6, + NPC_ShyGuy_08 = 7, + NPC_ShyGuy_09 = 8, + NPC_ShyGuy_10 = 9, + NPC_ShyGuy_11 = 10, + NPC_SpyGuy = 50, + NPC_SpyGuy_Rock1 = 51, + NPC_SpyGuy_Rock2 = 52, + NPC_SpyGuy_Rock3 = 53, + NPC_SpyGuy_Rock4 = 54, +}; + +enum { + MV_RestrictCamScript = MapVar(10), +}; + +enum { + CROWD_STATE_INIT = 0, + CROWD_STATE_RANDOM_LOOK = 1, + CROWD_STATE_RANDOM_JUMP = 2, + CROWD_STATE_RANDOM_DELAY = 10, + CROWD_STATE_TURN_AROUND = 11, + CROWD_STATE_RUN_AWAY = 20, + CROWD_STATE_DISPOSE = 21, +}; + #define NAMESPACE omo_02 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGizmos); +extern EvtScript N(EVS_SetupBarricade); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_02/omo_02_0_header.c b/src/world/area_omo/omo_02/omo_02_0_header.c new file mode 100644 index 0000000000..63a3b51b3e --- /dev/null +++ b/src/world/area_omo/omo_02/omo_02_0_header.c @@ -0,0 +1,14 @@ +#include "omo_02.h" + +EntryList N(Entrances) = { + [omo_02_ENTRY_0] { -970.0, 0.0, 0.0, 90.0 }, + [omo_02_ENTRY_1] { 360.0, 0.0, 20.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_02 }, +}; diff --git a/src/world/area_omo/omo_02/omo_02_1_music.c b/src/world/area_omo/omo_02/omo_02_1_music.c new file mode 100644 index 0000000000..a250912706 --- /dev/null +++ b/src/world/area_omo/omo_02/omo_02_1_music.c @@ -0,0 +1,7 @@ +#include "omo_02.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_02/omo_02_2_main.c b/src/world/area_omo/omo_02/omo_02_2_main.c new file mode 100644 index 0000000000..8a2ce5600f --- /dev/null +++ b/src/world/area_omo/omo_02/omo_02_2_main.c @@ -0,0 +1,27 @@ +#include "omo_02.h" + +EvtScript N(EVS_ExitWalk_omo_10_1) = EVT_EXIT_WALK(60, omo_02_ENTRY_0, "omo_10", omo_10_ENTRY_1); +EvtScript N(EVS_ExitWalk_omo_14_0) = EVT_EXIT_WALK(60, omo_02_ENTRY_1, "omo_14", omo_14_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_10_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_14_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupGizmos)) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupBarricade)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_02/omo_02_3_entity.c b/src/world/area_omo/omo_02/omo_02_3_entity.c new file mode 100644 index 0000000000..0f2282dbc5 --- /dev/null +++ b/src/world/area_omo/omo_02/omo_02_3_entity.c @@ -0,0 +1,53 @@ +#include "omo_02.h" +#include "entity.h" + +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" +#include "world/common/todo/SetCamera0MoveFlag1.inc.c" + +EvtScript N(EVS_TetherCamToPlayer) = { + 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_StarBoxLaunch_Impl) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_LOOP(4) + EVT_ADD(LVar1, 10) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) + EVT_CALL(PlayerJump, -290, 85, -78, 40) + EVT_KILL_THREAD(LVarA) + EVT_CALL(N(SetCamera0MoveFlag1)) + EVT_WAIT(3) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(N(SetCamera0MoveFlag1)) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 300, 60, -100, 0, ITEM_SLEEPY_SHEEP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO02_ItemBlock_SleepySheep) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -200, 60, -78, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO02_HiddenItem_Coin) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -80, 89, -78, 0, MAKE_ENTITY_END) + EVT_CALL(MakeItemEntity, ITEM_SHOOTING_STAR, -80, 114, -78, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_OMO02_Item_ShootingStar) + EVT_CALL(MakeEntity, EVT_PTR(Entity_StarBoxLauncher), -358, 0, -82, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_StarBoxLaunch_Impl))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_02/omo_02_4_gizmos.c b/src/world/area_omo/omo_02/omo_02_4_gizmos.c new file mode 100644 index 0000000000..a6735ee3ac --- /dev/null +++ b/src/world/area_omo/omo_02/omo_02_4_gizmos.c @@ -0,0 +1,90 @@ +#include "omo_02.h" + +EvtScript N(EVS_Gizmos_Wheels) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_ha1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha2, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha3, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha4, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha5, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha6, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha7, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Shutters) = { + EVT_LABEL(0) + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 160, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m3_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m3_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m4_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m4_2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 160, 0, 60, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m3_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m3_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m4_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m4_2, LVar0, 0, 1, 0) + EVT_WAIT(2) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Empty1) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Empty2) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Unused) = { + EVT_RETURN + EVT_END +}; + +s32 N(RockingHorseModels)[] = { + MODEL_o568, + MODEL_o569, +}; + +#define ROCKING_SOUND_LOCATION -706.0f, 0.0f, 102.0f +#import "../common/RockingHorse.inc.c" + +EvtScript N(EVS_SetupGizmos) = { + EVT_EXEC(N(EVS_Gizmos_Wheels)) + EVT_EXEC(N(EVS_Gizmos_Shutters)) + EVT_EXEC(N(EVS_Gizmos_Empty1)) + EVT_EXEC(N(EVS_Gizmos_Empty2)) + EVT_EXEC(N(EVS_Gizmos_RockingHorses)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_02/omo_02_5_barricade.c b/src/world/area_omo/omo_02/omo_02_5_barricade.c new file mode 100644 index 0000000000..783c600339 --- /dev/null +++ b/src/world/area_omo/omo_02/omo_02_5_barricade.c @@ -0,0 +1,463 @@ +#include "omo_02.h" +#include "model.h" +#include "effects.h" + +s32 N(BarricadeModels)[] = { + MODEL_t2, MODEL_t3, MODEL_t4, MODEL_t5, + MODEL_t2_2, MODEL_t2_3, MODEL_t2_4, MODEL_t2_5, + MODEL_t3_1, MODEL_t3_3, MODEL_t3_4, MODEL_t3_5, +}; + +s32 N(BarricadeColliders)[] = { + COLLIDER_t2, COLLIDER_t3, COLLIDER_t4, COLLIDER_t5, + COLLIDER_t2_2, COLLIDER_t2_3, COLLIDER_t2_4, COLLIDER_t2_5, + COLLIDER_t3_1, COLLIDER_t3_3, COLLIDER_t3_4, COLLIDER_t3_5, +}; + +typedef struct BarricadePart { + /* 0x00 */ s32 state; + /* 0x04 */ Vec3f pos; + /* 0x10 */ Vec3f origin; + /* 0x1C */ Vec3f rot; + /* 0x28 */ Vec3f angularVelocity; + /* 0x34 */ f32 verticalVelocity; + /* 0x38 */ f32 planarVelocity; + /* 0x3C */ f32 velocityAngle; + /* 0x40 */ s32 modelID; + /* 0x44 */ s32 colliderID; + /* 0x48 */ Matrix4f transformMatrix; + /* 0x88 */ s32 radius; +} BarricadePart; // size = 0x8C + +enum { + BARRICADE_STATE_FLYING = 0, + BARRICADE_STATE_CLEANUP = 100, + BARRICADE_STATE_DONE = 101, +}; + +// iterate through the display list, checking each vertex's distance from (0,0,0) and return the minimum distance +// this creates a spherical collision volume for the flying debris +void N(DetermineSphericalSize)(Gfx* displayList, s32* outDist) { + char pad[0x8]; + Gfx* dlist = displayList; + u8 cmd; + + do { + u32 w0 = dlist->words.w0; + u32 w1 = dlist->words.w1; + + cmd = w0 >> 0x18; + if (cmd == G_DL) { + N(DetermineSphericalSize)((Gfx*) w1, outDist); + } + if (cmd == G_VTX) { + s32 numVertices = (w0 >> 0xC) & 0xFF; + Vtx* vtx = (Vtx*) w1; + f32 subX, subY, subZ; + s32 i; + + subX = subY = subZ = 0.0f; + + *outDist = -1; + + for (i = 0; i < numVertices; i++) { + f32 dx = vtx[i].v.ob[0] - subX; + f32 dy = vtx[i].v.ob[1] - subY; + f32 dz = vtx[i].v.ob[2] - subZ; + f32 dist = sqrtf(SQ(dx) + SQ(dy) + SQ(dz)); + + if (*outDist < dist) { + *outDist = dist; + } + } + } + dlist++; + } while (cmd != G_ENDDL); +} + +API_CALLABLE(N(AnimateBarricadeParts)) { + Matrix4f mtxTransform, mtxRotX, mtxRotY, mtxRotZ; + BarricadePart* part; + Model* model; + u32 i; + s32 j, k; + + if (isInitialCall) { + script->functionTempPtr[0] = heap_malloc(sizeof(*part) * ARRAY_COUNT(N(BarricadeModels))); + script->functionTemp[1] = 0; + + part = (BarricadePart*) script->functionTempPtr[0]; + for (i = 0; i < ARRAY_COUNT(N(BarricadeModels)); i++, part++) { + part->modelID = N(BarricadeModels)[i]; + part->colliderID = N(BarricadeColliders)[i]; + model = get_model_from_list_index(get_model_list_index_from_tree_index(part->modelID)); + part->state = BARRICADE_STATE_FLYING; + part->pos.x = model->center.x; + part->pos.y = model->center.y; + part->pos.z = model->center.z; + part->rot.x = 0.0f; + part->rot.y = 0.0f; + part->rot.z = 0.0f; + part->origin.x = part->pos.x; + part->origin.y = part->pos.y; + part->origin.z = part->pos.z; + part->angularVelocity.x = rand_int(20) - 10; + part->angularVelocity.y = rand_int(20) - 10; + part->angularVelocity.z = rand_int(20) - 10; + part->verticalVelocity = (rand_int(40) + 100.0f) / 10.0f; + part->planarVelocity = (rand_int(30) + 60.0f) / 10.0f; + part->velocityAngle = ((rand_int(100) % 2) * 180.0f) + 90.0f; + N(DetermineSphericalSize)(model->modelNode->displayData->displayList, &part->radius); + + for (j = 0; j < 4; j++) { + for (k = 0; k < 4; k++) { + part->transformMatrix[j][k] = model->transformMatrix[j][k]; + } + } + } + } + + part = script->functionTempPtr[0]; + for (i = 0; i < ARRAY_COUNT(N(BarricadeModels)); i++, part++) { + model = get_model_from_list_index(get_model_list_index_from_tree_index(part->modelID)); + switch (part->state) { + case BARRICADE_STATE_FLYING: + add_vec2D_polar(&part->pos.x, &part->pos.z, part->planarVelocity, part->velocityAngle); + part->verticalVelocity -= 0.8f; + part->pos.y += part->verticalVelocity; + if (part->verticalVelocity <= 0.0f && part->pos.y < part->radius) { + part->pos.y = part->radius; + part->verticalVelocity *= -0.7f; + if (part->verticalVelocity < 1.0f) { + part->state = BARRICADE_STATE_CLEANUP; + part->angularVelocity.x = 0.0f; + part->angularVelocity.y = 0.0f; + part->angularVelocity.z = 0.0f; + } + if (i & 1) { + exec_ShakeCam1(0, 0, 1); + } + } + break; + case BARRICADE_STATE_CLEANUP: + update_collider_transform(part->colliderID); + script->functionTemp[1]++; + part->state = BARRICADE_STATE_DONE; + break; + case BARRICADE_STATE_DONE: + break; + } + + for (j = 0; j < 4; j++) { + for (k = 0; k < 4; k++) { + model->transformMatrix[j][k] = part->transformMatrix[j][k]; + } + } + + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; + guTranslateF(mtxTransform, part->pos.x - part->origin.x, part->pos.y - part->origin.y, part->pos.z - part->origin.z); + part->rot.x += part->angularVelocity.x; + part->rot.y += part->angularVelocity.y; + part->rot.z += part->angularVelocity.z; + part->rot.x = clamp_angle(part->rot.x); + part->rot.y = clamp_angle(part->rot.y); + part->rot.z = clamp_angle(part->rot.z); + guRotateF(mtxRotX, part->rot.x, 1.0f, 0.0f, 0.0f); + guRotateF(mtxRotY, part->rot.y, 0.0f, 1.0f, 0.0f); + guRotateF(mtxRotZ, part->rot.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxRotZ, mtxRotX, mtxRotX); + guMtxCatF(mtxRotX, mtxRotY, mtxRotY); + guMtxCatF(mtxRotY, mtxTransform, mtxTransform); + guMtxCatF(model->transformMatrix, mtxTransform, model->transformMatrix); + } + + if ((u32) script->functionTemp[1] >= ARRAY_COUNT(N(BarricadeModels))) { + heap_free(script->functionTempPtr[0]); + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +BombTrigger N(BombPos_Barricade) = { + .pos = { -520.0f, 0.0f, 0.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_Scene_BreakBarricade) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(EnableGroup, MODEL_hibi, FALSE) + EVT_THREAD + EVT_CALL(N(AnimateBarricadeParts)) + EVT_LOOP(10) + EVT_USE_BUF(EVT_PTR(N(BarricadeModels))) + EVT_LOOP(ARRAY_COUNT(N(BarricadeModels))) + EVT_BUF_READ1(LVar0) + EVT_CALL(EnableModel, LVar0, TRUE) + EVT_END_LOOP + EVT_WAIT(2) + EVT_USE_BUF(EVT_PTR(N(BarricadeModels))) + EVT_LOOP(ARRAY_COUNT(N(BarricadeModels))) + EVT_BUF_READ1(LVar0) + EVT_CALL(EnableModel, LVar0, FALSE) + EVT_END_LOOP + EVT_WAIT(2) + EVT_END_LOOP + EVT_USE_BUF(EVT_PTR(N(BarricadeColliders))) + EVT_LOOP(ARRAY_COUNT(N(BarricadeColliders))) + EVT_BUF_READ1(LVar0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar0, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(30) + EVT_KILL_THREAD(MV_RestrictCamScript) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(1) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -380, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -380, 0, 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_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t1, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -10, 7, 40, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t1, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 7, -90, 30, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t1, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtModel, MODEL_t1, SOUND_1F4, 0) + EVT_CALL(GetModelCenter, MODEL_t1) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t2_1, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t2_1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -10, 7, 40, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t2_1, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t2_1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 7, -90, 30, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t2_1, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t2_1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtModel, MODEL_t2_1, SOUND_1F4, 0) + EVT_CALL(GetModelCenter, MODEL_t2_1) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_SET(LVar0, 1) + EVT_LOOP(10) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcJumpscale, LVar0, EVT_FLOAT(1.5)) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_IF_EQ(LVar2, 0) + EVT_CALL(NpcJump0, LVar0, LVar1, 0, LVar3, 20) + EVT_END_IF + EVT_END_THREAD + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_CALL(MakeLerp, 0, -10, 20, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t3_2, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t3_2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -10, 7, 40, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t3_2, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t3_2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 7, -90, 30, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_t3_2, LVar0, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t3_2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtModel, MODEL_t3_2, SOUND_1F4, 0) + EVT_CALL(GetModelCenter, MODEL_t3_2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_THREAD + EVT_WAIT(35) + EVT_CALL(PlaySound, SOUND_8000004D) + EVT_END_THREAD + EVT_SET(LVar0, 1) + EVT_SET(LVar5, 1) + EVT_LOOP(10) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, LVar0, EVT_FLOAT(1.5)) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_CALL(RandInt, 10, LVar4) + EVT_ADD(LVar4, 10) + EVT_IF_EQ(LVar2, 0) + EVT_CALL(NpcJump0, LVar0, LVar1, 0, LVar3, LVar4) + EVT_END_IF + EVT_CALL(SetNpcVar, LVar0, 0, CROWD_STATE_TURN_AROUND) + EVT_WAIT(LVar5) + EVT_CALL(SetNpcVar, LVar0, 0, CROWD_STATE_RUN_AWAY) + EVT_END_THREAD + EVT_ADD(LVar0, 1) + EVT_ADD(LVar5, 12) + EVT_END_LOOP + EVT_WAIT(60) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -125, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -125, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(165) + EVT_CALL(PlaySound, SOUND_76D) + EVT_CALL(func_802D62E4, 877) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(SetNpcPos, NPC_ShyGuy_01, -285, 0, 35) + EVT_CALL(SetNpcSpeed, NPC_ShyGuy_01, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -135, 23, 0) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -110, -13, 0) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_01, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcRotationPivot, NPC_ShyGuy_01, 10) + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, -9) + EVT_CALL(SetNpcRotation, NPC_ShyGuy_01, 0, 0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcRotation, NPC_ShyGuy_01, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim10) + EVT_END_THREAD + EVT_CALL(NpcJump0, NPC_ShyGuy_01, -45, 0, -8, 10) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_MISS_JUMP, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(50) + EVT_LOOP(2) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3E4, 0) + EVT_WAIT(7) + EVT_END_LOOP + EVT_CALL(SetNpcRotationPivot, NPC_ShyGuy_01, 0) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(NpcJump0, NPC_ShyGuy_01, -50, 0, -8, 10) + EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 270, 0) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_3A2, 0) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(SetNpcSpeed, NPC_ShyGuy_01, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, 100, 50, 0) + EVT_CALL(RemoveNpc, NPC_ShyGuy_01) + EVT_WAIT(30) + EVT_CALL(StopSound, SOUND_3A2) + 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(90.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_SET(GF_OMO02_BombedWall, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupBarricade) = { + EVT_CALL(ParentColliderToModel, COLLIDER_t1, MODEL_t1) + EVT_CALL(ParentColliderToModel, COLLIDER_t2, MODEL_t2) + EVT_CALL(ParentColliderToModel, COLLIDER_t3, MODEL_t3) + EVT_CALL(ParentColliderToModel, COLLIDER_t4, MODEL_t4) + EVT_CALL(ParentColliderToModel, COLLIDER_t5, MODEL_t5) + EVT_CALL(ParentColliderToModel, COLLIDER_t2_1, MODEL_t2_1) + EVT_CALL(ParentColliderToModel, COLLIDER_t2_2, MODEL_t2_2) + EVT_CALL(ParentColliderToModel, COLLIDER_t2_3, MODEL_t2_3) + EVT_CALL(ParentColliderToModel, COLLIDER_t2_4, MODEL_t2_4) + EVT_CALL(ParentColliderToModel, COLLIDER_t2_5, MODEL_t2_5) + EVT_CALL(ParentColliderToModel, COLLIDER_t3_1, MODEL_t3_1) + EVT_CALL(ParentColliderToModel, COLLIDER_t3_2, MODEL_t3_2) + EVT_CALL(ParentColliderToModel, COLLIDER_t3_3, MODEL_t3_3) + EVT_CALL(ParentColliderToModel, COLLIDER_t3_4, MODEL_t3_4) + EVT_CALL(ParentColliderToModel, COLLIDER_t3_5, MODEL_t3_5) + EVT_IF_EQ(GF_OMO02_BombedWall, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_BreakBarricade)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Barricade)), 1, 0) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_hibi, FALSE) + EVT_USE_BUF(EVT_PTR(N(BarricadeModels))) + EVT_LOOP(ARRAY_COUNT(N(BarricadeModels))) + EVT_BUF_READ1(LVar0) + EVT_CALL(EnableModel, LVar0, FALSE) + EVT_END_LOOP + EVT_USE_BUF(EVT_PTR(N(BarricadeColliders))) + EVT_LOOP(ARRAY_COUNT(N(BarricadeColliders))) + EVT_BUF_READ1(LVar0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar0, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_LOOP + EVT_CALL(RotateModel, MODEL_t1, -90, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(RotateModel, MODEL_t2_1, -90, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(RotateModel, MODEL_t3_2, -90, EVT_FLOAT(0.518), 0, EVT_FLOAT(1.931)) + EVT_CALL(UpdateColliderTransform, COLLIDER_t1) + EVT_CALL(UpdateColliderTransform, COLLIDER_t2_1) + EVT_CALL(UpdateColliderTransform, COLLIDER_t3_2) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_02/omo_02_6_npc.c b/src/world/area_omo/omo_02/omo_02_6_npc.c new file mode 100644 index 0000000000..c281e97911 --- /dev/null +++ b/src/world/area_omo/omo_02/omo_02_6_npc.c @@ -0,0 +1,437 @@ +#include "omo_02.h" + +#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" +#include "world/common/enemy/complete/ShyGuy_Guard.inc.c" +#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" +#include "world/common/enemy/complete/SpyGuy.inc.c" + +EvtScript N(EVS_RestrictCamFromBarricade) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(GetCamPosB, CAM_DEFAULT, LVar0, LVar1) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-600.0), LVar1) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayShyGuyRunSounds) = { + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_B0000021, 0) + EVT_WAIT(8) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { + EVT_IF_EQ(GF_OMO02_ShyGuyFledBehindWall, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(30) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -570, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -570, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_EXEC_GET_TID(N(EVS_PlayShyGuyRunSounds), LVarA) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -575, 0, 0) + EVT_KILL_THREAD(LVarA) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_GET_TID(N(EVS_RestrictCamFromBarricade), MV_RestrictCamScript) + EVT_SET(GF_OMO02_ShyGuyFledBehindWall, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_EXEC_GET_TID(N(EVS_RestrictCamFromBarricade), MV_RestrictCamScript) + EVT_CALL(SetNpcPos, NPC_SELF, -575, 0, -20) + EVT_LABEL(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -760) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShyGuy_Loner) = { + EVT_IF_EQ(GF_OMO02_BombedWall, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, -800, 0, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy_Loner))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(CrowdScriptA)[] = { + CS_MOVE(-320, 30) + CS_MOVE(-234, 23) + CS_JUMP(-172, 0, 25) + CS_MOVE(-120, 43) + CS_MOVE( -63, -16) + CS_JUMP( -24, 0, -11) + CS_MOVE( 17, 46) + CS_JUMP( 65, 0, 87) + CS_MOVE( 115, 72) + CS_JUMP( 154, 0, 33) + CS_MOVE( 194, 0) + CS_MOVE( 240, -2) + CS_END +}; + +s32 N(CrowdScriptB)[] = { + CS_MOVE(-279, 20) + CS_MOVE(-168, 30) + CS_MOVE(-106, -11) + CS_MOVE( -60, -67) + CS_MOVE( -19, -104) + CS_MOVE( 29, -72) + CS_MOVE( 76, 8) + CS_MOVE( 128, 99) + CS_MOVE( 196, 79) + CS_MOVE( 259, 14) + CS_MOVE( 309, -20) + CS_MOVE( 371, 30) + CS_END +}; + +s32 N(CrowdScriptC)[] = { + CS_MOVE(-326, 42) + CS_MOVE(-288, 69) + CS_MOVE(-256, 84) + CS_MOVE(-229, 68) + CS_MOVE(-208, 43) + CS_MOVE(-181, 21) + CS_MOVE(-155, 21) + CS_MOVE(-121, 50) + CS_MOVE(-120, 103) + CS_MOVE(-145, 111) + CS_MOVE(-168, 73) + CS_MOVE(-164, 22) + CS_MOVE(-123, -13) + CS_MOVE( -77, 0) + CS_JUMP( -30, 0, 27) + CS_MOVE( 5, 45) + CS_MOVE( 40, 41) + CS_MOVE( 87, 0) + CS_MOVE( 120, -7) + CS_MOVE( 177, 18) + CS_MOVE( 219, 46) + CS_MOVE( 260, 54) + CS_END +}; + +s32 N(CrowdScriptD)[] = { + CS_MOVE(-309, 9) + CS_MOVE(-230, 27) + CS_MOVE(-150, 16) + CS_MOVE( -97, -24) + CS_MOVE( -31, -13) + CS_MOVE( 25, 30) + CS_MOVE( 84, 27) + CS_MOVE( 133, -3) + CS_END +}; + +s32* N(CrowdFleeScripts)[] = { + N(CrowdScriptA), + N(CrowdScriptB), + N(CrowdScriptC), + N(CrowdScriptD), + N(CrowdScriptA), + N(CrowdScriptB), + N(CrowdScriptA), + N(CrowdScriptD), + N(CrowdScriptA), + N(CrowdScriptB), +}; + +EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = { + EVT_CALL(GetNpcPos, NPC_SELF, LVarA, LVarB, LVarC) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(CROWD_STATE_INIT) + EVT_CALL(RandInt, 2, LVar0) + EVT_ADD(LVar0, 1) + EVT_CALL(SetSelfVar, 0, LVar0) + EVT_CASE_EQ(CROWD_STATE_RANDOM_LOOK) + EVT_LOOP(3) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_WAIT(2) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_WAIT(2) + EVT_CALL(RandInt, 1, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_WAIT(2) + EVT_END_IF + EVT_CALL(RandInt, 10, LVar0) + EVT_ADD(LVar0, 5) + EVT_WAIT(LVar0) + EVT_END_LOOP + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, CROWD_STATE_RANDOM_LOOK) + EVT_CALL(SetSelfVar, 0, CROWD_STATE_RANDOM_DELAY) + EVT_END_IF + EVT_CASE_EQ(CROWD_STATE_RANDOM_JUMP) + EVT_CALL(RandInt, 1, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) + EVT_END_IF + EVT_END_IF + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, CROWD_STATE_RANDOM_JUMP) + EVT_CALL(SetSelfVar, 0, CROWD_STATE_RANDOM_DELAY) + EVT_END_IF + EVT_CASE_EQ(CROWD_STATE_RANDOM_DELAY) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 10) + EVT_WAIT(LVar0) + EVT_CALL(RandInt, 1, LVar0) + EVT_ADD(LVar0, 1) + EVT_CALL(GetSelfVar, 0, LVar1) + EVT_IF_EQ(LVar1, CROWD_STATE_RANDOM_DELAY) + EVT_CALL(SetSelfVar, 0, LVar0) + EVT_END_IF + EVT_CASE_EQ(CROWD_STATE_TURN_AROUND) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_WAIT(2) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_WAIT(2) + EVT_CASE_EQ(CROWD_STATE_RUN_AWAY) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100, 1) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_USE_BUF(EVT_PTR(N(CrowdFleeScripts))) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_USE_BUF(LVar1) + EVT_LABEL(10) + EVT_BUF_READ1(LVar2) // get cmd + EVT_SWITCH(LVar2) + EVT_CASE_EQ(op_CS_MOVE) + EVT_BUF_READ2(LVar3, LVar4) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(10.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar3, LVar4, 0) + EVT_CASE_EQ(op_CS_JUMP) + EVT_BUF_READ3(LVar3, LVar4, LVar5) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10) + EVT_END_SWITCH + EVT_IF_NE(LVar2, op_CS_END) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetSelfVar, 0, CROWD_STATE_DISPOSE) + EVT_CASE_EQ(CROWD_STATE_DISPOSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +Vec3i N(InitialCrowdPositions)[] = { + { -462, 0, -80 }, + { -447, 0, -40 }, + { -432, 0, 0 }, + { -437, 0, 80 }, + { -402, 0, 80 }, + { -438, 0, -80 }, + { -423, 0, -40 }, + { -408, 0, 0 }, + { -474, 0, -59 }, + { -378, 0, 80 }, +}; + +EvtScript N(EVS_NpcInit_ShyGuy_Crowd) = { + EVT_IF_EQ(GF_OMO02_BombedWall, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy_Crowd))) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_SUB(LVar0, NPC_ShyGuy_01) + EVT_USE_BUF(EVT_PTR(N(InitialCrowdPositions))) + EVT_LOOP(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy_Loner) = { + .id = NPC_ShyGuy_01, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Loner), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_Crowd)[] = { + { + .id = NPC_ShyGuy_02, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_03, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_04, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_05, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_06, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_07, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_08, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_09, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_10, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_11, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, +}; + +StaticNpc N(NpcData_SpyGuy)[] = { + { + .id = NPC_SpyGuy, + .settings = &N(NpcSettings_SpyGuy), + .pos = { 200.0f, 0.0f, 30.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPY_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 200, 0, 30 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 200, 0, 30 }, + .detectSize = { 200 }, + } + }, + .animations = SPY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + SPY_GUY_ROCK_HITBOX(NPC_SpyGuy_Rock1), + SPY_GUY_ROCK_HITBOX(NPC_SpyGuy_Rock2), +}; + +// separated into its own NPC to make the group count match in DefaultNPCs +StaticNpc N(NpcData_SpyGuy_UnusedRock)[] = { + SPY_GUY_ROCK_HITBOX(NPC_SpyGuy_Rock3), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_ShyGuy_Loner)), + NPC_GROUP(N(NpcData_ShyGuy_Crowd)), + NPC_GROUP(N(NpcData_SpyGuy), BTL_OMO_FORMATION_1B, BTL_OMO_STAGE_00), + {} +}; diff --git a/src/world/area_omo/omo_03/DA5240.c b/src/world/area_omo/omo_03/DA5240.c deleted file mode 100644 index 6c4d908097..0000000000 --- a/src/world/area_omo/omo_03/DA5240.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "omo_03.h" - -static char* N(exit_str_0) = "omo_13"; -static char* N(exit_str_1) = "omo_04"; -static char* N(exit_str_2) = "mac_04"; -static char* N(exit_str_3) = "omo_10"; -static char* N(exit_str_4) = "omo_08"; -static char* N(exit_str_5) = "omo_06"; -static char* N(exit_str_6) = "omo_03"; -static char* N(exit_str_7) = "omo_16"; -static char* N(exit_str_8) = "mac_04\0"; -static char* N(exit_str_9) = "jan_04"; - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c deleted file mode 100644 index 9e8f0744dd..0000000000 --- a/src/world/area_omo/omo_03/DA5260.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "omo_03.h" - -#define NAMESPACE dup_omo_03 -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" -#define NAMESPACE omo_03 - -#include "common/SetAngleClamped.inc.c" - -#include "common/CompareFloats.inc.c" - -#include "common/AdvanceBuffer.inc.c" - -#include "common/SetPlayerStatusPosYaw.inc.c" - -#include "common/SetNpcPosYaw.inc.c" - -#include "common/CosInterpMinMax.inc.c" - -#include "common/IsAOrBPressed.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_omo/omo_03/omo_03.h b/src/world/area_omo/omo_03/omo_03.h index acad69a324..f45735f7c9 100644 --- a/src/world/area_omo/omo_03/omo_03.h +++ b/src/world/area_omo/omo_03/omo_03.h @@ -2,8 +2,56 @@ /// @brief Shy Guy's Toybox - BLU Station #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_03_shape.h" +#include "mapfs/omo_03_hit.h" + +#include "sprite/npc/TrainToad.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/WorldWatt.h" +#include "sprite/npc/ShyGuy.h" + +enum { + NPC_Conductor = 0, + NPC_TrainToad = 1, + NPC_Parakarry = 2, + NPC_Watt = 3, + NPC_ShyGuy_01 = 4, + NPC_ShyGuy_02 = 5, + NPC_ShyGuy_03 = 6, +}; + +enum { + MV_TrainUnk_00 = MapVar(0), + MV_TrainUnk_01 = MapVar(1), + MV_TrainUnk_02 = MapVar(2), + MV_ArrowTexUOffset = MapVar(9), + MV_DroppedTrainAngle = MapVar(10), + MV_TrainPos = MapVar(11), + MV_TrainUnk_0C = MapVar(12), + MV_TrainUnk_0D = MapVar(13), +}; + +enum { + MF_TrainUnk_00 = MapFlag(0), + MF_EitherSwitchPressed = MapFlag(1), + MF_Unk_0A = MapFlag(10), +}; + #define NAMESPACE omo_03 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_Scene_EnterSpring); +extern EvtScript N(EVS_SetupGizmos); +extern EvtScript N(EVS_8024746C); +extern EvtScript N(EVS_8024705C); +extern EvtScript N(EVS_80246108); +extern EvtScript N(EVS_Scene_Epilogue); +extern EvtScript N(EVS_Scene_TrainDropped); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); +extern NpcGroupList N(EpilogueNPCs); diff --git a/src/world/area_omo/omo_03/omo_03_0_header.c b/src/world/area_omo/omo_03/omo_03_0_header.c new file mode 100644 index 0000000000..3f7a9f92eb --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_0_header.c @@ -0,0 +1,19 @@ +#include "omo_03.h" + +EntryList N(Entrances) = { + [omo_03_ENTRY_0] { -320.0, 0.0, 320.0, 45.0 }, + [omo_03_ENTRY_1] { 340.0, 0.0, 330.0, 315.0 }, + [omo_03_ENTRY_2] { -320.0, 10.0, -320.0, 135.0 }, + [omo_03_ENTRY_3] { 320.0, 10.0, -320.0, 225.0 }, + [omo_03_ENTRY_4] { -245.0, 270.0, 250.0, 90.0 }, + [omo_03_ENTRY_5] { 0.0, -100.0, 0.0, 90.0 }, + [omo_03_ENTRY_6] { -320.0, 0.0, 320.0, 45.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_03 }, +}; diff --git a/src/world/area_omo/omo_03/omo_03_1_music.c b/src/world/area_omo/omo_03/omo_03_1_music.c new file mode 100644 index 0000000000..0009a63ea7 --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_1_music.c @@ -0,0 +1,20 @@ +#include "omo_03.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_ELSE + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(omo_03_ENTRY_2, omo_03_ENTRY_3) + EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) + EVT_CASE_EQ(omo_03_ENTRY_5) + EVT_CALL(FadeInMusic, 0, SONG_SHY_GUY_TOYBOX, 0, 3000, 0, 127) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_03/omo_03_2_main.c b/src/world/area_omo/omo_03/omo_03_2_main.c new file mode 100644 index 0000000000..f854e3d72c --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_2_main.c @@ -0,0 +1,66 @@ +#include "omo_03.h" + +EvtScript N(EVS_ExitWalk_omo_13_1) = EVT_EXIT_WALK(60, omo_03_ENTRY_0, "omo_13", omo_13_ENTRY_1); +EvtScript N(EVS_ExitWalk_omo_04_0) = EVT_EXIT_WALK(60, omo_03_ENTRY_1, "omo_04", omo_04_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_13_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_04_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(AF_OMO_04, FALSE) + 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_RANGE(omo_03_ENTRY_0, omo_03_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CASE_EQ(omo_03_ENTRY_4) + EVT_SET(AF_OMO_04, TRUE) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_Scene_EnterSpring)) + EVT_CASE_EQ(omo_03_ENTRY_5) + EVT_EXEC(N(EVS_Scene_Epilogue)) + EVT_CASE_EQ(omo_03_ENTRY_6) + EVT_EXEC(N(EVS_Scene_TrainDropped)) + EVT_CASE_DEFAULT + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_WAIT(3) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_ENTERED_THE_TOY_BOX) + EVT_SET(GB_StoryProgress, STORY_CH4_ENTERED_THE_TOY_BOX) + EVT_END_IF + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_SET(AF_OMO_05, FALSE) + EVT_SET(GF_MAP_ShyGuysToybox, TRUE) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, omo_03_ENTRY_5) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_ELSE + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(EpilogueNPCs))) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupGizmos)) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_8024746C)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_03/omo_03_3_gizmos.c b/src/world/area_omo/omo_03/omo_03_3_gizmos.c new file mode 100644 index 0000000000..40fa49fd96 --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_3_gizmos.c @@ -0,0 +1,127 @@ + +#include "omo_03.h" +#include "effects.h" + +EvtScript N(EVS_Gizmos_Wheels) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_ha1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha2, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha3, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha4, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Shutters) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 160, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 160, 0, 60, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_WAIT(2) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Clocks) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_hari1, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_PullBlueSwitch) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 70, 30, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bou1, LVar0, 0, 0, 1) + EVT_CALL(UpdateColliderTransform, COLLIDER_bou1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_1F1, 0, -440, 10, 40) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o978, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -184, 10, -229) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -184, 10, -229) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(517.4)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-180.0), EVT_FLOAT(-322.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(25.0), EVT_FLOAT(-6.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(20) + EVT_CALL(PlaySoundAt, SOUND_1F2, 0, -130, 0, -215) + EVT_CALL(MakeLerp, 0, 180, 30, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o933, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o818, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o817, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_51, 0, -130, 0, -215) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(GetModelCenter, MODEL_o932) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0) + EVT_WAIT(30) + EVT_SET(GF_OMO03_BlueSwitchActivated, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Idle) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupGizmos) = { + EVT_EXEC(N(EVS_Gizmos_Wheels)) + EVT_EXEC(N(EVS_Gizmos_Shutters)) + EVT_EXEC(N(EVS_Gizmos_Clocks)) + EVT_CALL(ParentColliderToModel, COLLIDER_bou1, MODEL_bou1) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_PullBlueSwitch)), TRIGGER_WALL_PRESS_A, COLLIDER_o801, 1, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o978, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_CALL(RotateModel, MODEL_bou1, 70, 0, 0, 1) + EVT_CALL(UpdateColliderTransform, COLLIDER_bou1) + EVT_CALL(RotateModel, MODEL_o933, 180, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o818, 180, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o817, 180, 1, 0, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_03/omo_03_4_entity.c b/src/world/area_omo/omo_03/omo_03_4_entity.c new file mode 100644 index 0000000000..dcc1c01ffa --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_4_entity.c @@ -0,0 +1,92 @@ +#include "omo_03.h" +#include "entity.h" + +#define NAME_SUFFIX _Spring +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" +#define NAME_SUFFIX + +EvtScript N(EVS_TetherCamToPlayer) = { + 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_UseSpring_Exit) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA) + EVT_IF_EQ(AF_OMO_04, FALSE) + EVT_CALL(N(UnsetCamera0MoveFlag1_Spring)) + EVT_THREAD + EVT_WAIT(6) + EVT_CALL(GotoMap, EVT_PTR("mac_04"), mac_04_ENTRY_2) + EVT_WAIT(100) + EVT_END_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) + EVT_CALL(PlayerJump, -245, 270, 250, 20) + EVT_ELSE + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, -95, 0, 250, 25) + EVT_SET(AF_OMO_04, FALSE) + EVT_END_IF + 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_Scene_EnterSpring) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 100) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA) + EVT_THREAD + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(PARTNER_PARAKARRY) + EVT_CASE_EQ(PARTNER_LAKILESTER) + EVT_CASE_EQ(PARTNER_BOW) + EVT_CASE_EQ(PARTNER_WATT) + EVT_CASE_DEFAULT + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_PARTNER, -150, 25, 250, 37) + EVT_CALL(NpcJump0, NPC_PARTNER, -110, 0, 190, 20) + EVT_END_SWITCH + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) + EVT_CALL(PlayerJump, -150, 25, 250, 25) + 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_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -250, 60, 50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), -150, 0, 250, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring_Exit))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 203, 0, 200, 0, MODEL_o930, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_OMO03_HiddenPanel) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 400, 60, -50, 0, ITEM_STONE_CAP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO03_HiddenItem_StoneCap) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_03/omo_03_5_npc.c b/src/world/area_omo/omo_03/omo_03_5_npc.c new file mode 100644 index 0000000000..710ef96498 --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_5_npc.c @@ -0,0 +1,224 @@ +#include "omo_03.h" + +#include "world/common/npc/TrainToad.inc.c" +#include "world/common/npc/Parakarry.inc.c" + +#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" + +EvtScript N(EVS_ItemPrompt_ToyTrain) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) + EVT_CALL(ShowKeyChoicePopup) + EVT_CALL(CloseChoicePopup) + EVT_IF_EQ(LVar0, ITEM_TOY_TRAIN) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0002) + EVT_ELSE + EVT_IF_EQ(AF_OMO_05, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_SadTalk, ANIM_TrainToad_SadIdle, 0, MSG_CH4_0000) + EVT_SET(AF_OMO_05, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_SadTalk, ANIM_TrainToad_SadIdle, 0, MSG_CH4_0001) + EVT_SET(AF_OMO_05, FALSE) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(GF_OMO03_LearnedAboutTrainSwitches, FALSE) + EVT_IF_EQ(AF_OMO_05, FALSE) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Conductor, LVar0, LVar1, LVar2) + EVT_LOOP(2) + EVT_CALL(NpcJump1, NPC_Conductor, LVar0, LVar1, LVar2, 15) + EVT_END_LOOP + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_100, FALSE) + EVT_END_THREAD + EVT_WAIT(10) + EVT_IF_EQ(MF_EitherSwitchPressed, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0003) + EVT_CALL(EndSpeech, NPC_Conductor, -1, -1, 0) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0003) + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0005) + EVT_SET(GF_OMO03_LearnedAboutTrainSwitches, TRUE) + EVT_END_IF + EVT_SET(AF_OMO_05, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0004) + EVT_SET(GF_OMO03_LearnedAboutTrainSwitches, TRUE) + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(AF_OMO_06, FALSE) + EVT_EXEC_WAIT(N(EVS_8024705C)) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_80246108)) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +s32 N(ToyTrainList)[] = { + ITEM_TOY_TRAIN, + ITEM_NONE +}; + +EvtScript N(EVS_NpcInteract_Conductor) = { + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemPrompt_ToyTrain)), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(ToyTrainList)), 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Conductor) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_TrainToad_SadIdle) + EVT_END_IF + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Conductor))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_TrainToad) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_GOT_STOREROOM_KEY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_SadTalk, ANIM_TrainToad_Blue_SadIdle, 0, MSG_CH4_0017) + EVT_CASE_LT(STORY_CH4_RETURNED_STOREROOM_KEY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_0018) + EVT_CASE_LT(STORY_CH4_RETURNED_TOY_TRAIN) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_0019) + EVT_CASE_LT(STORY_CH4_GOT_FRYING_PAN) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_001A) + EVT_CASE_LT(STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_001B) + EVT_CASE_LT(STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_001C) + EVT_CASE_LT(STORY_CH4_PULLED_SWITCH_SWITCH) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_001D) + EVT_CASE_LT(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(FindKeyItem, ITEM_MYSTERY_NOTE, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_001E) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_001F) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_0020) + EVT_CASE_LT(STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_0021) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Blue_Talk, ANIM_TrainToad_Blue_Idle, 0, MSG_CH4_0022) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TrainToad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainToad))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_TrainToads)[] = { + { + .id = NPC_Conductor, + .settings = &N(NpcSettings_TrainToad), + .pos = { 170.0f, 50.0f, -115.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Conductor), + .drops = NPC_NO_DROPS, + .animations = TRAIN_CONDUCTOR_ANIMS, + .tattle = MSG_NpcTattle_OMO_TrainConductor, + }, + { + .id = NPC_TrainToad, + .settings = &N(NpcSettings_TrainToad), + .pos = { 158.0f, 0.0f, 85.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_TrainToad), + .drops = NPC_NO_DROPS, + .animations = TRAIN_TOAD_BLUE_ANIMS, + .tattle = MSG_NpcTattle_OMO_TrainConductor, + } +}; + +StaticNpc N(NpcData_Epilogue)[] = { + { + .id = NPC_Parakarry, + .settings = &N(NpcSettings_Parakarry), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = PARAKARRY_ANIMS, + }, + { + .id = NPC_Watt, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { 50.0f, 15.0f, 160.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = { + .idle = ANIM_WorldWatt_Idle, + .walk = ANIM_WorldWatt_Idle, + .run = ANIM_WorldWatt_Idle, + .chase = ANIM_WorldWatt_Idle, + .anim_4 = ANIM_WorldWatt_Idle, + .anim_5 = ANIM_WorldWatt_Idle, + .death = ANIM_WorldWatt_Idle, + .hit = ANIM_WorldWatt_Idle, + .anim_8 = ANIM_WorldWatt_Idle, + .anim_9 = ANIM_WorldWatt_Idle, + .anim_A = ANIM_WorldWatt_Idle, + .anim_B = ANIM_WorldWatt_Idle, + .anim_C = ANIM_WorldWatt_Idle, + .anim_D = ANIM_WorldWatt_Idle, + .anim_E = ANIM_WorldWatt_Idle, + .anim_F = ANIM_WorldWatt_Idle, + }, + }, + { + .id = NPC_ShyGuy_01, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { 100.0f, 0.0f, 160.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_02, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { 115.0f, 0.0f, 200.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_03, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { 145.0f, 0.0f, 150.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_TrainToads)), + {} +}; + +NpcGroupList N(EpilogueNPCs) = { + //@bug? only loads the first NPC from the group, cannot use macro here + { .npcCount = 1, .npcs = &N(NpcData_TrainToads)[0], .battle = 0, .stage = 0 }, + NPC_GROUP(N(NpcData_Epilogue)), + {} +}; diff --git a/src/world/area_omo/omo_03/omo_03_6_train.c b/src/world/area_omo/omo_03/omo_03_6_train.c new file mode 100644 index 0000000000..9e21857299 --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_6_train.c @@ -0,0 +1,464 @@ +#include "omo_03.h" + +#define INCLUDE_ALTERNATES 1 +#include "../common/ToyTrain.inc.c" +#include "../common/TrainStationSwitches.inc.c" + +Vec2i N(D_80246080_DAB2C0) = { + 170, -115 +}; + +Vec2i N(D_80246088_DAB2C8) = { + -383, -240 +}; + +Vec2i N(D_80246090_DAB2D0)[] = { + { -360, -195 }, + { -335, -215 }, +}; + +s32 N(D_802460A0_DAB2E0)[] = { + EVT_FLOAT(-298.93), EVT_FLOAT(-288.62), EVT_FLOAT(140.0), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(0.0), + EVT_FLOAT(-175.0), EVT_FLOAT(169.89), EVT_FLOAT(-220.49), + -1, -1, -1 +}; + +s32 N(D_802460D0_DAB310)[] = { + EVT_FLOAT(-298.93), EVT_FLOAT(-288.62), EVT_FLOAT(140.0), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(0.0), + EVT_FLOAT(-175.0), EVT_FLOAT(262.5), EVT_FLOAT(-245.336), + EVT_FLOAT(479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(EVS_80246108) = { + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_SadTalk, ANIM_TrainToad_SadIdle, 0, MSG_CH4_0014) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_ELSE + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Conductor, LVar0, LVar1, LVar2) + EVT_LOOP(2) + EVT_CALL(NpcJump1, NPC_Conductor, LVar0, LVar1, LVar2, 15) + EVT_END_LOOP + EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_100, FALSE) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0015) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o941, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_C), LVarB) + EVT_SET(LVar0, EVT_PTR(N(D_802460A0_DAB2E0))) + EVT_SET(LVar9, EVT_PTR(N(D_80246090_DAB2D0))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_AltD)) + EVT_IF_EQ(AB_OMO_6, 0) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802460A0_DAB2E0))) + EVT_SET(MV_TrainUnk_02, 3) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(20) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_SET(LVar9, EVT_PTR(N(D_80246080_DAB2C0))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_000E) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o941, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802460D0_DAB310))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(30) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 0) + EVT_WAIT(100) + EVT_END_IF + EVT_END_IF + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +s32 N(D_80246510_DAB750)[] = { + EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(74.997), + EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), + EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80246538_DAB778) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o941, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_TrainUnk_C)) + EVT_SET(AB_OMO_5, 0) + EVT_SET(LVar0, EVT_PTR(N(D_80246510_DAB750))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_D)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246510_DAB750))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(10) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_802466C0_DAB900)[] = { + EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(254.997), + EVT_FLOAT(0.0), EVT_FLOAT(-175.0), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), + EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_802466F8_DAB938) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o941, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_TrainUnk_C)) + EVT_SET(AB_OMO_5, 0) + EVT_SET(LVar0, EVT_PTR(N(D_802466C0_DAB900))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_D)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802466C0_DAB900))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(10) + EVT_IF_GT(MV_TrainPos, -350) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_1) + EVT_SET(GB_OMO_TrainDestination, 3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_80246880_DABAC0)[] = { + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(92.61), EVT_FLOAT(-199.49), + -1, -1, -1 +}; + +s32 N(D_802468B0_DABAF0)[] = { + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), + EVT_FLOAT(-353.688), EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_802468F8_DABB38) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o941, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(AB_OMO_6, 0) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246880_DABAC0))) + EVT_SET(MV_TrainUnk_02, 2) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_A), LVarB) + EVT_LABEL(10) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_SET(LVar9, EVT_PTR(N(D_80246080_DAB2C0))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_000E) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o941, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_EXEC(N(EVS_TrainUnk_A)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802468B0_DABAF0))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(20) + EVT_IF_GT(MV_TrainPos, -350) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_1) + EVT_SET(GB_OMO_TrainDestination, 3) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_80246BE0_DABE20)[] = { + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(169.89), EVT_FLOAT(-220.49), + -1, -1, -1 +}; + +s32 N(D_80246C18_DABE58)[] = { + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-273.25), + EVT_FLOAT(-257.95), + -1, -1, -1 +}; + +s32 N(D_80246C40_DABE80)[] = { + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), + EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80246C80_DABEC0) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o941, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, FALSE) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246C18_DABE58))) + EVT_ELSE + EVT_IF_EQ(AB_OMO_6, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246BE0_DABE20))) + EVT_ELSE + EVT_GOTO(15) + EVT_END_IF + EVT_END_IF + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_02, 2) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_A), LVarB) + EVT_LABEL(10) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) + EVT_SET(LVar9, EVT_PTR(N(D_80246080_DAB2C0))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_000E) + EVT_ELSE + EVT_SET(LVar9, EVT_PTR(N(D_80246088_DAB2C8))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_AltE)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_SadTalk, ANIM_TrainToad_SadIdle, 0, MSG_CH4_0013) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o939, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o941, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_LABEL(15) + EVT_EXEC(N(EVS_TrainUnk_A)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246C40_DABE80))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(20) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_80247044_DAC284)[] = { + 3, 2, 1, +}; + +s32 N(D_80247050_DAC290)[] = { + 1, 2, 3, +}; + +EvtScript N(EVS_8024705C) = { + EVT_IF_EQ(MF_EitherSwitchPressed, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0006) + EVT_ELSE + EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_SadTalk, ANIM_TrainToad_SadIdle, 5, MSG_CH4_0012) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_CALL(ShowChoice, MSG_Choice_003A) + EVT_IF_NE(LVar0, 3) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80247044_DAC284))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_802466F8_DAB938)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_PULLED_SWITCH_SWITCH) + EVT_CALL(ShowChoice, MSG_Choice_0037) + EVT_IF_NE(LVar0, 1) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80247050_DAC290))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80246538_DAB778)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(ShowChoice, MSG_Choice_0038) + EVT_IF_NE(LVar0, 2) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80247050_DAC290))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80246538_DAB778)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_CASE_GE(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(ShowChoice, MSG_Choice_0039) + EVT_IF_NE(LVar0, 3) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80247050_DAC290))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80246538_DAB778)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_END_SWITCH + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_80247454_DAC694)[] = { + EVT_FLOAT(131.251), EVT_FLOAT(-210.168), EVT_FLOAT(74.997), + -1, -1, -1 +}; + +EvtScript N(EVS_8024746C) = { + EVT_EXEC_WAIT(N(EVS_SetupSwitches)) + EVT_CALL(EnableGroup, MODEL_po, FALSE) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) + EVT_CALL(EnableGroup, MODEL_popo, FALSE) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_eki1, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80247454_DAC694))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_ELSE + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(omo_03_ENTRY_2) + EVT_EXEC(N(D_80246C80_DABEC0)) + EVT_CASE_EQ(omo_03_ENTRY_3) + EVT_EXEC(N(D_802468F8_DABB38)) + EVT_CASE_EQ(omo_03_ENTRY_6) + EVT_CALL(EnableGroup, MODEL_popo, FALSE) + EVT_CALL(EnableGroup, MODEL_po, TRUE) + EVT_CASE_DEFAULT + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80247454_DAC694))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_03/omo_03_7_train_drop.c b/src/world/area_omo/omo_03/omo_03_7_train_drop.c new file mode 100644 index 0000000000..90fda74676 --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_7_train_drop.c @@ -0,0 +1,142 @@ +#include "omo_03.h" + +Vec3f N(FallPath)[] = { + { -170.0, 400.0, -196.0 }, + { -100.0, 225.0, -196.0 }, + { -70.0, 45.0, -193.0 }, +}; + +Vec3f N(FirstBouncePath)[] = { + { -70.0, 0.0, -193.0 }, + { -7.0, 100.0, -191.0 }, + { 54.0, 20.0, -189.0 }, +}; + +Vec3f N(SecondBouncePath)[] = { + { 54.0, 0.0, -189.0 }, + { 92.0, 55.0, -199.0 }, + { 131.0, 0.0, -210.0 }, +}; + +EvtScript N(EVS_Scene_TrainDropped) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(90.0), 82, 24, 12, 580, EVT_FLOAT(16.5), EVT_FLOAT(-8.5)) + EVT_CALL(TranslateGroup, MODEL_po, -170, 400, -196) + EVT_SET(MV_DroppedTrainAngle, 30) + EVT_WAIT(45) + EVT_THREAD + EVT_CALL(MakeLerp, MV_DroppedTrainAngle, 40, 29, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(MV_DroppedTrainAngle, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(LoadPath, 30, EVT_PTR(N(FallPath)), ARRAY_COUNT(N(FallPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(TranslateGroup, MODEL_po, LVar1, LVar2, LVar3) + EVT_CALL(RotateGroup, MODEL_po, MV_DroppedTrainAngle, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_A1, 0) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(3.0)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainToad_Idle) + EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(3.0)) + EVT_CALL(GetNpcPos, NPC_Conductor, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Conductor, LVar0, LVar1, LVar2, 12) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_TrainToad, ANIM_TrainToad_Blue_Idle) + EVT_CALL(SetNpcJumpscale, NPC_TrainToad, EVT_FLOAT(3.0)) + EVT_CALL(GetNpcPos, NPC_TrainToad, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_TrainToad, LVar0, LVar1, LVar2, 15) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, MV_DroppedTrainAngle, 18, 19, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(MV_DroppedTrainAngle, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(LoadPath, 20, EVT_PTR(N(FirstBouncePath)), ARRAY_COUNT(N(FirstBouncePath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(TranslateGroup, MODEL_po, LVar1, LVar2, LVar3) + EVT_CALL(RotateGroup, MODEL_po, MV_DroppedTrainAngle, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_A1, 0) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 8, EVT_FLOAT(2.0)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Conductor, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Conductor, LVar0, LVar1, LVar2, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_TrainToad, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_TrainToad, LVar0, LVar1, LVar2, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, MV_DroppedTrainAngle, 0, 14, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(MV_DroppedTrainAngle, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(LoadPath, 15, EVT_PTR(N(SecondBouncePath)), ARRAY_COUNT(N(SecondBouncePath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(TranslateGroup, MODEL_po, LVar1, LVar2, LVar3) + EVT_CALL(RotateGroup, MODEL_po, MV_DroppedTrainAngle, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtModel, MODEL_p_8, SOUND_A1, 0) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Conductor, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Conductor, LVar0, LVar1, LVar2, 8) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_TrainToad, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_TrainToad, LVar0, LVar1, LVar2, 5) + EVT_LOOP(0) + EVT_CALL(InterpNpcYaw, NPC_TrainToad, 270, 0) + EVT_WAIT(25) + EVT_CALL(InterpNpcYaw, NPC_TrainToad, 90, 0) + EVT_WAIT(25) + EVT_END_LOOP + EVT_END_THREAD + EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) + EVT_WAIT(75) + EVT_CALL(GotoMap, EVT_PTR("mac_04"), mac_04_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_03/omo_03_8_epilogue.c b/src/world/area_omo/omo_03/omo_03_8_epilogue.c new file mode 100644 index 0000000000..ed0f816ae7 --- /dev/null +++ b/src/world/area_omo/omo_03/omo_03_8_epilogue.c @@ -0,0 +1,52 @@ +#include "omo_03.h" +#include "effects.h" + +Vec3f N(FlightPath)[] = { + { -100.0, 200.0, 130.0 }, + { -70.0, 60.0, 140.0 }, + { -40.0, 25.0, 150.0 }, + { -10.0, 15.0, 160.0 }, +}; + +EvtScript N(EVS_Scene_Epilogue) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(GetNpcPos, NPC_Watt, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 13) + EVT_PLAY_EFFECT(EFFECT_STATIC_STATUS, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.9), 5, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 50, 0, 160) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 0, 160) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim11) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_02, ANIM_ShyGuy_Red_Anim11) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_03, ANIM_ShyGuy_Red_Anim11) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Talk) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_02, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_03, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Walk) + EVT_CALL(LoadPath, 60, EVT_PTR(N(FlightPath)), ARRAY_COUNT(N(FlightPath)), EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Parakarry, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Idle) + EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Idle) + EVT_CALL(NpcFaceNpc, NPC_Watt, NPC_Parakarry, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Talk) + EVT_WAIT(60) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_CALL(GotoMap, EVT_PTR("jan_04"), jan_04_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_04/omo_04_4_entity.c b/src/world/area_omo/omo_04/omo_04_4_entity.c index e00e21e6be..d46291db09 100644 --- a/src/world/area_omo/omo_04/omo_04_4_entity.c +++ b/src/world/area_omo/omo_04/omo_04_4_entity.c @@ -64,49 +64,49 @@ EvtScript N(EVS_StarBoxLaunch_Impl) = { }; EvtScript N(EVS_StarBoxLaunch1) = { - EVT_SET(LVar0, 1) + EVT_SET(LVar0, 1) // entityID EVT_EXEC_WAIT(N(EVS_StarBoxLaunch_Impl)) EVT_RETURN EVT_END }; EvtScript N(EVS_StarBoxLaunch2) = { - EVT_SET(LVar0, 2) + EVT_SET(LVar0, 2) // entityID EVT_EXEC_WAIT(N(EVS_StarBoxLaunch_Impl)) EVT_RETURN EVT_END }; EvtScript N(EVS_StarBoxLaunch3) = { - EVT_SET(LVar0, 3) + EVT_SET(LVar0, 3) // entityID EVT_EXEC_WAIT(N(EVS_StarBoxLaunch_Impl)) EVT_RETURN EVT_END }; EvtScript N(EVS_StarBoxLaunch4) = { - EVT_SET(LVar0, 4) + EVT_SET(LVar0, 4) // entityID EVT_EXEC_WAIT(N(EVS_StarBoxLaunch_Impl)) EVT_RETURN EVT_END }; EvtScript N(EVS_StarBoxLaunch5) = { - EVT_SET(LVar0, 5) + EVT_SET(LVar0, 5) // entityID EVT_EXEC_WAIT(N(EVS_StarBoxLaunch_Impl)) EVT_RETURN EVT_END }; EvtScript N(EVS_StarBoxLaunch6) = { - EVT_SET(LVar0, 6) + EVT_SET(LVar0, 6) // entityID EVT_EXEC_WAIT(N(EVS_StarBoxLaunch_Impl)) EVT_RETURN EVT_END }; EvtScript N(EVS_StarBoxLaunch7) = { - EVT_SET(LVar0, 7) + EVT_SET(LVar0, 7) // entityID EVT_EXEC_WAIT(N(EVS_StarBoxLaunch_Impl)) EVT_RETURN EVT_END diff --git a/src/world/area_omo/omo_04/omo_04_5_npc.c b/src/world/area_omo/omo_04/omo_04_5_npc.c index 86c13acaae..04f301554e 100644 --- a/src/world/area_omo/omo_04/omo_04_5_npc.c +++ b/src/world/area_omo/omo_04/omo_04_5_npc.c @@ -16,16 +16,7 @@ NpcSettings N(NpcSettings_Goomba) = { }; #include "world/common/enemy/complete/Clubba.inc.c" - -#include "world/common/enemy/complete/Kammy.h" - -NpcSettings N(NpcSettings_Kammy) = { - .height = 34, - .radius = 24, - .level = 26, - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; +#include "world/common/enemy/complete/Kammy.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_04/omo_04_6_scenes.c b/src/world/area_omo/omo_04/omo_04_6_scenes.c index e0005d7cca..e321a7f0d6 100644 --- a/src/world/area_omo/omo_04/omo_04_6_scenes.c +++ b/src/world/area_omo/omo_04/omo_04_6_scenes.c @@ -100,8 +100,8 @@ EvtScript N(EVS_PlayKammyFlightSounds) = { EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GF_OMO04_SpawnedPeachChoice1, TRUE) - EVT_SET(AB_OMO_4, GB_OMO_PeachChoice1) - EVT_SWITCH(AB_OMO_4) + EVT_SET(AB_OMO_CurrentPeachChoice, GB_OMO_PeachChoice1) + EVT_SWITCH(AB_OMO_CurrentPeachChoice) EVT_CASE_EQ(0) EVT_SET(MV_AmbushID, NPC_Goomba) EVT_CASE_EQ(1) @@ -112,7 +112,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcPos, NPC_Kammy, 800, 140, -20) EVT_CALL(SetNpcYaw, NPC_Kammy, 270) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim15) - EVT_IF_NE(AB_OMO_4, 2) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(SetNpcPos, MV_AmbushID, NPC_DISPOSE_LOCATION) EVT_END_IF EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1100, 0, 0) @@ -191,7 +191,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(PlaySoundAt, SOUND_2098, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 0, 0, 1, 15, 3, 8) EVT_WAIT(5) - EVT_IF_NE(AB_OMO_4, 2) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(SetNpcPos, MV_AmbushID, LVar0, 0, 0) EVT_ELSE EVT_CALL(MakeItemEntity, MV_AmbushID, LVar0, 0, 0, ITEM_SPAWN_MODE_DECORATION, 0) @@ -199,7 +199,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) EVT_WAIT(45) - EVT_SWITCH(AB_OMO_4) + EVT_SWITCH(AB_OMO_CurrentPeachChoice) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 517, MSG_CH4_0036) EVT_WAIT(30) @@ -231,7 +231,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(90) - EVT_IF_NE(AB_OMO_4, 2) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, 0) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(5) diff --git a/src/world/area_omo/omo_05/omo_05.h b/src/world/area_omo/omo_05/omo_05.h index 5ae2b0ae7c..f391f256ac 100644 --- a/src/world/area_omo/omo_05/omo_05.h +++ b/src/world/area_omo/omo_05/omo_05.h @@ -13,10 +13,10 @@ #include "sprite/npc/GrooveGuy.h" enum { - NPC_GourmetGuy_01 = 0, - NPC_GourmetGuy_02 = 1, - NPC_GourmetGuy_03 = 2, - NPC_GrooveGuy = 3, + NPC_GourmetGuy = 0, + NPC_GourmetGuy_Knife = 1, + NPC_GourmetGuy_Fork = 2, + NPC_GrooveGuy = 3, }; #define NAMESPACE omo_05 diff --git a/src/world/area_omo/omo_05/omo_05_4_npc.c b/src/world/area_omo/omo_05/omo_05_4_npc.c index ddc4927fc7..1589e608e9 100644 --- a/src/world/area_omo/omo_05/omo_05_4_npc.c +++ b/src/world/area_omo/omo_05/omo_05_4_npc.c @@ -191,40 +191,40 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Surprise) EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_03, NPC_FLAG_2, FALSE) - EVT_CALL(GetNpcPos, NPC_GourmetGuy_03, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_03, EVT_FLOAT(0.05)) - EVT_CALL(NpcJump0, NPC_GourmetGuy_03, LVar0, 2, LVar2, 8) - EVT_CALL(func_802CDE68, 2, 15) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_2, FALSE) + EVT_CALL(GetNpcPos, NPC_GourmetGuy_Fork, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Fork, EVT_FLOAT(0.05)) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, 2, LVar2, 8) + EVT_CALL(SetNpcRotationPivot, NPC_GourmetGuy_Fork, 15) EVT_SET(LVar3, 0) EVT_LOOP(5) EVT_ADD(LVar3, 50) - EVT_CALL(SetNpcRotation, NPC_GourmetGuy_03, 0, 0, LVar3) + EVT_CALL(SetNpcRotation, NPC_GourmetGuy_Fork, 0, 0, LVar3) EVT_WAIT(1) EVT_END_LOOP EVT_ADD(LVar2, 20) - EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_03, EVT_FLOAT(0.2)) - EVT_CALL(NpcJump0, NPC_GourmetGuy_03, LVar0, -10, LVar2, 8) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Fork, EVT_FLOAT(0.2)) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Fork, LVar0, -10, LVar2, 8) EVT_WAIT(10) - EVT_CALL(RemoveNpc, NPC_GourmetGuy_03) + EVT_CALL(RemoveNpc, NPC_GourmetGuy_Fork) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_02, NPC_FLAG_2, FALSE) - EVT_CALL(GetNpcPos, NPC_GourmetGuy_02, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_02, EVT_FLOAT(0.05)) - EVT_CALL(NpcJump0, NPC_GourmetGuy_02, LVar0, 2, LVar2, 8) - EVT_CALL(func_802CDE68, 1, 15) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_2, FALSE) + EVT_CALL(GetNpcPos, NPC_GourmetGuy_Knife, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.05)) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, 2, LVar2, 8) + EVT_CALL(SetNpcRotationPivot, NPC_GourmetGuy_Knife, 15) EVT_SET(LVar3, 0) EVT_LOOP(5) EVT_SUB(LVar3, 50) - EVT_CALL(SetNpcRotation, NPC_GourmetGuy_02, 0, 0, LVar3) + EVT_CALL(SetNpcRotation, NPC_GourmetGuy_Knife, 0, 0, LVar3) EVT_WAIT(1) EVT_END_LOOP EVT_ADD(LVar2, 20) - EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_02, EVT_FLOAT(0.2)) - EVT_CALL(NpcJump0, NPC_GourmetGuy_02, LVar0, -10, LVar2, 8) + EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy_Knife, EVT_FLOAT(0.2)) + EVT_CALL(NpcJump0, NPC_GourmetGuy_Knife, LVar0, -10, LVar2, 8) EVT_WAIT(10) - EVT_CALL(RemoveNpc, NPC_GourmetGuy_02) + EVT_CALL(RemoveNpc, NPC_GourmetGuy_Knife) EVT_END_THREAD EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -250, 25, -100) EVT_CALL(SetPanTarget, CAM_DEFAULT, -250, 25, -100) @@ -338,7 +338,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_WAIT(15) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_385, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Leap) - EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.001953125)) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.002)) EVT_CALL(NpcJump0, NPC_SELF, -250, 500, 110, 40) EVT_CALL(SetSelfVar, 0, 2) EVT_END_THREAD @@ -375,17 +375,17 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EvtScript N(EVS_NpcInit_GourmetGuy) = { EVT_IF_GE(GB_StoryProgress, STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY) - EVT_CALL(RemoveNpc, NPC_GourmetGuy_03) - EVT_CALL(RemoveNpc, NPC_GourmetGuy_02) + EVT_CALL(RemoveNpc, NPC_GourmetGuy_Fork) + EVT_CALL(RemoveNpc, NPC_GourmetGuy_Knife) EVT_CALL(RemoveNpc, NPC_SELF) EVT_ELSE EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_SitIdle) - EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_03, ANIM_GourmetGuy_Fork) - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_03, NPC_FLAG_2, TRUE) - EVT_CALL(SetNpcPos, NPC_GourmetGuy_03, -285, 50, 90) - EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_02, ANIM_GourmetGuy_Knife) - EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_02, NPC_FLAG_2, TRUE) - EVT_CALL(SetNpcPos, NPC_GourmetGuy_02, -210, 50, 90) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_Fork, ANIM_GourmetGuy_Fork) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Fork, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcPos, NPC_GourmetGuy_Fork, -285, 50, 90) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy_Knife, ANIM_GourmetGuy_Knife) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy_Knife, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcPos, NPC_GourmetGuy_Knife, -210, 50, 90) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_GourmetGuy))) EVT_END_IF EVT_RETURN @@ -394,7 +394,7 @@ EvtScript N(EVS_NpcInit_GourmetGuy) = { StaticNpc N(NpcData_GourmetGuy)[] = { { - .id = NPC_GourmetGuy_01, + .id = NPC_GourmetGuy, .settings = &N(NpcSettings_GourmetGuy), .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, @@ -426,7 +426,7 @@ StaticNpc N(NpcData_GourmetGuy)[] = { .tattle = MSG_NpcTattle_GourmetGuy, }, { - .id = NPC_GourmetGuy_02, + .id = NPC_GourmetGuy_Knife, .settings = &N(NpcSettings_GourmetGuy), .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, @@ -457,7 +457,7 @@ StaticNpc N(NpcData_GourmetGuy)[] = { .tattle = MSG_NpcTattle_GourmetGuy, }, { - .id = NPC_GourmetGuy_03, + .id = NPC_GourmetGuy_Fork, .settings = &N(NpcSettings_GourmetGuy), .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c deleted file mode 100644 index dc0cef397e..0000000000 --- a/src/world/area_omo/omo_06/DB7910.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "omo_06.h" - -static char* N(exit_str_0) = "omo_17"; -static char* N(exit_str_1) = "omo_07"; -static char* N(exit_str_2) = "omo_10"; -static char* N(exit_str_3) = "omo_08"; -static char* N(exit_str_4) = "omo_06"; -static char* N(exit_str_5) = "omo_03"; -static char* N(exit_str_6) = "omo_16"; -static char* N(exit_str_7) = ""; - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -#include "common/SetAngleClamped.inc.c" - -#include "common/CompareFloats.inc.c" - -#include "common/AdvanceBuffer.inc.c" - -#include "common/SetPlayerStatusPosYaw.inc.c" - -#include "common/SetNpcPosYaw.inc.c" - -#include "common/CosInterpMinMax.inc.c" - -#include "common/IsAOrBPressed.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c deleted file mode 100644 index be69431266..0000000000 --- a/src/world/area_omo/omo_06/DB8180.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "omo_06.h" - -#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" diff --git a/src/world/area_omo/omo_06/omo_06.h b/src/world/area_omo/omo_06/omo_06.h index d8e81bfeb4..40f298f569 100644 --- a/src/world/area_omo/omo_06/omo_06.h +++ b/src/world/area_omo/omo_06/omo_06.h @@ -2,8 +2,42 @@ /// @brief Shy Guy's Toybox - PNK Station #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_06_shape.h" +#include "mapfs/omo_06_hit.h" + +#include "sprite/npc/TrainToad.h" + +enum { + NPC_Conductor = 0, + NPC_TrainToad = 1, +}; + +enum { + MV_TrainUnk_00 = MapVar(0), + MV_TrainUnk_01 = MapVar(1), + MV_TrainUnk_02 = MapVar(2), + MV_ArrowTexUOffset = MapVar(9), + MV_TrainPos = MapVar(11), + MV_TrainUnk_0C = MapVar(12), + MV_TrainUnk_0D = MapVar(13), +}; + +enum { + MF_TrainUnk_00 = MapFlag(0), + MF_EitherSwitchPressed = MapFlag(1), + MF_Unk_0A = MapFlag(10), +}; + #define NAMESPACE omo_06 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGizmos); +extern EvtScript N(EVS_80244F40); +extern EvtScript N(D_80244B10_DBC420); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_06/omo_06_0_header.c b/src/world/area_omo/omo_06/omo_06_0_header.c new file mode 100644 index 0000000000..6c85dd3bc6 --- /dev/null +++ b/src/world/area_omo/omo_06/omo_06_0_header.c @@ -0,0 +1,17 @@ +#include "omo_06.h" + +EntryList N(Entrances) = { + [omo_06_ENTRY_0] { -475.0, 0.0, 140.0, 90.0 }, + [omo_06_ENTRY_1] { -475.0, 0.0, -160.0, 90.0 }, + [omo_06_ENTRY_2] { -466.0, 10.0, 5.0, 90.0 }, + [omo_06_ENTRY_3] { 340.0, 10.0, -330.0, 225.0 }, + [omo_06_ENTRY_4] { 337.0, 0.0, 337.0, 315.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_06 }, +}; diff --git a/src/world/area_omo/omo_06/omo_06_1_music.c b/src/world/area_omo/omo_06/omo_06_1_music.c new file mode 100644 index 0000000000..e54a91fb16 --- /dev/null +++ b/src/world/area_omo/omo_06/omo_06_1_music.c @@ -0,0 +1,18 @@ +#include "omo_06.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_ELSE + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(omo_06_ENTRY_2, omo_06_ENTRY_3) + EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_06/omo_06_2_main.c b/src/world/area_omo/omo_06/omo_06_2_main.c new file mode 100644 index 0000000000..97def3e407 --- /dev/null +++ b/src/world/area_omo/omo_06/omo_06_2_main.c @@ -0,0 +1,49 @@ +#include "omo_06.h" + +EvtScript N(EVS_ExitWalk_omo_17_2) = EVT_EXIT_WALK(60, omo_06_ENTRY_0, "omo_17", omo_17_ENTRY_2); +EvtScript N(EVS_ExitWalk_omo_17_3) = EVT_EXIT_WALK(60, omo_06_ENTRY_1, "omo_17", omo_17_ENTRY_3); +EvtScript N(EVS_ExitWalk_omo_07_0) = EVT_EXIT_WALK(60, omo_06_ENTRY_4, "omo_07", omo_07_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_17_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili3, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_17_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilit5, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_07_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 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_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(omo_06_ENTRY_2, omo_06_ENTRY_3) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_WAIT(3) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + 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_SetupGizmos)) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_80244F40)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_06/omo_06_3_gizmos.c b/src/world/area_omo/omo_06/omo_06_3_gizmos.c new file mode 100644 index 0000000000..b447ea9217 --- /dev/null +++ b/src/world/area_omo/omo_06/omo_06_3_gizmos.c @@ -0,0 +1,113 @@ +#include "omo_06.h" +#include "effects.h" + +EvtScript N(EVS_Gizmos_Wheels) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_ha1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha2, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha3, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha4, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Shutters) = { + EVT_LABEL(0) + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 160, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 160, 0, 60, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_WAIT(2) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_PullPinkSwitch) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 70, 30, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bou1, LVar0, 0, 0, 1) + EVT_CALL(UpdateColliderTransform, COLLIDER_bou1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_1F1, 0, -395, 0, -185) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o930, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 223, 10, -165) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 223, 10, -165) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-500.0), EVT_FLOAT(-200.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(20) + EVT_CALL(PlaySoundAt, SOUND_1F2, 0, 265, 0, -235) + EVT_CALL(MakeLerp, 0, 180, 30, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o898, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o899, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o897, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_51, 0, 265, 0, -235) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(GetModelCenter, MODEL_o897) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0) + EVT_WAIT(30) + EVT_SET(GB_StoryProgress, STORY_CH4_PULLED_SWITCH_SWITCH) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupGizmos) = { + EVT_EXEC(N(EVS_Gizmos_Wheels)) + EVT_EXEC(N(EVS_Gizmos_Shutters)) + EVT_CALL(ParentColliderToModel, COLLIDER_bou1, MODEL_bou1) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_PULLED_SWITCH_SWITCH) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_PullPinkSwitch)), TRIGGER_WALL_PRESS_A, COLLIDER_o664, 1, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o930, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_CALL(RotateModel, MODEL_bou1, 70, 0, 0, 1) + EVT_CALL(UpdateColliderTransform, COLLIDER_bou1) + EVT_CALL(RotateModel, MODEL_o898, 180, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o899, 180, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o897, 180, 1, 0, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_06/omo_06_4_train.c b/src/world/area_omo/omo_06/omo_06_4_train.c new file mode 100644 index 0000000000..f3db4c39d7 --- /dev/null +++ b/src/world/area_omo/omo_06/omo_06_4_train.c @@ -0,0 +1,330 @@ +#include "omo_06.h" + +#include "../common/ToyTrain.inc.c" +#include "../common/TrainStationSwitches.inc.c" + +Vec2i N(D_80244160_DBBA70) = { + 50, 45 +}; + +s32 N(D_80244168_DBBA78)[] = { + EVT_FLOAT(-1.825), EVT_FLOAT(-35.275), EVT_FLOAT(66.038), + EVT_FLOAT(162.917), EVT_FLOAT(-108.494), EVT_FLOAT(353.442), + EVT_FLOAT(-353.717), EVT_FLOAT(414.885), EVT_FLOAT(-426.942), + -1, -1, -1 +}; + +EvtScript N(D_80244198_DBBAA8) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC(N(EVS_TrainUnk_C)) + EVT_SET(AB_OMO_5, 1) + EVT_SET(LVar0, EVT_PTR(N(D_80244168_DBBA78))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_D)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o898, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80244168_DBBA78))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(10) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_80244308_DBBC18)[] = { + EVT_FLOAT(-1.825), EVT_FLOAT(-35.275), EVT_FLOAT(246.038), + EVT_FLOAT(-166.506), EVT_FLOAT(37.917), EVT_FLOAT(-500.0), + EVT_FLOAT(0.279), EVT_FLOAT(-600.0), EVT_FLOAT(0.558), + -1, -1, -1 +}; + +EvtScript N(D_80244338_DBBC48) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC(N(EVS_TrainUnk_C)) + EVT_SET(AB_OMO_5, 1) + EVT_SET(LVar0, EVT_PTR(N(D_80244308_DBBC18))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_D)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o898, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80244308_DBBC18))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(10) + EVT_IF_GT(MV_TrainPos, -480) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_1) + EVT_SET(GB_OMO_TrainDestination, 0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_802444A8_DBBDB8)[] = { + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.925), + EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(162.917), + EVT_FLOAT(-108.494), EVT_FLOAT(-38.38), EVT_FLOAT(-19.05), + -1, -1, -1 +}; + +s32 N(D_802444D8_DBBDE8)[] = { + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.925), + EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(162.917), + EVT_FLOAT(-108.494), EVT_FLOAT(-166.506), EVT_FLOAT(37.917), + EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-600.0), + EVT_FLOAT(0.558), -1, -1, -1 +}; + +EvtScript N(D_80244518_DBBE28) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o898, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(AB_OMO_6, 1) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802444A8_DBBDB8))) + EVT_SET(MV_TrainUnk_02, 2) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_A), LVarB) + EVT_LABEL(10) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_SET(LVar9, EVT_PTR(N(D_80244160_DBBA70))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_000F) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o898, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_EXEC(N(EVS_TrainUnk_A)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802444D8_DBBDE8))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(20) + EVT_IF_GT(MV_TrainPos, -480) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_1) + EVT_SET(GB_OMO_TrainDestination, 0) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_802447D0_DBC0E0)[] = { + EVT_FLOAT(-600.0), EVT_FLOAT(0.558), EVT_FLOAT(89.875), + EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-166.506), + EVT_FLOAT(37.917), EVT_FLOAT(34.74), EVT_FLOAT(-51.5), + -1, -1, -1 +}; + +s32 N(D_80244800_DBC110)[] = { + EVT_FLOAT(-600.0), EVT_FLOAT(0.558), EVT_FLOAT(89.875), + EVT_FLOAT(-500.0), EVT_FLOAT(0.279), EVT_FLOAT(-166.506), + EVT_FLOAT(37.917), EVT_FLOAT(162.917), EVT_FLOAT(-108.494), + EVT_FLOAT(353.442), EVT_FLOAT(-353.717), EVT_FLOAT(414.885), + EVT_FLOAT(-426.942), + -1, -1, -1 +}; + +EvtScript N(D_80244840_DBC150) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o898, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(AB_OMO_6, 1) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802447D0_DBC0E0))) + EVT_SET(MV_TrainUnk_02, 2) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_A), LVarB) + EVT_LABEL(10) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_SET(LVar9, EVT_PTR(N(D_80244160_DBBA70))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_000F) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o898, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_EXEC(N(EVS_TrainUnk_A)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80244800_DBC110))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(20) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 1) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_80244AF8_DBC408)[] = { + 0, 3, 2, +}; + +s32 N(D_80244B04_DBC414)[] = { + 2, 3, 0, +}; + +EvtScript N(D_80244B10_DBC420) = { + EVT_IF_EQ(MF_EitherSwitchPressed, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0006) + EVT_ELSE + EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, FALSE) + EVT_CALL(ShowChoice, MSG_Choice_003D) + EVT_IF_NE(LVar0, 1) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80244AF8_DBC408))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80244338_DBBC48)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_ELSE + EVT_CALL(ShowChoice, MSG_Choice_003E) + EVT_IF_NE(LVar0, 3) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80244AF8_DBC408))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80244338_DBBC48)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_PULLED_SWITCH_SWITCH) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_SadTalk, ANIM_TrainToad_SadIdle, 0, MSG_CH4_0012) + EVT_CASE_LT(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_CALL(ShowChoice, MSG_Choice_003B) + EVT_IF_NE(LVar0, 1) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80244B04_DBC414))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80244198_DBBAA8)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_CASE_GE(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_CALL(ShowChoice, MSG_Choice_003C) + EVT_IF_NE(LVar0, 3) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80244B04_DBC414))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80244198_DBBAA8)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_END_SWITCH + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_80244F28_DBC838)[] = { + EVT_FLOAT(-1.825), EVT_FLOAT(-35.275), EVT_FLOAT(66.038), + -1, -1, -1 +}; + +EvtScript N(EVS_80244F40) = { + EVT_EXEC_WAIT(N(EVS_SetupSwitches)) + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80244F28_DBC838))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_ELSE + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(omo_06_ENTRY_2) + EVT_EXEC(N(D_80244840_DBC150)) + EVT_CASE_EQ(omo_06_ENTRY_3) + EVT_EXEC(N(D_80244518_DBBE28)) + EVT_CASE_DEFAULT + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80244F28_DBC838))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_06/omo_06_5_npc.c b/src/world/area_omo/omo_06/omo_06_5_npc.c new file mode 100644 index 0000000000..f2384a41f8 --- /dev/null +++ b/src/world/area_omo/omo_06/omo_06_5_npc.c @@ -0,0 +1,76 @@ +#include "omo_06.h" + +#include "world/common/npc/TrainToad.inc.c" + +EvtScript N(EVS_NpcInteract_Conductor) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(D_80244B10_DBC420)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Conductor) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Conductor))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_TrainToad) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_GOT_FRYING_PAN) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Pink_Talk, ANIM_TrainToad_Pink_Idle, 0, MSG_CH4_0023) + EVT_CASE_LT(STORY_CH4_GOT_TAYCE_TS_CAKE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Pink_Talk, ANIM_TrainToad_Pink_Idle, 0, MSG_CH4_0024) + EVT_CASE_LT(STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Pink_Talk, ANIM_TrainToad_Pink_Idle, 0, MSG_CH4_0025) + EVT_CASE_LT(STORY_CH4_PULLED_SWITCH_SWITCH) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Pink_Talk, ANIM_TrainToad_Pink_Idle, 0, MSG_CH4_0026) + EVT_CASE_LT(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Pink_Talk, ANIM_TrainToad_Pink_Idle, 0, MSG_CH4_0027) + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Pink_Talk, ANIM_TrainToad_Pink_Idle, 0, MSG_CH4_0028) + EVT_CASE_LT(STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Pink_Talk, ANIM_TrainToad_Pink_Idle, 0, MSG_CH4_0029) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Pink_Talk, ANIM_TrainToad_Pink_Idle, 0, MSG_CH4_002A) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TrainToad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainToad))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcSettings_Toads)[] = { + { + .id = NPC_Conductor, + .settings = &N(NpcSettings_TrainToad), + .pos = { 50.0f, 50.0f, 45.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Conductor), + .drops = TRAIN_CONDUCTOR_DROPS, + .animations = TRAIN_CONDUCTOR_ANIMS, + .tattle = MSG_NpcTattle_OMO_TrainConductor, + }, + { + .id = NPC_TrainToad, + .settings = &N(NpcSettings_TrainToad), + .pos = { 55.0f, 0.0f, 240.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_TrainToad), + .drops = TRAIN_CONDUCTOR_DROPS, + .animations = TRAIN_TOAD_PINK_ANIMS, + .tattle = MSG_NpcTattle_OMO_TrainConductor, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcSettings_Toads)), + {} +}; diff --git a/src/world/area_omo/omo_06/omo_06_6_entity.c b/src/world/area_omo/omo_06/omo_06_6_entity.c new file mode 100644 index 0000000000..1bb74d1b41 --- /dev/null +++ b/src/world/area_omo/omo_06/omo_06_6_entity.c @@ -0,0 +1,27 @@ +#include "omo_06.h" +#include "entity.h" + +#include "world/common/atomic/Chest.inc.c" + +EvtScript N(EVS_OpenChest_Mailbag) = { + EVT_SET(LVarA, ITEM_MAILBAG) + EVT_SET(LVarB, ITEM_TYPE_KEY) + EVT_SET(GF_OMO06_Chest_Mailbag, TRUE) + EVT_EXEC_WAIT(N(EVS_Chest_GetItem)) + EVT_SET(GF_MAC01_MailbagStolen, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -200, 60, 300, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -280, 60, -290, 0, ITEM_THUNDER_RAGE, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO06_HiddenItem_ThunderRage) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 400, 0, 60, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_OMO06_Chest_Mailbag) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_Mailbag))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 100, 0, 400, 0, MODEL_o817, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_OMO06_HiddenPanel) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_07/omo_07.h b/src/world/area_omo/omo_07/omo_07.h index 00680c11ef..4b02cc06b8 100644 --- a/src/world/area_omo/omo_07/omo_07.h +++ b/src/world/area_omo/omo_07/omo_07.h @@ -28,8 +28,8 @@ enum { }; enum { - MV_SecretDoorAngle = MapVar(0), - MV_AmbushID = MapVar(10), // npcID or itemID depending on GB_OMO_PeachChoice1 + MV_SecretDoorAngle = MapVar(0), + MV_AmbushID = MapVar(10), // npcID or itemID depending on GB_OMO_PeachChoice1 }; #define NAMESPACE omo_07 diff --git a/src/world/area_omo/omo_07/omo_07_3_gizmos.c b/src/world/area_omo/omo_07/omo_07_3_gizmos.c index f0a85670a8..7b7f820b06 100644 --- a/src/world/area_omo/omo_07/omo_07_3_gizmos.c +++ b/src/world/area_omo/omo_07/omo_07_3_gizmos.c @@ -25,7 +25,7 @@ EvtScript N(EVS_Gizmos_Shutters) = { EVT_END }; -EvtScript N(EVS_Gizmos_Wheels) = { +EvtScript N(EVS_Gizmos_Clocks) = { EVT_LABEL(0) EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) EVT_LABEL(1) @@ -43,7 +43,7 @@ EvtScript N(EVS_Gizmos_Wheels) = { EvtScript N(EVS_SetupGizmos) = { EVT_EXEC(N(EVS_Gizmos_Shutters)) - EVT_EXEC(N(EVS_Gizmos_Wheels)) + EVT_EXEC(N(EVS_Gizmos_Clocks)) EVT_RETURN EVT_END }; diff --git a/src/world/area_omo/omo_07/omo_07_4_npc.c b/src/world/area_omo/omo_07/omo_07_4_npc.c index 97211eb792..5a66b6bcba 100644 --- a/src/world/area_omo/omo_07/omo_07_4_npc.c +++ b/src/world/area_omo/omo_07/omo_07_4_npc.c @@ -19,16 +19,7 @@ NpcSettings N(NpcSettings_HammerBros) = { .level = 27, }; -#include "world/common/enemy/complete/Kammy.h" - -NpcSettings N(NpcSettings_Kammy) = { - .height = 34, - .radius = 24, - .level = 26, - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - +#include "world/common/enemy/complete/Kammy.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_07/omo_07_6_scenes.c b/src/world/area_omo/omo_07/omo_07_6_scenes.c index 64b588d175..5c70fcb1f1 100644 --- a/src/world/area_omo/omo_07/omo_07_6_scenes.c +++ b/src/world/area_omo/omo_07/omo_07_6_scenes.c @@ -59,8 +59,8 @@ EvtScript N(EVS_NpcAux_Kammy) = { EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GF_OMO07_SpawnedPeachChoice2, TRUE) - EVT_SET(AB_OMO_4, GB_OMO_PeachChoice2) - EVT_SWITCH(AB_OMO_4) + EVT_SET(AB_OMO_CurrentPeachChoice, GB_OMO_PeachChoice2) + EVT_SWITCH(AB_OMO_CurrentPeachChoice) EVT_CASE_EQ(0) EVT_SET(MV_AmbushID, NPC_Fuzzy) EVT_CASE_EQ(1) @@ -71,7 +71,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcPos, NPC_Kammy, 1000, 15, 0) EVT_CALL(SetNpcYaw, NPC_Kammy, 90) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) - EVT_IF_NE(AB_OMO_4, 2) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(SetNpcPos, MV_AmbushID, NPC_DISPOSE_LOCATION) EVT_END_IF EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1060, 0, 0) @@ -97,7 +97,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(PlaySoundAt, SOUND_2098, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 0, 0, 1, 15, 3, 8) EVT_WAIT(5) - EVT_IF_NE(AB_OMO_4, 2) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(SetNpcPos, MV_AmbushID, LVar0, 0, 0) EVT_ELSE EVT_CALL(MakeItemEntity, MV_AmbushID, LVar0, 0, 0, ITEM_SPAWN_MODE_DECORATION, 0) @@ -106,7 +106,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) EVT_WAIT(5) - EVT_IF_NE(AB_OMO_4, 2) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, 0) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) EVT_WAIT(5) diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c deleted file mode 100644 index 6180bffdb1..0000000000 --- a/src/world/area_omo/omo_08/DC43D0.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "omo_08.h" - -static char* N(exit_str_0) = "omo_09"; -static char* N(exit_str_1) = "omo_10"; -static char* N(exit_str_2) = "omo_08"; -static char* N(exit_str_3) = "omo_06"; -static char* N(exit_str_4) = "omo_03"; -static char* N(exit_str_5) = "omo_16"; - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -#include "common/SetAngleClamped.inc.c" - -#include "common/CompareFloats.inc.c" - -#include "common/AdvanceBuffer.inc.c" - -#include "common/SetPlayerStatusPosYaw.inc.c" - -#include "common/SetNpcPosYaw.inc.c" - -#include "common/CosInterpMinMax.inc.c" - -#include "common/IsAOrBPressed.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_omo/omo_08/DC4C40.c b/src/world/area_omo/omo_08/DC4C40.c deleted file mode 100644 index 137c964c7a..0000000000 --- a/src/world/area_omo/omo_08/DC4C40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "omo_08.h" - -#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" diff --git a/src/world/area_omo/omo_08/omo_08.h b/src/world/area_omo/omo_08/omo_08.h index e508e562c0..dc074eda95 100644 --- a/src/world/area_omo/omo_08/omo_08.h +++ b/src/world/area_omo/omo_08/omo_08.h @@ -2,8 +2,49 @@ /// @brief Shy Guy's Toybox - GRN Station #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_08_shape.h" +#include "mapfs/omo_08_hit.h" + +#include "sprite/npc/TrainToad.h" +#include "sprite/npc/ShyGuy.h" + +enum { + NPC_Conductor = 0, + NPC_TrainToad = 1, + NPC_ShyGuy_01 = 2, + NPC_ShyGuy_02 = 3, + NPC_ShyGuy_03 = 4, + NPC_ShyGuy_04 = 5, +}; + +enum { + MV_TrainUnk_00 = MapVar(0), + MV_TrainUnk_01 = MapVar(1), + MV_TrainUnk_02 = MapVar(2), + MV_ArrowTexUOffset = MapVar(9), + MV_TrainPos = MapVar(11), + MV_TrainUnk_0C = MapVar(12), + MV_TrainUnk_0D = MapVar(13), + MV_BoxHitCount = MapVar(14), + MV_BoxHitSequence = MapVar(15), +}; + +enum { + MF_TrainUnk_00 = MapFlag(0), + MF_EitherSwitchPressed = MapFlag(1), + MF_Unk_0A = MapFlag(10), +}; + #define NAMESPACE omo_08 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupTrain); +extern EvtScript N(EVS_80247100); +extern EvtScript N(EVS_SetupBoxes); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_08/omo_08_0_header.c b/src/world/area_omo/omo_08/omo_08_0_header.c new file mode 100644 index 0000000000..663778b666 --- /dev/null +++ b/src/world/area_omo/omo_08/omo_08_0_header.c @@ -0,0 +1,15 @@ +#include "omo_08.h" + +EntryList N(Entrances) = { + [omo_08_ENTRY_0] { 333.0, 0.0, 333.0, 315.0 }, + [omo_08_ENTRY_1] { -335.0, 10.0, -335.0, 135.0 }, + [omo_08_ENTRY_2] { 340.0, 10.0, -340.0, 225.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_08 }, +}; diff --git a/src/world/area_omo/omo_08/omo_08_1_music.c b/src/world/area_omo/omo_08/omo_08_1_music.c new file mode 100644 index 0000000000..218c444288 --- /dev/null +++ b/src/world/area_omo/omo_08/omo_08_1_music.c @@ -0,0 +1,17 @@ +#include "omo_08.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_ELSE + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, omo_08_ENTRY_0) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_ELSE + EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_08/omo_08_2_main.c b/src/world/area_omo/omo_08/omo_08_2_main.c new file mode 100644 index 0000000000..31f9113ca5 --- /dev/null +++ b/src/world/area_omo/omo_08/omo_08_2_main.c @@ -0,0 +1,44 @@ +#include "omo_08.h" + +EvtScript N(EVS_ExitWalk_omo_09_0) = EVT_EXIT_WALK(60, omo_08_ENTRY_0, "omo_09", omo_09_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_09_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili3, 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_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, omo_08_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_ELSE + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_WAIT(3) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + 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_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupTrain)) + EVT_EXEC_WAIT(N(EVS_SetupBoxes)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_08/omo_08_3_boxes.c b/src/world/area_omo/omo_08/omo_08_3_boxes.c new file mode 100644 index 0000000000..f2941a6daa --- /dev/null +++ b/src/world/area_omo/omo_08/omo_08_3_boxes.c @@ -0,0 +1,741 @@ +#include "omo_08.h" +#include "effects.h" + +extern EvtScript N(EVS_HitBox); + +enum { + BOX_COLOR_GREEN = 0, + BOX_COLOR_YELLOW = 1, + BOX_COLOR_RED = 2, + BOX_COLOR_BLUE = 3, +}; + +#define BOX_SEQUENCE(a, b, c, d) (a << 6 | b << 4 | c << 2 | d) + +s32 N(GreenBoxInfo)[] = { + BOX_COLOR_GREEN, + MODEL_bm1_2, MODEL_b1_2, + MODEL_bm1_1, MODEL_b1_1, +}; + +s32 N(YellowBoxInfo)[] = { + BOX_COLOR_YELLOW, + MODEL_bm2_2, MODEL_b2_2, + MODEL_bm2_1, MODEL_b2_1, +}; + +s32 N(RedBoxInfo)[] = { + BOX_COLOR_RED, + MODEL_bm3_2, MODEL_b3_2, + MODEL_bm3_1, MODEL_b3_1, +}; + +s32 N(BlueBoxInfo)[] = { + BOX_COLOR_BLUE, + MODEL_bm4_2, MODEL_b4_2, + MODEL_bm4_1, MODEL_b4_1, +}; + +EvtScript N(EVS_GreenLightOff) = { + EVT_CALL(EnableModel, MODEL_bm1_1, TRUE) + EVT_CALL(EnableModel, MODEL_b1_1, TRUE) + EVT_CALL(EnableModel, MODEL_bm1_2, FALSE) + EVT_CALL(EnableModel, MODEL_b1_2, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_YellowLightOff) = { + EVT_CALL(EnableModel, MODEL_bm2_1, TRUE) + EVT_CALL(EnableModel, MODEL_b2_1, TRUE) + EVT_CALL(EnableModel, MODEL_bm2_2, FALSE) + EVT_CALL(EnableModel, MODEL_b2_2, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RedLightOff) = { + EVT_CALL(EnableModel, MODEL_bm3_1, TRUE) + EVT_CALL(EnableModel, MODEL_b3_1, TRUE) + EVT_CALL(EnableModel, MODEL_bm3_2, FALSE) + EVT_CALL(EnableModel, MODEL_b3_2, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BlueLightOff) = { + EVT_CALL(EnableModel, MODEL_bm4_1, TRUE) + EVT_CALL(EnableModel, MODEL_b4_1, TRUE) + EVT_CALL(EnableModel, MODEL_bm4_2, FALSE) + EVT_CALL(EnableModel, MODEL_b4_2, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GreenLightOn) = { + EVT_CALL(EnableModel, MODEL_bm1_1, FALSE) + EVT_CALL(EnableModel, MODEL_b1_1, FALSE) + EVT_CALL(EnableModel, MODEL_bm1_2, TRUE) + EVT_CALL(EnableModel, MODEL_b1_2, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_YellowLightOn) = { + EVT_CALL(EnableModel, MODEL_bm2_1, FALSE) + EVT_CALL(EnableModel, MODEL_b2_1, FALSE) + EVT_CALL(EnableModel, MODEL_bm2_2, TRUE) + EVT_CALL(EnableModel, MODEL_b2_2, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RedLightOn) = { + EVT_CALL(EnableModel, MODEL_bm3_1, FALSE) + EVT_CALL(EnableModel, MODEL_b3_1, FALSE) + EVT_CALL(EnableModel, MODEL_bm3_2, TRUE) + EVT_CALL(EnableModel, MODEL_b3_2, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BlueLightOn) = { + EVT_CALL(EnableModel, MODEL_bm4_1, FALSE) + EVT_CALL(EnableModel, MODEL_b4_1, FALSE) + EVT_CALL(EnableModel, MODEL_bm4_2, TRUE) + EVT_CALL(EnableModel, MODEL_b4_2, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ResetBoxesAfterAmbush) = { + // wait for all shy guys to be defeated + EVT_LABEL(0) + EVT_CALL(GetNpcPos, NPC_ShyGuy_01, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_ShyGuy_02, LVar0, LVar2, LVar3) + EVT_CALL(GetNpcPos, NPC_ShyGuy_03, LVar0, LVar3, LVar4) + EVT_CALL(GetNpcPos, NPC_ShyGuy_04, LVar0, LVar4, LVar5) + EVT_ADD(LVar1, LVar2) + EVT_ADD(LVar1, LVar3) + EVT_ADD(LVar1, LVar4) + EVT_IF_NE(LVar1, 4 * NPC_DISPOSE_POS_Y) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_THREAD + EVT_EXEC(N(EVS_GreenLightOff)) + EVT_CALL(MakeLerp, 90, 0, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm1_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm1_1, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(2) + EVT_THREAD + EVT_EXEC(N(EVS_YellowLightOff)) + EVT_CALL(MakeLerp, 90, 0, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm2_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm2_1, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(3) + EVT_THREAD + EVT_EXEC(N(EVS_RedLightOff)) + EVT_CALL(MakeLerp, 90, 0, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm3_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm3_1, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(3) + EVT_EXEC(N(EVS_BlueLightOff)) + EVT_CALL(MakeLerp, 90, 0, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm4_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm4_1, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(MV_BoxHitSequence, 0) + EVT_SET(MV_BoxHitCount, 0) + EVT_CALL(EnableModel, MODEL_bm1_2, FALSE) + EVT_CALL(EnableModel, MODEL_b1_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(GreenBoxInfo))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o907, 1, 0) + EVT_CALL(EnableModel, MODEL_bm2_2, FALSE) + EVT_CALL(EnableModel, MODEL_b2_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(YellowBoxInfo))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o911, 1, 0) + EVT_CALL(EnableModel, MODEL_bm3_2, FALSE) + EVT_CALL(EnableModel, MODEL_b3_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(RedBoxInfo))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o915, 1, 0) + EVT_CALL(EnableModel, MODEL_bm4_2, FALSE) + EVT_CALL(EnableModel, MODEL_b4_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(BlueBoxInfo))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o918, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BoxResult_GiveCoins) = { + EVT_SET(LVar0, 4) + EVT_LOOP(3) + EVT_EXEC(N(EVS_GreenLightOff)) + EVT_WAIT(LVar0) + EVT_EXEC(N(EVS_YellowLightOff)) + EVT_WAIT(LVar0) + EVT_EXEC(N(EVS_RedLightOff)) + EVT_WAIT(LVar0) + EVT_EXEC(N(EVS_BlueLightOff)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, 0) + EVT_EXEC(N(EVS_GreenLightOn)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, 0) + EVT_EXEC(N(EVS_YellowLightOn)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, 0) + EVT_EXEC(N(EVS_RedLightOn)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, 0) + EVT_EXEC(N(EVS_BlueLightOn)) + EVT_WAIT(LVar0) + EVT_SUB(LVar0, 1) + EVT_END_LOOP + EVT_WAIT(4) + EVT_SET(LVar0, 4) + EVT_LOOP(3) + EVT_EXEC(N(EVS_GreenLightOff)) + EVT_EXEC(N(EVS_YellowLightOff)) + EVT_EXEC(N(EVS_RedLightOff)) + EVT_EXEC(N(EVS_BlueLightOff)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySound, SOUND_1A9) + EVT_EXEC(N(EVS_GreenLightOn)) + EVT_EXEC(N(EVS_YellowLightOn)) + EVT_EXEC(N(EVS_RedLightOn)) + EVT_EXEC(N(EVS_BlueLightOn)) + EVT_WAIT(LVar0) + EVT_SUB(LVar0, 1) + EVT_END_LOOP + EVT_WAIT(2) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm1_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm1_1, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetModelCenter, MODEL_b1_1) + EVT_CALL(MakeItemEntity, ITEM_COIN, LVar0, 40, LVar2, ITEM_SPAWN_MODE_BATTLE_REWARD, 0) + EVT_END_THREAD + EVT_WAIT(3) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm2_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm2_1, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetModelCenter, MODEL_b2_1) + EVT_CALL(MakeItemEntity, ITEM_COIN, LVar0, 40, LVar2, ITEM_SPAWN_MODE_BATTLE_REWARD, 0) + EVT_END_THREAD + EVT_WAIT(3) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm3_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm3_1, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetModelCenter, MODEL_b3_1) + EVT_CALL(MakeItemEntity, ITEM_COIN, LVar0, 40, LVar2, ITEM_SPAWN_MODE_BATTLE_REWARD, 0) + EVT_END_THREAD + EVT_WAIT(3) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm4_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm4_1, LVar0, -1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetModelCenter, MODEL_b4_1) + EVT_CALL(MakeItemEntity, ITEM_COIN, LVar0, 40, LVar2, ITEM_SPAWN_MODE_BATTLE_REWARD, 0) + EVT_WAIT(20) + EVT_CALL(ResetCam, CAM_DEFAULT, 2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BoxResult_RepairTrack) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LOOP(4) + EVT_EXEC(N(EVS_GreenLightOff)) + EVT_WAIT(3) + EVT_EXEC(N(EVS_YellowLightOff)) + EVT_WAIT(3) + EVT_EXEC(N(EVS_RedLightOff)) + EVT_WAIT(3) + EVT_EXEC(N(EVS_BlueLightOff)) + EVT_WAIT(3) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, 0) + EVT_EXEC(N(EVS_GreenLightOn)) + EVT_WAIT(3) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, 0) + EVT_EXEC(N(EVS_YellowLightOn)) + EVT_WAIT(3) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, 0) + EVT_EXEC(N(EVS_RedLightOn)) + EVT_WAIT(3) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, 0) + EVT_EXEC(N(EVS_BlueLightOn)) + EVT_WAIT(3) + EVT_END_LOOP + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 160, 10, -200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 160, 10, -200) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 700) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 40, EVT_FLOAT(-4.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 40, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_t1, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetModelCenter, MODEL_o875) + EVT_CALL(PlaySoundAt, SOUND_1F3, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 40, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_t2, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetModelCenter, MODEL_o877) + EVT_CALL(PlaySoundAt, SOUND_1F3, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 40, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_t3, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetModelCenter, MODEL_o879) + EVT_CALL(PlaySoundAt, SOUND_1F3, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 40, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_t4, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetModelCenter, MODEL_o881) + EVT_CALL(PlaySoundAt, SOUND_1F3, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) + EVT_END_THREAD + EVT_WAIT(100) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 100, 0, 370) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 100, 0, 370) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -450) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 16, EVT_FLOAT(-6.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(GetModelCenter, MODEL_b1_1) + EVT_CALL(SetGroupEnabled, MODEL_b1, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_2098, 0) + EVT_LOOP(4) + EVT_SET(LVar3, 20) + EVT_CALL(RandInt, 40, LVar6) + EVT_SUB(LVar3, LVar6) + EVT_ADD(LVar3, LVar0) + EVT_SET(LVar4, 20) + EVT_CALL(RandInt, 40, LVar7) + EVT_SUB(LVar4, LVar7) + EVT_ADD(LVar4, LVar1) + EVT_SET(LVar5, 20) + EVT_CALL(RandInt, 40, LVar8) + EVT_SUB(LVar5, LVar8) + EVT_ADD(LVar5, LVar2) + EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 0, LVar3, LVar4, LVar5) + EVT_WAIT(2) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(GetModelCenter, MODEL_b2_1) + EVT_CALL(SetGroupEnabled, MODEL_b2, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_2098, 0) + EVT_LOOP(4) + EVT_SET(LVar3, 20) + EVT_CALL(RandInt, 40, LVar6) + EVT_SUB(LVar3, LVar6) + EVT_ADD(LVar3, LVar0) + EVT_SET(LVar4, 20) + EVT_CALL(RandInt, 40, LVar7) + EVT_SUB(LVar4, LVar7) + EVT_ADD(LVar4, LVar1) + EVT_SET(LVar5, 20) + EVT_CALL(RandInt, 40, LVar8) + EVT_SUB(LVar5, LVar8) + EVT_ADD(LVar5, LVar2) + EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 0, LVar3, LVar4, LVar5) + EVT_WAIT(2) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(GetModelCenter, MODEL_b3_1) + EVT_CALL(SetGroupEnabled, MODEL_b3, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_2098, 0) + EVT_LOOP(4) + EVT_SET(LVar3, 20) + EVT_CALL(RandInt, 40, LVar6) + EVT_SUB(LVar3, LVar6) + EVT_ADD(LVar3, LVar0) + EVT_SET(LVar4, 20) + EVT_CALL(RandInt, 40, LVar7) + EVT_SUB(LVar4, LVar7) + EVT_ADD(LVar4, LVar1) + EVT_SET(LVar5, 20) + EVT_CALL(RandInt, 40, LVar8) + EVT_SUB(LVar5, LVar8) + EVT_ADD(LVar5, LVar2) + EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 0, LVar3, LVar4, LVar5) + EVT_WAIT(2) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(GetModelCenter, MODEL_b4_1) + EVT_CALL(SetGroupEnabled, MODEL_b4, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_2098, 0) + EVT_LOOP(4) + EVT_SET(LVar3, 20) + EVT_CALL(RandInt, 40, LVar6) + EVT_SUB(LVar3, LVar6) + EVT_ADD(LVar3, LVar0) + EVT_SET(LVar4, 20) + EVT_CALL(RandInt, 40, LVar7) + EVT_SUB(LVar4, LVar7) + EVT_ADD(LVar4, LVar1) + EVT_SET(LVar5, 20) + EVT_CALL(RandInt, 40, LVar8) + EVT_SUB(LVar5, LVar8) + EVT_ADD(LVar5, LVar2) + EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 0, LVar3, LVar4, LVar5) + EVT_WAIT(2) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o907, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o911, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o915, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o918, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(20) + EVT_CALL(ResetCam, CAM_DEFAULT, 2) + EVT_SET(GB_StoryProgress, STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { + EVT_SET(LVar0, 4) + EVT_LOOP(3) + EVT_EXEC(N(EVS_GreenLightOff)) + EVT_WAIT(LVar0) + EVT_EXEC(N(EVS_YellowLightOff)) + EVT_WAIT(LVar0) + EVT_EXEC(N(EVS_RedLightOff)) + EVT_WAIT(LVar0) + EVT_EXEC(N(EVS_BlueLightOff)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A6, 0) + EVT_EXEC(N(EVS_BlueLightOn)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A5, 0) + EVT_EXEC(N(EVS_RedLightOn)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A7, 0) + EVT_EXEC(N(EVS_YellowLightOn)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A8, 0) + EVT_EXEC(N(EVS_GreenLightOn)) + EVT_WAIT(LVar0) + EVT_SUB(LVar0, 1) + EVT_END_LOOP + EVT_WAIT(4) + EVT_SET(LVar0, 4) + EVT_LOOP(3) + EVT_EXEC(N(EVS_GreenLightOff)) + EVT_EXEC(N(EVS_YellowLightOff)) + EVT_EXEC(N(EVS_RedLightOff)) + EVT_EXEC(N(EVS_BlueLightOff)) + EVT_WAIT(LVar0) + EVT_CALL(PlaySound, SOUND_1A9) + EVT_EXEC(N(EVS_GreenLightOn)) + EVT_EXEC(N(EVS_YellowLightOn)) + EVT_EXEC(N(EVS_RedLightOn)) + EVT_EXEC(N(EVS_BlueLightOn)) + EVT_WAIT(LVar0) + EVT_SUB(LVar0, 1) + EVT_END_LOOP + EVT_WAIT(2) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm1_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm1_1, 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_o907, SOUND_32C, 0) + EVT_CALL(GetModelCenter, MODEL_b1_1) + EVT_CALL(SetNpcPos, NPC_ShyGuy_01, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_01, EVT_FLOAT(1.0)) + EVT_ADD(LVar2, 60) + EVT_CALL(NpcJump0, NPC_ShyGuy_01, LVar0, 0, LVar2, 20) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_01, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_WAIT(3) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm2_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm2_1, 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_o911, SOUND_32C, 0) + EVT_CALL(GetModelCenter, MODEL_b2_1) + EVT_CALL(SetNpcPos, NPC_ShyGuy_02, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_02, EVT_FLOAT(1.0)) + EVT_ADD(LVar2, 60) + EVT_CALL(NpcJump0, NPC_ShyGuy_02, LVar0, 0, LVar2, 20) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_02, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_WAIT(3) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm3_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm3_1, 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_o915, SOUND_32C, 0) + EVT_CALL(GetModelCenter, MODEL_b3_1) + EVT_CALL(SetNpcPos, NPC_ShyGuy_03, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_03, EVT_FLOAT(1.0)) + EVT_ADD(LVar2, 60) + EVT_CALL(NpcJump0, NPC_ShyGuy_03, LVar0, 0, LVar2, 20) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_03, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_WAIT(3) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 10, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_bm4_2, LVar0, -1, 0, 0) + EVT_CALL(RotateModel, MODEL_bm4_1, 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_o918, SOUND_32C, 0) + EVT_CALL(GetModelCenter, MODEL_b4_1) + EVT_CALL(SetNpcPos, NPC_ShyGuy_04, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_04, EVT_FLOAT(1.0)) + EVT_ADD(LVar2, 60) + EVT_CALL(NpcJump0, NPC_ShyGuy_04, LVar0, 0, LVar2, 20) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_04, NPC_FLAG_40, FALSE) + EVT_CALL(ResetCam, CAM_DEFAULT, 1) + EVT_EXEC(N(EVS_ResetBoxesAfterAmbush)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HitBox) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(EVT_PTR(N(GreenBoxInfo))) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_1A2, 0) + EVT_CASE_EQ(EVT_PTR(N(YellowBoxInfo))) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_1A1, 0) + EVT_CASE_EQ(EVT_PTR(N(RedBoxInfo))) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_1A3, 0) + EVT_CASE_EQ(EVT_PTR(N(BlueBoxInfo))) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_1A4, 0) + EVT_END_SWITCH + EVT_USE_BUF(LVar0) + EVT_BUF_READ1(LVar1) + EVT_BUF_READ4(LVar2, LVar3, LVar4, LVar5) + EVT_LOOP(5) + EVT_CALL(EnableModel, LVar2, FALSE) + EVT_CALL(EnableModel, LVar3, FALSE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar5, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, LVar2, TRUE) + EVT_CALL(EnableModel, LVar3, TRUE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar5, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_MUL(MV_BoxHitSequence, 4) // shift left by 2 + EVT_BITWISE_OR(MV_BoxHitSequence, LVar1) + EVT_ADD(MV_BoxHitCount, 1) + EVT_IF_EQ(MV_BoxHitCount, 4) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(5) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 100, 0, 370) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 100, 0, 370) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -450) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 16, EVT_FLOAT(-6.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(30) + EVT_SWITCH(MV_BoxHitSequence) + EVT_CASE_EQ(BOX_SEQUENCE(BOX_COLOR_GREEN, BOX_COLOR_YELLOW, BOX_COLOR_RED, BOX_COLOR_BLUE)) + EVT_EXEC_WAIT(N(EVS_BoxResult_GiveCoins)) + EVT_CASE_EQ(BOX_SEQUENCE(BOX_COLOR_YELLOW, BOX_COLOR_GREEN, BOX_COLOR_RED, BOX_COLOR_BLUE)) + EVT_EXEC_WAIT(N(EVS_BoxResult_RepairTrack)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_BoxResult_ReleaseShyGuys)) + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_THREAD + EVT_LABEL(10) + EVT_CALL(EnableModel, LVar2, FALSE) + EVT_CALL(EnableModel, LVar3, FALSE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar5, TRUE) + EVT_WAIT(5) + EVT_CALL(EnableModel, LVar2, TRUE) + EVT_CALL(EnableModel, LVar3, TRUE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar5, FALSE) + EVT_WAIT(10) + EVT_IF_NE(MV_BoxHitCount, 4) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_END_IF + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupBoxes) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_SET(MV_BoxHitSequence, 0) + EVT_SET(MV_BoxHitCount, 0) + EVT_CALL(EnableModel, MODEL_bm1_2, FALSE) + EVT_CALL(EnableModel, MODEL_b1_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(GreenBoxInfo))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o907, 1, 0) + EVT_CALL(EnableModel, MODEL_bm2_2, FALSE) + EVT_CALL(EnableModel, MODEL_b2_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(YellowBoxInfo))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o911, 1, 0) + EVT_CALL(EnableModel, MODEL_bm3_2, FALSE) + EVT_CALL(EnableModel, MODEL_b3_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(RedBoxInfo))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o915, 1, 0) + EVT_CALL(EnableModel, MODEL_bm4_2, FALSE) + EVT_CALL(EnableModel, MODEL_b4_2, FALSE) + EVT_SET(LVar0, EVT_PTR(N(BlueBoxInfo))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o918, 1, 0) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_box, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o907, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o911, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o915, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o918, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_sen1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_sen2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(RotateGroup, MODEL_t1, 90, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_t2, 90, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_t3, 90, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_t4, 90, 1, 0, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_08/omo_08_4_train.c b/src/world/area_omo/omo_08/omo_08_4_train.c new file mode 100644 index 0000000000..0c1efd5bc5 --- /dev/null +++ b/src/world/area_omo/omo_08/omo_08_4_train.c @@ -0,0 +1,317 @@ +#include "omo_08.h" + +#include "../common/ToyTrain.inc.c" +#include "../common/TrainStationSwitches.inc.c" + +Vec2i N(D_80246740_DCAB10) = { + -145, -110 +}; + +s32 N(D_80246748_DCAB18)[] = { + EVT_FLOAT(-131.227), EVT_FLOAT(-210.271), EVT_FLOAT(105.004), + EVT_FLOAT(0.0), EVT_FLOAT(-175.0), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80246778_DCAB48) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC(N(EVS_TrainUnk_C)) + EVT_SET(AB_OMO_5, 2) + EVT_SET(LVar0, EVT_PTR(N(D_80246748_DCAB18))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_D)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1074, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246748_DCAB18))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(10) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_802468E8_DCACB8)[] = { + EVT_FLOAT(-131.227), EVT_FLOAT(-210.271), EVT_FLOAT(285.004), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), + EVT_FLOAT(-353.688), EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80246918_DCACE8) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC(N(EVS_TrainUnk_C)) + EVT_SET(AB_OMO_5, 2) + EVT_SET(LVar0, EVT_PTR(N(D_802468E8_DCACB8))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_D)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1074, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802468E8_DCACB8))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(10) + EVT_IF_GT(MV_TrainPos, -350) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_1) + EVT_SET(GB_OMO_TrainDestination, 1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_80246A88_DCAE58)[] = { + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(-169.87), EVT_FLOAT(-220.59), + -1, -1, -1 +}; + +s32 N(D_80246AC0_DCAE90)[] = { + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(-262.5), EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), + EVT_FLOAT(-353.688), EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80246B08_DCAED8) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1074, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(AB_OMO_6, 2) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246A88_DCAE58))) + EVT_SET(MV_TrainUnk_02, 2) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_A), LVarB) + EVT_LABEL(10) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_SET(LVar9, EVT_PTR(N(D_80246740_DCAB10))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0010) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1074, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_EXEC(N(EVS_TrainUnk_A)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246AC0_DCAE90))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(20) + EVT_IF_GT(MV_TrainPos, -350) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_1) + EVT_SET(GB_OMO_TrainDestination, 1) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_80246DC0_DCB190)[] = { + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-92.58), EVT_FLOAT(-199.95), + -1, -1, -1 +}; + +s32 N(D_80246DF0_DCB1C0)[] = { + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(0.0), EVT_FLOAT(-175.0), + EVT_FLOAT(262.5), EVT_FLOAT(-245.336), EVT_FLOAT(479.165), + EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80246E30_DCB200) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1074, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(AB_OMO_6, 2) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246DC0_DCB190))) + EVT_SET(MV_TrainUnk_02, 2) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_A), LVarB) + EVT_LABEL(10) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_SET(LVar9, EVT_PTR(N(D_80246740_DCAB10))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0010) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1074, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_EXEC(N(EVS_TrainUnk_A)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80246DF0_DCB1C0))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(20) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 2) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_802470E8_DCB4B8)[] = { + 1, 0, 3, +}; + +s32 N(D_802470F4_DCB4C4)[] = { + 3, 0, 1, +}; + +EvtScript N(EVS_80247100) = { + EVT_IF_EQ(MF_EitherSwitchPressed, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0006) + EVT_ELSE + EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, FALSE) + EVT_CALL(ShowChoice, MSG_Choice_0040) + EVT_IF_NE(LVar0, 2) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_802470E8_DCB4B8))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80246918_DCACE8)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_ELSE + EVT_CALL(ShowChoice, MSG_Choice_0041) + EVT_IF_NE(LVar0, 3) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_802470E8_DCB4B8))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80246918_DCACE8)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_SadTalk, ANIM_TrainToad_SadIdle, 0, MSG_CH4_0016) + EVT_CASE_GE(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_CALL(ShowChoice, MSG_Choice_003F) + EVT_IF_NE(LVar0, 3) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_802470F4_DCB4C4))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80246778_DCAB48)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_END_SWITCH + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_80247438_DCB808)[] = { + EVT_FLOAT(-131.227), EVT_FLOAT(-210.271), EVT_FLOAT(105.004), + -1, -1, -1 +}; + +EvtScript N(EVS_SetupTrain) = { + EVT_EXEC_WAIT(N(EVS_SetupSwitches)) + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80247438_DCB808))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_ELSE + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(omo_08_ENTRY_1) + EVT_EXEC(N(D_80246E30_DCB200)) + EVT_CASE_EQ(omo_08_ENTRY_2) + EVT_EXEC(N(D_80246B08_DCAED8)) + EVT_CASE_DEFAULT + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80247438_DCB808))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_08/omo_08_5_entity.c b/src/world/area_omo/omo_08/omo_08_5_entity.c new file mode 100644 index 0000000000..b9d1cdb640 --- /dev/null +++ b/src/world/area_omo/omo_08/omo_08_5_entity.c @@ -0,0 +1,12 @@ +#include "omo_08.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -350, 60, 50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 350, 60, 60, 0, ITEM_FIRE_FLOWER, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO08_HiddenItem_FireFlower) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), -200, 0, 200, 0, MODEL_soto, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_OMO08_HiddenPanel) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_08/omo_08_6_npc.c b/src/world/area_omo/omo_08/omo_08_6_npc.c new file mode 100644 index 0000000000..0fb3d706b2 --- /dev/null +++ b/src/world/area_omo/omo_08/omo_08_6_npc.c @@ -0,0 +1,232 @@ +#include "omo_08.h" + +#include "world/common/npc/TrainToad.inc.c" +#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" + +EvtScript N(EVS_NpcInteract_Conductor) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_80247100)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Conductor) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Conductor))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_TrainToad) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_SOLVED_COLOR_PUZZLE) + EVT_CALL(FindKeyItem, ITEM_MYSTERY_NOTE, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_IF_EQ(GF_OMO09_SpawnedPeachChoice3, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Green_Talk, ANIM_TrainToad_Green_Idle, 0, MSG_CH4_002B) + EVT_ELSE + EVT_IF_EQ(GF_OMO09_Chest_Dictionary, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Green_Talk, ANIM_TrainToad_Green_Idle, 0, MSG_CH4_002C) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Green_Talk, ANIM_TrainToad_Green_Idle, 0, MSG_CH4_002F) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Green_Talk, ANIM_TrainToad_Green_Idle, 0, MSG_CH4_002D) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Green_Talk, ANIM_TrainToad_Green_Idle, 0, MSG_CH4_002E) + EVT_CASE_LT(STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Green_Talk, ANIM_TrainToad_Green_Idle, 0, MSG_CH4_002F) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Green_Talk, ANIM_TrainToad_Green_Idle, 0, MSG_CH4_0030) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TrainToad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainToad))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_BoxedShyGuy) = { + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(SetSelfVar, 0, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_Wander))) + EVT_END_IF + EVT_CASE_EQ(2) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(25) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_BoxedShyGuy) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetSelfVar, 0, 2) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_BoxedShyGuy))) + 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_BoxedShyGuy) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_BoxedShyGuy))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_BoxedShyGuy))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Toads)[] = { + { + .id = NPC_Conductor, + .settings = &N(NpcSettings_TrainToad), + .pos = { -145.0f, 50.0f, -110.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Conductor), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = TRAIN_CONDUCTOR_ANIMS, + .tattle = MSG_NpcTattle_OMO_TrainConductor, + }, + { + .id = NPC_TrainToad, + .settings = &N(NpcSettings_TrainToad), + .pos = { -250.0f, 0.0f, 50.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_TrainToad), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = TRAIN_TOAD_GREEN_ANIMS, + .tattle = MSG_NpcTattle_OMO_TrainConductor, + }, +}; + +StaticNpc N(NpcData_ShyGuy_01) = { + .id = NPC_ShyGuy_01, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_BoxedShyGuy), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -15, 0, 365 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -15, 0, 365 }, + .detectSize = { 120 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_02) = { + .id = NPC_ShyGuy_02, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_BoxedShyGuy), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 64, 0, 275 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 64, 0, 275 }, + .detectSize = { 120 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_03) = { + .id = NPC_ShyGuy_03, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_BoxedShyGuy), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 145, 0, 365 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 145, 0, 365 }, + .detectSize = { 120 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_04) = { + .id = NPC_ShyGuy_04, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_BoxedShyGuy), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 224, 0, 275 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 224, 0, 275 }, + .detectSize = { 120 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Toads)), + NPC_GROUP(N(NpcData_ShyGuy_01), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_06), + NPC_GROUP(N(NpcData_ShyGuy_02), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_06), + NPC_GROUP(N(NpcData_ShyGuy_03), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_06), + NPC_GROUP(N(NpcData_ShyGuy_04), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_06), + {} +}; diff --git a/src/world/area_omo/omo_09/DCCCD0.c b/src/world/area_omo/omo_09/DCCCD0.c deleted file mode 100644 index 5f22e4275f..0000000000 --- a/src/world/area_omo/omo_09/DCCCD0.c +++ /dev/null @@ -1,98 +0,0 @@ -#include "omo_09.h" - -static char* N(exit_str_0) = "omo_08"; -static char* N(exit_str_1) = ""; - -extern s32 D_80243A80_DD0750[4]; -extern f32 D_80243A90_DD0760[4][2]; - -ApiStatus func_80240000_DCCCD0(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - PlayerData* playerData = &gPlayerData; - - if (playerStatus->flags & PS_FLAG_PAUSED) { - return TRUE; - } - - if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE && - (playerData->currentPartner == PARTNER_GOOMBARIO || playerData->currentPartner == PARTNER_SUSHIE)) - { - return TRUE; - } - - return FALSE; -} - -ApiStatus func_80240054_DCCD24(Evt* script, s32 isInitialCall) { - if (!func_80240000_DCCCD0()) { - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} - -ApiStatus func_80240078_DCCD48(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Npc* partner = get_npc_unsafe(NPC_PARTNER); - PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; - f32 x, y, z; - f32 outLength; - f32 hitRx, hitRz; - f32 hitDirX, hitDirZ; - s32 hit; - s32 one; - u32 i; - - script->varTable[0] = 0; - if (func_80240000_DCCCD0()) { - return ApiStatus_DONE2; - } - - one = 1; - if (partnerActionStatus->actingPartner == PARTNER_BOW && - partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE && - playerStatus->alpha1 == 128) - { - x = playerStatus->position.x; - y = playerStatus->position.y; - z = playerStatus->position.z; - outLength = 1000.0f; - hit = player_raycast_below_cam_relative(playerStatus, - &x, &y, &z, &outLength, - &hitRx, &hitRz, &hitDirX, &hitDirZ - ); - - for (i = 0; i < ARRAY_COUNT(D_80243A80_DD0750); i++) { - if (hit == D_80243A80_DD0750[i]) { - playerStatus->pushVelocity.x = D_80243A90_DD0760[i][0]; - playerStatus->pushVelocity.z = D_80243A90_DD0760[i][one]; // TODO needed to match - } - } - script->varTable[0] = 1; - return ApiStatus_DONE2; - } - - one = 1; - if (partnerActionStatus->actingPartner != PARTNER_LAKILESTER || - partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) - { - for (i = 0; i < ARRAY_COUNT(D_80243A80_DD0750); i++) { - if (gCollisionStatus.currentFloor == D_80243A80_DD0750[i] || - gCollisionStatus.lastTouchedFloor == D_80243A80_DD0750[i]) - { - playerStatus->pushVelocity.x = D_80243A90_DD0760[i][0]; - playerStatus->pushVelocity.z = D_80243A90_DD0760[i][one]; // TODO needed to match - } - - if (partner->currentFloor == D_80243A80_DD0750[i] && - ((partnerActionStatus->actingPartner != PARTNER_KOOPER) || - (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE))) - { - partner->pos.x += D_80243A90_DD0760[i][0]; - partner->pos.z += D_80243A90_DD0760[i][one]; // TODO needed to match - partner_clear_player_tracking(partner); - } - } - } - - return ApiStatus_DONE2; -} diff --git a/src/world/area_omo/omo_09/DCCFA0.c b/src/world/area_omo/omo_09/DCCFA0.c deleted file mode 100644 index 2b55b9a9b7..0000000000 --- a/src/world/area_omo/omo_09/DCCFA0.c +++ /dev/null @@ -1,99 +0,0 @@ -#include "omo_09.h" -#include "model.h" - -typedef struct UnkOmo9 { - /* 0x00 */ s32 shadowIndexes[4]; -} UnkOmo9; // size = 0x10 - -extern s32 D_802451AC_DD1E7C[]; -extern s32 D_8024636C_DD303C[4]; - -ApiStatus func_802402D0_DCCFA0(Evt* script, s32 isInitialCall) { - s32 sp10[3]; - Bytecode* args = script->ptrReadPos; - s32 v1 = evt_get_variable(script, *args++); - s32 v2 = evt_get_variable(script, *args++); - s32 v3 = evt_get_variable(script, *args++); - s32 iNum, jNum; - s32 i, j; - - if (v1 != -1) { - sp10[0] = D_802451AC_DD1E7C[(v1 % 360) / 45]; - } else { - sp10[0] = 0; - } - if (v2 != -1) { - sp10[1] = D_802451AC_DD1E7C[((v2 % 360) / 45) + 8]; - } else { - sp10[1] = 0; - } - if (v3 != -1) { - sp10[2] = D_802451AC_DD1E7C[((v3 % 360) / 45) + 16]; - } else { - sp10[2] = 0; - } - - for (i = 0; i < ARRAY_COUNT(sp10) - 1; i++) { - for (j = 1; j < ARRAY_COUNT(sp10); j++) { - iNum = sp10[i]; - jNum = sp10[j]; - if (jNum < iNum) { - sp10[i] = jNum; - sp10[j] = iNum; - } - } - } - if (sp10[1] == sp10[0]) { - if (sp10[1] == sp10[2]) { - script->varTable[10] = 3; - } else { - script->varTable[10] = 2; - } - } else if (sp10[1] == sp10[2]) { - script->varTable[10] = 2; - } else { - script->varTable[10] = 0; - } - script->varTable[11] = sp10[1]; - return ApiStatus_DONE2; -} - -ApiStatus func_80240534_DCD204(Evt* script, s32 isInitialCall) { - f32 x, y, z; - f32 rotX, rotZ; - f32 scale; - Shadow* shadow; - UnkOmo9* unkStruct; - Model* model; - u32 i; - - if (isInitialCall) { - - script->functionTempPtr[0] = unkStruct = heap_malloc(sizeof(*unkStruct)); - for (i = 0; i < ARRAY_COUNT(D_8024636C_DD303C); i++) { - model = get_model_from_list_index(get_model_list_index_from_tree_index(D_8024636C_DD303C[i])); - unkStruct->shadowIndexes[i] = create_shadow_type(1, model->center.x, model->center.y - 100.0f, model->center.z); - } - } - - unkStruct = script->functionTempPtr[0]; - for (i = 0; i < ARRAY_COUNT(D_8024636C_DD303C); i++) { - shadow = get_shadow_by_index(unkStruct->shadowIndexes[i]); - model = get_model_from_list_index(get_model_list_index_from_tree_index(D_8024636C_DD303C[i])); - x = model->center.x; - y = model->center.y; - z = model->center.z; - scale = 1000.0f; - entity_raycast_down(&x, &y, &z, &rotX, &rotZ, &scale); - set_standard_shadow_scale(shadow, scale); - shadow->rotation.y = 0.0f; - shadow->position.x = x; - shadow->position.y = y; - shadow->position.z = z; - shadow->rotation.x = rotX; - shadow->rotation.z = rotZ; - shadow->scale.x *= 1.3f; - shadow->scale.z *= 1.3f; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_omo/omo_09/DCD3B0.c b/src/world/area_omo/omo_09/DCD3B0.c deleted file mode 100644 index 2b44fd2d2c..0000000000 --- a/src/world/area_omo/omo_09/DCD3B0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "omo_09.h" - -ApiStatus func_802406E0_DCD3B0(Evt* script, s32 isInitialCall) { - if (gPlayerStatus.position.x < 850.0f) { - return ApiStatus_BLOCK; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c deleted file mode 100644 index df7801a79c..0000000000 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "omo_09.h" - -#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" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c deleted file mode 100644 index a1696b8a6e..0000000000 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "omo_09.h" - -#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" - -#include "world/common/enemy/ai/ShyGuyPatrolAI.inc.c" - -#include "world/common/enemy/ai/RangedAttackAI.inc.c" - -#include "world/common/todo/SetInstigatorValue_3.inc.c" - -#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" - -#define NAMESPACE dup_omo_09 -#include "world/common/todo/SetInstigatorValue_3.inc.c" -#define NAMESPACE omo_09 - -#include "world/common/todo/SetCamera0Flag1000.inc.c" - -#include "world/common/todo/UnsetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_09/DD02E0.c b/src/world/area_omo/omo_09/DD02E0.c deleted file mode 100644 index a747b1e13e..0000000000 --- a/src/world/area_omo/omo_09/DD02E0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "omo_09.h" - -static char* N(exit_str_0) = "omo_09"; - -#define KAMMY_NPC 7 -#include "world/common/util/GetKammyBroomEmitterPos.inc.c" diff --git a/src/world/area_omo/omo_09/omo_09.h b/src/world/area_omo/omo_09/omo_09.h index 282fa5ecd6..f546930785 100644 --- a/src/world/area_omo/omo_09/omo_09.h +++ b/src/world/area_omo/omo_09/omo_09.h @@ -2,8 +2,68 @@ /// @brief Shy Guy's Toybox - GRN Treadmills/Slot Machine #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_09_shape.h" +#include "mapfs/omo_09_hit.h" + +#include "sprite/npc/WorldKammy.h" + +enum { + NPC_ShyGuy_Jackpot1 = 0, + NPC_ShyGuy_Jackpot2 = 1, + NPC_ShyGuy_Jackpot3 = 2, + NPC_ShyGuy_Jackpot4 = 3, + NPC_ShyGuy_Jackpot5 = 4, + NPC_Pokey = 5, + NPC_Koopatrol = 6, + NPC_Kammy = 7, + NPC_ShyGuy_Thief = 8, + NPC_SpyGuy = 20, + NPC_SpyGuy_Rock1 = 21, + NPC_SpyGuy_Rock2 = 22, + NPC_SpyGuy_Rock3 = 23, +}; + +enum { + MV_SlotWheel1_Angle = MapVar(0), + MV_SlotWheel2_Angle = MapVar(1), + MV_SlotWheel3_Angle = MapVar(2), + MV_ProgressOnHitBlock1 = MapVar(3), + MV_ProgressOnHitBlock2 = MapVar(4), + MV_ProgressOnHitBlock3 = MapVar(5), + MV_SlotMachineProgress = MapVar(6), + MV_AmbushID = MapVar(10), + MV_ResetCamSpeed = MapVar(11), +}; + +enum { + MF_HitStartBlock = MapFlag(0), + MF_Block1_Hit = MapFlag(1), + MF_Block2_Hit = MapFlag(2), + MF_Block3_Hit = MapFlag(3), + MF_Block1_Active = MapFlag(4), + MF_Block2_Active = MapFlag(5), + MF_Block3_Active = MapFlag(6), + MF_AnimateSlotLights = MapFlag(7), +}; + #define NAMESPACE omo_09 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGizmos); +extern EvtScript N(EVS_SetupConveyors); +extern EvtScript N(EVS_SetupSlotMachine); +extern EvtScript N(EVS_Scene_KammySetAmbush); +extern EvtScript N(EVS_NpcIdle_Kammy); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(KammySceneNPCs); +extern NpcGroupList N(PokeyAmbushNPCs); +extern NpcGroupList N(KoopatrolAmbushNPCs); +extern NpcGroupList N(DefaultNPCs); + +API_CALLABLE(N(SetCamera0Flag1000)); +API_CALLABLE(N(UnsetCamera0Flag1000)); diff --git a/src/world/area_omo/omo_09/omo_09_0_header.c b/src/world/area_omo/omo_09/omo_09_0_header.c new file mode 100644 index 0000000000..1c7a81f937 --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_0_header.c @@ -0,0 +1,13 @@ +#include "omo_09.h" + +EntryList N(Entrances) = { + [omo_09_ENTRY_0] { -980.0, 0.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_09 }, +}; diff --git a/src/world/area_omo/omo_09/omo_09_1_music.c b/src/world/area_omo/omo_09/omo_09_1_music.c new file mode 100644 index 0000000000..90f4b72861 --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_1_music.c @@ -0,0 +1,11 @@ +#include "omo_09.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GF_OMO09_SpawnedPeachChoice3, FALSE) + EVT_CALL(SetMusicTrack, 0, SONG_KAMMY_KOOPA_THEME, 0, 8) + EVT_ELSE + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_09/omo_09_2_main.c b/src/world/area_omo/omo_09/omo_09_2_main.c new file mode 100644 index 0000000000..4ebdd3f225 --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_2_main.c @@ -0,0 +1,52 @@ +#include "omo_09.h" + +EvtScript N(EVS_ExitWalk_omo_08_0) = EVT_EXIT_WALK(60, omo_09_ENTRY_0, "omo_08", omo_08_ENTRY_0); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_08_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_IF_GE(GB_StoryProgress, STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_SET(GF_OMO09_SpawnedPeachChoice3, TRUE) + EVT_END_IF + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GF_OMO09_SpawnedPeachChoice3, FALSE) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(KammySceneNPCs))) + EVT_ELSE + EVT_IF_EQ(GF_OMO09_Item_SuperSoda, FALSE) + EVT_SWITCH(GB_OMO_PeachChoice3) + EVT_CASE_EQ(0) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(PokeyAmbushNPCs))) + EVT_CASE_EQ(1) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(KoopatrolAmbushNPCs))) + EVT_CASE_EQ(2) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(MakeItemEntity, ITEM_SUPER_SODA, 1900, 150, 0, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_SuperSoda) + EVT_END_SWITCH + EVT_ELSE + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_END_IF + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupGizmos)) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupConveyors)) + EVT_EXEC_WAIT(N(EVS_SetupSlotMachine)) + EVT_IF_EQ(GF_OMO09_SpawnedPeachChoice3, FALSE) + EVT_EXEC(N(EVS_Scene_KammySetAmbush)) + EVT_WAIT(2) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_09/omo_09_3_conveyors.c b/src/world/area_omo/omo_09/omo_09_3_conveyors.c new file mode 100644 index 0000000000..b8c40c914a --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_3_conveyors.c @@ -0,0 +1,133 @@ +#include "omo_09.h" + +s32 N(ConveyorColliders)[4] = { + COLLIDER_o904, + COLLIDER_o906, + COLLIDER_o907, + COLLIDER_o911 +}; + +//TODO Vec2f[4] +f32 N(ConveyorPushVels)[4][2] = { + { -3.9, 0.0 }, + { 3.9, 0.0 }, + { 0.0, 3.9 }, + { 0.0, -3.9 }, +}; + +s32 N(ShouldPauseConveyor)(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerData* playerData = &gPlayerData; + + if (playerStatus->flags & PS_FLAG_PAUSED) { + return TRUE; + } + + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE && + (playerData->currentPartner == PARTNER_GOOMBARIO || playerData->currentPartner == PARTNER_SUSHIE)) + { + return TRUE; + } + + return FALSE; +} + +API_CALLABLE(N(WaitWhileConveyorPaused)) { + if (!N(ShouldPauseConveyor)()) { + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(AddConveyorPush)) { + PlayerStatus* playerStatus = &gPlayerStatus; + Npc* partner = get_npc_unsafe(NPC_PARTNER); + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; + f32 x, y, z; + f32 outLength; + f32 hitRx, hitRz; + f32 hitDirX, hitDirZ; + s32 hit; + s32 one; + u32 i; + + script->varTable[0] = 0; + if (N(ShouldPauseConveyor)()) { + return ApiStatus_DONE2; + } + + one = 1; + if (partnerActionStatus->actingPartner == PARTNER_BOW) { + if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE && playerStatus->alpha1 == 128) { + x = playerStatus->position.x; + y = playerStatus->position.y; + z = playerStatus->position.z; + outLength = 1000.0f; + hit = player_raycast_below_cam_relative(playerStatus, + &x, &y, &z, &outLength, + &hitRx, &hitRz, &hitDirX, &hitDirZ + ); + + for (i = 0; i < ARRAY_COUNT(N(ConveyorColliders)); i++) { + if (hit == N(ConveyorColliders)[i]) { + playerStatus->pushVelocity.x = N(ConveyorPushVels)[i][0]; + playerStatus->pushVelocity.z = N(ConveyorPushVels)[i][one]; // TODO needed to match + } + } + script->varTable[0] = 1; + return ApiStatus_DONE2; + } + } + one = 1; + if (partnerActionStatus->actingPartner != PARTNER_LAKILESTER || + partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) + { + for (i = 0; i < ARRAY_COUNT(N(ConveyorColliders)); i++) { + if (gCollisionStatus.currentFloor == N(ConveyorColliders)[i] || + gCollisionStatus.lastTouchedFloor == N(ConveyorColliders)[i]) + { + playerStatus->pushVelocity.x = N(ConveyorPushVels)[i][0]; + playerStatus->pushVelocity.z = N(ConveyorPushVels)[i][one]; // TODO needed to match + } + + if (partner->currentFloor == N(ConveyorColliders)[i] && + ((partnerActionStatus->actingPartner != PARTNER_KOOPER) || + (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE))) + { + partner->pos.x += N(ConveyorPushVels)[i][0]; + partner->pos.z += N(ConveyorPushVels)[i][one]; // TODO needed to match + partner_clear_player_tracking(partner); + } + } + } + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupConveyors) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_CALL(EnableTexPanning, MODEL_1, TRUE) + EVT_CALL(EnableTexPanning, MODEL_3, TRUE) + EVT_CALL(EnableTexPanning, MODEL_4, TRUE) + EVT_CALL(EnableTexPanning, MODEL_8, TRUE) + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_LABEL(0) + EVT_CALL(N(WaitWhileConveyorPaused)) + EVT_ADD(LVar1, -1280) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, 0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_8, TEX_PANNER_MAIN, 0, LVar1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_THREAD + EVT_THREAD + EVT_LABEL(10) + EVT_CALL(N(AddConveyorPush)) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_09/omo_09_4_slot_machine.c b/src/world/area_omo/omo_09/omo_09_4_slot_machine.c new file mode 100644 index 0000000000..a3f86afa0c --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_4_slot_machine.c @@ -0,0 +1,878 @@ +#include "omo_09.h" +#include "model.h" + +enum SlotMatchResult { + SLOT_MATCH_NONE = 0, + SLOT_MATCH_TWO = 2, + SLOT_MATCH_THREE = 3, +}; + +enum SlotSymbol { + SYM_SHYGUY = 1, + SYM_COIN = 2, + SYM_STAR = 3, +}; + +enum SlotMachineProgress { + SLOT_PROGRESS_HIT_ONE = 2, + SLOT_PROGRESS_HIT_TWO = 4, + SLOT_PROGRESS_HIT_THREE = 6, + SLOT_PROGRESS_DISPENSE = 7, +}; + +EvtScript N(EVS_SetCam_ViewReels) = { + EVT_WAIT(8) + EVT_CALL(N(SetCamera0Flag1000)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 535, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 535, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetCam_ViewPayout) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 535, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 535, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-30.0)) + 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_RETURN + EVT_END +}; + +s32 N(HitBlockRecoilOffsets)[] = { + 3, 0, -3, 0, + 2, 0, -2, 0, + 1, 0, -1, 0, +}; + +EvtScript N(EVS_HitBlockRecoil) = { + EVT_USE_BUF(EVT_PTR(N(HitBlockRecoilOffsets))) + EVT_LOOP(12) + EVT_BUF_READ1(LVar1) + EVT_CALL(TranslateModel, LVar0, 0, LVar1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HitBlock_SlotStart) = { + EVT_IF_EQ(MF_HitStartBlock, FALSE) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlaySoundAtCollider, COLLIDER_s1, SOUND_80000015, 0) + EVT_END_THREAD + EVT_SET(MF_HitStartBlock, TRUE) + EVT_SET(AF_OMO09_StartBlock_DontBlink, TRUE) + EVT_CALL(EnableModel, MODEL_s1, TRUE) + EVT_CALL(EnableModel, MODEL_s2, FALSE) + EVT_SET(LVar0, MODEL_s1) + EVT_EXEC_WAIT(N(EVS_HitBlockRecoil)) + EVT_CALL(EnableModel, MODEL_s1, FALSE) + EVT_CALL(EnableModel, MODEL_s2, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HitBlock_SlotWheel1) = { + EVT_IF_EQ(MF_Block1_Hit, FALSE) + EVT_SET(MF_Block1_Hit, TRUE) + EVT_ADD(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_ONE) + EVT_SET(MV_ProgressOnHitBlock1, MV_SlotMachineProgress) + EVT_IF_EQ(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_THREE) + EVT_EXEC(N(EVS_SetCam_ViewReels)) + EVT_SET(MV_SlotMachineProgress, SLOT_PROGRESS_DISPENSE) + EVT_END_IF + EVT_SET(AF_OMO09_Block1_DontBlink, TRUE) + EVT_CALL(EnableModel, MODEL_h1, TRUE) + EVT_CALL(EnableModel, MODEL_h1_a, FALSE) + EVT_SET(LVar0, MODEL_h1) + EVT_EXEC_WAIT(N(EVS_HitBlockRecoil)) + EVT_CALL(EnableModel, MODEL_h1, FALSE) + EVT_CALL(EnableModel, MODEL_h1_a, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HitBlock_SlotWheel2) = { + EVT_IF_EQ(MF_Block2_Hit, FALSE) + EVT_SET(MF_Block2_Hit, TRUE) + EVT_ADD(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_ONE) + EVT_SET(MV_ProgressOnHitBlock2, MV_SlotMachineProgress) + EVT_IF_EQ(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_THREE) + EVT_EXEC(N(EVS_SetCam_ViewReels)) + EVT_SET(MV_SlotMachineProgress, SLOT_PROGRESS_DISPENSE) + EVT_END_IF + EVT_SET(AF_OMO09_Block2_DontBlink, TRUE) + EVT_CALL(EnableModel, MODEL_h2, TRUE) + EVT_CALL(EnableModel, MODEL_h2_a, FALSE) + EVT_SET(LVar0, MODEL_h2) + EVT_EXEC_WAIT(N(EVS_HitBlockRecoil)) + EVT_CALL(EnableModel, MODEL_h2, FALSE) + EVT_CALL(EnableModel, MODEL_h2_a, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HitBlock_SlotWheel3) = { + EVT_IF_EQ(MF_Block3_Hit, FALSE) + EVT_SET(MF_Block3_Hit, TRUE) + EVT_ADD(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_ONE) + EVT_SET(MV_ProgressOnHitBlock3, MV_SlotMachineProgress) + EVT_IF_EQ(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_THREE) + EVT_EXEC(N(EVS_SetCam_ViewReels)) + EVT_SET(MV_SlotMachineProgress, SLOT_PROGRESS_DISPENSE) + EVT_END_IF + EVT_SET(AF_OMO09_Block3_DontBlink, TRUE) + EVT_CALL(EnableModel, MODEL_h3, TRUE) + EVT_CALL(EnableModel, MODEL_h3_a, FALSE) + EVT_SET(LVar0, MODEL_h3) + EVT_EXEC_WAIT(N(EVS_HitBlockRecoil)) + EVT_CALL(EnableModel, MODEL_h3, FALSE) + EVT_CALL(EnableModel, MODEL_h3_a, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateActiveBlock1) = { + EVT_SET(MF_Block1_Active, TRUE) + EVT_SET(LVar2, MV_SlotWheel1_Angle) + EVT_ADD(LVar2, 360) + EVT_SET(LVar5, 0) + EVT_SET(LVar9, 0) + EVT_CALL(MakeLerp, MV_SlotWheel1_Angle, LVar2, 50, EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o864, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o865, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o866, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o867, LVar0, 1, 0, 0) + EVT_SET(LVar8, LVar0) + EVT_SUB(LVar8, LVar9) + EVT_SET(LVar9, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(RandInt, 7, LVar7) + EVT_MUL(LVar7, 45) + EVT_ADD(LVar7, 2520) + EVT_SET(LVar6, LVar7) + EVT_DIV(LVar6, LVar8) + EVT_SET(LVar3, LVar2) + EVT_ADD(LVar3, LVar7) + EVT_CALL(MakeLerp, LVar2, LVar3, LVar6, EASING_LINEAR) + EVT_LABEL(5) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o864, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o865, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o866, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o867, LVar0, 1, 0, 0) + EVT_IF_EQ(MF_Block1_Hit, TRUE) + EVT_SET(LVar9, LVar0) + EVT_MOD(LVar9, 45) + EVT_IF_EQ(LVar9, 0) + EVT_SUB(MV_ProgressOnHitBlock1, 1) + EVT_IF_EQ(MV_ProgressOnHitBlock1, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, FALSE) + EVT_SET(MF_Block1_Hit, TRUE) + EVT_ADD(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_ONE) + EVT_SET(MV_ProgressOnHitBlock1, MV_SlotMachineProgress) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(5) + EVT_LABEL(10) + EVT_IF_EQ(MF_Block1_Hit, TRUE) + EVT_SET(LVar3, LVar0) + EVT_END_IF + EVT_SET(LVar4, LVar3) + EVT_ADD(LVar4, 1080) + EVT_CALL(MakeLerp, LVar3, LVar4, 40, EASING_QUADRATIC_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o864, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o865, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o866, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o867, LVar0, 1, 0, 0) + EVT_IF_NE(LVar3, LVar0) + EVT_WAIT(1) + EVT_END_IF + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_SET(MF_Block1_Hit, TRUE) + EVT_SET(MF_Block1_Active, FALSE) + EVT_SET(MV_SlotWheel1_Angle, LVar4) + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h1, SOUND_3F3, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateActiveBlock2) = { + EVT_SET(MF_Block2_Active, TRUE) + EVT_SET(LVar2, MV_SlotWheel2_Angle) + EVT_ADD(LVar2, 360) + EVT_SET(LVar5, 0) + EVT_SET(LVar9, 0) + EVT_CALL(MakeLerp, MV_SlotWheel2_Angle, LVar2, 50, EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o868, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o869, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o870, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o871, LVar0, 1, 0, 0) + EVT_SET(LVar8, LVar0) + EVT_SUB(LVar8, LVar9) + EVT_SET(LVar9, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(RandInt, 7, LVar7) + EVT_MUL(LVar7, 45) + EVT_ADD(LVar7, 3240) + EVT_SET(LVar6, LVar7) + EVT_DIV(LVar6, LVar8) + EVT_SET(LVar3, LVar2) + EVT_ADD(LVar3, LVar7) + EVT_CALL(MakeLerp, LVar2, LVar3, LVar6, EASING_LINEAR) + EVT_LABEL(5) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o868, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o869, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o870, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o871, LVar0, 1, 0, 0) + EVT_IF_EQ(MF_Block2_Hit, TRUE) + EVT_SET(LVar9, LVar0) + EVT_MOD(LVar9, 45) + EVT_IF_EQ(LVar9, 0) + EVT_SUB(MV_ProgressOnHitBlock2, 1) + EVT_IF_EQ(MV_ProgressOnHitBlock2, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, FALSE) + EVT_SET(MF_Block2_Hit, TRUE) + EVT_ADD(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_ONE) + EVT_SET(MV_ProgressOnHitBlock2, MV_SlotMachineProgress) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(5) + EVT_LABEL(10) + EVT_IF_EQ(MF_Block2_Hit, TRUE) + EVT_SET(LVar3, LVar0) + EVT_END_IF + EVT_SET(LVar4, LVar3) + EVT_ADD(LVar4, 1080) + EVT_CALL(MakeLerp, LVar3, LVar4, 40, EASING_QUADRATIC_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o868, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o869, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o870, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o871, LVar0, 1, 0, 0) + EVT_IF_NE(LVar3, LVar0) + EVT_WAIT(1) + EVT_END_IF + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_SET(MF_Block2_Hit, TRUE) + EVT_SET(MF_Block2_Active, FALSE) + EVT_SET(MV_SlotWheel2_Angle, LVar4) + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h2, SOUND_3F3, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateActiveBlock3) = { + EVT_SET(MF_Block3_Active, TRUE) + EVT_SET(LVar2, MV_SlotWheel3_Angle) + EVT_ADD(LVar2, 360) + EVT_SET(LVar5, 0) + EVT_SET(LVar9, 0) + EVT_CALL(MakeLerp, MV_SlotWheel3_Angle, LVar2, 50, EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o872, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o873, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o874, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o875, LVar0, 1, 0, 0) + EVT_SET(LVar8, LVar0) + EVT_SUB(LVar8, LVar9) + EVT_SET(LVar9, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(RandInt, 7, LVar7) + EVT_MUL(LVar7, 45) + EVT_ADD(LVar7, 3960) + EVT_SET(LVar6, LVar7) + EVT_DIV(LVar6, LVar8) + EVT_SET(LVar3, LVar2) + EVT_ADD(LVar3, LVar7) + EVT_CALL(MakeLerp, LVar2, LVar3, LVar6, EASING_LINEAR) + EVT_LABEL(5) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o872, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o873, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o874, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o875, LVar0, 1, 0, 0) + EVT_IF_EQ(MF_Block3_Hit, TRUE) + EVT_SET(LVar9, LVar0) + EVT_MOD(LVar9, 45) + EVT_IF_EQ(LVar9, 0) + EVT_SUB(MV_ProgressOnHitBlock3, 1) + EVT_IF_EQ(MV_ProgressOnHitBlock3, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, FALSE) + EVT_SET(MF_Block3_Hit, TRUE) + EVT_ADD(MV_SlotMachineProgress, SLOT_PROGRESS_HIT_ONE) + EVT_SET(MV_ProgressOnHitBlock3, MV_SlotMachineProgress) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(5) + EVT_LABEL(10) + EVT_IF_EQ(MF_Block3_Hit, TRUE) + EVT_SET(LVar3, LVar0) + EVT_END_IF + EVT_SET(LVar4, LVar3) + EVT_ADD(LVar4, 1080) + EVT_CALL(MakeLerp, LVar3, LVar4, 40, EASING_QUADRATIC_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o872, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o873, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o874, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o875, LVar0, 1, 0, 0) + EVT_IF_NE(LVar3, LVar0) + EVT_WAIT(1) + EVT_END_IF + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_SET(MF_Block3_Hit, TRUE) + EVT_SET(MF_Block3_Active, FALSE) + EVT_SET(MV_SlotWheel3_Angle, LVar4) + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_h3, SOUND_3F3, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +//TODO these should be a 3x8 array +s32 N(ReelContents)[] = { + SYM_SHYGUY, SYM_STAR, SYM_SHYGUY, SYM_COIN, SYM_SHYGUY, SYM_COIN, SYM_SHYGUY, SYM_COIN, + SYM_SHYGUY, SYM_STAR, SYM_SHYGUY, SYM_COIN, SYM_STAR, SYM_COIN, SYM_SHYGUY, SYM_COIN, + SYM_SHYGUY, SYM_STAR, SYM_SHYGUY, SYM_COIN, SYM_SHYGUY, SYM_COIN, SYM_SHYGUY, SYM_COIN, +}; + +// returns the SlotMatchResult on LVarA and SlotSymbol on LVarB (only valid if SlotMatchResult != SLOT_MATCH_NONE) +API_CALLABLE(N(CheckSlotsResult)) { + Bytecode* args = script->ptrReadPos; + s32 angleReel1 = evt_get_variable(script, *args++); + s32 angleReel2 = evt_get_variable(script, *args++); + s32 angleReel3 = evt_get_variable(script, *args++); + s32 results[3]; + s32 a, b; + s32 i, j; + + // get results from completed reels + if (angleReel1 != -1) { + results[0] = N(ReelContents)[(angleReel1 % 360) / 45]; + } else { + results[0] = 0; + } + if (angleReel2 != -1) { + results[1] = N(ReelContents)[((angleReel2 % 360) / 45) + 8]; + } else { + results[1] = 0; + } + if (angleReel3 != -1) { + results[2] = N(ReelContents)[((angleReel3 % 360) / 45) + 16]; + } else { + results[2] = 0; + } + + // sort and categorize resulting matches + for (i = 0; i < ARRAY_COUNT(results) - 1; i++) { + for (j = 1; j < ARRAY_COUNT(results); j++) { + a = results[i]; + b = results[j]; + if (b < a) { + results[i] = b; + results[j] = a; + } + } + } + if (results[1] == results[0]) { + if (results[1] == results[2]) { + script->varTable[10] = SLOT_MATCH_THREE; + } else { + script->varTable[10] = SLOT_MATCH_TWO; + } + } else if (results[1] == results[2]) { + script->varTable[10] = SLOT_MATCH_TWO; + } else { + script->varTable[10] = SLOT_MATCH_NONE; + } + script->varTable[11] = results[1]; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Block1_UpdateBlinking) = { + EVT_SET(AF_OMO09_Block1_DontBlink, FALSE) + EVT_SET(LVar0, 0) + EVT_LABEL(0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(EnableModel, MODEL_h1, TRUE) + EVT_CALL(EnableModel, MODEL_h1_a, FALSE) + EVT_SET(LVar0, 1) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_h1, FALSE) + EVT_CALL(EnableModel, MODEL_h1_a, TRUE) + EVT_SET(LVar0, 0) + EVT_END_IF + EVT_LOOP(10) + EVT_WAIT(1) + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, FALSE) + EVT_SET(AF_OMO09_Block1_DontBlink, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_IF_EQ(AF_OMO09_Block1_DontBlink, FALSE) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Block2_UpdateBlinking) = { + EVT_SET(AF_OMO09_Block2_DontBlink, FALSE) + EVT_SET(LVar0, 0) + EVT_LABEL(0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(EnableModel, MODEL_h2, TRUE) + EVT_CALL(EnableModel, MODEL_h2_a, FALSE) + EVT_SET(LVar0, 1) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_h2, FALSE) + EVT_CALL(EnableModel, MODEL_h2_a, TRUE) + EVT_SET(LVar0, 0) + EVT_END_IF + EVT_LOOP(10) + EVT_WAIT(1) + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, FALSE) + EVT_SET(AF_OMO09_Block2_DontBlink, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_IF_EQ(AF_OMO09_Block2_DontBlink, FALSE) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Block3_UpdateBlinking) = { + EVT_SET(AF_OMO09_Block3_DontBlink, FALSE) + EVT_SET(LVar0, 0) + EVT_LABEL(0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(EnableModel, MODEL_h3, TRUE) + EVT_CALL(EnableModel, MODEL_h3_a, FALSE) + EVT_SET(LVar0, 1) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_h3, FALSE) + EVT_CALL(EnableModel, MODEL_h3_a, TRUE) + EVT_SET(LVar0, 0) + EVT_END_IF + EVT_LOOP(10) + EVT_WAIT(1) + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, FALSE) + EVT_SET(AF_OMO09_Block3_DontBlink, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_IF_EQ(AF_OMO09_Block3_DontBlink, FALSE) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StartBlock_UpdateBlinking) = { + EVT_SET(AF_OMO09_StartBlock_DontBlink, FALSE) + EVT_SET(LVar0, 0) + EVT_LABEL(0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(EnableModel, MODEL_s1, TRUE) + EVT_CALL(EnableModel, MODEL_s2, FALSE) + EVT_SET(LVar0, 1) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_s1, FALSE) + EVT_CALL(EnableModel, MODEL_s2, TRUE) + EVT_SET(LVar0, 0) + EVT_END_IF + EVT_WAIT(10) + EVT_IF_EQ(AF_OMO09_StartBlock_DontBlink, FALSE) + EVT_GOTO(0) + EVT_END_IF + EVT_SET(AB_OMO09_IsPlayerNearSlotMachine, TRUE) + EVT_EXEC(N(EVS_Block1_UpdateBlinking)) + EVT_EXEC(N(EVS_Block2_UpdateBlinking)) + EVT_EXEC(N(EVS_Block3_UpdateBlinking)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SlotMachine_MainUpdate) = { + EVT_LABEL(0) + EVT_SET(MF_AnimateSlotLights, FALSE) + EVT_LABEL(1) + EVT_WAIT(1) + EVT_IF_EQ(MF_HitStartBlock, FALSE) + EVT_GOTO(1) + EVT_END_IF + EVT_SET(MF_Block1_Hit, FALSE) + EVT_SET(MF_Block2_Hit, FALSE) + EVT_SET(MF_Block3_Hit, FALSE) + EVT_SET(MV_ProgressOnHitBlock1, 0) + EVT_SET(MV_ProgressOnHitBlock2, 0) + EVT_SET(MV_ProgressOnHitBlock3, 0) + EVT_SET(MV_SlotMachineProgress, 0) + EVT_EXEC(N(EVS_UpdateActiveBlock1)) + EVT_EXEC(N(EVS_UpdateActiveBlock2)) + EVT_EXEC(N(EVS_UpdateActiveBlock3)) + EVT_WAIT(3) + EVT_SET(LVar0, 0) + EVT_SET(LVar2, 0) + EVT_LABEL(2) + EVT_CALL(IsPlayerWithin, 525, 0, 500, AB_OMO09_IsPlayerNearSlotMachine) + EVT_IF_EQ(AB_OMO09_IsPlayerNearSlotMachine, FALSE) + EVT_CALL(StopSound, SOUND_80000015) + EVT_WAIT(100) + EVT_GOTO(99) + EVT_END_IF + // how many blocks have been hit? + EVT_SET(LVar1, MF_Block1_Active) + EVT_ADD(LVar1, MF_Block2_Active) + EVT_ADD(LVar1, MF_Block3_Active) + EVT_IF_EQ(LVar2, 0) + EVT_SET(LVarA, SLOT_MATCH_NONE) + EVT_IF_EQ(MF_Block1_Active, FALSE) + EVT_IF_EQ(MF_Block2_Active, FALSE) + EVT_SET(LVar2, 1) + EVT_CALL(N(CheckSlotsResult), MV_SlotWheel1_Angle, MV_SlotWheel2_Angle, -1) + EVT_END_IF + EVT_IF_EQ(MF_Block3_Active, FALSE) + EVT_SET(LVar2, 1) + EVT_CALL(N(CheckSlotsResult), MV_SlotWheel1_Angle, -1, MV_SlotWheel3_Angle) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MF_Block2_Active, FALSE) + EVT_IF_EQ(MF_Block3_Active, FALSE) + EVT_SET(LVar2, 1) + EVT_CALL(N(CheckSlotsResult), -1, MV_SlotWheel2_Angle, MV_SlotWheel3_Angle) + EVT_END_IF + EVT_END_IF + EVT_IF_NE(LVarA, SLOT_MATCH_NONE) + // partial match after two blocks hit + EVT_SET(MF_AnimateSlotLights, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o881, SOUND_B88, 0) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + // wait until all blocks are hit + EVT_IF_NE(LVar1, 0) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(StopSound, SOUND_80000015) + EVT_WAIT(20) + EVT_CALL(N(CheckSlotsResult), MV_SlotWheel1_Angle, MV_SlotWheel2_Angle, MV_SlotWheel3_Angle) + EVT_IF_NE(LVarA, 0) + EVT_SET(MF_AnimateSlotLights, TRUE) + EVT_END_IF + EVT_SET(MV_ResetCamSpeed, EVT_FLOAT(90.0)) + // dispense rewards + EVT_SWITCH(LVarB) + EVT_CASE_EQ(SYM_SHYGUY) + EVT_SWITCH(LVarA) + EVT_CASE_EQ(SLOT_MATCH_THREE) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewPayout)) + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ShyGuy_Jackpot1, 485, 130, -50) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_Jackpot1, EVT_FLOAT(0.8)) + EVT_CALL(NpcJump0, NPC_ShyGuy_Jackpot1, 460, 0, 50, 30) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_Jackpot1, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ShyGuy_Jackpot2, 510, 130, -50) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_Jackpot2, EVT_FLOAT(0.8)) + EVT_CALL(NpcJump0, NPC_ShyGuy_Jackpot2, 497, 0, 50, 30) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_Jackpot2, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ShyGuy_Jackpot3, 535, 130, -50) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_Jackpot3, EVT_FLOAT(0.8)) + EVT_CALL(NpcJump0, NPC_ShyGuy_Jackpot3, 535, 0, 50, 30) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_Jackpot3, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ShyGuy_Jackpot4, 560, 130, -50) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_Jackpot4, EVT_FLOAT(0.8)) + EVT_CALL(NpcJump0, NPC_ShyGuy_Jackpot4, 573, 0, 50, 30) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_Jackpot4, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ShyGuy_Jackpot5, 585, 130, -50) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_Jackpot5, EVT_FLOAT(0.8)) + EVT_CALL(NpcJump0, NPC_ShyGuy_Jackpot5, 610, 0, 50, 30) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_Jackpot5, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_WAIT(20) + EVT_CASE_EQ(SLOT_MATCH_TWO) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewPayout)) + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ShyGuy_Jackpot2, 510, 130, -50) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_Jackpot2, EVT_FLOAT(0.8)) + EVT_CALL(NpcJump0, NPC_ShyGuy_Jackpot2, 497, 0, 50, 30) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_Jackpot2, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ShyGuy_Jackpot4, 560, 130, -50) + EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_Jackpot4, EVT_FLOAT(0.8)) + EVT_CALL(NpcJump0, NPC_ShyGuy_Jackpot4, 573, 0, 50, 30) + EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_Jackpot4, NPC_FLAG_40, FALSE) + EVT_END_THREAD + EVT_WAIT(20) + EVT_CASE_DEFAULT + EVT_SET(MV_ResetCamSpeed, EVT_FLOAT(2.0)) + EVT_END_SWITCH + EVT_CASE_EQ(SYM_COIN) + EVT_SWITCH(LVarA) + EVT_CASE_EQ(SLOT_MATCH_THREE) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewPayout)) + EVT_THREAD + EVT_LOOP(2) + EVT_SET(LVar1, 480) + EVT_LOOP(5) + EVT_ADD(LVar1, 20) + EVT_CALL(MakeItemEntity, ITEM_COIN, LVar1, 150, 50, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) + EVT_WAIT(3) + EVT_END_LOOP + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(30) + EVT_CASE_EQ(SLOT_MATCH_TWO) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewPayout)) + EVT_CALL(MakeItemEntity, ITEM_COIN, 535, 150, 50, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) + EVT_WAIT(30) + EVT_CASE_DEFAULT + EVT_SET(MV_ResetCamSpeed, EVT_FLOAT(2.0)) + EVT_END_SWITCH + EVT_CASE_EQ(SYM_STAR) + EVT_SWITCH(LVarA) + EVT_CASE_EQ(SLOT_MATCH_THREE) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewPayout)) + EVT_THREAD + EVT_LOOP(2) + EVT_SET(LVar1, 480) + EVT_LOOP(5) + EVT_ADD(LVar1, 20) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, LVar1, 150, 50, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) + EVT_WAIT(3) + EVT_END_LOOP + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(30) + EVT_CASE_EQ(SLOT_MATCH_TWO) + EVT_EXEC_WAIT(N(EVS_SetCam_ViewPayout)) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, 535, 150, 50, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) + EVT_WAIT(30) + EVT_CASE_DEFAULT + EVT_SET(MV_ResetCamSpeed, EVT_FLOAT(2.0)) + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(N(UnsetCamera0Flag1000)) + EVT_CALL(ResetCam, CAM_DEFAULT, MV_ResetCamSpeed) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_LOOP(0) + EVT_SET(LVar0, 0) + EVT_SET(LVar4, -1) + EVT_LOOP(5) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_IF_GE(LVar2, 0) + EVT_SET(LVar4, 0) + EVT_END_IF + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_IF_NE(LVar4, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(50) + EVT_LABEL(99) + EVT_SET(MF_HitStartBlock, FALSE) + EVT_SET(MF_Block1_Hit, TRUE) + EVT_SET(MF_Block2_Hit, TRUE) + EVT_SET(MF_Block3_Hit, TRUE) + EVT_SET(MF_Block1_Active, FALSE) + EVT_SET(MF_Block2_Active, FALSE) + EVT_SET(MF_Block3_Active, FALSE) + EVT_SET(MF_AnimateSlotLights, FALSE) + EVT_SET(AF_OMO09_Block1_DontBlink, FALSE) + EVT_SET(AF_OMO09_Block2_DontBlink, FALSE) + EVT_SET(AF_OMO09_Block3_DontBlink, FALSE) + EVT_CALL(EnableModel, MODEL_s1, TRUE) + EVT_CALL(EnableModel, MODEL_s2, FALSE) + EVT_EXEC(N(EVS_StartBlock_UpdateBlinking)) + EVT_CALL(EnableModel, MODEL_h1, TRUE) + EVT_CALL(EnableModel, MODEL_h1_a, FALSE) + EVT_CALL(EnableModel, MODEL_h2, TRUE) + EVT_CALL(EnableModel, MODEL_h2_a, FALSE) + EVT_CALL(EnableModel, MODEL_h3, TRUE) + EVT_CALL(EnableModel, MODEL_h3_a, FALSE) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +s32 N(SlotMachineBlocks)[] = { + MODEL_s1, + MODEL_h1, + MODEL_h2, + MODEL_h3, +}; + +API_CALLABLE(N(UpdateSlotMachineBlockShadows)) { + s32 (*shadowIDs)[4]; + Shadow* shadow; + Model* model; + f32 x, y, z; + f32 rotX, rotZ; + f32 scale; + u32 i; + + if (isInitialCall) { + + script->functionTempPtr[0] = shadowIDs = heap_malloc(sizeof(*shadowIDs)); + for (i = 0; i < ARRAY_COUNT(N(SlotMachineBlocks)); i++) { + model = get_model_from_list_index(get_model_list_index_from_tree_index(N(SlotMachineBlocks)[i])); + (*shadowIDs)[i] = create_shadow_type(1, model->center.x, model->center.y - 100.0f, model->center.z); + } + } + + shadowIDs = script->functionTempPtr[0]; + for (i = 0; i < ARRAY_COUNT(N(SlotMachineBlocks)); i++) { + shadow = get_shadow_by_index((*shadowIDs)[i]); + model = get_model_from_list_index(get_model_list_index_from_tree_index(N(SlotMachineBlocks)[i])); + x = model->center.x; + y = model->center.y; + z = model->center.z; + scale = 1000.0f; + entity_raycast_down(&x, &y, &z, &rotX, &rotZ, &scale); + set_standard_shadow_scale(shadow, scale); + shadow->position.x = x; + shadow->position.y = y; + shadow->position.z = z; + shadow->rotation.x = rotX; + shadow->rotation.y = 0.0f; + shadow->rotation.z = rotZ; + shadow->scale.x *= 1.3f; + shadow->scale.z *= 1.3f; + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_SetupSlotMachine) = { + EVT_CALL(ParentColliderToModel, COLLIDER_s1, MODEL_s1) + EVT_CALL(ParentColliderToModel, COLLIDER_h1, MODEL_h1) + EVT_CALL(ParentColliderToModel, COLLIDER_h2, MODEL_h2) + EVT_CALL(ParentColliderToModel, COLLIDER_h3, MODEL_h3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBlock_SlotStart)), TRIGGER_CEILING_TOUCH, COLLIDER_s1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBlock_SlotWheel1)), TRIGGER_CEILING_TOUCH, COLLIDER_h1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBlock_SlotWheel2)), TRIGGER_CEILING_TOUCH, COLLIDER_h2, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBlock_SlotWheel3)), TRIGGER_CEILING_TOUCH, COLLIDER_h3, 1, 0) + EVT_CALL(RandInt, 7, MV_SlotWheel1_Angle) + EVT_MUL(MV_SlotWheel1_Angle, 45) + EVT_CALL(RotateModel, MODEL_o864, MV_SlotWheel1_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o865, MV_SlotWheel1_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o866, MV_SlotWheel1_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o867, MV_SlotWheel1_Angle, 1, 0, 0) + EVT_CALL(RandInt, 7, MV_SlotWheel2_Angle) + EVT_MUL(MV_SlotWheel2_Angle, 45) + EVT_CALL(RotateModel, MODEL_o868, MV_SlotWheel2_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o869, MV_SlotWheel2_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o870, MV_SlotWheel2_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o871, MV_SlotWheel2_Angle, 1, 0, 0) + EVT_CALL(RandInt, 7, MV_SlotWheel3_Angle) + EVT_MUL(MV_SlotWheel3_Angle, 45) + EVT_CALL(RotateModel, MODEL_o872, MV_SlotWheel3_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o873, MV_SlotWheel3_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o874, MV_SlotWheel3_Angle, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o875, MV_SlotWheel3_Angle, 1, 0, 0) + EVT_SET(MF_HitStartBlock, FALSE) + EVT_SET(MF_Block1_Hit, TRUE) + EVT_SET(MF_Block2_Hit, TRUE) + EVT_SET(MF_Block3_Hit, TRUE) + EVT_SET(MF_Block1_Active, FALSE) + EVT_SET(MF_Block2_Active, FALSE) + EVT_SET(MF_Block3_Active, FALSE) + EVT_SET(MF_AnimateSlotLights, FALSE) + EVT_CALL(EnableTexPanning, MODEL_o888, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o876, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o884, TRUE) + EVT_THREAD + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_IF_EQ(MF_AnimateSlotLights, TRUE) + EVT_ADD(LVar1, -1110) + EVT_END_IF + EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0, LVar1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(UpdateSlotMachineBlockShadows)) + EVT_END_THREAD + EVT_CALL(EnableModel, MODEL_s1, TRUE) + EVT_CALL(EnableModel, MODEL_s2, FALSE) + EVT_EXEC(N(EVS_StartBlock_UpdateBlinking)) + EVT_CALL(EnableModel, MODEL_h1, TRUE) + EVT_CALL(EnableModel, MODEL_h1_a, FALSE) + EVT_CALL(EnableModel, MODEL_h2, TRUE) + EVT_CALL(EnableModel, MODEL_h2_a, FALSE) + EVT_CALL(EnableModel, MODEL_h3, TRUE) + EVT_CALL(EnableModel, MODEL_h3_a, FALSE) + EVT_EXEC(N(EVS_SlotMachine_MainUpdate)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_09/omo_09_5_gizmos.c b/src/world/area_omo/omo_09/omo_09_5_gizmos.c new file mode 100644 index 0000000000..9795ef531a --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_5_gizmos.c @@ -0,0 +1,151 @@ +#include "omo_09.h" + +EvtScript N(EVS_Gizmos_Wheels) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_ha1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha2, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha3, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha4, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha5, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Shutters) = { + EVT_LABEL(0) + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 160, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m3_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m3_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m4_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m4_2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 160, 0, 60, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m3_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m3_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m4_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m4_2, LVar0, 0, 1, 0) + EVT_WAIT(2) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Clocks) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_hari1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_hari2, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +typedef struct MovingBlock { + /* 0x0 */ s32 colliderID; + /* 0x4 */ s32 modelID; + /* 0x8 */ s32 moveDist; + /* 0xC */ s32 moveDelay; +} MovingBlock; // size = 0x10 + +MovingBlock N(MovingBlockPlatforms)[] = { + { COLLIDER_u1, MODEL_u1, 40, 41 }, + { COLLIDER_u2, MODEL_u2, 60, 51 }, + { COLLIDER_u3, MODEL_u3, 70, 1 }, + { COLLIDER_u4, MODEL_u4, 30, 61 }, + { COLLIDER_u5, MODEL_u5, 50, 71 }, + { COLLIDER_u6, MODEL_u6, 70, 101 }, +}; + +API_CALLABLE(N(AwaitPlayerNearPlatforms)) { + if (gPlayerStatus.position.x < 850.0f) { + return ApiStatus_BLOCK; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Gizmos_MovingBlocks) = { + EVT_SET_GROUP(EVT_GROUP_EF) + EVT_CALL(N(AwaitPlayerNearPlatforms)) + EVT_WAIT(LVar9) + EVT_CALL(ParentColliderToModel, LVar6, LVar7) + EVT_LOOP(0) + EVT_CALL(MakeLerp, 0, LVar8, LVar8, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, LVar7, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar6) + EVT_CALL(N(AwaitPlayerNearPlatforms)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LOOP(30) + EVT_CALL(N(AwaitPlayerNearPlatforms)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(MakeLerp, LVar8, 0, LVar8, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, LVar7, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar6) + EVT_CALL(N(AwaitPlayerNearPlatforms)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LOOP(30) + EVT_CALL(N(AwaitPlayerNearPlatforms)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupGizmos) = { + EVT_EXEC(N(EVS_Gizmos_Wheels)) + EVT_EXEC(N(EVS_Gizmos_Shutters)) + EVT_EXEC(N(EVS_Gizmos_Clocks)) + EVT_USE_BUF(EVT_PTR(N(MovingBlockPlatforms))) + EVT_LOOP(ARRAY_COUNT(N(MovingBlockPlatforms))) + EVT_BUF_READ4(LVar6, LVar7, LVar8, LVar9) + EVT_EXEC(N(EVS_Gizmos_MovingBlocks)) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_09/omo_09_6_entity.c b/src/world/area_omo/omo_09/omo_09_6_entity.c new file mode 100644 index 0000000000..95d41f6aee --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_6_entity.c @@ -0,0 +1,43 @@ +#include "omo_09.h" +#include "entity.h" + +#include "world/common/atomic/Chest.inc.c" + +EvtScript N(EVS_OpenChest_Dictionary) = { + EVT_SET(LVarA, ITEM_DICTIONARY) + EVT_SET(LVarB, ITEM_TYPE_KEY) + EVT_SET(GF_OMO09_Chest_Dictionary, TRUE) + EVT_EXEC_WAIT(N(EVS_Chest_GetItem)) + EVT_SET(GF_MAC00_DictionaryStolen, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_COIN, -760, 10, 0, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinA) + EVT_CALL(MakeItemEntity, ITEM_COIN, -700, 10, 0, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinB) + EVT_CALL(MakeItemEntity, ITEM_COIN, -640, 10, 0, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinC) + EVT_CALL(MakeItemEntity, ITEM_COIN, -440, 10, 100, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinD) + EVT_CALL(MakeItemEntity, ITEM_COIN, -380, 10, 100, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinE) + EVT_CALL(MakeItemEntity, ITEM_COIN, -320, 10, 100, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinF) + EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 1800, 25, 0, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_StarPiece) + EVT_CALL(MakeItemEntity, ITEM_COIN, 1775, 25, -50, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinG) + EVT_CALL(MakeItemEntity, ITEM_COIN, 1825, 25, -50, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinH) + EVT_CALL(MakeItemEntity, ITEM_COIN, 1750, 25, 0, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinI) + EVT_CALL(MakeItemEntity, ITEM_COIN, 1850, 25, 0, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinJ) + EVT_CALL(MakeItemEntity, ITEM_COIN, 1775, 25, 50, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinK) + EVT_CALL(MakeItemEntity, ITEM_COIN, 1825, 25, 50, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_CoinL) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 1285, 230, -50, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO09_MultiCoinBrick) + EVT_CALL(UseDynamicShadow, TRUE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 1950, 150, -31, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_OMO09_Chest_Dictionary) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_Dictionary))) + EVT_IF_EQ(GF_OMO09_Defeated_MysteryNoteThief, TRUE) + EVT_IF_EQ(GF_OMO09_Item_MysteryNote, FALSE) + EVT_CALL(MakeItemEntity, ITEM_MYSTERY_NOTE, 142, 10, -96, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_OMO09_Item_MysteryNote) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_09/omo_09_7_npc.c b/src/world/area_omo/omo_09/omo_09_7_npc.c new file mode 100644 index 0000000000..8c8abfeb33 --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_7_npc.c @@ -0,0 +1,481 @@ +#include "omo_09.h" + +#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" + +MobileAISettings N(AISettings_ShyGuy_Wander_NoReaction) = { + .moveSpeed = 2.0f, + .moveTime = 60, + .waitTime = 15, + .alertRadius = 100.0f, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 4, + .chaseSpeed = 4.0f, + .chaseTurnRate = 6, + .chaseUpdateInterval = 1, + .chaseRadius = 140.0f, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_ShyGuy_Wander_NoReaction) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_ShyGuy_Wander_NoReaction))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_ShyGuy_Wander_NoReaction) = { + .height = 23, + .radius = 22, + .level = 14, + .ai = &N(EVS_NpcAI_ShyGuy_Wander_NoReaction), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = 0, +}; + +#include "world/common/enemy/complete/ShyGuy_Patrol.inc.c" +#include "world/common/enemy/complete/SpyGuy.inc.c" +#include "world/common/enemy/complete/Koopatrol_Stationary.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" +#include "world/common/enemy/complete/Kammy.inc.c" + +#include "world/common/todo/SetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" + +EvtScript N(EVS_ShyGuy_CarryItem) = { + EVT_SET(LVarA, LVar0) // npcID + EVT_SET(LVarB, LVar1) // itemID + EVT_SET(LVarD, LVar2) // item type + EVT_SET(LVarE, LVar3) // pickup flag + EVT_CALL(SetNpcVar, LVarA, 10, 0) + EVT_CALL(GetNpcPos, LVarA, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 26) + EVT_CALL(MakeItemEntity, LVarB, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(LVar9, LVar0) + EVT_WAIT(1) + EVT_LABEL(10) + EVT_CALL(GetNpcPos, LVarA, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 26) + EVT_CALL(SetItemPos, LVar9, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, LVarA, 10, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(RemoveItemEntity, LVar9) + EVT_SWITCH(LVarD) + EVT_CASE_EQ(ITEM_TYPE_CONSUMABLE) + EVT_CALL(MakeItemEntity, LVarB, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS, LVarE) + EVT_CASE_EQ(ITEM_TYPE_KEY) + EVT_CALL(DropItemEntity, LVarB, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, LVarE) + EVT_CASE_EQ(ITEM_TYPE_BADGE) + EVT_CALL(DropItemEntity, LVarB, LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_FALL, LVarE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + + +EvtScript N(EVS_NpcDefeat_ShyGuy_Thief) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_OMO09_Defeated_MysteryNoteThief, TRUE) + EVT_CALL(SetSelfVar, 10, 1) + EVT_WAIT(2) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_SET(GF_OMO09_Defeated_MysteryNoteThief, TRUE) + EVT_CALL(SetSelfVar, 10, 1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Pokey) = { + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 1850) + EVT_GOTO(0) + EVT_END_IF + EVT_IF_LT(LVar1, 150) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetCamera0Flag1000)) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(5.0), LVar0, LVar1, LVar2, 300, EVT_FLOAT(13.0), EVT_FLOAT(-9.5)) + EVT_IF_EQ(GB_OMO_PeachChoice3, 0) + EVT_CALL(SpeakToPlayer, NPC_Pokey, ANIM_Pokey_Anim04, ANIM_Pokey_Anim04, 0, MSG_CH4_003E) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Koopatrol, ANIM_WorldKoopatrol_Anim08, ANIM_WorldKoopatrol_Anim01, 0, MSG_CH4_003F) + EVT_END_IF + EVT_THREAD + EVT_CALL(N(UnsetCamera0Flag1000)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_END_THREAD + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Pokey) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_OMO09_Item_SuperSoda, TRUE) + 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_Pokey) = { + EVT_IF_EQ(GB_OMO_PeachChoice3, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey))) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol) = { + EVT_IF_EQ(GB_OMO_PeachChoice3, 1) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey))) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kammy) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kammy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_ShyGuy_Jackpot) = { + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(SetSelfVar, 0, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_Wander))) + EVT_END_IF + EVT_CASE_EQ(2) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(25) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_ShyGuy_Jackpot) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetSelfVar, 0, 2) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_Jackpot))) + 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_ShyGuy_Jackpot) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_Jackpot))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_ShyGuy_Jackpot))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Pokey) = { + .id = NPC_Pokey, + .settings = &N(NpcSettings_Pokey), + .pos = { 1900.0f, 150.0f, -30.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Pokey), + .drops = NPC_NO_DROPS, + .animations = POKEY_ANIMS, +}; + +StaticNpc N(NpcData_Koopatrol) = { + .id = NPC_Koopatrol, + .settings = &N(NpcSettings_Koopatrol_Stationary), + .pos = { 1900.0f, 150.0f, -30.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Koopatrol), + .drops = NPC_NO_DROPS, + .animations = KOOPATROL_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_01) = { + .id = NPC_ShyGuy_Jackpot1, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 460, 0, 50 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 460, 0, 50 }, + .detectSize = { 200 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_02) = { + .id = NPC_ShyGuy_Jackpot2, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 497, 0, 50 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 497, 0, 50 }, + .detectSize = { 200 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_03) = { + .id = NPC_ShyGuy_Jackpot3, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 535, 0, 50 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 535, 0, 50 }, + .detectSize = { 200 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_04) = { + .id = NPC_ShyGuy_Jackpot4, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 573, 0, 50 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 573, 0, 50 }, + .detectSize = { 200 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_05) = { + .id = NPC_ShyGuy_Jackpot5, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_ShyGuy_Jackpot), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 610, 0, 50 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 610, 0, 50 }, + .detectSize = { 200 }, + } + }, + .animations = RED_SHY_GUY_ANIMS, +}; + +s32 N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim0E, + ANIM_WorldKammy_Anim0F, + ANIM_WorldKammy_Anim10, + ANIM_WorldKammy_Anim13, + ANIM_WorldKammy_Anim15, + ANIM_WorldKammy_Anim16, + -1 +}; + +StaticNpc N(NpcData_Kammy) = { + .id = NPC_Kammy, + .settings = &N(NpcSettings_Kammy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_Kammy), + .drops = NPC_NO_DROPS, + .animations = KAMMY_ANIMS, + .extraAnimations = N(ExtraAnims_Kammy), +}; + +EvtScript N(EVS_ShyGuy_Thief) = { + EVT_IF_EQ(GF_OMO09_Defeated_MysteryNoteThief, TRUE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_ShyGuy_Thief))) + EVT_SET(LVar0, NPC_ShyGuy_Thief) + EVT_SET(LVar1, ITEM_MYSTERY_NOTE) + EVT_SET(LVar2, ITEM_TYPE_KEY) + EVT_SET_CONST(LVar3, GF_OMO09_Item_MysteryNote) + EVT_EXEC(N(EVS_ShyGuy_CarryItem)) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy_Thief) = { + .id = NPC_ShyGuy_Thief, + .settings = &N(NpcSettings_ShyGuy_Patrol), + .pos = { 155.0f, 10.0f, -96.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_ShyGuy_Thief), + .drops = SHY_GUY_DROPS, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { 155, 10, -96 }, + { 90, 10, -96 }, + }, + .detectShape = SHAPE_RECT, + .detectPos = { 135, 10, 0 }, + .detectSize = { 105, 140 }, + } + }, + .animations = YELLOW_SHY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + .aiFlags = ENEMY_AI_FLAG_1, +}; + +StaticNpc N(NpcData_SpyGuy)[] = { + { + .id = NPC_SpyGuy, + .settings = &N(NpcSettings_SpyGuy), + .pos = { 850.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPY_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 850, 0, 0 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 850, 0, 0 }, + .detectSize = { 200 }, + } + }, + .animations = SPY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + SPY_GUY_ROCK_HITBOX(NPC_SpyGuy_Rock1), + SPY_GUY_ROCK_HITBOX(NPC_SpyGuy_Rock2), + SPY_GUY_ROCK_HITBOX(NPC_SpyGuy_Rock3), +}; + +NpcGroupList N(PokeyAmbushNPCs) = { + NPC_GROUP(N(NpcData_Pokey), BTL_OMO3_FORMATION_08, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_01), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_02), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_03), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_04), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_05), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_Thief), BTL_OMO_FORMATION_09, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_SpyGuy), BTL_OMO_FORMATION_19, BTL_OMO_STAGE_00), + {} +}; + +NpcGroupList N(KoopatrolAmbushNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol), BTL_OMO3_FORMATION_09, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_01), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_02), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_03), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_04), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_05), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_Thief), BTL_OMO_FORMATION_09, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_SpyGuy), BTL_OMO_FORMATION_19, BTL_OMO_STAGE_00), + {} +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_ShyGuy_01), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_02), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_03), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_04), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_05), BTL_OMO3_FORMATION_0A, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_ShyGuy_Thief), BTL_OMO_FORMATION_09, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_SpyGuy), BTL_OMO_FORMATION_19, BTL_OMO_STAGE_00), + {} +}; + +NpcGroupList N(KammySceneNPCs) = { + NPC_GROUP(N(NpcData_Kammy)), + NPC_GROUP(N(NpcData_Pokey), BTL_OMO3_FORMATION_08, BTL_OMO3_STAGE_04), + NPC_GROUP(N(NpcData_Koopatrol), BTL_OMO3_FORMATION_09, BTL_OMO3_STAGE_04), + {} +}; diff --git a/src/world/area_omo/omo_09/omo_09_8_scenes.c b/src/world/area_omo/omo_09/omo_09_8_scenes.c new file mode 100644 index 0000000000..4ab99a76be --- /dev/null +++ b/src/world/area_omo/omo_09/omo_09_8_scenes.c @@ -0,0 +1,118 @@ +#include "omo_09.h" +#include "effects.h" + +s32 N(HoverOffsets)[] = { + 1, 2 , 3, 2, 1, + -1, -2, -3, -2, -1, +}; + +EvtScript N(EVS_NpcIdle_Kammy) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar6, LVar3, LVar4) + EVT_LOOP(0) + EVT_USE_BUF(EVT_PTR(N(HoverOffsets))) + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_CALL(GetSelfVar, 0, LVar5) + EVT_IF_EQ(LVar5, 0) + EVT_WAIT(1) + EVT_ELSE + EVT_BUF_READ1(LVar1) + EVT_ADD(LVar3, LVar1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_WAIT(3) + EVT_END_IF + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +#define KAMMY_NPC NPC_Kammy +#include "world/common/util/GetKammyBroomEmitterPos.inc.c" + +EvtScript N(EVS_NpcAux_Kammy) = { + EVT_CALL(GetNpcPos, NPC_Kammy, LVar6, LVar7, LVar8) + EVT_LOOP(0) + EVT_CALL(N(GetKammyBroomEmitterPos)) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar9, LVarA, LVarB) + EVT_SET(LVar3, LVar9) + EVT_SET(LVar4, LVarA) + EVT_SET(LVar5, LVarB) + EVT_SUBF(LVar3, LVar6) + EVT_SUBF(LVar4, LVar7) + EVT_SUBF(LVar5, LVar8) + EVT_SETF(LVar6, LVar9) + EVT_SETF(LVar7, LVarA) + EVT_SETF(LVar8, LVarB) + EVT_IF_NE(LVar3, 0) + EVT_IF_NE(LVar5, 0) + EVT_PLAY_EFFECT(EFFECT_PURPLE_RING, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_END_IF + EVT_WAIT(3) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_KammySetAmbush) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GF_OMO09_SpawnedPeachChoice3, TRUE) + EVT_SET(AB_OMO_CurrentPeachChoice, GB_OMO_PeachChoice3) + EVT_SWITCH(AB_OMO_CurrentPeachChoice) + EVT_CASE_EQ(0) + EVT_SET(MV_AmbushID, NPC_Pokey) + EVT_CASE_EQ(1) + EVT_SET(MV_AmbushID, NPC_Koopatrol) + EVT_CASE_EQ(2) + EVT_SET(MV_AmbushID, ITEM_SUPER_SODA) + EVT_END_SWITCH + EVT_CALL(SetNpcPos, NPC_Kammy, 1820, 165, 0) + EVT_CALL(SetNpcYaw, NPC_Kammy, 90) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) + EVT_CALL(SetNpcPos, MV_AmbushID, NPC_DISPOSE_LOCATION) + EVT_END_IF + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1900, 150, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 1900, 150, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.5)) + 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(5) + EVT_CALL(SetNpcVar, NPC_Kammy, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) + EVT_WAIT(25) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 25) + EVT_ADD(LVar1, 38) + EVT_CALL(PlaySoundAt, SOUND_207A, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75) + EVT_WAIT(75) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) + EVT_ADD(LVar0, 55) + EVT_CALL(PlaySoundAt, SOUND_2098, 0, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, 150, 0, 1, 15, 3, 8) + EVT_WAIT(5) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) + EVT_CALL(SetNpcPos, MV_AmbushID, LVar0, 150, 0) + EVT_ELSE + EVT_CALL(MakeItemEntity, MV_AmbushID, LVar0, 150, 0, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) + EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) + EVT_WAIT(5) + EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, 0) + EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_09"), omo_09_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c deleted file mode 100644 index ad940aac85..0000000000 --- a/src/world/area_omo/omo_10/DD79B0.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "omo_10.h" - -static char* N(exit_str_0) = "omo_11"; -static char* N(exit_str_1) = "omo_02"; -static char* N(exit_str_2) = "omo_10"; -static char* N(exit_str_3) = "omo_08"; -static char* N(exit_str_4) = "omo_06"; -static char* N(exit_str_5) = "omo_03"; -static char* N(exit_str_6) = "omo_16"; -static char* N(exit_str_7) = ""; - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -#include "common/SetAngleClamped.inc.c" - -#include "common/CompareFloats.inc.c" - -#include "common/AdvanceBuffer.inc.c" - -#include "common/SetPlayerStatusPosYaw.inc.c" - -#include "common/SetNpcPosYaw.inc.c" - -#include "common/CosInterpMinMax.inc.c" - -#include "common/IsAOrBPressed.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_omo/omo_10/omo_10.h b/src/world/area_omo/omo_10/omo_10.h index da71c48fbc..15293acd9e 100644 --- a/src/world/area_omo/omo_10/omo_10.h +++ b/src/world/area_omo/omo_10/omo_10.h @@ -2,8 +2,42 @@ /// @brief Shy Guy's Toybox - RED Station #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_10_shape.h" +#include "mapfs/omo_10_hit.h" + +#include "sprite/npc/TrainToad.h" + +enum { + NPC_Conductor = 0, + NPC_TrainToad = 1, +}; + +enum { + MV_TrainUnk_00 = MapVar(0), + MV_TrainUnk_01 = MapVar(1), + MV_TrainUnk_02 = MapVar(2), + MV_ArrowTexUOffset = MapVar(9), + MV_TrainPos = MapVar(11), + MV_TrainUnk_0C = MapVar(12), + MV_TrainUnk_0D = MapVar(13), +}; + +enum { + MF_TrainUnk_00 = MapFlag(0), + MF_EitherSwitchPressed = MapFlag(1), + MF_Unk_0A = MapFlag(10), +}; + #define NAMESPACE omo_10 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGizmos); +extern EvtScript N(EVS_SetupTrain); +extern EvtScript N(D_802444A0_DDBE50); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_10/omo_10_0_header.c b/src/world/area_omo/omo_10/omo_10_0_header.c new file mode 100644 index 0000000000..f4d8b43f04 --- /dev/null +++ b/src/world/area_omo/omo_10/omo_10_0_header.c @@ -0,0 +1,16 @@ +#include "omo_10.h" + +EntryList N(Entrances) = { + [omo_10_ENTRY_0] { -330.0, 0.0, 330.0, 45.0 }, + [omo_10_ENTRY_1] { 330.0, 0.0, 330.0, 315.0 }, + [omo_10_ENTRY_2] { -330.0, 10.0, -330.0, 135.0 }, + [omo_10_ENTRY_3] { 330.0, 10.0, -330.0, 225.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_10 }, +}; diff --git a/src/world/area_omo/omo_10/omo_10_1_music.c b/src/world/area_omo/omo_10/omo_10_1_music.c new file mode 100644 index 0000000000..11f32100f9 --- /dev/null +++ b/src/world/area_omo/omo_10/omo_10_1_music.c @@ -0,0 +1,18 @@ +#include "omo_10.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_ELSE + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(omo_10_ENTRY_0, omo_10_ENTRY_1) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_10/omo_10_2_main.c b/src/world/area_omo/omo_10/omo_10_2_main.c new file mode 100644 index 0000000000..ad8ea9146c --- /dev/null +++ b/src/world/area_omo/omo_10/omo_10_2_main.c @@ -0,0 +1,47 @@ +#include "omo_10.h" + +EvtScript N(EVS_ExitWalk_omo_11_1) = EVT_EXIT_WALK(60, omo_10_ENTRY_0, "omo_11", omo_11_ENTRY_1); +EvtScript N(EVS_ExitWalk_omo_02_0) = EVT_EXIT_WALK(60, omo_10_ENTRY_1, "omo_02", omo_02_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_11_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili4, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_02_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 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_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(omo_10_ENTRY_0, omo_10_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CASE_DEFAULT + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_WAIT(3) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + 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_SetupGizmos)) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupTrain)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_10/omo_10_3_gizmos.c b/src/world/area_omo/omo_10/omo_10_3_gizmos.c new file mode 100644 index 0000000000..206cbd1c36 --- /dev/null +++ b/src/world/area_omo/omo_10/omo_10_3_gizmos.c @@ -0,0 +1,73 @@ +#include "omo_10.h" + +EvtScript N(EVS_Gizmos_Wheels) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_ha1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha2, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha3, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha4, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha5, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Shutters) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 160, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 160, 0, 60, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_m2_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m2_2, LVar0, 0, 1, 0) + EVT_WAIT(2) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Clocks) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_hari1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_hari2, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupGizmos) = { + EVT_EXEC(N(EVS_Gizmos_Wheels)) + EVT_EXEC(N(EVS_Gizmos_Shutters)) + EVT_EXEC(N(EVS_Gizmos_Clocks)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_10/omo_10_4_train.c b/src/world/area_omo/omo_10/omo_10_4_train.c new file mode 100644 index 0000000000..a01ca8c93a --- /dev/null +++ b/src/world/area_omo/omo_10/omo_10_4_train.c @@ -0,0 +1,299 @@ +#include "omo_10.h" + +#include "../common/ToyTrain.inc.c" +#include "../common/TrainStationSwitches.inc.c" + +Vec2i N(D_80243AC0_DDB470) = { + 10, -105 +}; + +s32 N(D_80243AC8_DDB478)[] = { + EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(90.0), + EVT_FLOAT(124.202), EVT_FLOAT(-209.494), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80243AF8_DDB4A8) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC(N(EVS_TrainUnk_C)) + EVT_SET(AB_OMO_5, 3) + EVT_SET(LVar0, EVT_PTR(N(D_80243AC8_DDB478))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_D)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o961, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80243AC8_DDB478))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(10) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_80243C68_DDB618)[] = { + EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(270.0), + EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), + EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80243CA0_DDB650) = { + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_EXEC(N(EVS_TrainUnk_C)) + EVT_SET(AB_OMO_5, 3) + EVT_SET(LVar0, EVT_PTR(N(D_80243C68_DDB618))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_D)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o961, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80243C68_DDB618))) + EVT_SET(MV_TrainUnk_02, 1) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_LABEL(10) + EVT_IF_GT(MV_TrainPos, -350) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_1) + EVT_SET(GB_OMO_TrainDestination, 2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(D_80243E10_DDB7C0)[] = { + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(124.202), EVT_FLOAT(-209.494), + EVT_FLOAT(-42.27), EVT_FLOAT(-209.49), + -1, -1, -1 +}; + +s32 N(D_80243E48_DDB7F8)[] = { + EVT_FLOAT(414.885), EVT_FLOAT(-426.942), EVT_FLOAT(219.92), + EVT_FLOAT(353.553), EVT_FLOAT(-353.553), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(124.202), EVT_FLOAT(-209.494), + EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), + EVT_FLOAT(-479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_80243E98_DDB848) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o961, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(AB_OMO_6, 3) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80243E10_DDB7C0))) + EVT_SET(MV_TrainUnk_02, 2) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_A), LVarB) + EVT_LABEL(10) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_SET(LVar9, EVT_PTR(N(D_80243AC0_DDB470))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0011) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o961, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_EXEC(N(EVS_TrainUnk_A)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80243E48_DDB7F8))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(20) + EVT_IF_GT(MV_TrainPos, -350) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_1) + EVT_SET(GB_OMO_TrainDestination, 2) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_80244150_DDBB00)[] = { + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), + EVT_FLOAT(37.73), EVT_FLOAT(-209.49), + -1, -1, -1 +}; + +s32 N(D_80244188_DDBB38)[] = { + EVT_FLOAT(-414.885), EVT_FLOAT(-426.942), EVT_FLOAT(140.075), + EVT_FLOAT(-353.418), EVT_FLOAT(-353.688), EVT_FLOAT(-262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(-128.733), EVT_FLOAT(-209.494), + EVT_FLOAT(124.202), EVT_FLOAT(-209.494), EVT_FLOAT(262.5), + EVT_FLOAT(-245.336), EVT_FLOAT(479.165), EVT_FLOAT(-503.546), + -1, -1, -1 +}; + +EvtScript N(D_802441D0_DDBB80) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o961, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(AB_OMO_6, 3) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80244150_DDBB00))) + EVT_SET(MV_TrainUnk_02, 2) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TrainUnk_A), LVarB) + EVT_LABEL(10) + EVT_IF_EQ(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(20) + EVT_KILL_THREAD(LVarB) + EVT_EXEC(N(EVS_TrainUnk_B)) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_SET(LVar9, EVT_PTR(N(D_80243AC0_DDB470))) + EVT_EXEC_WAIT(N(EVS_TrainUnk_E)) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0011) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o961, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_EXEC(N(EVS_TrainUnk_A)) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80244188_DDBB38))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_WAIT(1) + EVT_EXEC(N(EVS_TrainUnk_H)) + EVT_LABEL(20) + EVT_IF_LT(MV_TrainPos, 350) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("omo_16"), omo_16_ENTRY_0) + EVT_SET(GB_OMO_TrainDestination, 3) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_80244488_DDBE38)[] = { + 2, 1, 0, +}; + +s32 N(D_80244494_DDBE44)[] = { + 0, 1, 2, +}; + +EvtScript N(D_802444A0_DDBE50) = { + EVT_IF_EQ(MF_EitherSwitchPressed, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0006) + EVT_ELSE + EVT_IF_EQ(AF_OMO_UsingRightSwitch, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_CALL(ShowChoice, MSG_Choice_0043) + EVT_IF_NE(LVar0, 3) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80244488_DDBE38))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80243CA0_DDB650)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0007) + EVT_CALL(ShowChoice, MSG_Choice_0042) + EVT_IF_NE(LVar0, 3) + EVT_CALL(CloseMessage) + EVT_USE_BUF(EVT_PTR(N(D_80244494_DDBE44))) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_SET(AB_OMO_6, LVar1) + EVT_EXEC_WAIT(N(D_80243AF8_DDB4A8)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 0, MSG_CH4_0008) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(D_802446B8_DDC068)[] = { + EVT_FLOAT(-2.266), EVT_FLOAT(-209.494), EVT_FLOAT(90.0), + -1, -1, -1 +}; + +EvtScript N(EVS_SetupTrain) = { + EVT_EXEC_WAIT(N(EVS_SetupSwitches)) + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802446B8_DDC068))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_ELSE + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(omo_10_ENTRY_2) + EVT_EXEC(N(D_802441D0_DDBB80)) + EVT_CASE_EQ(omo_10_ENTRY_3) + EVT_EXEC(N(D_80243E98_DDB848)) + EVT_CASE_DEFAULT + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802446B8_DDC068))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_10/omo_10_5_npc.c b/src/world/area_omo/omo_10/omo_10_5_npc.c new file mode 100644 index 0000000000..300057ad4f --- /dev/null +++ b/src/world/area_omo/omo_10/omo_10_5_npc.c @@ -0,0 +1,66 @@ +#include "omo_10.h" + +#include "world/common/npc/TrainToad.inc.c" + +EvtScript N(EVS_NpcInteract_Conductor) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(D_802444A0_DDBE50)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Conductor) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Conductor))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_TrainToad) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Red_Talk, ANIM_TrainToad_Red_Idle, 0, MSG_CH4_0031) + EVT_CASE_LT(STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Red_Talk, ANIM_TrainToad_Red_Idle, 0, MSG_CH4_0032) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_TrainToad_Red_Talk, ANIM_TrainToad_Red_Idle, 0, MSG_CH4_0033) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TrainToad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainToad))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Toads)[] = { + { + .id = NPC_Conductor, + .settings = &N(NpcSettings_TrainToad), + .pos = { 10.0f, 50.0f, -105.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Conductor), + .drops = NPC_NO_DROPS, + .animations = TRAIN_CONDUCTOR_ANIMS, + .tattle = MSG_NpcTattle_OMO_TrainConductor, + }, + { + .id = NPC_TrainToad, + .settings = &N(NpcSettings_TrainToad), + .pos = { -50.0f, 0.0f, 80.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_TrainToad), + .drops = NPC_NO_DROPS, + .animations = TRAIN_TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_OMO_TrainConductor, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Toads)), + {} +}; diff --git a/src/world/area_omo/omo_10/omo_10_6_entity.c b/src/world/area_omo/omo_10/omo_10_6_entity.c new file mode 100644 index 0000000000..53f5b769e5 --- /dev/null +++ b/src/world/area_omo/omo_10/omo_10_6_entity.c @@ -0,0 +1,13 @@ +#include "omo_10.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -350, 60, 60, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO10_HiddenItem_SuperShroom) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 250, 60, 55, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 150, 60, 55, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 0, 0, 200, 0, MODEL_soto, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_OMO10_HiddenPanel) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_11/DDC830.c b/src/world/area_omo/omo_11/DDC830.c deleted file mode 100644 index da12041d8c..0000000000 --- a/src/world/area_omo/omo_11/DDC830.c +++ /dev/null @@ -1,181 +0,0 @@ -#include "omo_11.h" -#include "model.h" -#include "mapfs/omo_11_shape.h" - -static char* N(exit_str_0) = "omo_12"; -static char* N(exit_str_1) = "omo_10"; - -typedef struct UnkOmo9 { - /* 0x00 */ s32 shadowIndexes[8]; -} UnkOmo11; // size = 0x20 - -extern s32 D_80241740_DDDF70[8]; - -ApiStatus func_80240000_DDC830(Evt* script, s32 isInitialCall) { - f32 x, y, z; - f32 rotX, rotZ; - f32 scale; - Shadow* shadow; - UnkOmo11* unkStruct; - Model* model; - u32 i; - - if (isInitialCall) { - - script->functionTempPtr[0] = unkStruct = heap_malloc(sizeof(*unkStruct)); - for (i = 0; i < ARRAY_COUNT(D_80241740_DDDF70); i++) { - model = get_model_from_list_index(get_model_list_index_from_tree_index(D_80241740_DDDF70[i])); - unkStruct->shadowIndexes[i] = - create_shadow_type(0, model->center.x, model->center.y - 100.0f, model->center.z); - } - } - - unkStruct = script->functionTempPtr[0]; - for (i = 0; i < ARRAY_COUNT(D_80241740_DDDF70); i++) { - shadow = get_shadow_by_index(unkStruct->shadowIndexes[i]); - model = get_model_from_list_index(get_model_list_index_from_tree_index(D_80241740_DDDF70[i])); - x = model->center.x; - y = model->center.y; - z = model->center.z; - scale = 1000.0f; - entity_raycast_down(&x, &y, &z, &rotX, &rotZ, &scale); - set_standard_shadow_scale(shadow, scale); - shadow->rotation.y = 0.0f; - shadow->position.x = x; - shadow->position.y = y; - shadow->position.z = z; - shadow->rotation.x = rotX; - shadow->rotation.z = rotZ; - shadow->scale.x *= 3.0f; - shadow->scale.z *= 3.0f; - } - return ApiStatus_BLOCK; -} - -typedef struct UnkOmo11 { - /* 0x00 */ Vec3f unk_00; - /* 0x0C */ Vec3f unk_0C; - /* 0x18 */ Matrix4f transformMatrix; -} UnkOmo11_2; // size = 0x58 - -extern s32 D_80241760_DDDF90[6]; // TODO remove hard-coded size once data is migrated -extern s32 D_80241778_DDDFA8[6]; // TODO remove hard-coded size once data is migrated - -NOP_FIX -ApiStatus func_802401A0_DDC9D0(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Matrix4f sp20, sp60, spA0, spE0; - Npc* partner = get_npc_unsafe(NPC_PARTNER); - Model* model1 = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_fl)); - Model* model2 = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_1_0)); - f32 ox, oy, oz; - Model* loopModel; - f32 x, y, z; - UnkOmo11_2* it; - u32 cond; - u32 i; - s32 j, k; - - if (isInitialCall) { - sfx_play_sound_at_position(SOUND_80000016, 0, 315.0f, 125.0f, -100.0f); - script->functionTempPtr[0] = it = heap_malloc(sizeof(*it) * ARRAY_COUNT(D_80241760_DDDF90)); - script->functionTemp[1] = 0; - - for (i = 0; i < ARRAY_COUNT(D_80241760_DDDF90); it++, i += 2) { - loopModel = get_model_from_list_index(get_model_list_index_from_tree_index(D_80241760_DDDF90[i])); - it->unk_00.x = x = loopModel->center.x - model1->center.x; - it->unk_00.y = y = loopModel->center.y - model1->center.y; - it->unk_00.z = z = loopModel->center.z - model1->center.z; - - ox = x; - oy = y; - oz = z; - - for (j = 0; j < 4; j++) { - for (k = 0; k < 4; k++) { - it->transformMatrix[j][k] = loopModel->transformMatrix[j][k]; - } - } - - loopModel = get_model_from_list_index(get_model_list_index_from_tree_index(D_80241760_DDDF90[i + 1])); - - it = it + 1; - it->unk_00.x = ox; - it->unk_00.y = oy; - it->unk_00.z = oz; - - for (j = 0; j < 4; j++) { - for (k = 0; k < 4; k++) { - it->transformMatrix[j][k] = loopModel->transformMatrix[j][k]; - } - } - } - } - - it = script->functionTempPtr[0]; - for (i = 0; i < 6; i++, it++) { - loopModel = get_model_from_list_index(get_model_list_index_from_tree_index(D_80241760_DDDF90[i])); - - for (j = 0; j < 4; j++) { - for (k = 0; k < 4; k++) { - loopModel->transformMatrix[j][k] = it->transformMatrix[j][k]; - } - } - - loopModel->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; - guTranslateF(sp20, it->unk_00.x, it->unk_00.y, it->unk_00.z); - guRotateF(spA0, script->functionTemp[1], 0.0f, 0.0f, 1.0f); - guTranslateF(sp60, -it->unk_00.x, -it->unk_00.y, -it->unk_00.z); - guRotateF(spE0, -script->functionTemp[1], 0.0f, 0.0f, 1.0f); - guMtxCatF(sp20, spA0, spA0); - guMtxCatF(spA0, sp60, sp60); - guMtxCatF(spE0, sp60, sp60); - guMtxCatF(loopModel->transformMatrix, sp60, loopModel->transformMatrix); - update_collider_transform(D_80241778_DDDFA8[i]); - guMtxXFMF(loopModel->transformMatrix, 0.0f, 0.0f, 0.0f, &ox, &oy, &oz); - if (gCollisionStatus.currentFloor == D_80241778_DDDFA8[i] || - gCollisionStatus.lastTouchedFloor == D_80241778_DDDFA8[i]) - { - playerStatus->pushVelocity.x = ox - it->unk_0C.x; - playerStatus->pushVelocity.y = oy - it->unk_0C.y; - playerStatus->pushVelocity.z = oz - it->unk_0C.z; - } - if (partner->currentFloor == D_80241778_DDDFA8[i]) { - partner->pos.x += ox - it->unk_0C.x; - partner->pos.y += oy - it->unk_0C.y; - partner->pos.z += oz - it->unk_0C.z; - } - it->unk_0C.x = ox; - it->unk_0C.y = oy; - it->unk_0C.z = oz; - } - - guRotateF(model1->transformMatrix, script->functionTemp[1], 0.0f, 0.0f, 1.0f); - model1->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; - update_collider_transform(0x32); - - guRotateF(model2->transformMatrix, script->functionTemp[1], 0.0f, 0.0f, 1.0f); - model2->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; - update_collider_transform(0x27); - - cond = FALSE; - for (i = 0; i < ARRAY_COUNT(D_80241778_DDDFA8); i++) { - if (gCollisionStatus.currentFloor == D_80241778_DDDFA8[i]) { - if (playerStatus->flags & PS_FLAG_NO_STATIC_COLLISION) { - gCameras[CAM_DEFAULT].targetPos.x = playerStatus->position.x; - gCameras[CAM_DEFAULT].targetPos.y = playerStatus->position.y; - gCameras[CAM_DEFAULT].targetPos.z = playerStatus->position.z; - } - if (playerStatus->actionState == ACTION_COMMAND_AIR_RAID || - playerStatus->actionState == ACTION_COMMAND_POWER_SHOCK) - { - cond = TRUE; - } - } - } - if (!cond) { - script->functionTemp[1]--; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c deleted file mode 100644 index 1d7ff5bfac..0000000000 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "omo_11.h" - -#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_omo/omo_11/omo_11.h b/src/world/area_omo/omo_11/omo_11.h index 7e0da7769b..100fdda9e7 100644 --- a/src/world/area_omo/omo_11/omo_11.h +++ b/src/world/area_omo/omo_11/omo_11.h @@ -2,8 +2,28 @@ /// @brief Shy Guy's Toybox - RED Moving Platforms #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_11_shape.h" +#include "mapfs/omo_11_hit.h" + +#include "sprite/npc/PyroGuy.h" + +enum { + NPC_PyroGuy_01 = 0, + NPC_PyroGuy_02 = 1, +}; + +enum { + MV_SuperBlock = MapVar(0), +}; + #define NAMESPACE omo_11 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGizmos); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_11/omo_11_0_header.c b/src/world/area_omo/omo_11/omo_11_0_header.c new file mode 100644 index 0000000000..88511571bb --- /dev/null +++ b/src/world/area_omo/omo_11/omo_11_0_header.c @@ -0,0 +1,14 @@ +#include "omo_11.h" + +EntryList N(Entrances) = { + [omo_11_ENTRY_0] { -640.0, 0.0, 20.0, 90.0 }, + [omo_11_ENTRY_1] { 730.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_11 }, +}; diff --git a/src/world/area_omo/omo_11/omo_11_1_music.c b/src/world/area_omo/omo_11/omo_11_1_music.c new file mode 100644 index 0000000000..a88f827f4a --- /dev/null +++ b/src/world/area_omo/omo_11/omo_11_1_music.c @@ -0,0 +1,7 @@ +#include "omo_11.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_11/omo_11_2_main.c b/src/world/area_omo/omo_11/omo_11_2_main.c new file mode 100644 index 0000000000..320d9b412b --- /dev/null +++ b/src/world/area_omo/omo_11/omo_11_2_main.c @@ -0,0 +1,26 @@ +#include "omo_11.h" + +EvtScript N(EVS_ExitWalk_omo_12_0) = EVT_EXIT_WALK(60, omo_11_ENTRY_0, "omo_12", omo_12_ENTRY_0); +EvtScript N(EVS_ExitWalk_omo_10_0) = EVT_EXIT_WALK(60, omo_11_ENTRY_1, "omo_10", omo_10_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_12_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_10_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupGizmos)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_11/omo_11_3_gizmos.c b/src/world/area_omo/omo_11/omo_11_3_gizmos.c new file mode 100644 index 0000000000..f151059e86 --- /dev/null +++ b/src/world/area_omo/omo_11/omo_11_3_gizmos.c @@ -0,0 +1,342 @@ +#include "omo_11.h" +#include "model.h" + +s32 N(PlatformFloorModels)[] = { + MODEL_1_1, + MODEL_1_2, + MODEL_1_3, + MODEL_2_1, + MODEL_2_2, + MODEL_2_3, + MODEL_2_4, + MODEL_2_5, +}; + +s32 N(RotatingPlatformModels)[] = { + MODEL_1_1, + MODEL_f1_1, + MODEL_1_2, + MODEL_f1_2, + MODEL_1_3, + MODEL_f1_3, +}; + +s32 N(RotatingPlatformColliders)[] = { + COLLIDER_1_1, + COLLIDER_f1_1, + COLLIDER_1_2, + COLLIDER_f1_2, + COLLIDER_1_3, + COLLIDER_f1_3, +}; + +s32 N(BasicPlatform1)[] = { + MODEL_2_1, + COLLIDER_2_1, + MODEL_f2_1, + COLLIDER_f2_1, +}; + +s32 N(BasicPlatform2)[] = { + MODEL_2_2, + COLLIDER_2_2, + MODEL_f2_2, + COLLIDER_f2_2, +}; + +s32 N(BasicPlatform3)[] = { + MODEL_2_3, + COLLIDER_2_3, + MODEL_f2_3, + COLLIDER_f2_3, +}; + +s32 N(BasicPlatform4)[] = { + MODEL_2_4, + COLLIDER_2_4, + MODEL_f2_4, + COLLIDER_f2_4, +}; + +s32 N(BasicPlatform5)[] = { + MODEL_2_5, + COLLIDER_2_5, + MODEL_f2_5, + COLLIDER_f2_5, +}; + +API_CALLABLE(N(UpdatePlatformShadows)) { + s32 (*shadowIDs)[8]; + Model* model; + Shadow* shadow; + f32 x, y, z; + f32 rotX, rotZ; + f32 scale; + u32 i; + + if (isInitialCall) { + script->functionTempPtr[0] = shadowIDs = heap_malloc(sizeof(*shadowIDs)); + for (i = 0; i < ARRAY_COUNT(N(PlatformFloorModels)); i++) { + model = get_model_from_list_index(get_model_list_index_from_tree_index(N(PlatformFloorModels)[i])); + (*shadowIDs)[i] = create_shadow_type(0, model->center.x, model->center.y - 100.0f, model->center.z); + } + } + + shadowIDs = script->functionTempPtr[0]; + for (i = 0; i < ARRAY_COUNT(N(PlatformFloorModels)); i++) { + shadow = get_shadow_by_index((*shadowIDs)[i]); + model = get_model_from_list_index(get_model_list_index_from_tree_index(N(PlatformFloorModels)[i])); + x = model->center.x; + y = model->center.y; + z = model->center.z; + scale = 1000.0f; + entity_raycast_down(&x, &y, &z, &rotX, &rotZ, &scale); + set_standard_shadow_scale(shadow, scale); + shadow->rotation.y = 0.0f; + shadow->position.x = x; + shadow->position.y = y; + shadow->position.z = z; + shadow->rotation.x = rotX; + shadow->rotation.z = rotZ; + shadow->scale.x *= 3.0f; + shadow->scale.z *= 3.0f; + } + return ApiStatus_BLOCK; +} + +typedef struct RotatingPlatform { + /* 0x00 */ Vec3f relativePos; + /* 0x0C */ Vec3f lastRelativePos; + /* 0x18 */ Matrix4f transformMatrix; +} RotatingPlatform; // size = 0x58 + +API_CALLABLE(N(UpdateRotatingPlatforms)) { + PlayerStatus* playerStatus = &gPlayerStatus; + Matrix4f sp20, sp60, spA0, spE0; + Npc* partner = get_npc_unsafe(NPC_PARTNER); + Model* axisModel = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_fl)); + Model* ringModel = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_1_0)); + f32 ox, oy, oz; + Model* loopModel; + f32 x, y, z; + RotatingPlatform* it; + u32 isPounding; + u32 i; + s32 j, k; + + if (isInitialCall) { + sfx_play_sound_at_position(SOUND_80000016, 0, 315.0f, 125.0f, -100.0f); + script->functionTempPtr[0] = it = heap_malloc(sizeof(*it) * ARRAY_COUNT(N(RotatingPlatformModels))); + script->functionTemp[1] = 0; + + for (i = 0; i < ARRAY_COUNT(N(RotatingPlatformModels)); it++, i += 2) { + loopModel = get_model_from_list_index(get_model_list_index_from_tree_index(N(RotatingPlatformModels)[i])); + + it->relativePos.x = x = loopModel->center.x - axisModel->center.x; + it->relativePos.y = y = loopModel->center.y - axisModel->center.y; + it->relativePos.z = z = loopModel->center.z - axisModel->center.z; + + ox = x; + oy = y; + oz = z; + + for (j = 0; j < 4; j++) { + for (k = 0; k < 4; k++) { + it->transformMatrix[j][k] = loopModel->transformMatrix[j][k]; + } + } + + it++; + loopModel = get_model_from_list_index(get_model_list_index_from_tree_index(N(RotatingPlatformModels)[i + 1])); + + it->relativePos.x = ox; + it->relativePos.y = oy; + it->relativePos.z = oz; + + for (j = 0; j < 4; j++) { + for (k = 0; k < 4; k++) { + it->transformMatrix[j][k] = loopModel->transformMatrix[j][k]; + } + } + } + } + + it = script->functionTempPtr[0]; + for (i = 0; i < ARRAY_COUNT(N(RotatingPlatformModels)); i++, it++) { + loopModel = get_model_from_list_index(get_model_list_index_from_tree_index(N(RotatingPlatformModels)[i])); + + for (j = 0; j < 4; j++) { + for (k = 0; k < 4; k++) { + loopModel->transformMatrix[j][k] = it->transformMatrix[j][k]; + } + } + + loopModel->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; + guTranslateF(sp20, it->relativePos.x, it->relativePos.y, it->relativePos.z); + guRotateF(spA0, script->functionTemp[1], 0.0f, 0.0f, 1.0f); + guTranslateF(sp60, -it->relativePos.x, -it->relativePos.y, -it->relativePos.z); + guRotateF(spE0, -script->functionTemp[1], 0.0f, 0.0f, 1.0f); + guMtxCatF(sp20, spA0, spA0); + guMtxCatF(spA0, sp60, sp60); + guMtxCatF(spE0, sp60, sp60); + guMtxCatF(loopModel->transformMatrix, sp60, loopModel->transformMatrix); + update_collider_transform(N(RotatingPlatformColliders)[i]); + guMtxXFMF(loopModel->transformMatrix, 0.0f, 0.0f, 0.0f, &ox, &oy, &oz); + if (gCollisionStatus.currentFloor == N(RotatingPlatformColliders)[i] || + gCollisionStatus.lastTouchedFloor == N(RotatingPlatformColliders)[i]) + { + playerStatus->pushVelocity.x = ox - it->lastRelativePos.x; + playerStatus->pushVelocity.y = oy - it->lastRelativePos.y; + playerStatus->pushVelocity.z = oz - it->lastRelativePos.z; + } + if (partner->currentFloor == N(RotatingPlatformColliders)[i]) { + partner->pos.x += ox - it->lastRelativePos.x; + partner->pos.y += oy - it->lastRelativePos.y; + partner->pos.z += oz - it->lastRelativePos.z; + } + it->lastRelativePos.x = ox; + it->lastRelativePos.y = oy; + it->lastRelativePos.z = oz; + } + + guRotateF(axisModel->transformMatrix, script->functionTemp[1], 0.0f, 0.0f, 1.0f); + axisModel->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; + update_collider_transform(COLLIDER_fl); + + guRotateF(ringModel->transformMatrix, script->functionTemp[1], 0.0f, 0.0f, 1.0f); + ringModel->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; + update_collider_transform(COLLIDER_1_0); + + isPounding = FALSE; + for (i = 0; i < ARRAY_COUNT(N(RotatingPlatformColliders)); i++) { + if (gCollisionStatus.currentFloor == N(RotatingPlatformColliders)[i]) { + if (playerStatus->flags & PS_FLAG_NO_STATIC_COLLISION) { + gCameras[CAM_DEFAULT].targetPos.x = playerStatus->position.x; + gCameras[CAM_DEFAULT].targetPos.y = playerStatus->position.y; + gCameras[CAM_DEFAULT].targetPos.z = playerStatus->position.z; + } + if (playerStatus->actionState == ACTION_STATE_SPIN_POUND || + playerStatus->actionState == ACTION_STATE_TORNADO_POUND) + { + isPounding = TRUE; + } + } + } + if (!isPounding) { + script->functionTemp[1]--; + } + + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_UpdateBasicPlatformA) = { + EVT_CALL(RandInt, 20, LVarA) + EVT_WAIT(LVarA) + EVT_USE_BUF(LVar0) + EVT_BUF_READ4(LVar6, LVar7, LVar8, LVar9) + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -82, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, LVar6, 0, LVar0, 0) + EVT_CALL(TranslateModel, LVar8, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar7) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_WAIT(20) + EVT_CALL(MakeLerp, -82, 0, 60, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, LVar6, 0, LVar0, 0) + EVT_CALL(TranslateModel, LVar8, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar7) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_WAIT(20) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateBasicPlatformB) = { + EVT_CALL(RandInt, 20, LVarA) + EVT_WAIT(LVarA) + EVT_USE_BUF(LVar0) + EVT_BUF_READ4(LVar6, LVar7, LVar8, LVar9) + EVT_LABEL(0) + EVT_CALL(PlaySound, SOUND_85) + EVT_CALL(MakeLerp, 0, 70, 51, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, LVar6, 0, LVar0, 0) + EVT_CALL(TranslateModel, LVar8, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar7) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_WAIT(20) + EVT_CALL(PlaySound, SOUND_87) + EVT_CALL(MakeLerp, 70, 0, 51, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, LVar6, 0, LVar0, 0) + EVT_CALL(TranslateModel, LVar8, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar7) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_WAIT(20) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupGizmos) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_CALL(ParentColliderToModel, COLLIDER_1_0, MODEL_1_0) + EVT_CALL(ParentColliderToModel, COLLIDER_fl, MODEL_fl) + EVT_CALL(ParentColliderToModel, COLLIDER_1_1, MODEL_1_1) + EVT_CALL(ParentColliderToModel, COLLIDER_f1_1, MODEL_f1_1) + EVT_CALL(ParentColliderToModel, COLLIDER_1_2, MODEL_1_2) + EVT_CALL(ParentColliderToModel, COLLIDER_f1_2, MODEL_f1_2) + EVT_CALL(ParentColliderToModel, COLLIDER_1_3, MODEL_1_3) + EVT_CALL(ParentColliderToModel, COLLIDER_f1_3, MODEL_f1_3) + EVT_THREAD + EVT_CALL(N(UpdateRotatingPlatforms)) + EVT_END_THREAD + EVT_CALL(ParentColliderToModel, COLLIDER_2_1, MODEL_2_1) + EVT_CALL(ParentColliderToModel, COLLIDER_f2_1, MODEL_f2_1) + EVT_CALL(ParentColliderToModel, COLLIDER_2_2, MODEL_2_2) + EVT_CALL(ParentColliderToModel, COLLIDER_f2_2, MODEL_f2_2) + EVT_CALL(ParentColliderToModel, COLLIDER_2_3, MODEL_2_3) + EVT_CALL(ParentColliderToModel, COLLIDER_f2_3, MODEL_f2_3) + EVT_CALL(ParentColliderToModel, COLLIDER_2_4, MODEL_2_4) + EVT_CALL(ParentColliderToModel, COLLIDER_f2_4, MODEL_f2_4) + EVT_CALL(ParentColliderToModel, COLLIDER_2_5, MODEL_2_5) + EVT_CALL(ParentColliderToModel, COLLIDER_f2_5, MODEL_f2_5) + EVT_SET(LVar0, EVT_PTR(N(BasicPlatform1))) + EVT_EXEC(N(EVS_UpdateBasicPlatformA)) + EVT_SET(LVar0, EVT_PTR(N(BasicPlatform2))) + EVT_EXEC(N(EVS_UpdateBasicPlatformA)) + EVT_SET(LVar0, EVT_PTR(N(BasicPlatform3))) + EVT_EXEC(N(EVS_UpdateBasicPlatformA)) + EVT_SET(LVar0, EVT_PTR(N(BasicPlatform4))) + EVT_EXEC(N(EVS_UpdateBasicPlatformB)) + EVT_SET(LVar0, EVT_PTR(N(BasicPlatform5))) + EVT_EXEC(N(EVS_UpdateBasicPlatformA)) + EVT_THREAD + EVT_CALL(N(UpdatePlatformShadows)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_11/omo_11_4_entity.c b/src/world/area_omo/omo_11/omo_11_4_entity.c new file mode 100644 index 0000000000..5af291e11b --- /dev/null +++ b/src/world/area_omo/omo_11/omo_11_4_entity.c @@ -0,0 +1,26 @@ +#include "omo_11.h" +#include "entity.h" + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_OMO11_SuperBlock +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" + +EvtScript N(EVS_MakeEntities) = { + EVT_MAKE_SUPER_BLOCK(-115, 270, -120, 0) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 315, 270, -100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO11_MultiCoinBrick) + EVT_CALL(UseDynamicShadow, TRUE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 685, 60, -100, 0, ITEM_VOLT_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO11_HiddenItem_VoltShroom) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -600, 60, -50, 0, ITEM_SNOWMAN_DOLL, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO11_HiddenItem_SnowmanDoll) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -100, 60, -45, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO11_ItemBlock_CoinB) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenRedBlock), -150, 60, -45, 0, ITEM_DEEP_FOCUS2, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO11_HiddenBadge_DeepFocus2) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -200, 60, -45, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO11_ItemBlock_CoinA) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_11/omo_11_5_npc.c b/src/world/area_omo/omo_11/omo_11_5_npc.c new file mode 100644 index 0000000000..d4d4cfc00f --- /dev/null +++ b/src/world/area_omo/omo_11/omo_11_5_npc.c @@ -0,0 +1,55 @@ +#include "omo_11.h" + +#include "world/common/enemy/complete/PyroGuy.inc.c" + +StaticNpc N(NpcData_PyroGuy_01) = { + .id = NPC_PyroGuy_01, + .settings = &N(NpcSettings_PyroGuy), + .pos = { -180.0f, 0.0f, 70.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PYRO_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { -180, 0, 70 }, + .wanderSize = { 30, 10 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -180, 0, 70 }, + .detectSize = { 200 }, + } + }, + .animations = PYRO_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_PyroGuy_02) = { + .id = NPC_PyroGuy_02, + .settings = &N(NpcSettings_PyroGuy), + .pos = { 330.0f, 0.0f, 83.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = PYRO_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 330, 0, 83 }, + .wanderSize = { 30, 10 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 330, 0, 83 }, + .detectSize = { 200 }, + } + }, + .animations = PYRO_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_PyroGuy_01), BTL_OMO_FORMATION_22, BTL_OMO_STAGE_07), + NPC_GROUP(N(NpcData_PyroGuy_02), BTL_OMO_FORMATION_24, BTL_OMO_STAGE_07), + {} +}; diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c deleted file mode 100644 index 24d1605889..0000000000 --- a/src/world/area_omo/omo_12/DDF310.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "omo_12.h" - -#include "world/common/util/ChangeNpcToPartner.inc.c" - -#include "world/common/atomic/CreateDarkness.inc.c" - -#include "world/common/todo/SetCamera0Flag1000.inc.c" - -#include "world/common/todo/UnsetCamera0Flag1000.inc.c" - -ApiStatus func_80240314_DDF624(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 x = evt_get_variable(script, *args++); - s32 y = evt_get_variable(script, *args++); - s32 z = evt_get_variable(script, *args++); - s32 temp_s0_5 = evt_get_variable(script, *args++); - - set_screen_overlay_center_worldpos(1, 1, x, y, z); - set_screen_overlay_alpha(1, temp_s0_5); - set_screen_overlay_params_back(0xB, 255.0f); - return ApiStatus_DONE2; -} - -ApiStatus func_802403D8_DDF6E8(Evt* script, s32 isInitialCall) { - set_screen_overlay_alpha(1, 0.0f); - set_screen_overlay_params_back(0xB, 0.0f); - return ApiStatus_DONE2; -} - -BSS char N(bss_80241380)[0x10]; diff --git a/src/world/area_omo/omo_12/omo_12.h b/src/world/area_omo/omo_12/omo_12.h index fe898b879b..ca3a8edbeb 100644 --- a/src/world/area_omo/omo_12/omo_12.h +++ b/src/world/area_omo/omo_12/omo_12.h @@ -2,8 +2,35 @@ /// @brief Shy Guy's Toybox - RED Lantern Ghost #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_12_shape.h" +#include "mapfs/omo_12_hit.h" + +#include "sprite/npc/BigLanternGhost.h" +#include "sprite/npc/WorldWatt.h" + +enum { + NPC_BigLanternGhost = 0, + NPC_Watt = 1, + NPC_LaternTop = 2, + NPC_LaternBottom = 3, +}; + +enum { + MF_LanternGhost_DoneSpeaking = MapFlag(0), +}; + #define NAMESPACE omo_12 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_PushPartnerSong); +extern EvtScript N(EVS_PopSong); +extern EvtScript N(EVS_SetupLightSource); +extern EvtScript N(EVS_EnterScene); +extern NpcGroupList N(DefaultNPCs); + +API_CALLABLE(N(LoadPartyImage)); diff --git a/src/world/area_omo/omo_12/omo_12_0_header.c b/src/world/area_omo/omo_12/omo_12_0_header.c new file mode 100644 index 0000000000..5ade785a8f --- /dev/null +++ b/src/world/area_omo/omo_12/omo_12_0_header.c @@ -0,0 +1,12 @@ +#include "omo_12.h" + +EntryList N(Entrances) = { + [omo_12_ENTRY_0] { 260.0, 0.0, 20.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_omo_12 }, +}; diff --git a/src/world/area_omo/omo_12/omo_12_1_music.c b/src/world/area_omo/omo_12/omo_12_1_music.c new file mode 100644 index 0000000000..d27ab3736b --- /dev/null +++ b/src/world/area_omo/omo_12/omo_12_1_music.c @@ -0,0 +1,34 @@ +#include "omo_12.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_CALL(SetMusicTrack, 0, SONG_CREEPY_TOYBOX, 0, 8) + EVT_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_GE(GB_StoryProgress, STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_END_THREAD + EVT_ELSE + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushPartnerSong) = { + EVT_CALL(PushSong, SONG_NEW_PARTNER, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PopSong) = { + EVT_CALL(FadeOutMusic, 0, 500) + EVT_WAIT(15) + EVT_CALL(PopSong) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_12/omo_12_2_main.c b/src/world/area_omo/omo_12/omo_12_2_main.c new file mode 100644 index 0000000000..97e2343355 --- /dev/null +++ b/src/world/area_omo/omo_12/omo_12_2_main.c @@ -0,0 +1,34 @@ +#include "omo_12.h" + +EvtScript N(EVS_ExitWalk_omo_11_0) = EVT_EXIT_WALK(60, omo_12_ENTRY_0, "omo_11", omo_11_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_11_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupLightSource)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_EnterScene)) + EVT_WAIT(1) + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CASE_GE(STORY_CH4_WATT_JOINED_PARTY) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_12/omo_12_3_npc.c b/src/world/area_omo/omo_12/omo_12_3_npc.c new file mode 100644 index 0000000000..b934295ce3 --- /dev/null +++ b/src/world/area_omo/omo_12/omo_12_3_npc.c @@ -0,0 +1,713 @@ +#include "omo_12.h" + +#include "world/common/npc/BigLanternGhost.inc.c" + +NpcSettings N(NpcSettings_Watt) = { + .height = 23, + .radius = 22, + .level = 14, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; + +#include "world/common/util/ChangeNpcToPartner.inc.c" + +#include "world/common/atomic/CreateDarkness.inc.c" + +EvtScript N(EVS_SetupDarkness) = { + EVT_THREAD + EVT_CALL(N(DarkRoomUpdate)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/SetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" + +API_CALLABLE(N(SetLightOriginAndPower)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + s32 alpha = evt_get_variable(script, *args++); + + set_screen_overlay_center_worldpos(1, 1, x, y, z); + set_screen_overlay_alpha(1, alpha); + set_screen_overlay_params_back(0xB, 255.0f); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetLightOff)) { + set_screen_overlay_alpha(1, 0.0f); + set_screen_overlay_params_back(0xB, 0.0f); + return ApiStatus_DONE2; +} + +MAP_STATIC_PAD(1, unk); + +enum { + LIGHT_FROM_DEFAULT = 0, + LIGHT_FROM_GHOST = 1, + LIGHT_FROM_WATT = 2, + LIGHT_FROM_LANTERN = 3, + LIGHT_FROM_FLICK_OFF = 4, + LIGHT_FROM_HIDDEN = 5, + LIGHT_FROM_NO_CHANGE = 6, +}; + +EvtScript N(EVS_ManageLanternLight) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_LABEL(0) + EVT_SWITCH(AB_OMO12_LightSource) + EVT_CASE_EQ(LIGHT_FROM_DEFAULT) + EVT_CASE_EQ(LIGHT_FROM_GHOST) + EVT_CALL(GetNpcPos, NPC_BigLanternGhost, LVar0, LVar1, LVar2) + EVT_SET(LVar3, AB_OMO12_LightPowerMod) + EVT_ADD(LVar3, 128) + EVT_CALL(N(SetLightOriginAndPower), LVar0, LVar1, LVar2, LVar3) + EVT_CASE_EQ(LIGHT_FROM_WATT) + EVT_CALL(GetNpcPos, NPC_Watt, LVar0, LVar1, LVar2) + EVT_SET(LVar3, AB_OMO12_LightPowerMod) + EVT_ADD(LVar3, 128) + EVT_CALL(N(SetLightOriginAndPower), LVar0, LVar1, LVar2, LVar3) + EVT_CASE_EQ(LIGHT_FROM_LANTERN) + EVT_CALL(GetNpcPos, NPC_LaternTop, LVar0, LVar1, LVar2) + EVT_SET(LVar3, AB_OMO12_LightPowerMod) + EVT_ADD(LVar3, 128) + EVT_CALL(N(SetLightOriginAndPower), LVar0, LVar1, LVar2, LVar3) + EVT_CASE_EQ(LIGHT_FROM_FLICK_OFF) + EVT_CALL(N(SetLightOff)) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_DEFAULT) + EVT_CASE_EQ(LIGHT_FROM_HIDDEN) + EVT_SET(LVar3, AB_OMO12_LightPowerMod) + EVT_ADD(LVar3, 128) + EVT_CALL(N(SetLightOriginAndPower), NPC_DISPOSE_LOCATION, LVar3) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_DEFAULT) + EVT_CASE_EQ(LIGHT_FROM_NO_CHANGE) + EVT_RETURN + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupLightSource) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_HIDDEN) + EVT_SET(AB_OMO12_LightPowerMod, 127) + EVT_EXEC(N(EVS_ManageLanternLight)) + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_LANTERN) + EVT_SET(AB_OMO12_LightPowerMod, 102) + EVT_EXEC(N(EVS_ManageLanternLight)) + EVT_CASE_GE(STORY_CH4_WATT_JOINED_PARTY) + EVT_EXEC_WAIT(N(EVS_SetupDarkness)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterScene) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerPos, 70, 20, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH4_004E, 160, 40) + EVT_CALL(SetNpcPos, NPC_BigLanternGhost, -150, 0, 20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -150, 0, 20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -150, 0, 20) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-9.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(GetNpcPos, NPC_BigLanternGhost, LVar2, LVar3, LVar4) + EVT_ADD(LVar2, 32) + EVT_ADD(LVar3, 10) + // turn on lantern light + EVT_CALL(MakeLerp, 255, 100, 60, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetLightOriginAndPower), LVar2, LVar3, LVar4, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim05, ANIM_BigLanternGhost_Anim01, 0, MSG_CH4_004F) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 0, 20) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_GHOST) + EVT_SET(AB_OMO12_LightPowerMod, -28) + EVT_CALL(SetNpcAnimation, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim06) + EVT_CALL(SetNpcSpeed, NPC_BigLanternGhost, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_BigLanternGhost, 0, 20, 0) + EVT_CALL(SetNpcAnimation, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim01) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim05, ANIM_BigLanternGhost_Anim01, 0, MSG_CH4_0050) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.5)) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim0F) + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_WAIT(15) + EVT_THREAD + EVT_WAIT(20) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_FLICK_OFF) + EVT_END_THREAD + EVT_CALL(SetNpcVar, NPC_BigLanternGhost, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseWattTutorial) = { + EVT_LOOP(0) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_EQ(LVar0, PARTNER_WATT) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldWatt_Celebrate, ANIM_WorldWatt_Idle, 5, MSG_CH4_005C) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +Vec3f N(WattRightFlightPath)[] = { + { 0.0, 0.0, 0.0 }, + { 25.0, -5.0, 0.0 }, + { 60.0, 30.0, 0.0 }, +}; + +Vec3f N(WattLeftFlightPath)[] = { + { 0.0, 0.0, 0.0 }, + { -25.0, -5.0, 0.0 }, + { -60.0, 30.0, 0.0 }, +}; + +BombTrigger N(BombPos_Lantern_Unused) = { + .pos = { 0.0f, 0.0f, 20.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_Scene_ReleaseWatt) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetCamera0Flag1000)) + EVT_CALL(GetNpcPos, NPC_LaternTop, LVar0, LVar1, LVar2) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(2.0), LVar0, LVar1, LVar2, EVT_FLOAT(450.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_SET(LVarA, 0) + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_IF_EQ(LVar0, ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_BOMBETTE) + EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Hurt) + EVT_SET(LVarA, -1) + EVT_END_IF + EVT_END_IF + EVT_CALL(NpcFacePlayer, NPC_Watt, 0) + EVT_IF_EQ(LVarA, 0) + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CASE_DEFAULT + EVT_CALL(GetEncounterTriggerHitTier, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(25) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(PlaySound, SOUND_1F5) + EVT_SET(AF_OMO_10, FALSE) + EVT_LOOP(8) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, TRUE) + EVT_WAIT(3) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, FALSE) + EVT_WAIT(3) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_LaternTop, ANIM_BigLanternGhost_Anim03) + EVT_CALL(SetNpcAnimation, NPC_LaternBottom, ANIM_BigLanternGhost_Anim04) + EVT_THREAD + EVT_LABEL(10) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_2, TRUE) + EVT_WAIT(2) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_2, FALSE) + EVT_WAIT(2) + EVT_IF_EQ(AF_OMO_10, FALSE) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(GetAngleToPlayer, NPC_LaternTop, LVar0) + EVT_IF_LT(LVar0, 180) + EVT_SET(LVar1, 27) + EVT_SET(LVar2, 50) + EVT_ELSE + EVT_SET(LVar1, -27) + EVT_SET(LVar2, -50) + EVT_END_IF + EVT_CALL(func_802D2C14, 1) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, LVar1, 0, 0) + EVT_CALL(PlayerFaceNpc, NPC_LaternTop, 3) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_LaternTop, 0) + EVT_CALL(GetNpcPos, NPC_LaternTop, LVar0, 20, LVar2) + EVT_CALL(NpcJump0, NPC_LaternTop, LVar0, 20, LVar2, 20) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(6) + EVT_CALL(GetNpcPos, NPC_LaternTop, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_Watt, LVar0, 6, LVar2) + EVT_LOOP(7) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, TRUE) + EVT_WAIT(1) + EVT_CALL(SetNpcFlagBits, NPC_LaternTop, NPC_FLAG_2, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(10) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_WATT) + EVT_SET(AB_OMO12_LightPowerMod, 72) + EVT_WAIT(40) + EVT_SET(AF_OMO_10, TRUE) + EVT_CALL(SetNpcPos, NPC_LaternTop, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_LaternBottom, NPC_DISPOSE_LOCATION) + EVT_WAIT(25) + EVT_CALL(GetPlayerPos, LVar3, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Watt, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar3) + EVT_DIV(LVar0, 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(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.0)) + 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_IF_EQ(LVarA, -1) + EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Strain, ANIM_WorldWatt_Hurt, 0, MSG_CH4_0058) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Strain, ANIM_WorldWatt_Hurt, 0) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Celebrate, ANIM_WorldWatt_Idle, 0, MSG_CH4_0057) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_END_IF + EVT_CALL(func_802D2C14, 0) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Idle) + EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Watt, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_0059) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80011) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(20) + EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0) + EVT_WAIT(20) + EVT_CALL(GetAngleToPlayer, NPC_Watt, LVar0) + EVT_IF_LT(LVar0, 180) + EVT_SET(LVar1, -25) + EVT_ELSE + EVT_SET(LVar1, 25) + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_ADD(LVar1, LVar2) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar1, LVar4, 0) + EVT_CALL(NpcFacePlayer, NPC_PARTNER, 3) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Watt, NPC_FLAG_100, TRUE) + EVT_CALL(GetNpcPos, NPC_Watt, LVar7, LVar8, LVar9) + EVT_CALL(GetAngleToPlayer, NPC_Watt, LVar0) + EVT_IF_LT(LVar0, 180) + EVT_CALL(LoadPath, 15, EVT_PTR(N(WattRightFlightPath)), ARRAY_COUNT(N(WattRightFlightPath)), EASING_LINEAR) + EVT_SET(LVar4, 12) + EVT_ELSE + EVT_CALL(LoadPath, 15, EVT_PTR(N(WattLeftFlightPath)), ARRAY_COUNT(N(WattLeftFlightPath)), EASING_LINEAR) + EVT_SET(LVar4, -12) + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar4) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_LABEL(30) + EVT_CALL(GetNextPathPos) + EVT_ADD(LVar1, LVar7) + EVT_ADD(LVar2, LVar8) + EVT_ADD(LVar3, LVar9) + EVT_CALL(SetNpcPos, NPC_Watt, LVar1, LVar2, LVar3) + EVT_CALL(PlayerFaceNpc, NPC_Watt, FALSE) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(NpcFacePlayer, NPC_Watt, 3) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_005A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(20) + EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_NO_CHANGE) + EVT_WAIT(1) + EVT_CALL(N(ChangeNpcToPartner), NPC_Watt, PARTNER_WATT) + EVT_CALL(N(LoadPartyImage)) + EVT_EXEC(N(EVS_PushPartnerSong)) + EVT_WAIT(15) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018E, 160, 40) + EVT_EXEC(N(EVS_PopSong)) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, 200, 255, 45, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetLightOriginAndPower), LVar2, LVar3, LVar4, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, 8) + EVT_CALL(N(SetLightOriginAndPower), LVar2, LVar3, LVar4, LVar0) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(CloseMessage) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_SetupDarkness)) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_005B) + EVT_CALL(EnablePartnerAI) + EVT_EXEC(N(EVS_UseWattTutorial)) + EVT_CALL(N(UnsetCamera0Flag1000)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_SET(GB_StoryProgress, STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_LaternTop) + EVT_CALL(RemoveNpc, NPC_LaternBottom) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_BigLanternGhost) = { + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_WAIT(1) + EVT_IF_NE(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(1) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_BigLanternGhost) = { + EVT_WAIT(1) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_DEFAULT) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(N(SetLightOriginAndPower), LVar0, LVar1, LVar2, 100) + EVT_THREAD + EVT_SET(MF_LanternGhost_DoneSpeaking, FALSE) + EVT_CALL(SpeakToPlayer, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim08, ANIM_BigLanternGhost_Anim08, 0, MSG_CH4_0054) + EVT_SET(MF_LanternGhost_DoneSpeaking, TRUE) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcJumpscale, NPC_LaternTop, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcPos, NPC_LaternTop, 0, 0, 20) + EVT_CALL(NpcJump0, NPC_LaternTop, 0, 0, 20, 10) + EVT_CALL(SetNpcPos, NPC_LaternBottom, 0, 0, 20) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BigLanternGhost_Anim07) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(10.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 400, 0, 0) + EVT_LABEL(0) + EVT_IF_EQ(MF_LanternGhost_DoneSpeaking, FALSE) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_LaternTop, LVar3, LVar4, LVar5) + EVT_SUBF(LVar3, LVar0) + EVT_SUBF(LVar4, LVar1) + EVT_SUBF(LVar5, LVar2) + EVT_DIVF(LVar3, EVT_FLOAT(60.0)) + EVT_DIVF(LVar4, EVT_FLOAT(60.0)) + EVT_DIVF(LVar5, EVT_FLOAT(60.0)) + EVT_SETF(LVar6, EVT_FLOAT(2.167)) + EVT_SETF(LVar7, EVT_FLOAT(100.0)) + EVT_LOOP(60) + EVT_ADDF(LVar0, LVar3) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar2, LVar5) + EVT_ADDF(LVar7, LVar6) + EVT_CALL(N(SetLightOriginAndPower), LVar0, LVar1, LVar2, LVar7) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_LANTERN) + EVT_SET(AB_OMO12_LightPowerMod, 102) + EVT_WAIT(1) + EVT_CALL(SetNpcVar, NPC_LaternTop, 0, 1) + EVT_SET(GB_StoryProgress, STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_BigLanternGhost) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_BigLanternGhost))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_BigLanternGhost))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_LanternTop) = { + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 10) + EVT_WAIT(6) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, -9) + EVT_WAIT(6) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 8) + EVT_WAIT(5) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, -7) + EVT_WAIT(5) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 6) + EVT_WAIT(4) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, -5) + EVT_WAIT(4) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 4) + EVT_WAIT(3) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, -3) + EVT_WAIT(3) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 2) + EVT_WAIT(2) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_BigLanternGhost_Anim02, ANIM_BigLanternGhost_Anim02, 5, MSG_CH4_0055) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_LanternTop) = { + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_EQ(1) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(AwaitPlayerLeave, LVar0, LVar2, 100) + EVT_CALL(PartnerCanUseAbility, LVar0) + EVT_IF_NE(LVar0, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 16) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 8) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 4) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_BigLanternGhost_Anim02, ANIM_BigLanternGhost_Anim02, 0, MSG_CH4_0056) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetSelfVar, 0, 2) + EVT_END_IF + EVT_CASE_EQ(2) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(AwaitPlayerApproach, LVar0, LVar2, 60) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 2) + EVT_CALL(SetSelfVar, 0, 1) + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_LanternTop) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BigLanternGhost_Anim02) + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BigLanternGhost_Anim02) + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, 20) + EVT_CALL(SetSelfVar, 0, 2) + EVT_CASE_GE(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_SWITCH + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_LanternTop))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_LanternTop))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_LanternBottom) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BigLanternGhost_Anim02) + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BigLanternGhost_Anim02) + EVT_CALL(SetNpcPos, NPC_SELF, 0, 0, 20) + EVT_CASE_GE(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_SWITCH + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_Scene_ReleaseWatt))) + EVT_CALL(SetNpcFlagBits, NPC_LaternBottom, NPC_FLAG_2, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Watt) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_DEFEATED_LANTERN_GHOST) + EVT_CASE_LT(STORY_CH4_WATT_JOINED_PARTY) + EVT_CASE_GE(STORY_CH4_WATT_JOINED_PARTY) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +s32 N(ExtraAnims_LanternGhost)[] = { + ANIM_BigLanternGhost_Anim01, + ANIM_BigLanternGhost_Anim06, + ANIM_BigLanternGhost_Anim07, + ANIM_BigLanternGhost_Anim08, + ANIM_BigLanternGhost_Anim0F, + ANIM_BigLanternGhost_Anim05, + ANIM_BigLanternGhost_Anim02, + ANIM_BigLanternGhost_Anim03, + ANIM_BigLanternGhost_Anim04, + -1 +}; + +StaticNpc N(NpcData_BigLanternGhost) = { + .id = NPC_BigLanternGhost, + .settings = &N(NpcSettings_BigLanternGhost), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_BigLanternGhost), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = BIG_LANTERN_GHOST_DROPS, + .animations = BIG_LANTERN_GHOST_ANIMS, + .extraAnimations = N(ExtraAnims_LanternGhost), + .tattle = MSG_NpcTattle_OMO_Lantern, +}; + +StaticNpc N(NpcData_Watt) = { + .id = NPC_Watt, + .settings = &N(NpcSettings_Watt), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_Watt), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = NPC_NO_DROPS, + .animations = { + .idle = ANIM_WorldWatt_Idle, + .walk = ANIM_WorldWatt_Idle, + .run = ANIM_WorldWatt_Idle, + .chase = ANIM_WorldWatt_Idle, + .anim_4 = ANIM_WorldWatt_Idle, + .anim_5 = ANIM_WorldWatt_Idle, + .death = ANIM_WorldWatt_Idle, + .hit = ANIM_WorldWatt_Idle, + .anim_8 = ANIM_WorldWatt_Idle, + .anim_9 = ANIM_WorldWatt_Idle, + .anim_A = ANIM_WorldWatt_Idle, + .anim_B = ANIM_WorldWatt_Idle, + .anim_C = ANIM_WorldWatt_Idle, + .anim_D = ANIM_WorldWatt_Idle, + .anim_E = ANIM_WorldWatt_Idle, + .anim_F = ANIM_WorldWatt_Idle, + }, + .tattle = MSG_NpcTattle_OMO_Lantern, +}; + +StaticNpc N(NpcData_LanternTop) = { + .id = NPC_LaternTop, + .settings = &N(NpcSettings_Watt), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_LanternTop), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = NPC_NO_DROPS, + .animations = BIG_LANTERN_GHOST_ANIMS, + .extraAnimations = N(ExtraAnims_LanternGhost), + .tattle = MSG_NpcTattle_OMO_Lantern, +}; + +StaticNpc N(NpcData_LanternBottom) = { + .id = NPC_LaternBottom, + .settings = &N(NpcSettings_Watt), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000, + .init = &N(EVS_NpcInit_LanternBottom), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = NPC_NO_DROPS, + .animations = BIG_LANTERN_GHOST_ANIMS, + .extraAnimations = N(ExtraAnims_LanternGhost), + .tattle = MSG_NpcTattle_OMO_Lantern, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BigLanternGhost), BTL_OMO3_FORMATION_00), + NPC_GROUP(N(NpcData_Watt)), + NPC_GROUP(N(NpcData_LanternTop)), + NPC_GROUP(N(NpcData_LanternBottom)), + {} +}; diff --git a/src/world/area_omo/omo_12/DDF730.c b/src/world/area_omo/omo_12/omo_12_4_partner.c similarity index 71% rename from src/world/area_omo/omo_12/DDF730.c rename to src/world/area_omo/omo_12/omo_12_4_partner.c index 4ea8adab16..220925d174 100644 --- a/src/world/area_omo/omo_12/DDF730.c +++ b/src/world/area_omo/omo_12/omo_12_4_partner.c @@ -1,6 +1,4 @@ #include "omo_12.h" -static char* N(exit_str_0) = "omo_11\0"; - #define PARTY_IMAGE "party_akari" #include "world/common/todo/LoadPartyImage.inc.c" diff --git a/src/world/area_omo/omo_13/DE2490.c b/src/world/area_omo/omo_13/DE2490.c deleted file mode 100644 index 034e9c3182..0000000000 --- a/src/world/area_omo/omo_13/DE2490.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "omo_13.h" -#include "model.h" - -static char* N(exit_str_0) = "omo_01"; -static char* N(exit_str_1) = "omo_03"; - -extern s32 D_80241A78_DE3F08[]; - -ApiStatus func_80240000_DE2490(Evt* script, s32 isInitialCall) { - Matrix4f sp18, sp58; - UnkOmo* it; - Model* model; - f32 temp_f20; - f32 temp_f24; - u32 i; - - if (isInitialCall) { - it = heap_malloc(sizeof(*it)); - script->functionTempPtr[0] = it; - - for (i = 0; i < 1; i++, it++) { - s32 treeIndex = D_80241A78_DE3F08[i]; - - it->treeIndex = treeIndex; - model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); - it->unk_00 = model->center.x; - it->unk_04 = model->center.z; - it->unk_0C = 3.5f; - it->unk_10 = 0; - it->unk_08 = 0; - } - } - - it = script->functionTempPtr[0]; - for (i = 0; i < 1; i++, it++) { - it->unk_10 += it->unk_0C; - it->unk_10 = clamp_angle(it->unk_10); - temp_f20 = sin_rad((it->unk_10 * 3.14f) / 180.0f) * 20.0f; - temp_f24 = SQ(temp_f20) / 90.0f; - if (i == 0) { - if ((it->unk_08 >= 0.0f && temp_f20 < 0.0f) || (it->unk_08 < 0.0f && temp_f20 >= 0.0f)) { - sfx_play_sound_at_position(SOUND_CREAKY_ROCKING_CHAIR, 0, -320.0f, 0.0f, 95.0f); - } - it->unk_08 = temp_f20; - } - model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex)); - model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; - guTranslateF(sp18, -it->unk_00, 0.0f, -it->unk_04); - guRotateF(sp58, temp_f20, 0.0f, 0.0f, 1.0f); - guMtxCatF(sp18, sp58, model->transformMatrix); - guTranslateF(sp18, it->unk_00, temp_f24, it->unk_04); - guMtxCatF(model->transformMatrix, sp18, model->transformMatrix); - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c deleted file mode 100644 index b505345ecc..0000000000 --- a/src/world/area_omo/omo_13/DE2710.c +++ /dev/null @@ -1,81 +0,0 @@ -#include "omo_13.h" -#include "sprite/npc/ShyGuy.h" - -#include "world/common/enemy/ai/ShyGuyWanderAI.inc.c" - -#include "world/common/enemy/ai/GrooveGuyAI.inc.c" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -extern s32 N(ItemChoice_HasSelectedItem); -extern s32 N(ItemChoice_SelectedItemID); -#include "world/common/todo/ItemChoice_WaitForSelection.inc.c" - -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; -} - -BSS s32 omo_13_80243220[92]; - -ApiStatus func_80240F8C_DE341C(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++) { - omo_13_80243220[i] = ptr[i]; - } - omo_13_80243220[i] = 0; - } else { - for (i = 0; i < 91; i++) { - omo_13_80243220[i] = i + 128; - omo_13_80243220[91] = 0; - } - } - return ApiStatus_DONE2; -} - -ApiStatus func_80241028_DE34B8(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Npc* npc = get_npc_safe(0); - f32 theta; - f32 x, y, z; - - dist2D(110.0f, -45.0f, playerStatus->position.x, playerStatus->position.z); - theta = clamp_angle(atan2(110.0f, -45.0f, playerStatus->position.x, playerStatus->position.z)); - x = (sin_deg(theta) * 30.0f) + 110.0f; - if (script->varTable[11] != 0) { - y = playerStatus->position.y * 0.7f; - } else { - y = npc->pos.y; - } - z = -45.0f - (cos_deg(theta) * 30.0f); - - if (script->varTable[11] != 0 && npc->pos.y == 0.0f) { - script->varTable[11] = 0; - } - - if (npc->pos.x != x || npc->pos.y != y || npc->pos.z != z) { - if (npc->currentAnim != ANIM_ShyGuy_Black_Anim02 && script->varTable[10]++ >= 6) { - npc->currentAnim = ANIM_ShyGuy_Black_Anim02; - script->varTable[10] = 0; - } - npc->pos.x = x; - npc->pos.z = z; - npc->colliderPos.x = npc->pos.x; - npc->colliderPos.y = npc->pos.y; - npc->colliderPos.z = npc->pos.z; - npc->flags |= NPC_FLAG_DIRTY_SHADOW; - } else if (npc->currentAnim != ANIM_ShyGuy_Black_Anim01) { - npc->currentAnim = ANIM_ShyGuy_Black_Anim01; - } - npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); - return ApiStatus_DONE2; -} diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c deleted file mode 100644 index f6cf50051e..0000000000 --- a/src/world/area_omo/omo_13/DE36C0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "omo_13.h" - -#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" diff --git a/src/world/area_omo/omo_13/omo_13.h b/src/world/area_omo/omo_13/omo_13.h index bfdc3ccd3c..39e0fccacd 100644 --- a/src/world/area_omo/omo_13/omo_13.h +++ b/src/world/area_omo/omo_13/omo_13.h @@ -2,8 +2,26 @@ /// @brief Shy Guy's Toybox - BLU Anti-Guy Hall #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_13_shape.h" +#include "mapfs/omo_13_hit.h" + +#include "sprite/npc/ShyGuy.h" +#include "sprite/npc/GrooveGuy.h" + +enum { + NPC_AntiGuy = 0, + NPC_ShyGuy = 1, + NPC_GrooveGuy = 2, +}; + #define NAMESPACE omo_13 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGizmos); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_13/omo_13_0_header.c b/src/world/area_omo/omo_13/omo_13_0_header.c new file mode 100644 index 0000000000..f710e658f4 --- /dev/null +++ b/src/world/area_omo/omo_13/omo_13_0_header.c @@ -0,0 +1,14 @@ +#include "omo_13.h" + +EntryList N(Entrances) = { + [omo_13_ENTRY_0] { -480.0, 0.0, 0.0, 90.0 }, + [omo_13_ENTRY_1] { 565.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_13 }, +}; diff --git a/src/world/area_omo/omo_13/omo_13_1_music.c b/src/world/area_omo/omo_13/omo_13_1_music.c new file mode 100644 index 0000000000..24ed41321e --- /dev/null +++ b/src/world/area_omo/omo_13/omo_13_1_music.c @@ -0,0 +1,7 @@ +#include "omo_13.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_13/omo_13_2_main.c b/src/world/area_omo/omo_13/omo_13_2_main.c new file mode 100644 index 0000000000..424cd7429d --- /dev/null +++ b/src/world/area_omo/omo_13/omo_13_2_main.c @@ -0,0 +1,29 @@ +#include "omo_13.h" + +EvtScript N(EVS_ExitWalk_omo_01_0) = EVT_EXIT_WALK(60, omo_13_ENTRY_0, "omo_01", omo_01_ENTRY_0); +EvtScript N(EVS_ExitWalk_omo_03_0) = EVT_EXIT_WALK(60, omo_13_ENTRY_1, "omo_03", omo_03_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_01_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_03_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GF_OMO13_Defeated_AntiGuy, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_he, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupGizmos)) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_13/omo_13_3_gizmos.c b/src/world/area_omo/omo_13/omo_13_3_gizmos.c new file mode 100644 index 0000000000..f985a42a60 --- /dev/null +++ b/src/world/area_omo/omo_13/omo_13_3_gizmos.c @@ -0,0 +1,74 @@ +#include "omo_13.h" +#include "model.h" + +EvtScript N(EVS_Gizmos_Wheels) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_ha1, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_ha2, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Shutters) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 160, 60, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 160, 0, 60, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m1_1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m1_2, LVar0, 0, 1, 0) + EVT_WAIT(2) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Gizmos_Clocks) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -360, 100, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_hari1, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +s32 N(RockingHorseModels)[] = { + MODEL_o829 +}; + +#define ROCKING_SOUND_LOCATION -320.0f, 0.0f, 95.0f +#import "../common/RockingHorse.inc.c" + +EvtScript N(EVS_SetupGizmos) = { + EVT_EXEC(N(EVS_Gizmos_Wheels)) + EVT_EXEC(N(EVS_Gizmos_Shutters)) + EVT_EXEC(N(EVS_Gizmos_Clocks)) + EVT_EXEC(N(EVS_Gizmos_RockingHorses)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_13/omo_13_4_npc.c b/src/world/area_omo/omo_13/omo_13_4_npc.c new file mode 100644 index 0000000000..d50b1faa50 --- /dev/null +++ b/src/world/area_omo/omo_13/omo_13_4_npc.c @@ -0,0 +1,295 @@ +#include "omo_13.h" + +#include "world/common/enemy/complete/ShyGuy_Wander.inc.c" +#include "world/common/enemy/complete/GrooveGuy.inc.c" + +NpcSettings N(NpcSettings_AntiGuy) = { + .height = 23, + .radius = 22, + .level = 14, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; + +#include "world/common/complete/NormalItemChoice.inc.c" + +s32 N(BribeItemList)[] = { + ITEM_LEMON_CANDY, + -1 +}; + +EvtScript N(EVS_NpcInteract_AntiGuy) = { + EVT_IF_EQ(GF_OMO13_Defeated_AntiGuy, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim15, ANIM_ShyGuy_Black_Anim15, 5, MSG_CH4_004D) + EVT_RETURN + EVT_END_IF + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 10, EVT_FLOAT(300.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.5)) + EVT_CALL(FindItem, ITEM_LEMON_CANDY, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80011) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0046) + EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim13, ANIM_ShyGuy_Black_Anim01, 0) + EVT_CALL(ShowChoice, MSG_Choice_0044) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0048) + EVT_ELSE + EVT_WAIT(5) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0047) + EVT_CALL(ShowChoice, MSG_Choice_0044) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0048) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0049) + EVT_CALL(SetNpcVar, NPC_SELF, 0, 1) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_004A) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(15) + EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0) + EVT_SET(LVar0, EVT_PTR(N(BribeItemList))) + EVT_SET(LVar1, -1) + EVT_EXEC_WAIT(N(EVS_ChooseItem)) + EVT_IF_EQ(LVar0, -1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_004B) + EVT_CALL(ShowChoice, MSG_Choice_0044) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0048) + EVT_ELSE + EVT_WAIT(5) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0047) + EVT_CALL(ShowChoice, MSG_Choice_0044) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0048) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0049) + EVT_CALL(SetNpcVar, NPC_SELF, 0, 1) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_004C) + EVT_WAIT(20) + EVT_SET(GF_OMO13_Defeated_AntiGuy, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_he, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcVar, NPC_SELF, 0, 2) + EVT_END_IF + EVT_END_IF + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(UpdateAntiGuyPosition)) { + PlayerStatus* playerStatus = &gPlayerStatus; + Npc* npc = get_npc_safe(NPC_AntiGuy); + f32 theta; + f32 x, y, z; + + dist2D(110.0f, -45.0f, playerStatus->position.x, playerStatus->position.z); + theta = clamp_angle(atan2(110.0f, -45.0f, playerStatus->position.x, playerStatus->position.z)); + x = 110.0f + (sin_deg(theta) * 30.0f); + if (script->varTable[11] != 0) { + y = playerStatus->position.y * 0.7f; + } else { + y = npc->pos.y; + } + z = -45.0f - (cos_deg(theta) * 30.0f); + + if (script->varTable[11] != 0 && npc->pos.y == 0.0f) { + script->varTable[11] = 0; + } + + if (npc->pos.x != x || npc->pos.y != y || npc->pos.z != z) { + if (npc->currentAnim != ANIM_ShyGuy_Black_Anim02 && script->varTable[10]++ >= 6) { + npc->currentAnim = ANIM_ShyGuy_Black_Anim02; + script->varTable[10] = 0; + } + npc->pos.x = x; + npc->pos.z = z; + npc->colliderPos.x = npc->pos.x; + npc->colliderPos.y = npc->pos.y; + npc->colliderPos.z = npc->pos.z; + npc->flags |= NPC_FLAG_DIRTY_SHADOW; + } else if (npc->currentAnim != ANIM_ShyGuy_Black_Anim01) { + npc->currentAnim = ANIM_ShyGuy_Black_Anim01; + } + npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcIdle_AntiGuy) = { + EVT_LABEL(0) + EVT_CALL(N(UpdateAntiGuyPosition)) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_IF_EQ(LVar0, 1) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_LABEL(1) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_ELSE + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Black_Anim02) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar2, -60) + EVT_IF_LT(LVar0, 110) + EVT_ADD(LVar0, 60) + EVT_ELSE + EVT_ADD(LVar0, -60) + EVT_END_IF + EVT_ELSE + EVT_IF_LT(LVar0, 110) + EVT_ADD(LVar0, -60) + EVT_ELSE + EVT_ADD(LVar0, 60) + EVT_END_IF + EVT_END_IF + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, -100, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Black_Anim15) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_LABEL(9) + EVT_WAIT(1) + EVT_GOTO(9) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_AntiGuy) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_OMO13_Defeated_AntiGuy, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_he, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_AntiGuy) = { + EVT_IF_EQ(GF_OMO13_Defeated_AntiGuy, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_AntiGuy))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_AntiGuy))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_AntiGuy))) + EVT_ELSE + EVT_CALL(RemoveEncounter, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_AntiGuy) = { + .id = NPC_AntiGuy, + .settings = &N(NpcSettings_AntiGuy), + .pos = { 110.0f, 0.0f, -20.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_AntiGuy), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Black_Anim01, + .walk = ANIM_ShyGuy_Black_Anim02, + .run = ANIM_ShyGuy_Black_Anim03, + .chase = ANIM_ShyGuy_Black_Anim02, + .anim_4 = ANIM_ShyGuy_Black_Anim01, + .anim_5 = ANIM_ShyGuy_Black_Anim01, + .death = ANIM_ShyGuy_Black_Anim0C, + .hit = ANIM_ShyGuy_Black_Anim0C, + .anim_8 = ANIM_ShyGuy_Black_Anim15, + .anim_9 = ANIM_ShyGuy_Black_Anim12, + .anim_A = ANIM_ShyGuy_Black_Anim11, + .anim_B = ANIM_ShyGuy_Black_Anim10, + .anim_C = ANIM_ShyGuy_Black_Anim05, + .anim_D = ANIM_ShyGuy_Black_Anim01, + .anim_E = ANIM_ShyGuy_Black_Anim01, + .anim_F = ANIM_ShyGuy_Black_Anim01, + }, + .tattle = MSG_NpcTattle_AntiGuy, +}; + +StaticNpc N(NpcData_ShyGuy) = { + .id = NPC_ShyGuy, + .settings = &N(NpcSettings_ShyGuy_Wander), + .pos = { 300.0f, 0.0f, 50.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SHY_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 300, 0, 50 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 300, 0, 50 }, + .detectSize = { 200 }, + } + }, + .animations = YELLOW_SHY_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_GrooveGuy) = { + .id = NPC_GrooveGuy, + .settings = &N(NpcSettings_GrooveGuy), + .pos = { -222.0f, 0.0f, 35.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = GROOVE_GUY_DROPS_B, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -222, 0, 35 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -222, 0, 35 }, + .detectSize = { 200 }, + } + }, + .animations = GROOVE_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_AntiGuy), BTL_OMO_FORMATION_2C, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_ShyGuy), BTL_OMO_FORMATION_03, BTL_OMO_STAGE_00), + NPC_GROUP(N(NpcData_GrooveGuy), BTL_OMO_FORMATION_25, BTL_OMO_STAGE_00), + {} +}; diff --git a/src/world/area_omo/omo_13/omo_13_5_entity.c b/src/world/area_omo/omo_13/omo_13_5_entity.c new file mode 100644 index 0000000000..e8ea04a4f6 --- /dev/null +++ b/src/world/area_omo/omo_13/omo_13_5_entity.c @@ -0,0 +1,18 @@ +#include "omo_13.h" +#include "entity.h" + +#include "world/common/atomic/Chest.inc.c" + +EvtScript N(EVS_OpenChest_PowerPlus) = EVT_OPEN_CHEST_BADGE(ITEM_POWER_PLUS_B, GF_OMO13_Chest_PowerPlusB); + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 110, 0, -60, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_OMO13_Chest_PowerPlusB) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_PowerPlus))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -375, 60, -95, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO13_ItemBlock_Coin) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 470, 60, -60, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_OMO13_HiddenItem_MapleSyrup) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_14/DE56B0.c b/src/world/area_omo/omo_14/DE56B0.c deleted file mode 100644 index ec3b17d3ba..0000000000 --- a/src/world/area_omo/omo_14/DE56B0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "omo_14.h" - -static char* N(exit_str_0) = "omo_02"; -static char* N(exit_str_1) = "omo_15"; - -#include "world/common/atomic/CreateDarkness.inc.c" diff --git a/src/world/area_omo/omo_14/DE5810.c b/src/world/area_omo/omo_14/DE5810.c deleted file mode 100644 index ab2a00d03d..0000000000 --- a/src/world/area_omo/omo_14/DE5810.c +++ /dev/null @@ -1,77 +0,0 @@ -#include "omo_14.h" - -ApiStatus func_80240160_DE5810(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - f32 x = playerStatus->position.x + - ((playerStatus->colliderDiameter + npc->collisionRadius) * 0.5f * sin_deg((npc->npcID * 360.0f) / 10.0f)); - f32 z = playerStatus->position.z - - ((playerStatus->colliderDiameter + npc->collisionRadius) * 0.5f * cos_deg((npc->npcID * 360.0f) / 10.0f)); - f32 dist = dist2D(npc->pos.x, npc->pos.z, x, z); - - if (npc->moveSpeed < dist) { - if (npc->flags & 0x2000) { - if (npc->yaw < 180.0f) { - npc->yaw = npc->pos.z > 0.0f ? 45.0f : 135.0f; - } else { - npc->yaw = npc->pos.z > 0.0f ? 315.0f : 225.0f; - } - } else { - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - } - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); - } - - if (script->varTableF[11] == playerStatus->position.x && script->varTableF[13] == playerStatus->position.z) { - if (dist < 20.0f) { - script->varTable[14]++; - } else { - script->varTable[14] = 0; - } - } - script->varTableF[11] = playerStatus->position.x; - script->varTableF[12] = playerStatus->position.y; - script->varTableF[13] = playerStatus->position.z; - return ApiStatus_DONE2; -} - -ApiStatus func_802403FC_DE5AAC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - f32 x = evt_get_float_variable(script, *args++); - f32 z = evt_get_float_variable(script, *args++); - - if (npc->moveSpeed < dist2D(npc->pos.x, npc->pos.z, x, z)) { - if (npc->flags & NPC_FLAG_NO_PROJECT_SHADOW) { - if (npc->yaw < 180.0f) { - npc->yaw = npc->pos.z > 0.0f ? 45.0f : 135.0f; - } else { - npc->yaw = npc->pos.z > 0.0f ? 315.0f : 225.0f; - } - } else { - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - } - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } - return ApiStatus_DONE2; -} - -ApiStatus func_80240564_DE5C14(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.partnerActionState != 0) { - script->varTable[9] = gPartnerActionStatus.actingPartner; - } else { - script->varTable[9] = -1; - } - return ApiStatus_DONE2; -} - -ApiStatus N(IsPartnerWatt)(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.actingPartner == PARTNER_WATT) { - script->varTable[1] = TRUE; - } else { - script->varTable[1] = FALSE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_omo/omo_14/omo_14.h b/src/world/area_omo/omo_14/omo_14.h index 6c6337784b..a0f4eff79e 100644 --- a/src/world/area_omo/omo_14/omo_14.h +++ b/src/world/area_omo/omo_14/omo_14.h @@ -2,8 +2,35 @@ /// @brief Shy Guy's Toybox - RED Boss Antechamber #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_14_shape.h" +#include "mapfs/omo_14_hit.h" + +#include "sprite/npc/ShyGuy.h" + +enum { + NPC_ShyGuy_01 = 0, + NPC_ShyGuy_02 = 1, + NPC_ShyGuy_03 = 2, + NPC_ShyGuy_04 = 3, + NPC_ShyGuy_05 = 4, + NPC_ShyGuy_06 = 5, + NPC_ShyGuy_07 = 6, + NPC_ShyGuy_08 = 7, + NPC_ShyGuy_09 = 8, + NPC_ShyGuy_10 = 9, + NPC_ShyGuy_11 = 10, +}; + +enum { + MV_Unk_0A = MapVar(10), +}; + #define NAMESPACE omo_14 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_14/omo_14_0_header.c b/src/world/area_omo/omo_14/omo_14_0_header.c new file mode 100644 index 0000000000..054ee119b1 --- /dev/null +++ b/src/world/area_omo/omo_14/omo_14_0_header.c @@ -0,0 +1,13 @@ +#include "omo_14.h" + +EntryList N(Entrances) = { + [omo_14_ENTRY_0] { -260.0, 0.0, 20.0, 90.0 }, + [omo_14_ENTRY_1] { 230.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_omo_14 }, +}; diff --git a/src/world/area_omo/omo_14/omo_14_1_music.c b/src/world/area_omo/omo_14/omo_14_1_music.c new file mode 100644 index 0000000000..7db90eadc7 --- /dev/null +++ b/src/world/area_omo/omo_14/omo_14_1_music.c @@ -0,0 +1,7 @@ +#include "omo_14.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_14/omo_14_2_main.c b/src/world/area_omo/omo_14/omo_14_2_main.c new file mode 100644 index 0000000000..a4f665e1c0 --- /dev/null +++ b/src/world/area_omo/omo_14/omo_14_2_main.c @@ -0,0 +1,43 @@ +#include "omo_14.h" + +#include "world/common/atomic/CreateDarkness.inc.c" + +EvtScript N(EVS_SetupDarkness) = { + EVT_THREAD + EVT_CALL(N(DarkRoomUpdate)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_omo_02_1) = EVT_EXIT_WALK(60, omo_14_ENTRY_0, "omo_02", omo_02_ENTRY_1); +EvtScript N(EVS_ExitWalk_omo_15_0) = EVT_EXIT_WALK(60, omo_14_ENTRY_1, "omo_15", omo_15_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_02_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_15_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_8000004C, 0) + EVT_END_IF + EVT_EXEC(N(EVS_SetupDarkness)) + EVT_IF_GE(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) + EVT_CALL(EnableModel, MODEL_o823, FALSE) + EVT_CALL(EnableModel, MODEL_o828, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + 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_omo/omo_14/omo_14_3_npc.c b/src/world/area_omo/omo_14/omo_14_3_npc.c new file mode 100644 index 0000000000..75e6e2f6d8 --- /dev/null +++ b/src/world/area_omo/omo_14/omo_14_3_npc.c @@ -0,0 +1,502 @@ +#include "omo_14.h" +#include "effects.h" + +API_CALLABLE(N(SurroundPlayer)) { + PlayerStatus* playerStatus = &gPlayerStatus; + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + f32 goalPosX = playerStatus->position.x + + ((playerStatus->colliderDiameter + npc->collisionRadius) * 0.5f * sin_deg((npc->npcID * 360.0f) / 10.0f)); + f32 goalPosZ = playerStatus->position.z - + ((playerStatus->colliderDiameter + npc->collisionRadius) * 0.5f * cos_deg((npc->npcID * 360.0f) / 10.0f)); + f32 dist = dist2D(npc->pos.x, npc->pos.z, goalPosX, goalPosZ); + + if (npc->moveSpeed < dist) { + if (npc->flags & NPC_FLAG_NO_PROJECT_SHADOW) { + if (npc->yaw < 180.0f) { + npc->yaw = npc->pos.z > 0.0f ? 45.0f : 135.0f; + } else { + npc->yaw = npc->pos.z > 0.0f ? 315.0f : 225.0f; + } + } else { + npc->yaw = atan2(npc->pos.x, npc->pos.z, goalPosX, goalPosZ); + } + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); + } + + if (script->varTableF[11] == playerStatus->position.x && script->varTableF[13] == playerStatus->position.z) { + if (dist < 20.0f) { + script->varTable[14]++; + } else { + script->varTable[14] = 0; + } + } + script->varTableF[11] = playerStatus->position.x; + script->varTableF[12] = playerStatus->position.y; + script->varTableF[13] = playerStatus->position.z; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SimpleMoveNPC)) { + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + f32 x = evt_get_float_variable(script, *args++); + f32 z = evt_get_float_variable(script, *args++); + + if (npc->moveSpeed < dist2D(npc->pos.x, npc->pos.z, x, z)) { + if (npc->flags & NPC_FLAG_NO_PROJECT_SHADOW) { + if (npc->yaw < 180.0f) { + npc->yaw = npc->pos.z > 0.0f ? 45.0f : 135.0f; + } else { + npc->yaw = npc->pos.z > 0.0f ? 315.0f : 225.0f; + } + } else { + npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); + } + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetActingPartner)) { + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { + script->varTable[9] = gPartnerActionStatus.actingPartner; + } else { + script->varTable[9] = -1; + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(IsPartnerWatt)) { + if (gPartnerActionStatus.actingPartner == PARTNER_WATT) { + script->varTable[1] = TRUE; + } else { + script->varTable[1] = FALSE; + } + return ApiStatus_DONE2; +} + +#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" + +Vec2i N(CrowdChaseGoalPositions)[] = { + { 200, 0 }, + { 210, -10 }, + { 210, 10 }, + { 220, -20 }, + { 220, 0 }, + { 220, 20 }, + { 230, 30 }, + { 230, 10 }, + { 230, 0 }, + { 230, 10 }, + { 230, 30 }, +}; + +EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { + EVT_SETF(LVarA, EVT_FLOAT(3.5)) + EVT_SET(AF_OMO_11, FALSE) + EVT_CALL(SetNpcSpeed, NPC_SELF, LVarA) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_IF_GT(LVar2, -210) + EVT_CALL(N(GetActingPartner)) + EVT_SET(MV_Unk_0A, LVar9) + EVT_SWITCH(LVar9) + EVT_CASE_EQ(-1) + EVT_CALL(SetNpcSpeed, NPC_SELF, LVarA) + EVT_CALL(N(SurroundPlayer)) + EVT_IF_GT(LVarE, 30) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(PlaySound, SOUND_3ED) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 1, 4, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_WAIT(3) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_RunPanic) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlaySound, SOUND_3EE) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_ELSE + EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) + EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10) + EVT_END_IF + EVT_SET(LVarE, 0) + EVT_END_IF + EVT_CASE_EQ(PARTNER_WATT) + EVT_USE_BUF(EVT_PTR(N(CrowdChaseGoalPositions))) + EVT_BUF_READ2(LVar3, LVar4) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 180) + EVT_CALL(GetSelfVar, 1, LVar9) + EVT_IF_NE(LVar9, 6) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15) + EVT_END_IF + EVT_IF_EQ(AF_OMO_11, FALSE) + EVT_SET(AF_OMO_11, TRUE) + EVT_END_IF + EVT_USE_BUF(EVT_PTR(N(CrowdChaseGoalPositions))) + EVT_BUF_READ2(LVar1, LVar2) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) + EVT_CALL(N(SimpleMoveNPC), LVar3, LVar4) + EVT_ELSE + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 150) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, LVar3, 0, LVar4, 15) + EVT_WAIT(30) + EVT_ELSE + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, LVar3, 0, LVar4, 15) + EVT_WAIT(30) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_CALL(SetSelfVar, 0, 1) + EVT_END_IF + EVT_CASE_EQ(PARTNER_BOW) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_IF_LT(LVar2, 30) + EVT_CALL(N(SimpleMoveNPC), 200, 0) + EVT_ELSE + EVT_CALL(N(SimpleMoveNPC), -150, 0) + EVT_END_IF + EVT_END_SWITCH + EVT_SET(LVar9, MV_Unk_0A) + EVT_CALL(SetSelfVar, 1, LVar9) + EVT_ELSE + EVT_CALL(N(SimpleMoveNPC), 200, 0) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_IF_LT(LVar2, 150) + EVT_CALL(N(GetActingPartner)) + EVT_IF_NE(LVar9, 6) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_ELSE + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 5, MSG_CH4_005D) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 230, 0, 0) + EVT_CALL(SetNpcSpeed, NPC_SELF, LVarA) + EVT_SET(LVar0, 1) + EVT_LOOP(10) + EVT_CALL(SetNpcVar, LVar0, 0, 2) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_WAIT(45) + EVT_CALL(StopSound, SOUND_8000004C) + EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 5, MSG_CH4_005E) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt1, SOUND_1E4, 0) + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 37, 37, 1, 10, 30) + EVT_CALL(EnableModel, MODEL_o821, TRUE) + EVT_LOOP(10) + EVT_CALL(EnableModel, MODEL_o823, TRUE) + EVT_CALL(EnableModel, MODEL_o828, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_o823, FALSE) + EVT_CALL(EnableModel, MODEL_o828, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(40) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_WAIT(20) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 300, 0, 0) + EVT_SET(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) + EVT_WAIT(30) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = { + EVT_CALL(RandInt, 15, LVarA) + EVT_ADD(LVarA, 20) + EVT_DIVF(LVarA, EVT_FLOAT(10.0)) + EVT_CALL(SetNpcSpeed, NPC_SELF, LVarA) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_IF_GT(LVar2, -210) + EVT_CALL(N(GetActingPartner)) + EVT_SET(MV_Unk_0A, LVar9) + EVT_SWITCH(LVar9) + EVT_CASE_EQ(-1) + EVT_CALL(SetNpcSpeed, NPC_SELF, LVarA) + EVT_CALL(N(SurroundPlayer)) + EVT_IF_GT(LVarE, 30) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) + EVT_ELSE + EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) + EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10) + EVT_END_IF + EVT_SET(LVarE, 0) + EVT_END_IF + EVT_CASE_EQ(PARTNER_WATT) + EVT_CALL(GetSelfVar, 1, LVar9) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_NE(LVar9, 6) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 15) + EVT_END_IF + EVT_CALL(GetSelfNpcID, LVar5) + EVT_USE_BUF(EVT_PTR(N(CrowdChaseGoalPositions))) + EVT_LOOP(LVar5) + EVT_BUF_READ2(LVar3, LVar4) + EVT_END_LOOP + EVT_IF_EQ(LVar0, LVarF) + EVT_SET(LVar3, LVar0) + EVT_ADD(LVar3, 10) + EVT_SET(LVar4, 50) + EVT_END_IF + EVT_SET(LVarF, LVar0) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(7.0)) + EVT_CALL(N(SimpleMoveNPC), LVar3, LVar4) + EVT_CALL(GetNpcVar, NPC_ShyGuy_01, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetSelfVar, 0, 1) + EVT_END_IF + EVT_CASE_EQ(PARTNER_BOW) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_IF_LT(LVar2, 30) + EVT_CALL(N(SimpleMoveNPC), 200, 0) + EVT_ELSE + EVT_CALL(N(SimpleMoveNPC), -150, 0) + EVT_END_IF + EVT_END_SWITCH + EVT_SET(LVar9, MV_Unk_0A) + EVT_CALL(SetSelfVar, 1, LVar9) + EVT_ELSE + EVT_CALL(N(SimpleMoveNPC), 200, 0) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(RandInt, 360, LVar0) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 0) + EVT_CALL(RandInt, 20, LVar0) + EVT_ADD(LVar0, 1) + EVT_WAIT(LVar0) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_SELF, 2) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 12) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(N(GetActingPartner)) + EVT_IF_NE(LVar9, 6) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_CASE_EQ(2) + EVT_CALL(RandInt, 15, LVar0) + EVT_ADD(LVar0, 1) + EVT_WAIT(LVar0) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, 235, LVar1, LVar2, 20) + EVT_WAIT(30) + EVT_CALL(SetSelfVar, 0, 3) + EVT_CASE_EQ(3) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 235, 0, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 300, 0, 0) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShyGuy_Loner) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy_Loner))) + EVT_CALL(SetNpcPos, NPC_SELF, 120, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim02) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +Vec3i N(CrowdInitialPositions)[] = { + { 150, 0, -100 }, + { 150, 0, -50 }, + { 150, 0, 0 }, + { 150, 0, 50 }, + { 150, 0, 100 }, + { 180, 0, -100 }, + { 180, 0, -50 }, + { 180, 0, 0 }, + { 180, 0, 50 }, + { 180, 0, 100 }, +}; + +EvtScript N(EVS_NpcInit_ShyGuy_Crowd) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy_Crowd))) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_SUB(LVar0, 0) + EVT_USE_BUF(EVT_PTR(N(CrowdInitialPositions))) + EVT_LOOP(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim02) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy_Loner) = { + .id = NPC_ShyGuy_01, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Loner), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, +}; + +StaticNpc N(NpcData_ShyGuy_Crowd)[] = { + { + .id = NPC_ShyGuy_02, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_03, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_04, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_05, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_06, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_07, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_08, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_09, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_10, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_11, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, + .init = &N(EVS_NpcInit_ShyGuy_Crowd), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_ShyGuy_Loner)), + NPC_GROUP(N(NpcData_ShyGuy_Crowd)), + {} +}; diff --git a/src/world/area_omo/omo_15/DE8770.c b/src/world/area_omo/omo_15/DE8770.c deleted file mode 100644 index 87343275e7..0000000000 --- a/src/world/area_omo/omo_15/DE8770.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "omo_15.h" - -#include "world/common/todo/StarSpiritEffectFunc.inc.c" - -static char* N(exit_str_0) = "kmr_23"; -static char* N(exit_str_1) = "omo_14"; diff --git a/src/world/area_omo/omo_15/omo_15.h b/src/world/area_omo/omo_15/omo_15.h index 671d0a039d..b1d4ec89bb 100644 --- a/src/world/area_omo/omo_15/omo_15.h +++ b/src/world/area_omo/omo_15/omo_15.h @@ -2,8 +2,31 @@ /// @brief Shy Guy's Toybox - RED General Guy Room #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_15_shape.h" +#include "mapfs/omo_15_hit.h" + +#include "sprite/npc/GeneralGuy.h" + +enum { + NPC_GeneralGuy = 0, + NPC_ShyGuy_01 = 1, + NPC_ShyGuy_02 = 2, + NPC_ShyGuy_03 = 3, + NPC_ShyGuy_04 = 4, + NPC_ShyGuy_05 = 5, + NPC_ShyGuy_06 = 6, + NPC_ShyGuy_07 = 7, + NPC_ShyGuy_08 = 8, + NPC_ShyGuy_09 = 9, +}; + #define NAMESPACE omo_15 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_TrySpawningStarCard); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_15/omo_15_0_header.c b/src/world/area_omo/omo_15/omo_15_0_header.c new file mode 100644 index 0000000000..cc1a7ab6f0 --- /dev/null +++ b/src/world/area_omo/omo_15/omo_15_0_header.c @@ -0,0 +1,13 @@ +#include "omo_15.h" + +EntryList N(Entrances) = { + [omo_15_ENTRY_0] { -290.0, 0.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_omo_15 }, +}; diff --git a/src/world/area_omo/omo_15/omo_15_1_music.c b/src/world/area_omo/omo_15/omo_15_1_music.c new file mode 100644 index 0000000000..a8db67f038 --- /dev/null +++ b/src/world/area_omo/omo_15/omo_15_1_music.c @@ -0,0 +1,14 @@ +#include "omo_15.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(SetMusicTrack, 0, SONG_GENERAL_GUY_THEME, 0, 8) + EVT_CASE_EQ(STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_15/omo_15_2_main.c b/src/world/area_omo/omo_15/omo_15_2_main.c new file mode 100644 index 0000000000..c1705631df --- /dev/null +++ b/src/world/area_omo/omo_15/omo_15_2_main.c @@ -0,0 +1,100 @@ +#include "omo_15.h" + +#include "world/common/todo/StarSpiritEffectFunc.inc.c" + +EvtScript N(EVS_TrySpawningStarCard) = { + // determine if card should be spawned + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH4_OPENED_GENERAL_GUY_ROOM) + EVT_SET(LVar0, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CASE_EQ(STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_SET(LVar0, TRUE) + EVT_CASE_DEFAULT + EVT_RETURN + EVT_END_SWITCH + EVT_IF_EQ(LVar0, FALSE) + // card appearing scene + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -100, 85, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -100, 30, 0) + EVT_SPIRIT_ADJUST_CAM(10000) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(StarSpiritEffectFunc2), 3, 180, 215, 60, 0, -100, 85, 0, 30, 0) + 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, -100, 85, 0) + 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, -100, 85, 0) + 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, -100, 0, 0) + 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(4.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 + // just make the card spawn + EVT_CALL(N(StarSpiritEffectFunc5), 3, -100, 30, 0, 0) + EVT_THREAD + EVT_CALL(N(StarSpiritEffectFunc6)) + EVT_END_THREAD + EVT_WAIT(1) + EVT_END_IF + // wait for pickup + EVT_CALL(N(StarSpiritEffectFunc4), 3) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GB_StoryProgress, STORY_CH4_STAR_SPIRIT_RESCUED) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_3, TRANSITION_14) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_omo_14_1) = EVT_EXIT_WALK(60, omo_15_ENTRY_0, "omo_14", omo_14_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_omo_14_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_IF_EQ(GB_StoryProgress, STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_EXEC(N(EVS_TrySpawningStarCard)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_15/omo_15_3_npc.c b/src/world/area_omo/omo_15/omo_15_3_npc.c new file mode 100644 index 0000000000..145e4a7e5c --- /dev/null +++ b/src/world/area_omo/omo_15/omo_15_3_npc.c @@ -0,0 +1,564 @@ +#include "omo_15.h" + +#include "world/common/enemy/complete/ShyGuy_Stationary.inc.c" + +enum { + MANAGER_IDLE_STATE = 0, + MANAGER_ARMY_CHARGE = 10, + MANAGER_ARMY_FLEE = 40, +}; + +s32 N(BeginSurroundCrowdPositions)[] = { + 8, -35, -240, + 7, -5, -180, + 6, 10, -120, + 6, 25, -60, + 6, 25, 60, + 6, 10, 120, + 7, -5, 180, + 8, -35, 240, + 6, 30, 0, +}; + +EvtScript N(EVS_Scene_MeetingGeneralGuy) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(30) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(InterruptUsePartner) + EVT_WAIT(30) + EVT_CALL(func_802D2C14, 1) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_WAIT(45) + EVT_CALL(func_802D2C14, 0) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_005F) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 250, -50, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, -50, 10) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(205.0), EVT_FLOAT(11.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_0060) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_0061) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0A, ANIM_GeneralGuy_Anim02, 0, MSG_CH4_0062) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -200, 0, 0) + EVT_SET(LVar0, NPC_ShyGuy_01) + EVT_LOOP(9) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ShyGuy_Red_Anim02) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_GeneralGuy, ANIM_GeneralGuy_Anim0C) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH4_0063, 160, 40) + EVT_CALL(SetNpcAnimation, NPC_GeneralGuy, ANIM_GeneralGuy_Anim02) + EVT_WAIT(20) + EVT_SET(LVar0, NPC_ShyGuy_01) + EVT_LOOP(9) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ShyGuy_Red_Anim01) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_CALL(SpeakToPlayer, NPC_GeneralGuy, ANIM_GeneralGuy_Anim02, ANIM_GeneralGuy_Anim0A, 0, MSG_CH4_0064) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(PlaySound, SOUND_8000004D) + EVT_SET(LVar0, NPC_ShyGuy_01) + EVT_LOOP(9) + EVT_CALL(SetNpcVar, LVar0, 0, MANAGER_ARMY_CHARGE) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_END_THREAD + // screen 'shaking' from charging army + EVT_LOOP(30) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(330.0)) + EVT_WAIT(1) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(320.0)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar0, NPC_ShyGuy_01) + EVT_USE_BUF(EVT_PTR(N(BeginSurroundCrowdPositions))) + EVT_LOOP(9) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_CALL(SetNpcSpeed, LVar0, LVar1) + EVT_CALL(SetNpcPos, LVar0, LVar2, 0, LVar3) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_WAIT(20) + // wait for battle to be over + EVT_LABEL(5) + EVT_CALL(GetNpcVar, NPC_ShyGuy_09, 0, LVar0) + EVT_IF_NE(LVar0, MANAGER_ARMY_FLEE) + EVT_WAIT(1) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_WATT) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_TALK, PARTNER_ANIM_IDLE, 0, MSG_CH4_0075) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_EXEC(N(EVS_TrySpawningStarCard)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +s32 N(CrowdFleeScriptA)[] = { + CS_JUMP( 65, 0, 87) + CS_MOVE( 17, 46) + CS_JUMP( -24, 0, -11) + CS_MOVE( -63, -16) + CS_MOVE(-120, 43) + CS_JUMP(-172, 0, 25) + CS_MOVE(-234, 23) + CS_MOVE(-320, 30) + CS_MOVE(-400, 0) + CS_END +}; + +s32 N(CrowdFleeScriptB)[] = { + CS_MOVE( 29, -72) + CS_MOVE( -19, -104) + CS_MOVE( -60, -67) + CS_MOVE(-106, -50) + CS_MOVE(-168, -100) + CS_MOVE(-279, -20) + CS_MOVE(-400, 0) + CS_END +}; + +s32 N(CrowdFleeScriptC)[] = { + CS_JUMP( -30, 0, 27) + CS_MOVE(-123, -13) + CS_MOVE(-168, 73) + CS_MOVE(-120, 103) + CS_MOVE(-155, 21) + CS_MOVE(-208, 43) + CS_MOVE(-256, 84) + CS_MOVE(-326, 42) + CS_MOVE(-400, 0) + CS_END +}; + +s32 N(CrowdFleeScriptD)[] = { + CS_MOVE( 133, -3) + CS_MOVE( 84, 27) + CS_MOVE( 25, 0) + CS_MOVE( -31, -23) + CS_MOVE( -97, 0) + -50, //@bug -- ignored by event running this script; previous op should probably be CS_JUMP with this as third arg + CS_MOVE(-150, -75) + CS_MOVE(-230, -90) + CS_MOVE(-309, -55) + CS_MOVE(-400, 0) + CS_END +}; + +s32 N(CrowdFleeScriptE)[] = { + CS_MOVE( -40, 200) + CS_MOVE(-100, 256) + CS_MOVE(-180, 270) + CS_MOVE(-210, 200) + CS_MOVE(-179, 102) + CS_JUMP(-167, 0, 52) + CS_MOVE(-261, 118) + CS_MOVE(-400, 0) + CS_END +}; + +s32 N(CrowdPratfallScript)[] = { + CS_MOVE( -97, -24) + CS_MOVE( -25, 300) + CS_MOVE( 100, 0) + CS_MOVE( -50, 50) + CS_MOVE(-100, 30) + CS_MOVE(-160, 63) + CS_FALL() + CS_MOVE(-400, 0) + CS_END +}; + +s32 N(GeneralGuyFleeScript)[] = { + CS_MOVE(-153, 0) + CS_MOVE(-170, 70) + CS_MOVE(-208, 80) + CS_MOVE(-246, 70) + CS_MOVE(-263, 0) + CS_MOVE(-246, -70) + CS_MOVE(-208, -80) + CS_MOVE(-170, -70) + CS_MOVE(-153, 0) + CS_MOVE(-170, 70) + CS_MOVE(-208, 80) + CS_MOVE(-400, 0) + CS_END +}; + +s32* N(CrowdFleeScripts)[] = { + N(CrowdFleeScriptA), + N(CrowdFleeScriptB), + N(CrowdFleeScriptC), + N(CrowdFleeScriptD), + N(CrowdFleeScriptE), + N(CrowdFleeScriptB), + N(CrowdFleeScriptA), + N(CrowdFleeScriptD), + N(CrowdPratfallScript), +}; + +s32* N(GeneralGuyFleeScripts)[] = { + N(GeneralGuyFleeScript), +}; + +Vec3i N(FinalSurroundCrowdPositions)[] = { + { -238, -55, 0 }, + { -218, -60, 0 }, + { -198, -60, 0 }, + { -178, -50, 0 }, + { -178, 35, 0 }, + { -192, 50, 0 }, + { -210, 60, 0 }, + { -228, 55, 0 }, + { -165, -10, 0 }, +}; + +Vec3i N(PostBattleGeneralPosition) = { + -182, 0, 0, +}; + +EvtScript N(EVS_NpcIdle_ShyGuy) = { + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(MANAGER_ARMY_CHARGE) + EVT_THREAD + EVT_CALL(GetSelfNpcID, LVar0) + EVT_SUB(LVar0, 0) + EVT_USE_BUF(EVT_PTR(N(FinalSurroundCrowdPositions))) + EVT_LOOP(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar1, LVar2, LVar3) + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_CALL(SetSelfVar, 0, MANAGER_IDLE_STATE) + EVT_IF_EQ(LVar0, NPC_ShyGuy_09) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(StopSound, SOUND_8000004D) + EVT_END_THREAD + EVT_CALL(StartBossBattle, SONG_GENERAL_GUY_BATTLE) + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BossDefeated_RunAway) = { + EVT_CALL(GetSelfNpcID, LVar9) + EVT_IF_EQ(LVar9, NPC_GeneralGuy) + EVT_CALL(PlaySound, SOUND_8000004D) + EVT_USE_BUF(EVT_PTR(N(GeneralGuyFleeScripts))) + EVT_BUF_READ1(LVar1) + EVT_USE_BUF(LVar1) + EVT_CALL(SetNpcAnimation, LVar9, ANIM_GeneralGuy_Anim0E) + EVT_LOOP(0) + EVT_BUF_READ1(LVar2) + EVT_SWITCH(LVar2) + EVT_CASE_EQ(op_CS_MOVE) + EVT_BUF_READ2(LVar3, LVar4) + EVT_CALL(SetNpcSpeed, NPC_GeneralGuy, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_GeneralGuy, LVar3, LVar4, 0) + EVT_CASE_EQ(op_CS_JUMP) + EVT_BUF_READ3(LVar3, LVar4, LVar5) + EVT_CALL(SetNpcJumpscale, NPC_GeneralGuy, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_GeneralGuy, LVar3, LVar4, LVar5, 10) + EVT_END_SWITCH + EVT_IF_EQ(LVar2, op_CS_END) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySound, SOUND_76D) + EVT_CALL(func_802D62E4, SOUND_36D) + EVT_ELSE + EVT_SET(LVar0, LVar9) + EVT_SUB(LVar0, 0) + EVT_USE_BUF(EVT_PTR(N(CrowdFleeScripts))) + EVT_LOOP(LVar0) + EVT_BUF_READ1(LVar1) + EVT_END_LOOP + EVT_USE_BUF(LVar1) + EVT_LOOP(0) + EVT_BUF_READ1(LVar2) + EVT_SWITCH(LVar2) + EVT_CASE_EQ(op_CS_MOVE) + EVT_BUF_READ2(LVar3, LVar4) + EVT_CALL(SetNpcAnimation, LVar9, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(SetNpcSpeed, LVar9, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, LVar9, LVar3, LVar4, 0) + EVT_CASE_EQ(op_CS_JUMP) + EVT_BUF_READ3(LVar3, LVar4, LVar5) + EVT_CALL(SetNpcJumpscale, LVar9, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, LVar9, LVar3, LVar4, LVar5, 10) + EVT_CASE_EQ(op_CS_FALL) + EVT_CALL(SetNpcRotationPivot, LVar9, 10) + EVT_THREAD + EVT_SET(LVar3, 0) + EVT_LOOP(10) + EVT_ADD(LVar3, 9) + EVT_CALL(SetNpcRotation, LVar9, 0, 0, LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(NpcJump0, LVar9, -180, 0, 63, 4) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcRotation, LVar9, 0, 0, 0) + EVT_CALL(SetNpcAnimation, LVar9, ANIM_ShyGuy_Red_Anim10) + EVT_CALL(PlayerFaceNpc, LVar9, 3) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, LVar9, 3) + EVT_END_THREAD + EVT_CALL(NpcJump0, LVar9, -220, 0, 63, 10) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_MISS_JUMP, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(50) + EVT_LOOP(2) + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3E4, 0) + EVT_WAIT(7) + EVT_END_LOOP + EVT_WAIT(6) + EVT_CALL(SetNpcRotationPivot, LVar9, 0) + EVT_CALL(SetNpcAnimation, LVar9, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(NpcJump0, LVar9, -230, 0, 63, 10) + EVT_CALL(InterpNpcYaw, LVar9, 90, 0) + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, LVar9, SOUND_3A2, 0) + EVT_WAIT(45) + EVT_CALL(StopSound, SOUND_3A2) + EVT_CALL(SetNpcVar, NPC_ShyGuy_09, 0, MANAGER_ARMY_FLEE) + EVT_END_THREAD + EVT_END_SWITCH + EVT_IF_EQ(LVar2, op_CS_END) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_IF + EVT_CALL(SetNpcFlagBits, LVar9, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, LVar9, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_GeneralGuy) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_IF_EQ(LVar0, NPC_GeneralGuy) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + EVT_USE_BUF(EVT_PTR(N(FinalSurroundCrowdPositions))) + EVT_SET(LVar0, NPC_ShyGuy_01) + EVT_LOOP(9) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_CALL(SetNpcPos, LVar0, LVar1, 0, LVar2) + EVT_CALL(NpcFacePlayer, LVar0, 0) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_USE_BUF(EVT_PTR(N(PostBattleGeneralPosition))) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_CALL(SetNpcPos, NPC_GeneralGuy, LVar1, LVar2, LVar3) + EVT_END_IF + EVT_EXEC(N(EVS_BossDefeated_RunAway)) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +Vec3i N(InitialCrowdPositions)[] = { + { 140, 19, 5 }, + { 147, 19, 32 }, + { 154, 19, 59 }, + { 161, 19, 86 }, + { 100, 0, 30 }, + { 106, 0, 55 }, + { 112, 0, 80 }, + { 118, 0, 105 }, + { 124, 0, 130 }, +}; + +EvtScript N(EVS_NpcInit_ShyGuy) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_GeneralGuy))) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_SUB(LVar0, 0) + EVT_USE_BUF(EVT_PTR(N(InitialCrowdPositions))) + EVT_LOOP(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_GeneralGuy) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_EXEC(N(EVS_Scene_MeetingGeneralGuy)) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_GeneralGuy))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_GeneralGuy)[] = { + { + .id = NPC_GeneralGuy, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { 187.0f, 38.0f, 20.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_GeneralGuy), + .drops = NPC_NO_DROPS, + .animations = { + .idle = ANIM_GeneralGuy_Anim02, + .walk = ANIM_GeneralGuy_Anim02, + .run = ANIM_GeneralGuy_Anim02, + .chase = ANIM_GeneralGuy_Anim02, + .anim_4 = ANIM_GeneralGuy_Anim02, + .anim_5 = ANIM_GeneralGuy_Anim02, + .death = ANIM_GeneralGuy_Anim02, + .hit = ANIM_GeneralGuy_Anim02, + .anim_8 = ANIM_GeneralGuy_Anim02, + .anim_9 = ANIM_GeneralGuy_Anim02, + .anim_A = ANIM_GeneralGuy_Anim02, + .anim_B = ANIM_GeneralGuy_Anim02, + .anim_C = ANIM_GeneralGuy_Anim02, + .anim_D = ANIM_GeneralGuy_Anim02, + .anim_E = ANIM_GeneralGuy_Anim02, + .anim_F = ANIM_GeneralGuy_Anim02, + }, + }, + { + .id = NPC_ShyGuy_01, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_02, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_03, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_04, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_05, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_06, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_07, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_08, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, + { + .id = NPC_ShyGuy_09, + .settings = &N(NpcSettings_ShyGuy_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = NPC_NO_DROPS, + .animations = RED_SHY_GUY_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_GeneralGuy), BTL_OMO2_FORMATION_00), + {} +}; diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c deleted file mode 100644 index 5e5cb7b05d..0000000000 --- a/src/world/area_omo/omo_16/DEBED0.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "omo_16.h" - -static char* N(exit_str_0) = "omo_10"; -static char* N(exit_str_1) = "omo_08"; -static char* N(exit_str_2) = "omo_06"; -static char* N(exit_str_3) = "omo_03"; - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -#include "common/SetAngleClamped.inc.c" - -#include "common/CompareFloats.inc.c" - -#include "common/AdvanceBuffer.inc.c" - -#include "common/SetPlayerStatusPosYaw.inc.c" - -#include "common/SetNpcPosYaw.inc.c" - -#include "common/CosInterpMinMax.inc.c" - -#include "common/IsAOrBPressed.inc.c" - -ApiStatus func_8024055C_DEC42C(Evt* script, s32 isInitialCall) { - f32 temp_f0 = evt_get_float_variable(script, MapVar(11)); - - script->varTable[0] = 0; - if (fabsf(temp_f0) < 2000.0f && (gGameStatusPtr->pressedButtons[0] & BUTTON_A)) { - script->varTable[0] = 1; - } - - if (fabsf(temp_f0) < 2000.0f && (gGameStatusPtr->pressedButtons[0] & BUTTON_B)) { - script->varTable[0] = 1; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_omo/omo_16/omo_16.h b/src/world/area_omo/omo_16/omo_16.h index 910fd09e3b..46059be53f 100644 --- a/src/world/area_omo/omo_16/omo_16.h +++ b/src/world/area_omo/omo_16/omo_16.h @@ -2,8 +2,34 @@ /// @brief Shy Guy's Toybox - Riding the Train #include "common.h" -#include "../omo.h" #include "message_ids.h" #include "map.h" +#include "../omo.h" +#include "mapfs/omo_16_shape.h" +#include "mapfs/omo_16_hit.h" + +#include "sprite/npc/TrainToad.h" + +enum { + NPC_Conductor = 0, +}; + +enum { + MV_TrainUnk_00 = MapVar(0), + MV_TrainUnk_01 = MapVar(1), + MV_TrainUnk_02 = MapVar(2), + MV_TrainPos = MapVar(11), + MV_TrainUnk_0C = MapVar(12), + MV_TrainUnk_0D = MapVar(13), +}; + +enum { + MF_TrainUnk_00 = MapFlag(0), +}; + #define NAMESPACE omo_16 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_802429C4); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_omo/omo_16/omo_16_0_header.c b/src/world/area_omo/omo_16/omo_16_0_header.c new file mode 100644 index 0000000000..3e216132e8 --- /dev/null +++ b/src/world/area_omo/omo_16/omo_16_0_header.c @@ -0,0 +1,13 @@ +#include "omo_16.h" + +EntryList N(Entrances) = { + [omo_16_ENTRY_0] { -1460.0, 50.0, 0.0, 90.0 }, + [omo_16_ENTRY_1] { 1460.0, 50.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, +}; diff --git a/src/world/area_omo/omo_16/omo_16_1_main.c b/src/world/area_omo/omo_16/omo_16_1_main.c new file mode 100644 index 0000000000..536d4eed34 --- /dev/null +++ b/src/world/area_omo/omo_16/omo_16_1_main.c @@ -0,0 +1,13 @@ +#include "omo_16.h" + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_SHY_GUYS_TOYBOX) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) + EVT_EXEC_WAIT(N(EVS_802429C4)) + EVT_WAIT(3) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_16/omo_16_2_train.c b/src/world/area_omo/omo_16/omo_16_2_train.c new file mode 100644 index 0000000000..f0419ca384 --- /dev/null +++ b/src/world/area_omo/omo_16/omo_16_2_train.c @@ -0,0 +1,164 @@ +#include "omo_16.h" + +#include "../common/ToyTrain.inc.c" + +EvtScript N(D_8024262C_DEE4FC) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, omo_16_ENTRY_0) + EVT_WAIT(140) + EVT_SWITCH(GB_OMO_TrainDestination) + EVT_CASE_EQ(0) + EVT_IF_EQ(AB_OMO_6, 1) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_000B) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_IF_EQ(AB_OMO_6, 2) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_000C) + EVT_END_IF + EVT_CASE_EQ(2) + EVT_IF_EQ(AB_OMO_6, 3) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_000D) + EVT_END_IF + EVT_CASE_EQ(3) + EVT_IF_EQ(AB_OMO_6, 0) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_000A) + EVT_END_IF + EVT_END_SWITCH + EVT_ELSE + EVT_WAIT(140) + EVT_SWITCH(GB_OMO_TrainDestination) + EVT_CASE_EQ(0) + EVT_IF_EQ(AB_OMO_6, 0) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_000A) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_IF_EQ(AB_OMO_6, 1) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_000B) + EVT_END_IF + EVT_CASE_EQ(2) + EVT_IF_EQ(AB_OMO_6, 2) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_000C) + EVT_END_IF + EVT_CASE_EQ(3) + EVT_IF_EQ(AB_OMO_6, 3) + EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainToad_Talk, ANIM_TrainToad_Idle, 5, MSG_CH4_000D) + EVT_END_IF + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802428CC_DEE79C) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -2000) + EVT_SET(LVar0, -2000) + EVT_END_IF + EVT_IF_GT(LVar0, 2000) + EVT_SET(LVar0, 2000) + EVT_END_IF + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, EVT_FLOAT(50.0), LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +s32 N(D_80242984_DEE854)[] = { + -1550, EVT_FLOAT(0.0), EVT_FLOAT(90.0), 1550, EVT_FLOAT(0.0), + -1, -1, -1 +}; + +s32 N(D_802429A4_DEE874)[] = { + 1550, EVT_FLOAT(0.0), EVT_FLOAT(270.0), -1550, EVT_FLOAT(0.0), + -1, -1, -1 +}; + +API_CALLABLE(N(CheckForSceneSkip)) { + f32 trainPos = evt_get_float_variable(script, MV_TrainPos); + + script->varTable[0] = 0; + if (fabsf(trainPos) < 2000.0f && (gGameStatusPtr->pressedButtons[0] & BUTTON_A)) { + script->varTable[0] = 1; + } + + if (fabsf(trainPos) < 2000.0f && (gGameStatusPtr->pressedButtons[0] & BUTTON_B)) { + script->varTable[0] = 1; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_802429C4) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_EXEC(N(D_802428CC_DEE79C)) + EVT_EXEC(N(D_8024262C_DEE4FC)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, omo_16_ENTRY_0) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_80242984_DEE854))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_THREAD + EVT_LABEL(10) + EVT_CALL(N(CheckForSceneSkip)) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(11) + EVT_END_IF + EVT_WAIT(1) + EVT_IF_LT(MV_TrainPos, 1400) + EVT_GOTO(10) + EVT_END_IF + EVT_SWITCH(GB_OMO_TrainDestination) + EVT_CASE_EQ(0) + EVT_CALL(GotoMap, EVT_PTR("omo_06"), omo_06_ENTRY_2) + EVT_CASE_EQ(1) + EVT_CALL(GotoMap, EVT_PTR("omo_08"), omo_08_ENTRY_1) + EVT_CASE_EQ(2) + EVT_CALL(GotoMap, EVT_PTR("omo_10"), omo_10_ENTRY_2) + EVT_CASE_EQ(3) + EVT_CALL(GotoMap, EVT_PTR("omo_03"), omo_03_ENTRY_2) + EVT_END_SWITCH + EVT_WAIT(100) + EVT_RETURN + EVT_LABEL(11) + EVT_EXEC_WAIT(N(EVS_TrainUnk_G)) + EVT_END_THREAD + EVT_ELSE + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(D_802429A4_DEE874))) + EVT_SET(MV_TrainUnk_02, 0) + EVT_EXEC(N(EVS_Scene_RideTrain)) + EVT_SET(MF_TrainUnk_00, TRUE) + EVT_THREAD + EVT_LABEL(30) + EVT_CALL(N(CheckForSceneSkip)) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(31) + EVT_END_IF + EVT_WAIT(1) + EVT_IF_GT(MV_TrainPos, -1400) + EVT_GOTO(30) + EVT_END_IF + EVT_SWITCH(GB_OMO_TrainDestination) + EVT_CASE_EQ(0) + EVT_CALL(GotoMap, EVT_PTR("omo_03"), omo_03_ENTRY_3) + EVT_CASE_EQ(1) + EVT_CALL(GotoMap, EVT_PTR("omo_06"), omo_06_ENTRY_3) + EVT_CASE_EQ(2) + EVT_CALL(GotoMap, EVT_PTR("omo_08"), omo_08_ENTRY_2) + EVT_CASE_EQ(3) + EVT_CALL(GotoMap, EVT_PTR("omo_10"), omo_10_ENTRY_3) + EVT_END_SWITCH + EVT_WAIT(100) + EVT_RETURN + EVT_LABEL(31) + EVT_EXEC_WAIT(N(EVS_TrainUnk_F)) + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_omo/omo_16/omo_16_3_npc.c b/src/world/area_omo/omo_16/omo_16_3_npc.c new file mode 100644 index 0000000000..66ca7919d8 --- /dev/null +++ b/src/world/area_omo/omo_16/omo_16_3_npc.c @@ -0,0 +1,18 @@ +#include "omo_16.h" + +#include "world/common/npc/TrainToad.inc.c" + +StaticNpc N(NpcData_TrainToad) = { + .id = NPC_Conductor, + .settings = &N(NpcSettings_TrainToad), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NPC_NO_DROPS, + .animations = TRAIN_CONDUCTOR_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_TrainToad)), + {} +}; diff --git a/src/world/area_omo/omo_17/omo_17.h b/src/world/area_omo/omo_17/omo_17.h index 9c9f1644c8..82cb9803a3 100644 --- a/src/world/area_omo/omo_17/omo_17.h +++ b/src/world/area_omo/omo_17/omo_17.h @@ -9,7 +9,7 @@ #include "mapfs/omo_17_shape.h" #include "mapfs/omo_17_hit.h" -#include "sprite/npc/TrainStationToad.h" +#include "sprite/npc/TrainToad.h" #include "sprite/npc/SpyGuy.h" #include "sprite/npc/PyroGuy.h" #include "sprite/npc/GrooveGuy.h" @@ -25,16 +25,16 @@ enum { }; enum { - MV_Unk_00 = MapVar(0), - MV_Unk_01 = MapVar(1), - MV_Unk_02 = MapVar(2), - MV_TrainPos = MapVar(11), - MV_Unk_0C = MapVar(12), - MV_Unk_0D = MapVar(13), + MV_TrainUnk_00 = MapVar(0), + MV_TrainUnk_01 = MapVar(1), + MV_TrainUnk_02 = MapVar(2), + MV_TrainPos = MapVar(11), + MV_TrainUnk_0C = MapVar(12), + MV_TrainUnk_0D = MapVar(13), }; enum { - MF_Unk_00 = MapFlag(0), + MF_TrainUnk_00 = MapFlag(0), }; #define NAMESPACE omo_17 diff --git a/src/world/area_omo/omo_17/omo_17_3_train.c b/src/world/area_omo/omo_17/omo_17_3_train.c index 8423af3785..cce185ca9c 100644 --- a/src/world/area_omo/omo_17/omo_17_3_train.c +++ b/src/world/area_omo/omo_17/omo_17_3_train.c @@ -1,514 +1,6 @@ #include "omo_17.h" -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -#include "common/SetAngleClamped.inc.c" - -#include "common/CompareFloats.inc.c" - -#include "common/AdvanceBuffer.inc.c" - -#include "common/SetPlayerStatusPosYaw.inc.c" - -#include "common/SetNpcPosYaw.inc.c" - -#include "common/CosInterpMinMax.inc.c" - -#include "common/IsAOrBPressed.inc.c" - -EvtScript N(EVS_Scene_RideTrain) = { - EVT_MALLOC_ARRAY(20, LVar0) - EVT_USE_ARRAY(LVar0) - EVT_SETF(ArrayVar(2), EVT_FLOAT(0.0)) - EVT_SETF(ArrayVar(3), EVT_FLOAT(0.0)) - EVT_SETF(ArrayVar(7), EVT_FLOAT(0.0)) - EVT_SETF(ArrayVar(8), EVT_FLOAT(0.0)) - EVT_SETF(ArrayVar(14), EVT_FLOAT(0.0)) - EVT_SETF(ArrayVar(15), EVT_FLOAT(0.0)) - EVT_SETF(ArrayVar(16), EVT_FLOAT(0.0)) - EVT_SET(AF_OMO_03, FALSE) - EVT_LABEL(0) - EVT_SWITCH(MV_Unk_00) - EVT_CASE_EQ(0) - EVT_USE_BUF(MV_Unk_01) - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_SETF(ArrayVar(0), LVar0) - EVT_SETF(ArrayVar(1), LVar1) - EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), EVT_FLOAT(40.0), LVar2) - EVT_SETF(ArrayVar(5), LVar0) - EVT_SETF(ArrayVar(6), LVar1) - EVT_SETF(LVar3, LVar2) - EVT_ADDF(LVar3, EVT_FLOAT(180.0)) - EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), EVT_FLOAT(40.0), LVar3) - EVT_SETF(ArrayVar(11), LVar0) - EVT_SETF(ArrayVar(12), LVar1) - EVT_SETF(MV_TrainPos, ArrayVar(11)) - EVT_SETF(MV_Unk_0C, ArrayVar(12)) - EVT_SETF(MV_Unk_0D, LVar2) - EVT_SETF(ArrayVar(17), EVT_FLOAT(0.0)) - EVT_LABEL(11) - EVT_BUF_READ2(LVar2, LVar3) - EVT_IF_EQ(LVar2, -1) - EVT_GOTO(12) - EVT_END_IF - EVT_CALL(GetDist2D, LVar4, LVar0, LVar1, LVar2, LVar3) - EVT_ADDF(ArrayVar(17), LVar4) - EVT_SETF(LVar0, LVar2) - EVT_SETF(LVar1, LVar3) - EVT_GOTO(11) - EVT_LABEL(12) - EVT_SUBF(ArrayVar(17), EVT_FLOAT(40.0)) - EVT_SETF(ArrayVar(10), EVT_FLOAT(0.0)) - EVT_SETF(ArrayVar(13), EVT_FLOAT(0.0)) - EVT_SET(ArrayVar(18), 0) - EVT_IF_EQ(MF_Unk_00, TRUE) - EVT_SET(MV_Unk_00, 1) - EVT_END_IF - EVT_CASE_EQ(1) - EVT_USE_BUF(MV_Unk_01) - EVT_CALL(N(AdvanceBuffer), 3, 0, 0) - EVT_BUF_READ2(LVar0, LVar1) - EVT_IF_EQ(LVar0, -1) - EVT_SET(MV_Unk_00, 100) - EVT_SET(MF_Unk_00, FALSE) - EVT_ELSE - EVT_SETF(ArrayVar(2), LVar0) - EVT_SETF(ArrayVar(3), LVar1) - EVT_SET(ArrayVar(4), 1) - EVT_SETF(ArrayVar(7), LVar0) - EVT_SETF(ArrayVar(8), LVar1) - EVT_SET(ArrayVar(9), 1) - EVT_SET(MV_Unk_00, 10) - EVT_END_IF - EVT_CASE_EQ(10) - EVT_SWITCH(MV_Unk_02) - EVT_CASE_EQ(0) - EVT_SETF(ArrayVar(10), EVT_FLOAT(10.0)) - EVT_CASE_EQ(1) - EVT_CALL(N(CosInterpMinMax), ArrayVar(18), ArrayVar(10), EVT_FLOAT(0.0), EVT_FLOAT(10.0), 100, 1, EVT_FLOAT(0.0)) - EVT_ADD(ArrayVar(18), 1) - EVT_CASE_EQ(2) - EVT_SET(LVar0, ArrayVar(13)) - EVT_SET(LVar1, ArrayVar(17)) - EVT_CALL(N(CosInterpMinMax), LVar0, ArrayVar(10), EVT_FLOAT(10.0), EVT_FLOAT(2.0), LVar1, 0, EVT_FLOAT(0.0)) - EVT_CASE_EQ(3) - EVT_SET(LVar0, ArrayVar(13)) - EVT_SET(LVar1, ArrayVar(17)) - EVT_DIV(LVar1, 2) - EVT_CALL(N(CosInterpMinMax), LVar0, ArrayVar(10), EVT_FLOAT(1.0), EVT_FLOAT(10.0), LVar1, 0, EVT_FLOAT(0.0)) - EVT_END_SWITCH - EVT_CALL(GetDist2D, LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(2), ArrayVar(3)) - EVT_CALL(N(CompareFloats), LVar0, ArrayVar(10), LVar2) - EVT_IF_EQ(LVar2, 1) - EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(2), ArrayVar(3)) - EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), ArrayVar(10), LVar0) - EVT_ELSE - EVT_SETF(LVar1, ArrayVar(10)) - EVT_SUBF(LVar1, LVar0) - EVT_SETF(ArrayVar(0), ArrayVar(2)) - EVT_SETF(ArrayVar(1), ArrayVar(3)) - EVT_USE_BUF(MV_Unk_01) - EVT_CALL(N(AdvanceBuffer), 3, 2, ArrayVar(4)) - EVT_BUF_READ2(ArrayVar(2), ArrayVar(3)) - EVT_ADD(ArrayVar(4), 1) - EVT_IF_EQ(ArrayVar(2), -1) - EVT_SET(MV_Unk_00, 100) - EVT_SET(MF_Unk_00, FALSE) - EVT_SET(LocalFlag(1), TRUE) - EVT_ELSE - EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(2), ArrayVar(3)) - EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), LVar1, LVar0) - EVT_END_IF - EVT_END_IF - EVT_CALL(GetDist2D, LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(7), ArrayVar(8)) - EVT_CALL(N(CompareFloats), LVar0, ArrayVar(10), LVar2) - EVT_IF_EQ(LVar2, 1) - EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(7), ArrayVar(8)) - EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), ArrayVar(10), LVar0) - EVT_ELSE - EVT_SETF(LVar1, ArrayVar(10)) - EVT_SUBF(LVar1, LVar0) - EVT_SETF(ArrayVar(5), ArrayVar(7)) - EVT_SETF(ArrayVar(6), ArrayVar(8)) - EVT_USE_BUF(MV_Unk_01) - EVT_CALL(N(AdvanceBuffer), 3, 2, ArrayVar(9)) - EVT_BUF_READ2(ArrayVar(7), ArrayVar(8)) - EVT_ADD(ArrayVar(9), 1) - EVT_IF_EQ(ArrayVar(7), -1) - EVT_SET(MV_Unk_00, 100) - EVT_SET(MF_Unk_00, FALSE) - EVT_SET(LocalFlag(1), FALSE) - EVT_ELSE - EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(7), ArrayVar(8)) - EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), LVar1, LVar0) - EVT_END_IF - EVT_END_IF - EVT_IF_EQ(MV_Unk_00, 100) - EVT_IF_EQ(LocalFlag(1), TRUE) - EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(0), ArrayVar(1), ArrayVar(5), ArrayVar(6)) - EVT_SETF(ArrayVar(5), ArrayVar(0)) - EVT_SETF(ArrayVar(6), ArrayVar(1)) - EVT_CALL(AddVectorPolar, ArrayVar(5), ArrayVar(6), EVT_FLOAT(80.0), LVar0) - EVT_ELSE - EVT_CALL(N(SetAngleClamped), LVar0, ArrayVar(5), ArrayVar(6), ArrayVar(0), ArrayVar(1)) - EVT_SETF(ArrayVar(0), ArrayVar(5)) - EVT_SETF(ArrayVar(1), ArrayVar(6)) - EVT_CALL(AddVectorPolar, ArrayVar(0), ArrayVar(1), EVT_FLOAT(80.0), LVar0) - EVT_END_IF - EVT_END_IF - EVT_SETF(LVar0, ArrayVar(0)) - EVT_SETF(LVar1, ArrayVar(1)) - EVT_ADDF(LVar0, ArrayVar(5)) - EVT_ADDF(LVar1, ArrayVar(6)) - EVT_DIVF(LVar0, EVT_FLOAT(2.0)) - EVT_DIVF(LVar1, EVT_FLOAT(2.0)) - EVT_CALL(N(SetAngleClamped), LVar2, ArrayVar(5), ArrayVar(6), ArrayVar(0), ArrayVar(1)) - EVT_SETF(MV_TrainPos, LVar0) - EVT_SETF(MV_Unk_0C, LVar1) - EVT_SETF(MV_Unk_0D, LVar2) - EVT_CALL(GetDist2D, LVar3, LVar0, LVar1, ArrayVar(11), ArrayVar(12)) - EVT_ADDF(ArrayVar(13), LVar3) - EVT_SETF(ArrayVar(14), ArrayVar(13)) - EVT_MULF(ArrayVar(14), EVT_FLOAT(1.4326172)) - EVT_IF_EQ(LocalFlag(0), FALSE) - EVT_SETF(LVar0, ArrayVar(10)) - EVT_IF_LT(LVar0, 1) - EVT_SETF(LVar0, EVT_FLOAT(1.0)) - EVT_END_IF - EVT_DIVF(LVar0, EVT_FLOAT(3.0)) - EVT_SUBF(ArrayVar(15), LVar0) - EVT_IF_LT(ArrayVar(15), -10) - EVT_SETF(ArrayVar(15), EVT_FLOAT(-10.0)) - EVT_SET(LocalFlag(0), TRUE) - EVT_IF_EQ(AF_OMO_03, FALSE) - EVT_CALL(PlaySound, SOUND_1FF) - EVT_ELSE - EVT_CALL(PlaySound, SOUND_84) - EVT_END_IF - EVT_END_IF - EVT_ELSE - EVT_SETF(LVar0, ArrayVar(10)) - EVT_IF_LT(LVar0, 1) - EVT_SETF(LVar0, EVT_FLOAT(1.0)) - EVT_END_IF - EVT_DIVF(LVar0, EVT_FLOAT(3.0)) - EVT_ADDF(ArrayVar(15), LVar0) - EVT_IF_GT(ArrayVar(15), 10) - EVT_SETF(ArrayVar(15), EVT_FLOAT(10.0)) - EVT_SET(LocalFlag(0), FALSE) - EVT_IF_EQ(AF_OMO_03, FALSE) - EVT_CALL(PlaySound, SOUND_1FE) - EVT_SET(AF_OMO_03, TRUE) - EVT_ELSE - EVT_CALL(PlaySound, SOUND_1FE) - EVT_SET(AF_OMO_03, FALSE) - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_SETF(LVar0, MV_TrainPos) - EVT_SETF(LVar1, MV_Unk_0C) - EVT_SETF(LVar2, MV_Unk_0D) - EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(15.0), LVar2) - EVT_CALL(N(SetPlayerStatusPosYaw), LVar0, 50, LVar1, MV_Unk_0D) - EVT_SETF(LVar0, MV_TrainPos) - EVT_SETF(LVar1, MV_Unk_0C) - EVT_SETF(LVar2, MV_Unk_0D) - EVT_ADDF(LVar2, EVT_FLOAT(180.0)) - EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(15.0), LVar2) - EVT_CALL(N(SetNpcPosYaw), -4, LVar0, 50, LVar1, MV_Unk_0D) - EVT_SETF(LVar0, MV_TrainPos) - EVT_SETF(LVar1, MV_Unk_0C) - EVT_SETF(LVar2, MV_Unk_0D) - EVT_IF_LT(LVar2, 180) - EVT_ADDF(LVar2, EVT_FLOAT(90.0)) - EVT_ELSE - EVT_SUBF(LVar2, EVT_FLOAT(90.0)) - EVT_END_IF - EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(20.0), LVar2) - EVT_CALL(N(SetNpcPosYaw), 0, LVar0, 50, LVar1, MV_Unk_0D) - EVT_CASE_EQ(100) - EVT_END_SWITCH - EVT_CALL(TranslateGroup, MODEL_p2, EVT_FLOAT(79.1), EVT_FLOAT(-27.93), EVT_FLOAT(-29.53)) - EVT_CALL(TranslateGroup, MODEL_p3, EVT_FLOAT(-35.1), EVT_FLOAT(-27.93), EVT_FLOAT(-29.53)) - EVT_CALL(RotateGroup, MODEL_p2, EVT_FLOAT(-45.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) - EVT_CALL(RotateGroup, MODEL_p3, EVT_FLOAT(45.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) - EVT_CALL(TranslateGroup, MODEL_p5, EVT_FLOAT(40.5), EVT_FLOAT(-20.0), EVT_FLOAT(-0.4)) - EVT_CALL(TranslateGroup, MODEL_p6, EVT_FLOAT(-39.5), EVT_FLOAT(-20.0), EVT_FLOAT(-0.4)) - EVT_CALL(TranslateGroup, MODEL_popo, MV_TrainPos, EVT_FLOAT(10.0), MV_Unk_0C) - EVT_IF_LT(MV_Unk_0D, 180) - EVT_SETF(LVar1, MV_Unk_0D) - EVT_SUBF(LVar1, EVT_FLOAT(90.0)) - EVT_CALL(RotateGroup, MODEL_popo, LVar1, EVT_FLOAT(0.0), EVT_FLOAT(-1.0), EVT_FLOAT(0.0)) - EVT_ELSE - EVT_SETF(LVar1, MV_Unk_0D) - EVT_SUBF(LVar1, EVT_FLOAT(180.0)) - EVT_SUBF(LVar1, EVT_FLOAT(90.0)) - EVT_CALL(RotateGroup, MODEL_popo, LVar1, EVT_FLOAT(0.0), EVT_FLOAT(-1.0), EVT_FLOAT(0.0)) - EVT_END_IF - EVT_CALL(RotateGroup, MODEL_p2, EVT_FLOAT(45.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) - EVT_CALL(RotateGroup, MODEL_p3, EVT_FLOAT(-45.0), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) - EVT_CALL(TranslateGroup, MODEL_p2, EVT_FLOAT(-79.1), EVT_FLOAT(27.93), EVT_FLOAT(29.53)) - EVT_CALL(TranslateGroup, MODEL_p3, EVT_FLOAT(35.1), EVT_FLOAT(27.93), EVT_FLOAT(29.53)) - EVT_CALL(TranslateGroup, MODEL_p5, EVT_FLOAT(-40.5), EVT_FLOAT(20.0), EVT_FLOAT(0.4)) - EVT_CALL(TranslateGroup, MODEL_p6, EVT_FLOAT(39.5), EVT_FLOAT(20.0), EVT_FLOAT(0.4)) - EVT_IF_LT(MV_Unk_0D, 180) - EVT_CALL(RotateGroup, MODEL_p5, ArrayVar(14), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(-1.0)) - EVT_CALL(RotateGroup, MODEL_p6, ArrayVar(14), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(-1.0)) - EVT_ELSE - EVT_CALL(RotateGroup, MODEL_p5, ArrayVar(14), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) - EVT_CALL(RotateGroup, MODEL_p6, ArrayVar(14), EVT_FLOAT(0.0), EVT_FLOAT(0.0), EVT_FLOAT(1.0)) - EVT_END_IF - EVT_CALL(TranslateGroup, MODEL_p2, EVT_FLOAT(0.0), ArrayVar(15), EVT_FLOAT(0.0)) - EVT_SETF(LVar0, ArrayVar(15)) - EVT_MULF(LVar0, EVT_FLOAT(-1.0)) - EVT_CALL(TranslateGroup, MODEL_p3, EVT_FLOAT(0.0), LVar0, EVT_FLOAT(0.0)) - EVT_SETF(LVar0, ArrayVar(10)) - EVT_IF_LT(LVar0, 1) - EVT_SETF(LVar0, EVT_FLOAT(1.0)) - EVT_END_IF - EVT_ADDF(ArrayVar(16), LVar0) - EVT_IF_GT(ArrayVar(16), 360) - EVT_SUBF(ArrayVar(16), EVT_FLOAT(360.0)) - EVT_END_IF - EVT_CALL(RotateGroup, MODEL_p4, ArrayVar(16), EVT_FLOAT(0.0), EVT_FLOAT(1.0), EVT_FLOAT(0.0)) - EVT_SETF(ArrayVar(11), MV_TrainPos) - EVT_SETF(ArrayVar(12), MV_Unk_0C) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_80244FB8) = { - EVT_LABEL(0) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, 0, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_80245020) = { - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(MakeLerp, 0, LVar1, 45, EASING_LINEAR) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) - EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar2, LVar0, LVar4) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_802450E4) = { - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(MakeLerp, LVar1, 0, 40, EASING_LINEAR) - EVT_LOOP(0) - EVT_CALL(UpdateLerp) - EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) - EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar2, LVar0, LVar4) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LOOP(0) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, 0, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_802451FC) = { - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) - EVT_THREAD - EVT_USE_BUF(LVar0) - EVT_BUF_READ3(LVar1, LVar2, LVar3) - EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(15.0), LVar3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) - EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(0.7)) - EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) - EVT_CALL(SetPlayerPos, LVar1, 50, LVar2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(InterpPlayerYaw, LVar3, 0) - EVT_END_THREAD - EVT_WAIT(5) - EVT_USE_BUF(LVar0) - EVT_BUF_READ3(LVar1, LVar2, LVar3) - EVT_SETF(LVarA, LVar3) - EVT_ADDF(LVar3, EVT_FLOAT(180.0)) - EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(15.0), LVar3) - EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.7)) - EVT_CALL(NpcJump0, NPC_PARTNER, LVar1, 50, LVar2, 10) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(0.5)) - EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar1, LVar2, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVarA, 0) - EVT_WAIT(5) - EVT_USE_BUF(LVar0) - EVT_BUF_READ3(LVar1, LVar2, LVar3) - EVT_SETF(LVarA, LVar3) - EVT_IF_LT(LVar3, 180) - EVT_ADDF(LVar3, EVT_FLOAT(90.0)) - EVT_ELSE - EVT_SUBF(LVar3, EVT_FLOAT(90.0)) - EVT_END_IF - EVT_SETF(LVar4, LVar1) - EVT_SETF(LVar5, LVar2) - EVT_SETF(LVar6, LVar3) - EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(100.0), LVar3) - EVT_CALL(SetNpcSpeed, NPC_Conductor, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainStationToad_Walk) - EVT_CALL(NpcMoveTo, NPC_Conductor, LVar1, LVar2, 0) - EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainStationToad_Idle) - EVT_CALL(AddVectorPolar, LVar4, LVar5, EVT_FLOAT(20.0), LVar6) - EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(0.7)) - EVT_CALL(NpcJump0, NPC_Conductor, LVar4, 50, LVar5, 10) - EVT_CALL(InterpNpcYaw, NPC_Conductor, LVarA, 0) - EVT_CALL(SpeakToPlayer, NPC_Conductor, ANIM_TrainStationToad_Talk, ANIM_TrainStationToad_Idle, 5, MSG_CH4_0009) - EVT_CALL(PlaySound, SOUND_83) - EVT_CALL(SetMusicTrack, 0, SONG_TOYBOX_TRAIN, 0, 8) - EVT_WAIT(10) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_802455FC) = { - EVT_CALL(StopSound, SOUND_83) - EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) - EVT_SETF(LVar0, MV_TrainPos) - EVT_SETF(LVar1, MV_Unk_0C) - EVT_SETF(LVar2, MV_Unk_0D) - EVT_IF_LT(LVar2, 180) - EVT_ADDF(LVar2, EVT_FLOAT(90.0)) - EVT_ELSE - EVT_SUBF(LVar2, EVT_FLOAT(90.0)) - EVT_END_IF - EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(100.0), LVar2) - EVT_THREAD - EVT_CALL(SetNpcJumpscale, NPC_Conductor, EVT_FLOAT(1.0)) - EVT_CALL(NpcJump0, NPC_Conductor, LVar0, 50, LVar1, 10) - EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainStationToad_Walk) - EVT_CALL(SetNpcSpeed, NPC_Conductor, EVT_FLOAT(2.0)) - EVT_USE_BUF(LVar9) - EVT_BUF_READ2(LVar3, LVar4) - EVT_CALL(NpcMoveTo, NPC_Conductor, LVar3, LVar4, 0) - EVT_CALL(SetNpcAnimation, NPC_Conductor, ANIM_TrainStationToad_Idle) - EVT_CALL(InterpNpcYaw, NPC_Conductor, 270, 15) - EVT_CALL(SetNpcFlagBits, NPC_Conductor, NPC_FLAG_40 | NPC_FLAG_100, FALSE) - EVT_END_THREAD - EVT_WAIT(10) - EVT_THREAD - EVT_ADDF(LVar2, EVT_FLOAT(60.0)) - EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(20.0), LVar2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) - EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) - EVT_CALL(PlayerMoveTo, LVar0, LVar1, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_END_THREAD - EVT_WAIT(10) - EVT_SUB(LVar1, 30) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) - EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5)) - EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar1, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802458F8_DF4798) = { - EVT_SWITCH(AB_OMO_6) - EVT_CASE_EQ(0) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_3, TRANSITION_1) - EVT_CASE_EQ(1) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_3, TRANSITION_1) - EVT_CASE_EQ(2) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_2, TRANSITION_1) - EVT_CASE_EQ(3) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_3, TRANSITION_1) - EVT_END_SWITCH - EVT_WAIT(100) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802459B8_DF4858) = { - EVT_SWITCH(AB_OMO_5) - EVT_CASE_RANGE(0, 1) - EVT_SWITCH(AB_OMO_6) - EVT_CASE_EQ(0) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) - EVT_CASE_EQ(1) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) - EVT_CASE_EQ(2) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_1, TRANSITION_1) - EVT_CASE_EQ(3) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_2, TRANSITION_1) - EVT_END_SWITCH - EVT_CASE_EQ(2) - EVT_SWITCH(AB_OMO_6) - EVT_CASE_EQ(0) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) - EVT_CASE_EQ(1) - EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) - EVT_ELSE - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) - EVT_END_IF - EVT_CASE_EQ(3) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_10"), omo_10_ENTRY_2, TRANSITION_1) - EVT_END_SWITCH - EVT_CASE_EQ(3) - EVT_SWITCH(AB_OMO_6) - EVT_CASE_EQ(0) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) - EVT_CASE_EQ(1) - EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_06"), omo_06_ENTRY_2, TRANSITION_1) - EVT_ELSE - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) - EVT_END_IF - EVT_CASE_EQ(2) - EVT_IF_EQ(GF_OMO03_BlueSwitchActivated, TRUE) - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_08"), omo_08_ENTRY_1, TRANSITION_1) - EVT_ELSE - EVT_CALL(GotoMapSpecial, EVT_PTR("omo_03"), omo_03_ENTRY_2, TRANSITION_1) - EVT_END_IF - EVT_END_SWITCH - EVT_END_SWITCH - EVT_WAIT(100) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_80245C5C) = { - EVT_LABEL(10) - EVT_WAIT(1) - EVT_CALL(N(IsAOrBPressed)) - EVT_IF_NE(LVar0, 1) - EVT_GOTO(10) - EVT_END_IF - EVT_IF_EQ(AF_OMO_02, FALSE) - EVT_EXEC_WAIT(N(D_802458F8_DF4798)) - EVT_ELSE - EVT_EXEC_WAIT(N(D_802459B8_DF4858)) - EVT_END_IF - EVT_RETURN - EVT_END -}; +#include "../common/ToyTrain.inc.c" EvtScript N(D_80245CEC_DF4B8C) = { EVT_LABEL(0) @@ -548,11 +40,11 @@ EvtScript N(EVS_EnterTrain) = { EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(omo_17_ENTRY_4) - EVT_SET(MV_Unk_00, 0) - EVT_SET(MV_Unk_01, EVT_PTR(N(EVS_TrainPath_LeftToRight))) - EVT_SET(MV_Unk_02, 0) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(EVS_TrainPath_LeftToRight))) + EVT_SET(MV_TrainUnk_02, 0) EVT_EXEC(N(EVS_Scene_RideTrain)) - EVT_SET(MF_Unk_00, TRUE) + EVT_SET(MF_TrainUnk_00, TRUE) EVT_THREAD EVT_LABEL(10) EVT_IF_LT(MV_TrainPos, 600) @@ -563,11 +55,11 @@ EvtScript N(EVS_EnterTrain) = { EVT_WAIT(100) EVT_END_THREAD EVT_CASE_EQ(omo_17_ENTRY_5) - EVT_SET(MV_Unk_00, 0) - EVT_SET(MV_Unk_01, EVT_PTR(N(EVS_TrainPath_RightToLeft))) - EVT_SET(MV_Unk_02, 0) + EVT_SET(MV_TrainUnk_00, 0) + EVT_SET(MV_TrainUnk_01, EVT_PTR(N(EVS_TrainPath_RightToLeft))) + EVT_SET(MV_TrainUnk_02, 0) EVT_EXEC(N(EVS_Scene_RideTrain)) - EVT_SET(MF_Unk_00, TRUE) + EVT_SET(MF_TrainUnk_00, TRUE) EVT_THREAD EVT_LABEL(20) EVT_IF_GT(MV_TrainPos, -600) diff --git a/src/world/area_omo/omo_17/omo_17_4_npc.c b/src/world/area_omo/omo_17/omo_17_4_npc.c index 58abda5a6f..7b4fa219b7 100644 --- a/src/world/area_omo/omo_17/omo_17_4_npc.c +++ b/src/world/area_omo/omo_17/omo_17_4_npc.c @@ -22,7 +22,7 @@ EvtScript N(EVS_NpcAI_Conductor) = { }; NpcSettings N(NpcSettings_Conductor) = { - .defaultAnim = ANIM_TrainStationToad_Blue_Idle, + .defaultAnim = ANIM_TrainToad_Blue_Idle, .height = 24, .radius = 24, .otherAI = &N(EVS_NpcAuxAI_Conductor), diff --git a/src/world/area_osr/osr_02/osr_02_1_main.c b/src/world/area_osr/osr_02/osr_02_1_main.c index 48c9da5f2a..d6fc3bc232 100644 --- a/src/world/area_osr/osr_02/osr_02_1_main.c +++ b/src/world/area_osr/osr_02/osr_02_1_main.c @@ -107,14 +107,14 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_IF_EQ(GF_KKJ25_Defeated_Bowser, FALSE) EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(-269.16895), EVT_FLOAT(50.0), EVT_FLOAT(100.22), 1, LVar0) - EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(-2.6025392), EVT_FLOAT(50.0), EVT_FLOAT(161.58301), 1, LVar0) - EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(182.14648), EVT_FLOAT(50.0), EVT_FLOAT(158.0332), 1, LVar0) - EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(346.93848), EVT_FLOAT(50.0), EVT_FLOAT(31.861328), 1, LVar0) - EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(291.04492), EVT_FLOAT(86.206055), EVT_FLOAT(-191.08205), 1, LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(-2.6025392), EVT_FLOAT(50.0), EVT_FLOAT(161.583), 1, LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(182.146), EVT_FLOAT(50.0), EVT_FLOAT(158.033), 1, LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(346.938), EVT_FLOAT(50.0), EVT_FLOAT(31.861), 1, LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(291.045), EVT_FLOAT(86.206), EVT_FLOAT(-191.08205), 1, LVar0) EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(-105.39165), EVT_FLOAT(70.0), EVT_FLOAT(-203.115235), 1, LVar0) EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(-52.5), EVT_FLOAT(70.0), EVT_FLOAT(-233.73735), 1, LVar0) EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(52.5), EVT_FLOAT(70.0), EVT_FLOAT(-233.73735), 1, LVar0) - EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(108.2295), EVT_FLOAT(70.0), EVT_FLOAT(-200.6), 1, LVar0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 3, EVT_FLOAT(108.229), EVT_FLOAT(70.0), EVT_FLOAT(-200.6), 1, LVar0) EVT_ELSE EVT_CALL(EnableGroup, MODEL_g116, FALSE) EVT_END_IF diff --git a/src/world/area_osr/osr_02/osr_02_3_npc.c b/src/world/area_osr/osr_02/osr_02_3_npc.c index 70a97929d0..1eaeec0c02 100644 --- a/src/world/area_osr/osr_02/osr_02_3_npc.c +++ b/src/world/area_osr/osr_02/osr_02_3_npc.c @@ -143,7 +143,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, -70, LVar1, 15) EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_pra/common/MapInit_EnableFloorReflection.inc.c b/src/world/area_pra/common/MapInit_EnableFloorReflection.inc.c new file mode 100644 index 0000000000..9cffce230d --- /dev/null +++ b/src/world/area_pra/common/MapInit_EnableFloorReflection.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +s32 N(map_init)(void) { + gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR; + return FALSE; +} diff --git a/src/world/area_pra/pra.h b/src/world/area_pra/pra.h index eb40f973af..62b572eae7 100644 --- a/src/world/area_pra/pra.h +++ b/src/world/area_pra/pra.h @@ -2,24 +2,88 @@ #define _WORLD_AREA_PRA_PRA_H_ enum { - AB_PRA_0 = AreaByte(0), - AB_PRA_1 = AreaByte(1), - AB_PRA_2 = AreaByte(2), - AB_PRA_3 = AreaByte(3), - AB_PRA_4 = AreaByte(4), - AB_PRA_5 = AreaByte(5), - AB_PRA_6 = AreaByte(6), - AB_PRA_7 = AreaByte(7), - AB_PRA_8 = AreaByte(8), - AB_PRA_9 = AreaByte(9), - AB_PRA_A = AreaByte(10), - AB_PRA_B = AreaByte(11), - AB_PRA_C = AreaByte(12), - AB_PRA_D = AreaByte(13), - AB_PRA_E = AreaByte(14), - AB_PRA_F = AreaByte(15), + AB_PRA_Unused_0 = AreaByte(0), + AB_PRA_Unused_1 = AreaByte(1), + AB_PRA_Unused_2 = AreaByte(2), + AB_PRA_Unused_3 = AreaByte(3), + AB_PRA_Unused_4 = AreaByte(4), + AB_PRA_Unused_5 = AreaByte(5), + AB_PRA_Unused_6 = AreaByte(6), + AB_PRA_Unused_7 = AreaByte(7), + AB_PRA_Unused_8 = AreaByte(8), + AB_PRA_Unused_9 = AreaByte(9), + AB_PRA_Unused_A = AreaByte(10), + AB_PRA_Unused_B = AreaByte(11), + AB_PRA_Unused_C = AreaByte(12), + AB_PRA_Unused_D = AreaByte(13), + AB_PRA_Unused_E = AreaByte(14), + AB_PRA_Unused_F = AreaByte(15), }; -#define AF_PRA(index) AreaFlag(index) +extern MapSettings pra_01_settings; +extern MapSettings pra_02_settings; +extern MapSettings pra_03_settings; +extern MapSettings pra_04_settings; +extern MapSettings pra_05_settings; +extern MapSettings pra_06_settings; +extern MapSettings pra_09_settings; +extern MapSettings pra_10_settings; +extern MapSettings pra_11_settings; +extern MapSettings pra_12_settings; +extern MapSettings pra_13_settings; +extern MapSettings pra_14_settings; +extern MapSettings pra_15_settings; +extern MapSettings pra_16_settings; +extern MapSettings pra_18_settings; +extern MapSettings pra_19_settings; +extern MapSettings pra_20_settings; +extern MapSettings pra_21_settings; +extern MapSettings pra_22_settings; +extern MapSettings pra_27_settings; +extern MapSettings pra_28_settings; +extern MapSettings pra_29_settings; +extern MapSettings pra_31_settings; +extern MapSettings pra_32_settings; +extern MapSettings pra_33_settings; +extern MapSettings pra_34_settings; +extern MapSettings pra_35_settings; +extern MapSettings pra_36_settings; +extern MapSettings pra_37_settings; +extern MapSettings pra_38_settings; +extern MapSettings pra_39_settings; +extern MapSettings pra_40_settings; + +s32 pra_01_map_init(void); +s32 pra_02_map_init(void); +s32 pra_03_map_init(void); +s32 pra_04_map_init(void); +s32 pra_05_map_init(void); +s32 pra_06_map_init(void); +s32 pra_09_map_init(void); +s32 pra_10_map_init(void); +s32 pra_11_map_init(void); +s32 pra_12_map_init(void); +s32 pra_13_map_init(void); +s32 pra_14_map_init(void); +s32 pra_15_map_init(void); +s32 pra_16_map_init(void); +s32 pra_18_map_init(void); +s32 pra_19_map_init(void); +s32 pra_20_map_init(void); +s32 pra_21_map_init(void); +s32 pra_22_map_init(void); +s32 pra_27_map_init(void); +s32 pra_28_map_init(void); +s32 pra_29_map_init(void); +s32 pra_31_map_init(void); +s32 pra_32_map_init(void); +s32 pra_33_map_init(void); +s32 pra_34_map_init(void); +s32 pra_35_map_init(void); +s32 pra_36_map_init(void); +s32 pra_37_map_init(void); +s32 pra_38_map_init(void); +s32 pra_39_map_init(void); +s32 pra_40_map_init(void); #endif diff --git a/src/world/area_pra/pra_01/D4D040.c b/src/world/area_pra/pra_01/D4D040.c index 516a5629bd..c27c2a30d4 100644 --- a/src/world/area_pra/pra_01/D4D040.c +++ b/src/world/area_pra/pra_01/D4D040.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "pra_15"; static char* N(exit_str_2) = "pra_02"; static char* N(exit_str_3) = ""; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index e27337f2ff..db383639ab 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -5,7 +5,7 @@ #include "common/UnkFogFunc.inc.c" ApiStatus func_80240F60_D4DFA0(Evt* script, s32 isInitialCall) { - gOverrideFlags &= ~GLOBAL_OVERRIDES_80; + gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; return ApiStatus_DONE2; } diff --git a/src/world/area_pra/pra_02/D4FFF0.c b/src/world/area_pra/pra_02/D4FFF0.c index 2642c4d9ac..392d9c2188 100644 --- a/src/world/area_pra/pra_02/D4FFF0.c +++ b/src/world/area_pra/pra_02/D4FFF0.c @@ -7,4 +7,4 @@ static char* N(exit_str_3) = "pra_13"; static char* N(exit_str_4) = "pra_04"; static char* N(exit_str_5) = ""; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_03/D53CB0.c b/src/world/area_pra/pra_03/D53CB0.c index 8f15d534b1..7d761a4968 100644 --- a/src/world/area_pra/pra_03/D53CB0.c +++ b/src/world/area_pra/pra_03/D53CB0.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "pra_38"; static char* N(exit_str_2) = "pra_09"; static char* N(exit_str_3) = ""; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_04/D54690.c b/src/world/area_pra/pra_04/D54690.c index 38e57eeabc..9cf41ce90e 100644 --- a/src/world/area_pra/pra_04/D54690.c +++ b/src/world/area_pra/pra_04/D54690.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "pra_39"; static char* N(exit_str_2) = "pra_10"; static char* N(exit_str_3) = ""; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_05/D55BB0.c b/src/world/area_pra/pra_05/D55BB0.c index 7e3cb184dd..88b0773723 100644 --- a/src/world/area_pra/pra_05/D55BB0.c +++ b/src/world/area_pra/pra_05/D55BB0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_38"; static char* N(exit_str_1) = ""; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c deleted file mode 100644 index 308f269086..0000000000 --- a/src/world/area_pra/pra_06/D57430.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "pra_06.h" - -ApiStatus func_80240000_D57430(void) { - gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR; - sprintf(wMapShapeName, "pra_05_shape"); - sprintf(wMapHitName, "pra_05_hit"); - return ApiStatus_BLOCK; -} - -const char N(exit_str_0)[] = "pra_39"; - -#include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_06/pra_06.h b/src/world/area_pra/pra_06/pra_06.h index 3cf6b87abe..38dc1aa35e 100644 --- a/src/world/area_pra/pra_06/pra_06.h +++ b/src/world/area_pra/pra_06/pra_06.h @@ -2,8 +2,15 @@ /// @brief Crystal Palace - Shooting Star Room #include "common.h" -#include "../pra.h" #include "message_ids.h" #include "map.h" +#include "../pra.h" +#include "mapfs/pra_05_shape.h" +#include "mapfs/pra_05_hit.h" + #define NAMESPACE pra_06 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_pra/pra_06/pra_06_0_header.c b/src/world/area_pra/pra_06/pra_06_0_header.c new file mode 100644 index 0000000000..b7d15e3c8a --- /dev/null +++ b/src/world/area_pra/pra_06/pra_06_0_header.c @@ -0,0 +1,12 @@ +#include "pra_06.h" + +EntryList N(Entrances) = { + [pra_06_ENTRY_0] { 13.0, 0.0, 75.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_pra_06 }, +}; diff --git a/src/world/area_pra/pra_06/pra_06_1_music.c b/src/world/area_pra/pra_06/pra_06_1_music.c new file mode 100644 index 0000000000..bbb63e87c4 --- /dev/null +++ b/src/world/area_pra/pra_06/pra_06_1_music.c @@ -0,0 +1,8 @@ +#include "pra_06.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_pra/pra_06/pra_06_2_main.c b/src/world/area_pra/pra_06/pra_06_2_main.c new file mode 100644 index 0000000000..945e604497 --- /dev/null +++ b/src/world/area_pra/pra_06/pra_06_2_main.c @@ -0,0 +1,64 @@ +#include "pra_06.h" + +s32 N(map_init)(void) { + gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR; + sprintf(wMapShapeName, "pra_05_shape"); + sprintf(wMapHitName, "pra_05_hit"); + return FALSE; +} + +#include "world/common/atomic/Reflection.inc.c" +#include "world/common/atomic/Reflection.data.inc.c" + +EvtScript N(EVS_ExitDoors_pra_39_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, pra_06_ENTRY_0) + EVT_SET(LVar1, COLLIDER_deilittsw) + EVT_SET(LVar2, MODEL_o772) + EVT_SET(LVar3, MODEL_o768) + EVT_SET(LVar4, MODEL_o844) + EVT_SET(LVar5, MODEL_o846) + EVT_EXEC(ExitSplitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("pra_39"), pra_39_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_39_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittsw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterDoors_0) = { + EVT_SET(LVar0, pra_06_ENTRY_0) + EVT_SET(LVar2, MODEL_o772) + EVT_SET(LVar3, MODEL_o768) + EVT_SET(LVar4, MODEL_o844) + EVT_SET(LVar5, MODEL_o846) + EVT_EXEC_WAIT(EnterSplitDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_SET(LVar0, 1) + EVT_SET(LVar1, GF_PRA_BrokeIllusion) + EVT_EXEC(N(EVS_Reflection_UnkB)) + EVT_EXEC(N(EVS_EnterDoors_0)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_pra/pra_06/pra_06_3_entity.c b/src/world/area_pra/pra_06/pra_06_3_entity.c new file mode 100644 index 0000000000..f1d43ee0a4 --- /dev/null +++ b/src/world/area_pra/pra_06/pra_06_3_entity.c @@ -0,0 +1,7 @@ +#include "pra_06.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_SHOOTING_STAR, 200, 20, 94, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_PRA06_Item_ShootingStar) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_pra/pra_09/D58890.c b/src/world/area_pra/pra_09/D58890.c index c8fdb6a616..0596e68511 100644 --- a/src/world/area_pra/pra_09/D58890.c +++ b/src/world/area_pra/pra_09/D58890.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_03"; static char* N(exit_str_1) = "pra_11"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_10/D5F2B0.c b/src/world/area_pra/pra_10/D5F2B0.c index feb731214a..ac751aef44 100644 --- a/src/world/area_pra/pra_10/D5F2B0.c +++ b/src/world/area_pra/pra_10/D5F2B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_04"; static char* N(exit_str_1) = "pra_12"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_11/D61500.c b/src/world/area_pra/pra_11/D61500.c index 8949f657bc..5992616c17 100644 --- a/src/world/area_pra/pra_11/D61500.c +++ b/src/world/area_pra/pra_11/D61500.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_09"; static char* N(exit_str_1) = ""; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_13/D645E0.c b/src/world/area_pra/pra_13/D645E0.c index 74f1f18efe..d5cff9e662 100644 --- a/src/world/area_pra/pra_13/D645E0.c +++ b/src/world/area_pra/pra_13/D645E0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_02"; static char* N(exit_str_1) = "pra_14"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_14/D67D00.c b/src/world/area_pra/pra_14/D67D00.c index 2ecfc520c1..6d3e52d7cc 100644 --- a/src/world/area_pra/pra_14/D67D00.c +++ b/src/world/area_pra/pra_14/D67D00.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_13"; static char* N(exit_str_1) = ""; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_15/D69810.c b/src/world/area_pra/pra_15/D69810.c deleted file mode 100644 index 2f305be06b..0000000000 --- a/src/world/area_pra/pra_15/D69810.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "pra_15.h" - -static char* N(exit_str_0) = "pra_01"; -static char* N(exit_str_1) = ""; - -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_15/D69830.c b/src/world/area_pra/pra_15/D69830.c deleted file mode 100644 index db3f4e1a4f..0000000000 --- a/src/world/area_pra/pra_15/D69830.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "pra_15.h" - -ApiStatus func_80240020_D69830(Evt* script, s32 isInitialCall) { - gOverrideFlags &= ~GLOBAL_OVERRIDES_80; - return ApiStatus_DONE2; -} diff --git a/src/world/area_pra/pra_15/pra_15.h b/src/world/area_pra/pra_15/pra_15.h index c029ce02f7..2742e088eb 100644 --- a/src/world/area_pra/pra_15/pra_15.h +++ b/src/world/area_pra/pra_15/pra_15.h @@ -2,8 +2,15 @@ /// @brief Crystal Palace - Star Piece Cave #include "common.h" -#include "../pra.h" #include "message_ids.h" #include "map.h" +#include "../pra.h" +#include "mapfs/pra_15_shape.h" +#include "mapfs/pra_15_hit.h" + #define NAMESPACE pra_15 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_pra/pra_15/pra_15_0_header.c b/src/world/area_pra/pra_15/pra_15_0_header.c new file mode 100644 index 0000000000..f433157be8 --- /dev/null +++ b/src/world/area_pra/pra_15/pra_15_0_header.c @@ -0,0 +1,15 @@ +#include "pra_15.h" + +#include "../common/MapInit_EnableFloorReflection.inc.c" + +EntryList N(Entrances) = { + [pra_15_ENTRY_0] { 487.0, -60.0, 106.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_pra_15 }, +}; diff --git a/src/world/area_pra/pra_15/pra_15_1_music.c b/src/world/area_pra/pra_15/pra_15_1_music.c new file mode 100644 index 0000000000..a7a7820004 --- /dev/null +++ b/src/world/area_pra/pra_15/pra_15_1_music.c @@ -0,0 +1,8 @@ +#include "pra_15.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_SHIVER_MOUNTAIN, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_pra/pra_15/pra_15_2_main.c b/src/world/area_pra/pra_15/pra_15_2_main.c new file mode 100644 index 0000000000..494e494b7e --- /dev/null +++ b/src/world/area_pra/pra_15/pra_15_2_main.c @@ -0,0 +1,40 @@ +#include "pra_15.h" + +API_CALLABLE(N(DisableTotalFloorReflections)) { + gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitWalk_pra_01_3) = EVT_EXIT_WALK(60, pra_15_ENTRY_0, "pra_01", pra_01_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_pra_01_3)), 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(pra_15_ENTRY_0) + 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_CRYSTAL_PALACE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1298, SURFACE_TYPE_SNOW) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilie, SURFACE_TYPE_SNOW) + EVT_CALL(N(DisableTotalFloorReflections)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_pra/pra_15/pra_15_3_entity.c b/src/world/area_pra/pra_15/pra_15_3_entity.c new file mode 100644 index 0000000000..0176879323 --- /dev/null +++ b/src/world/area_pra/pra_15/pra_15_3_entity.c @@ -0,0 +1,7 @@ +#include "pra_15.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 395, -60, 120, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_PRA15_Item_StarPiece) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_pra/pra_16/D69B20.c b/src/world/area_pra/pra_16/D69B20.c index 8c3a7918c6..eeba1d03f1 100644 --- a/src/world/area_pra/pra_16/D69B20.c +++ b/src/world/area_pra/pra_16/D69B20.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_02"; static char* N(exit_str_1) = "pra_18"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_18/D6B620.c b/src/world/area_pra/pra_18/D6B620.c index 3f5c74f672..bd7b29ce3d 100644 --- a/src/world/area_pra/pra_18/D6B620.c +++ b/src/world/area_pra/pra_18/D6B620.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_16"; static char* N(exit_str_1) = "pra_33"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_19/D6E9B0.c b/src/world/area_pra/pra_19/D6E9B0.c index e2b77cc3e6..60b1343ea9 100644 --- a/src/world/area_pra/pra_19/D6E9B0.c +++ b/src/world/area_pra/pra_19/D6E9B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_35"; static char* N(exit_str_1) = "pra_20"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_20/D763A0.c b/src/world/area_pra/pra_20/D763A0.c index 388855a174..d29f968dac 100644 --- a/src/world/area_pra/pra_20/D763A0.c +++ b/src/world/area_pra/pra_20/D763A0.c @@ -5,4 +5,4 @@ static char* N(exit_str_1) = "pra_21"; static char* N(exit_str_2) = "pra_29"; static char* N(exit_str_3) = "pra_22"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_21/D77F20.c b/src/world/area_pra/pra_21/D77F20.c index 88a13aeb48..baf2aa683a 100644 --- a/src/world/area_pra/pra_21/D77F20.c +++ b/src/world/area_pra/pra_21/D77F20.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_20"; static char* N(exit_str_1) = "pra_36"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_22/D78880.c b/src/world/area_pra/pra_22/D78880.c index 0a23594db3..979ee6f3c7 100644 --- a/src/world/area_pra/pra_22/D78880.c +++ b/src/world/area_pra/pra_22/D78880.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_20"; static char* N(exit_str_1) = "pra_37"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_29/D7CB50.c b/src/world/area_pra/pra_29/D7CB50.c index 9874f53061..acfdff809c 100644 --- a/src/world/area_pra/pra_29/D7CB50.c +++ b/src/world/area_pra/pra_29/D7CB50.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_20"; static char* N(exit_str_1) = "pra_34"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_32/D86A00.c b/src/world/area_pra/pra_32/D86A00.c index ff4c42c9e9..72e41ee232 100644 --- a/src/world/area_pra/pra_32/D86A00.c +++ b/src/world/area_pra/pra_32/D86A00.c @@ -1,3 +1,3 @@ #include "pra_32.h" -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_32/D86A20.c b/src/world/area_pra/pra_32/D86A20.c index fd31f2b0b5..03908e2c0a 100644 --- a/src/world/area_pra/pra_32/D86A20.c +++ b/src/world/area_pra/pra_32/D86A20.c @@ -6,6 +6,6 @@ static char* N(exit_str_0) = "kmr_23"; static char* N(exit_str_1) = "pra_40"; ApiStatus func_80240814_D87214(Evt* script, s32 isInitialCall) { - gOverrideFlags &= ~GLOBAL_OVERRIDES_80; + gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; return ApiStatus_DONE2; } diff --git a/src/world/area_pra/pra_33/D896E0.c b/src/world/area_pra/pra_33/D896E0.c index ae13066e5a..0ee60867d5 100644 --- a/src/world/area_pra/pra_33/D896E0.c +++ b/src/world/area_pra/pra_33/D896E0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_35"; static char* N(exit_str_1) = "pra_18"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_34/D8B3B0.c b/src/world/area_pra/pra_34/D8B3B0.c index 334e6f6ea7..cf85001ec5 100644 --- a/src/world/area_pra/pra_34/D8B3B0.c +++ b/src/world/area_pra/pra_34/D8B3B0.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_29"; static char* N(exit_str_1) = "pra_31"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_35/D8D250.c b/src/world/area_pra/pra_35/D8D250.c index 1725383208..0300196d9b 100644 --- a/src/world/area_pra/pra_35/D8D250.c +++ b/src/world/area_pra/pra_35/D8D250.c @@ -3,4 +3,4 @@ static char* N(exit_str_0) = "pra_33"; static char* N(exit_str_1) = "pra_19"; -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" +#include "../common/MapInit_EnableFloorReflection.inc.c" diff --git a/src/world/area_pra/pra_40/D999B0.c b/src/world/area_pra/pra_40/D999B0.c deleted file mode 100644 index 59c2786a7d..0000000000 --- a/src/world/area_pra/pra_40/D999B0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "pra_40.h" - -static char* N(exit_str_0) = "pra_31"; -static char* N(exit_str_1) = "pra_32"; - -#include "world/common/todo/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c deleted file mode 100644 index 05cee079cf..0000000000 --- a/src/world/area_pra/pra_40/D999D0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "pra_40.h" - -#include "world/common/atomic/Reflection.inc.c" diff --git a/src/world/area_pra/pra_40/pra_40.h b/src/world/area_pra/pra_40/pra_40.h index 0fb5e5e4d7..f0aa788d7c 100644 --- a/src/world/area_pra/pra_40/pra_40.h +++ b/src/world/area_pra/pra_40/pra_40.h @@ -2,8 +2,15 @@ /// @brief Crystal Palace - Boss Antechamber #include "common.h" -#include "../pra.h" #include "message_ids.h" #include "map.h" +#include "../pra.h" +#include "mapfs/pra_40_shape.h" +#include "mapfs/pra_40_hit.h" + #define NAMESPACE pra_40 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_pra/pra_40/pra_40_0_header.c b/src/world/area_pra/pra_40/pra_40_0_header.c new file mode 100644 index 0000000000..b85d08bab5 --- /dev/null +++ b/src/world/area_pra/pra_40/pra_40_0_header.c @@ -0,0 +1,15 @@ +#include "pra_40.h" + +#include "../common/MapInit_EnableFloorReflection.inc.c" + +EntryList N(Entrances) = { + [pra_40_ENTRY_0] { 13.0, 0.0, 0.0, 90.0 }, + [pra_40_ENTRY_1] { 237.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_pra_40 }, +}; diff --git a/src/world/area_pra/pra_40/pra_40_1_music.c b/src/world/area_pra/pra_40/pra_40_1_music.c new file mode 100644 index 0000000000..b7223d29c8 --- /dev/null +++ b/src/world/area_pra/pra_40/pra_40_1_music.c @@ -0,0 +1,8 @@ +#include "pra_40.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_CRYSTAL_PALACE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_pra/pra_40/pra_40_2_main.c b/src/world/area_pra/pra_40/pra_40_2_main.c new file mode 100644 index 0000000000..693974a5a3 --- /dev/null +++ b/src/world/area_pra/pra_40/pra_40_2_main.c @@ -0,0 +1,52 @@ +#include "pra_40.h" + +#include "world/common/atomic/Reflection.inc.c" +#include "world/common/atomic/Reflection.data.inc.c" + +EvtScript N(EVS_ExitDoors_pra_31_1) = EVT_EXIT_DOUBLE_DOOR(pra_40_ENTRY_0, "pra_31", pra_31_ENTRY_1, COLLIDER_deilitt1, MODEL_o1055, MODEL_o1053); +EvtScript N(EVS_ExitDoors_pra_32_0) = EVT_EXIT_DOUBLE_DOOR(pra_40_ENTRY_1, "pra_32", pra_32_ENTRY_0, COLLIDER_deilitt2, MODEL_o880, MODEL_o878); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_31_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilitt1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_32_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilitt2, 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_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(pra_40_ENTRY_0) + EVT_SET(LVar2, MODEL_o1055) + EVT_SET(LVar3, MODEL_o1053) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(pra_40_ENTRY_1) + EVT_SET(LVar2, MODEL_o880) + EVT_SET(LVar3, MODEL_o878) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_END_SWITCH + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_CRYSTAL_PALACE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 24, 24, 40) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + 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_pra/pra_40/pra_40_3_entity.c b/src/world/area_pra/pra_40/pra_40_3_entity.c new file mode 100644 index 0000000000..85aad0cc3e --- /dev/null +++ b/src/world/area_pra/pra_40/pra_40_3_entity.c @@ -0,0 +1,9 @@ +#include "pra_40.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 165, 60, -50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 85, 60, -50, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c index 132437955d..85bedd232a 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c +++ b/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c @@ -5,7 +5,7 @@ #include "world/common/atomic/UnkFunc27.inc.c" API_CALLABLE(N(HideSun)) { - EffectInstance* effect = (EffectInstance*)evt_get_variable(script, MapVar(0)); + EffectInstance* effect = (EffectInstance*)evt_get_variable(script, MV_Unk_00); effect->data.sun->targetAlpha = 0; return ApiStatus_DONE2; @@ -203,7 +203,7 @@ EvtScript N(EVS_SandRingClone_Vanish) = { EVT_CALL(EnableModel, CLONED_MODEL(0), TRUE) EVT_SET(LVar0, 0) EVT_SET(LVar2, 100) - EVT_SETF(LVar3, EVT_FLOAT(0.9091)) + EVT_SETF(LVar3, EVT_FLOAT(0.909)) EVT_LOOP(20) EVT_CALL(ScaleModel, CLONED_MODEL(0), LVar3, EVT_FLOAT(1.0), LVar3) EVT_WAIT(1) diff --git a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c index 5249eb9f9a..bcf3e02b85 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c +++ b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c @@ -1,7 +1,7 @@ #include "sbk_30.h" -#include "world/common/enemy/ai/StationaryAI.inc.c" +#include "world/common/enemy/ai/GuardAI.inc.c" NpcSettings N(NpcSettings_Kolorado) = { .height = 40, diff --git a/src/world/area_trd/trd_01/trd_01_3_npc.c b/src/world/area_trd/trd_01/trd_01_3_npc.c index 7876c209a5..86c45f7ae8 100644 --- a/src/world/area_trd/trd_01/trd_01_3_npc.c +++ b/src/world/area_trd/trd_01/trd_01_3_npc.c @@ -5,7 +5,7 @@ MAP_RODATA_PAD(1, pad); extern EvtScript N(EVS_FocusCamOnLock); #include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" -#include "world/common/enemy/complete/Bobomb_Stationary.inc.c" +#include "world/common/enemy/complete/Bobomb_Guard.inc.c" API_CALLABLE(N(SetNewWanderCenterPos)) { Enemy* owner1 = script->owner1.enemy; @@ -222,7 +222,7 @@ StaticNpc N(NpcData_KoopaTroopa_03) = { StaticNpc N(NpcData_Bobomb) = { .id = NPC_Bobomb, - .settings = &N(NpcSettings_Bobomb_Stationary), + .settings = &N(NpcSettings_Bobomb_Guard), .pos = { -255.0f, 640.0f, 35.0f }, .yaw = 180, .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index 0893d902be..4940ebee26 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -280,12 +280,12 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -10) EVT_ADD(LVar2, -5) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 10) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(EnableModel, MODEL_o101, FALSE) @@ -316,7 +316,7 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) EVT_WAIT(5) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_9) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_HURT) EVT_WAIT(15) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_WAIT(5) diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index 3df5b026a5..06cf72d9cc 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -329,11 +329,11 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) EVT_CALL(SetPanTarget, CAM_DEFAULT, 27, 0, 30) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(NpcMoveTo, NPC_PARTNER, -21, 47, 10) EVT_CALL(NpcMoveTo, NPC_PARTNER, 50, 35, 15) EVT_CALL(NpcMoveTo, NPC_PARTNER, 73, 22, 10) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(GetAngleToNPC, NPC_Bombette, LVar0) EVT_CALL(InterpPlayerYaw, LVar0, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 0) diff --git a/src/world/area_trd/trd_09/trd_09_3_npcs.c b/src/world/area_trd/trd_09/trd_09_3_npc.c similarity index 100% rename from src/world/area_trd/trd_09/trd_09_3_npcs.c rename to src/world/area_trd/trd_09/trd_09_3_npc.c diff --git a/src/world/common/atomic/CreateDarkness.inc.c b/src/world/common/atomic/CreateDarkness.inc.c index 0c9e3a9996..75b7381a69 100644 --- a/src/world/common/atomic/CreateDarkness.inc.c +++ b/src/world/common/atomic/CreateDarkness.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(DarkRoomUpdate)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DarkRoomUpdate)) { PlayerStatus* playerStatus = &gPlayerStatus; PlayerData* playerData = &gPlayerData; diff --git a/src/world/common/atomic/QuizmoData.inc.c b/src/world/common/atomic/QuizmoData.inc.c index 950990b644..c8403d262d 100644 --- a/src/world/common/atomic/QuizmoData.inc.c +++ b/src/world/common/atomic/QuizmoData.inc.c @@ -157,7 +157,7 @@ EvtScript N(EVS_Quizmo_MovePartnerToPodium) = { EVT_END_THREAD EVT_CALL(N(Quizmo_SpinPartner)) EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_RETURN EVT_END }; @@ -402,9 +402,9 @@ EvtScript N(EVS_Quizmo_ReturnPlayerToOriginalPos) = { EVT_ADDF(LVar2, LVar0) EVT_SETF(LVar3, ArrayVar(3)) EVT_ADDF(LVar3, LVar1) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar2, LVar3, 40) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_END_THREAD EVT_CALL(PlayerMoveTo, ArrayVar(1), ArrayVar(3), 40) EVT_RETURN @@ -476,7 +476,7 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_100, TRUE) EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_EXEC_GET_TID(N(EVS_Quizmo_SetCharacterPositons), LVar1) EVT_CALL(ContinueSpeech, -1, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000B) EVT_CALL(PlaySound, 137) diff --git a/src/world/common/atomic/Reflection.data.inc.c b/src/world/common/atomic/Reflection.data.inc.c new file mode 100644 index 0000000000..f2f2d65d7d --- /dev/null +++ b/src/world/common/atomic/Reflection.data.inc.c @@ -0,0 +1,42 @@ +#include "common.h" + +EvtScript N(EVS_Reflection_UnkA) = { + EVT_CALL(GetEntryID, LVarA) + EVT_IF_EQ(LVarA, LVar1) + EVT_SET(LVar0, 2) + EVT_END_IF + EVT_IF_EQ(LVarA, LVar2) + EVT_SET(LVar0, 2) + EVT_END_IF + EVT_IF_EQ(LVarA, LVar3) + EVT_SET(LVar0, 2) + EVT_END_IF + EVT_IF_EQ(LVarA, LVar4) + EVT_SET(LVar0, 2) + EVT_END_IF + EVT_IF_EQ(LVarA, LVar5) + EVT_SET(LVar0, 2) + EVT_END_IF + EVT_IF_EQ(LVarA, LVar6) + EVT_SET(LVar0, 2) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Reflection_UnkB) = { + EVT_MALLOC_ARRAY(16, LVarA) + EVT_IF_EQ(LVar1, 0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(N(EnableWallReflection)) + EVT_CASE_EQ(1) + EVT_CASE_EQ(2) + EVT_CALL(N(EnableWallReflection)) + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(N(EnableFloorReflection), LVar0) + EVT_CALL(N(EnablePartnerReflection), LVar0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/atomic/Reflection.inc.c b/src/world/common/atomic/Reflection.inc.c index a33457a0c2..ba7bc35c00 100644 --- a/src/world/common/atomic/Reflection.inc.c +++ b/src/world/common/atomic/Reflection.inc.c @@ -142,7 +142,7 @@ API_CALLABLE(N(EnableFloorReflection)){ case REFLECTION_FLOOR_WALL: case REFLECTION_FLOOR: script->array[0] = create_worker_world(NULL, N(worker_reflect_player_floor)); - gOverrideFlags |= GLOBAL_OVERRIDES_80; + gOverrideFlags |= GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; break; case REFLECTION_WALL: break; @@ -396,26 +396,3 @@ void N(worker_reflect_partner_wall)(void) { partner->flags |= NPC_FLAG_REFLECT_WALL; } } - -// TODO: scripts in this include, e.g. the following. -// Requires most of area_pra to have its data decomped. - -/* -#new:EvtScript $Script_802415D0 -{ - 0: NewArray 00000010 *VarA - 10: If *Var1 == 00000000 - 20: Switch *Var0 - 2C: Case == 00000000 - 38: Call $Function_802400EC ( ) // EnableWallReflection - 44: Case == 00000001 - 50: Case == 00000002 - 5C: Call $Function_802400EC ( ) // EnableWallReflection - 68: EndSwitch - 70: EndIf - 78: Call $Function_8024049C ( *Var0 ) // EnableFloorReflection - 88: Call $Function_80240D3C ( *Var0 ) // EnablePartnerReflection - 98: Return - A0: End -} -*/ diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index c617791496..a4399305ca 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -660,7 +660,7 @@ EvtScript N(EVS_Quizmo_MovePartnerToPodium) = { EVT_END_THREAD EVT_CALL(N(Quizmo_SpinPartner)) EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_RETURN EVT_END }; @@ -905,9 +905,9 @@ EvtScript N(EVS_Quizmo_ReturnPlayerToOriginalPos) = { EVT_ADDF(LVar2, LVar0) EVT_SETF(LVar3, QUIZ_ARRAY_ORIGIN_Z) EVT_ADDF(LVar3, LVar1) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar2, LVar3, 40) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_END_THREAD EVT_CALL(PlayerMoveTo, QUIZ_ARRAY_ORIGIN_X, QUIZ_ARRAY_ORIGIN_Z, 40) EVT_RETURN @@ -979,7 +979,7 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_100, TRUE) EVT_CALL(SetNpcFlagBits, CHUCK_QUIZMO_NPC_ID, NPC_FLAG_100, TRUE) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_EXEC_GET_TID(N(EVS_Quizmo_SetCharacterPositons), LVar1) EVT_CALL(ContinueSpeech, -1, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000B) EVT_CALL(PlaySound, 137) diff --git a/src/world/common/enemy/ai/UnkFloAI.inc.c b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c similarity index 93% rename from src/world/common/enemy/ai/UnkFloAI.inc.c rename to src/world/common/enemy/ai/AvoidPlayerAI.inc.c index 8c0869728b..622b944f85 100644 --- a/src/world/common/enemy/ai/UnkFloAI.inc.c +++ b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c @@ -5,7 +5,7 @@ #include "dead_structs.h" #endif -void N(UnkFloAI_ChaseInit)(Evt* script, MobileAISettings* npcAISettings, EnemyDetectVolume* territory) { +void N(AvoidPlayerAI_ChaseInit)(Evt* script, MobileAISettings* npcAISettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -122,7 +122,7 @@ void N(UnkFloAI_ChaseInit)(Evt* script, MobileAISettings* npcAISettings, EnemyDe script->AI_TEMP_STATE = AI_STATE_CHASE; } -void N(UnkFloAI_Chase)(Evt* script, MobileAISettings* npcAISettings, EnemyDetectVolume* territory) { +void N(AvoidPlayerAI_Chase)(Evt* script, MobileAISettings* npcAISettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 emoteTemp; @@ -149,7 +149,7 @@ void N(UnkFloAI_Chase)(Evt* script, MobileAISettings* npcAISettings, EnemyDetect } } -void N(UnkFloAI_LosePlayer)(Evt* script, MobileAISettings* npcAISettings, EnemyDetectVolume* territory) { +void N(AvoidPlayerAI_LosePlayer)(Evt* script, MobileAISettings* npcAISettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -159,7 +159,7 @@ void N(UnkFloAI_LosePlayer)(Evt* script, MobileAISettings* npcAISettings, EnemyD } } -ApiStatus N(UnkFloAI_Main)(Evt* script, s32 isInitialCall) { +ApiStatus N(AvoidPlayerAI_Main)(Evt* script, s32 isInitialCall) { #ifdef _DEAD_H_ DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; #else @@ -224,12 +224,12 @@ ApiStatus N(UnkFloAI_Main)(Evt* script, s32 isInitialCall) { basic_ai_found_player_jump(script, npcAISettings, territoryPtr); break; case AI_STATE_CHASE_INIT: - N(UnkFloAI_ChaseInit)(script, npcAISettings, territoryPtr); + N(AvoidPlayerAI_ChaseInit)(script, npcAISettings, territoryPtr); case AI_STATE_CHASE: - N(UnkFloAI_Chase)(script, npcAISettings, territoryPtr); + N(AvoidPlayerAI_Chase)(script, npcAISettings, territoryPtr); break; case AI_STATE_LOSE_PLAYER: - N(UnkFloAI_LosePlayer)(script, npcAISettings, territoryPtr); + N(AvoidPlayerAI_LosePlayer)(script, npcAISettings, territoryPtr); break; case AI_STATE_SUSPEND: basic_ai_suspend(script); diff --git a/src/world/common/enemy/ai/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c index 68d82f0ff8..4738ee0fee 100644 --- a/src/world/common/enemy/ai/BulletBillAI.inc.c +++ b/src/world/common/enemy/ai/BulletBillAI.inc.c @@ -36,7 +36,7 @@ static s32 N(BillBlasterAI_GetIdleBulletNpcID)(void) { return -1; } -ApiStatus N(BulletBillAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(BulletBillAI_Main)) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); MobileAISettings* aiSettings = (MobileAISettings*)evt_get_variable(script, *script->ptrReadPos); @@ -150,7 +150,7 @@ ApiStatus N(BulletBillAI_Main)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(BillBlasterAI_Main)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(BillBlasterAI_Main)) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -211,7 +211,7 @@ ApiStatus N(BillBlasterAI_Main)(Evt* script, s32 isInitialCall) { npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; bulletEnemy = get_enemy(enemy->AI_VAR_BLASTER_BULLET); bulletEnemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_PRE; - ai_enemy_play_sound(npc, SOUND_328, 0x200000); + ai_enemy_play_sound(npc, SOUND_328, SOUND_PARAM_MORE_QUIET); npc->duration = 5; script->AI_TEMP_STATE = AI_STATE_BLASTER_COOLDOWN; // fallthrough diff --git a/src/world/common/enemy/ai/StationaryAI.inc.c b/src/world/common/enemy/ai/GuardAI.inc.c similarity index 75% rename from src/world/common/enemy/ai/StationaryAI.inc.c rename to src/world/common/enemy/ai/GuardAI.inc.c index 198d33808d..808599066a 100644 --- a/src/world/common/enemy/ai/StationaryAI.inc.c +++ b/src/world/common/enemy/ai/GuardAI.inc.c @@ -8,23 +8,23 @@ // - omo_02 (unused) // custom states for this AI -enum AiStateStationary { - AI_STATE_STATIONARY_IDLE_INIT = 0, - AI_STATE_STATIONARY_IDLE = 1, - AI_STATE_STATIONARY_RETURN_HOME_INIT = 15, - AI_STATE_STATIONARY_RETURN_HOME = 16 +enum AiStateGuard { + AI_STATE_GUARD_IDLE_INIT = 0, + AI_STATE_GUARD_IDLE = 1, + AI_STATE_GUARD_RETURN_HOME_INIT = 15, + AI_STATE_GUARD_RETURN_HOME = 16 }; #include "common.h" #include "npc.h" #include "effects.h" -void N(StationaryAI_IdleInit)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { +void N(GuardAI_IdleInit)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - script->AI_TEMP_STATE = AI_STATE_STATIONARY_IDLE; + script->AI_TEMP_STATE = AI_STATE_GUARD_IDLE; if (enemy->flags & ENEMY_FLAG_100000) { npc->yaw = enemy->varTable[0]; @@ -37,14 +37,14 @@ void N(StationaryAI_IdleInit)(Evt* script, StationaryAISettings* aiSettings, Ene } } -void N(StationaryAI_Idle)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { +void N(GuardAI_Idle)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 emoteTemp; if (aiSettings->playerSearchInterval >= 0 && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); if (!(enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER)) { @@ -55,7 +55,7 @@ void N(StationaryAI_Idle)(Evt* script, StationaryAISettings* aiSettings, EnemyDe } } -void N(StationaryAI_AlertInit)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { +void N(GuardAI_AlertInit)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* territory) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->jumpVelocity = 10.0f; @@ -65,7 +65,7 @@ void N(StationaryAI_AlertInit)(Evt* script, StationaryAISettings* aiSettings, En script->AI_TEMP_STATE = AI_STATE_ALERT; } -void N(StationaryAI_Alert)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { +void N(GuardAI_Alert)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* territory) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->pos.y += npc->jumpVelocity; @@ -79,7 +79,7 @@ void N(StationaryAI_Alert)(Evt* script, StationaryAISettings* aiSettings, EnemyD } } -void N(StationaryAI_ChaseInit)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { +void N(GuardAI_ChaseInit)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 tempAngle; @@ -106,7 +106,7 @@ void N(StationaryAI_ChaseInit)(Evt* script, StationaryAISettings* aiSettings, En script->AI_TEMP_STATE = AI_STATE_CHASE; } -void N(StationaryAI_Chase)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* arg2) { +void N(GuardAI_Chase)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* arg2) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 emoteTemp; @@ -126,16 +126,16 @@ void N(StationaryAI_Chase)(Evt* script, StationaryAISettings* aiSettings, EnemyD } } -void N(StationaryAI_LosePlayer)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { +void N(GuardAI_LosePlayer)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* territory) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; if (npc->duration == 0) { - script->AI_TEMP_STATE = AI_STATE_STATIONARY_RETURN_HOME_INIT; + script->AI_TEMP_STATE = AI_STATE_GUARD_RETURN_HOME_INIT; } } -void N(StationaryAI_ReturnHomeInit)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { +void N(GuardAI_ReturnHomeInit)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -146,10 +146,10 @@ void N(StationaryAI_ReturnHomeInit)(Evt* script, StationaryAISettings* aiSetting npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; } script->functionTemp[1] = 0; - script->AI_TEMP_STATE = AI_STATE_STATIONARY_RETURN_HOME; + script->AI_TEMP_STATE = AI_STATE_GUARD_RETURN_HOME; } -void N(StationaryAI_ReturnHome)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { +void N(GuardAI_ReturnHome)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 emoteTemp; @@ -176,7 +176,7 @@ void N(StationaryAI_ReturnHome)(Evt* script, StationaryAISettings* aiSettings, E npc->pos.x = enemy->territory->wander.centerPos.x; npc->pos.z = enemy->territory->wander.centerPos.z; npc->yaw = enemy->territory->wander.wanderSize.x; - script->AI_TEMP_STATE = AI_STATE_STATIONARY_IDLE_INIT; + script->AI_TEMP_STATE = AI_STATE_GUARD_IDLE_INIT; } if (npc->turnAroundYawAdjustment == 0) { @@ -185,13 +185,13 @@ void N(StationaryAI_ReturnHome)(Evt* script, StationaryAISettings* aiSettings, E } } -ApiStatus N(StationaryAI_Main)(Evt* script, s32 isInitialCall) { +ApiStatus N(GuardAI_Main)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); EnemyDetectVolume territory; EnemyDetectVolume* territoryPtr = &territory; - StationaryAISettings* aiSettings = (StationaryAISettings*)evt_get_variable(script, *args++); + GuardAISettings* aiSettings = (GuardAISettings*)evt_get_variable(script, *args++); territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; @@ -203,7 +203,7 @@ ApiStatus N(StationaryAI_Main)(Evt* script, s32 isInitialCall) { territory.detectFlags = 0; if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { - script->AI_TEMP_STATE = AI_STATE_STATIONARY_IDLE_INIT; + script->AI_TEMP_STATE = AI_STATE_GUARD_IDLE_INIT; npc->duration = 0; enemy->varTable[0] = npc->yaw; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -228,32 +228,32 @@ ApiStatus N(StationaryAI_Main)(Evt* script, s32 isInitialCall) { } switch (script->AI_TEMP_STATE) { - case AI_STATE_STATIONARY_IDLE_INIT: - N(StationaryAI_IdleInit)(script, aiSettings, territoryPtr); - case AI_STATE_STATIONARY_IDLE: - N(StationaryAI_Idle)(script, aiSettings, territoryPtr); + case AI_STATE_GUARD_IDLE_INIT: + N(GuardAI_IdleInit)(script, aiSettings, territoryPtr); + case AI_STATE_GUARD_IDLE: + N(GuardAI_Idle)(script, aiSettings, territoryPtr); break; case AI_STATE_ALERT_INIT: - N(StationaryAI_AlertInit)(script, aiSettings, territoryPtr); + N(GuardAI_AlertInit)(script, aiSettings, territoryPtr); case AI_STATE_ALERT: - N(StationaryAI_Alert)(script, aiSettings, territoryPtr); + N(GuardAI_Alert)(script, aiSettings, territoryPtr); break; case AI_STATE_CHASE_INIT: - N(StationaryAI_ChaseInit)(script, aiSettings, territoryPtr); + N(GuardAI_ChaseInit)(script, aiSettings, territoryPtr); case AI_STATE_CHASE: - N(StationaryAI_Chase)(script, aiSettings, territoryPtr); + N(GuardAI_Chase)(script, aiSettings, territoryPtr); break; case AI_STATE_LOSE_PLAYER: - N(StationaryAI_LosePlayer)(script, aiSettings, territoryPtr); + N(GuardAI_LosePlayer)(script, aiSettings, territoryPtr); break; - case AI_STATE_STATIONARY_RETURN_HOME_INIT: - N(StationaryAI_ReturnHomeInit)(script, aiSettings, territoryPtr); - case AI_STATE_STATIONARY_RETURN_HOME: - N(StationaryAI_ReturnHome)(script, aiSettings, territoryPtr); + case AI_STATE_GUARD_RETURN_HOME_INIT: + N(GuardAI_ReturnHomeInit)(script, aiSettings, territoryPtr); + case AI_STATE_GUARD_RETURN_HOME: + N(GuardAI_ReturnHome)(script, aiSettings, territoryPtr); break; case AI_STATE_SUSPEND: diff --git a/src/world/common/enemy/complete/AmazyDayzee.inc.c b/src/world/common/enemy/complete/AmazyDayzee.inc.c index 8099f34d0a..110765e879 100644 --- a/src/world/common/enemy/complete/AmazyDayzee.inc.c +++ b/src/world/common/enemy/complete/AmazyDayzee.inc.c @@ -1,6 +1,6 @@ #include "AmazyDayzee.h" -#include "world/common/enemy/ai/UnkFloAI.inc.c" +#include "world/common/enemy/ai/AvoidPlayerAI.inc.c" MobileAISettings N(AISettings_AmazyDayzee) = { .moveSpeed = 1.5f, @@ -18,7 +18,7 @@ MobileAISettings N(AISettings_AmazyDayzee) = { }; EvtScript N(EVS_NpcAI_AmazyDayzee) = { - EVT_CALL(N(UnkFloAI_Main), EVT_PTR(N(AISettings_AmazyDayzee))) + EVT_CALL(N(AvoidPlayerAI_Main), EVT_PTR(N(AISettings_AmazyDayzee))) EVT_RETURN EVT_END }; diff --git a/src/world/common/enemy/complete/Bobomb_Guard.inc.c b/src/world/common/enemy/complete/Bobomb_Guard.inc.c new file mode 100644 index 0000000000..0e386a7255 --- /dev/null +++ b/src/world/common/enemy/complete/Bobomb_Guard.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "Bobomb.h" + +#include "world/common/enemy/ai/GuardAI.inc.c" + +GuardAISettings N(AISettings_Bobomb_Guard) = { + .alertRadius = 110.0f, + .alertOffsetDist = 65.0f, + .playerSearchInterval = 8, + .chaseSpeed = 3.4f, + .chaseTurnRate = 120, + .chaseUpdateInterval = 2, + .chaseRadius = 110.0f, + .chaseOffsetDist = 65.0f, + .unk_AI_20 = 1, +}; + +EvtScript N(EVS_NpcAI_Bobomb_Guard) = { + EVT_CALL(N(GuardAI_Main), EVT_PTR(N(AISettings_Bobomb_Guard))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Bobomb_Guard) = { + .height = 23, + .radius = 20, + .level = 6, + .ai = &N(EVS_NpcAI_Bobomb_Guard), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/Bobomb_Stationary.inc.c b/src/world/common/enemy/complete/Bobomb_Stationary.inc.c deleted file mode 100644 index 5d34d8d6b1..0000000000 --- a/src/world/common/enemy/complete/Bobomb_Stationary.inc.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "common.h" -#include "Bobomb.h" - -#include "world/common/enemy/ai/StationaryAI.inc.c" - -StationaryAISettings N(AISettings_Bobomb_Stationary) = { - .unk_00 = 110.0f, - .unk_04 = 65.0f, - .playerSearchInterval = 8, - .chaseSpeed = 3.4f, - .chaseTurnRate = 120, - .chaseUpdateInterval = 2, - .chaseRadius = 110.0f, - .chaseOffsetDist = 65.0f, - .unk_20 = 1, -}; - -EvtScript N(EVS_NpcAI_Bobomb_Stationary) = { - EVT_CALL(N(StationaryAI_Main), EVT_PTR(N(AISettings_Bobomb_Stationary))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_Bobomb_Stationary) = { - .height = 23, - .radius = 20, - .level = 6, - .ai = &N(EVS_NpcAI_Bobomb_Stationary), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; diff --git a/src/world/common/enemy/complete/GoombaBros_Guard.inc.c b/src/world/common/enemy/complete/GoombaBros_Guard.inc.c new file mode 100644 index 0000000000..a5c8eed430 --- /dev/null +++ b/src/world/common/enemy/complete/GoombaBros_Guard.inc.c @@ -0,0 +1,28 @@ +#include "GoombaBros.h" + +#include "world/common/enemy/ai/GuardAI.inc.c" + +GuardAISettings N(AISettings_GoombaBros_Guard) = { + .alertRadius = 130.0f, + .playerSearchInterval = 1, + .chaseSpeed = 2.5f, + .chaseTurnRate = 180, + .chaseUpdateInterval = 3, + .chaseRadius = 150.0f, + .unk_AI_20 = 1, +}; + +EvtScript N(EVS_NpcAI_GoombaBros_Guard) = { + EVT_CALL(N(GuardAI_Main), EVT_PTR(N(AISettings_GoombaBros_Guard))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_GoombaBros_Guard) = { + .height = 20, + .radius = 23, + .level = 5, + .ai = &N(EVS_NpcAI_GoombaBros_Guard), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/GoombaBros_Stationary.inc.c b/src/world/common/enemy/complete/GoombaBros_Stationary.inc.c deleted file mode 100644 index e10af058d9..0000000000 --- a/src/world/common/enemy/complete/GoombaBros_Stationary.inc.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "GoombaBros.h" - -#include "world/common/enemy/ai/StationaryAI.inc.c" - -StationaryAISettings N(AISettings_GoombaBros_Stationary) = { - .unk_00 = 130.0f, - .playerSearchInterval = 1, - .chaseSpeed = 2.5f, - .chaseTurnRate = 180, - .chaseUpdateInterval = 3, - .chaseRadius = 150.0f, - .unk_20 = 1, -}; - -EvtScript N(EVS_NpcAI_GoombaBros_Stationary) = { - EVT_CALL(N(StationaryAI_Main), EVT_PTR(N(AISettings_GoombaBros_Stationary))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_GoombaBros_Stationary) = { - .height = 20, - .radius = 23, - .level = 5, - .ai = &N(EVS_NpcAI_GoombaBros_Stationary), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; diff --git a/src/world/common/enemy/complete/Kammy.inc.c b/src/world/common/enemy/complete/Kammy.inc.c new file mode 100644 index 0000000000..15ec37d4fd --- /dev/null +++ b/src/world/common/enemy/complete/Kammy.inc.c @@ -0,0 +1,9 @@ +#include "Kammy.h" + +NpcSettings N(NpcSettings_Kammy) = { + .height = 34, + .radius = 24, + .level = 26, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/Koopatrol_Stationary.inc.c b/src/world/common/enemy/complete/Koopatrol_Stationary.inc.c new file mode 100644 index 0000000000..c8265c80ae --- /dev/null +++ b/src/world/common/enemy/complete/Koopatrol_Stationary.inc.c @@ -0,0 +1,7 @@ +#include "Koopatrol.h" + +NpcSettings N(NpcSettings_Koopatrol_Stationary) = { + .height = 40, + .radius = 24, + .level = 25, +}; diff --git a/src/world/common/enemy/complete/Pokey.inc.c b/src/world/common/enemy/complete/Pokey.inc.c index b412103267..4821c2a379 100644 --- a/src/world/common/enemy/complete/Pokey.inc.c +++ b/src/world/common/enemy/complete/Pokey.inc.c @@ -1,6 +1,9 @@ #include "Pokey.h" -#include "world/common/todo/SetInstigatorValue_3.inc.c" +API_CALLABLE(N(SetPokeyInstigatorValue)) { + script->owner1.enemy->instigatorValue = 3; + return ApiStatus_DONE2; +} MobileAISettings N(AISettings_Pokey) = { .moveSpeed = 1.8f, @@ -16,7 +19,7 @@ MobileAISettings N(AISettings_Pokey) = { }; EvtScript N(EVS_NpcAI_Pokey) = { - EVT_CALL(N(SetInstigatorValue_3)) + EVT_CALL(N(SetPokeyInstigatorValue)) EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Pokey))) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/complete/PyroGuy.inc.c b/src/world/common/enemy/complete/PyroGuy.inc.c index 414cbd3a4c..252aa4dd69 100644 --- a/src/world/common/enemy/complete/PyroGuy.inc.c +++ b/src/world/common/enemy/complete/PyroGuy.inc.c @@ -1,6 +1,6 @@ #include "PyroGuy.h" -MobileAISettings N(D_8024608C_DF4F2C) = { +MobileAISettings N(AISettings_PyroGuy) = { .moveSpeed = 3.0f, .moveTime = 30, .waitTime = 60, @@ -16,7 +16,7 @@ MobileAISettings N(D_8024608C_DF4F2C) = { }; EvtScript N(EVS_NpcAI_PyroGuy) = { - EVT_CALL(BasicAI_Main, EVT_PTR(N(D_8024608C_DF4F2C))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_PyroGuy))) EVT_RETURN EVT_END }; diff --git a/src/world/common/enemy/complete/Sentinel.inc.c b/src/world/common/enemy/complete/Sentinel.inc.c index d9426d3bf6..dfa310ccca 100644 --- a/src/world/common/enemy/complete/Sentinel.inc.c +++ b/src/world/common/enemy/complete/Sentinel.inc.c @@ -67,7 +67,7 @@ EvtScript N(EVS_NpcAI_Sentinel) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_HURT) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_TALK) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) diff --git a/src/world/common/enemy/complete/ShyGuy.h b/src/world/common/enemy/complete/ShyGuy.h index 4496112a72..ed79630293 100644 --- a/src/world/common/enemy/complete/ShyGuy.h +++ b/src/world/common/enemy/complete/ShyGuy.h @@ -27,6 +27,8 @@ .maxCoinBonus = 2, \ } +// standard shy guys + #define RED_SHY_GUY_ANIMS \ { \ .idle = ANIM_ShyGuy_Red_Anim01, \ @@ -126,3 +128,105 @@ .anim_E = ANIM_ShyGuy_Yellow_Anim01, \ .anim_F = ANIM_ShyGuy_Yellow_Anim01, \ } + +// shy guys who avoid the player + +#define RED_AVOID_SHY_GUY_ANIMS \ +{ \ + .idle = ANIM_ShyGuy_Red_Anim01, \ + .walk = ANIM_ShyGuy_Red_Anim02, \ + .run = ANIM_ShyGuy_Red_Anim04, \ + .chase = ANIM_ShyGuy_Red_Anim04, \ + .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, \ +} + +#define BLUE_AVOID_SHY_GUY_ANIMS \ +{ \ + .idle = ANIM_ShyGuy_Blue_Anim01, \ + .walk = ANIM_ShyGuy_Blue_Anim02, \ + .run = ANIM_ShyGuy_Blue_Anim04, \ + .chase = ANIM_ShyGuy_Blue_Anim04, \ + .anim_4 = ANIM_ShyGuy_Blue_Anim01, \ + .anim_5 = ANIM_ShyGuy_Blue_Anim01, \ + .death = ANIM_ShyGuy_Blue_Anim0C, \ + .hit = ANIM_ShyGuy_Blue_Anim0C, \ + .anim_8 = ANIM_ShyGuy_Blue_Anim15, \ + .anim_9 = ANIM_ShyGuy_Blue_Anim12, \ + .anim_A = ANIM_ShyGuy_Blue_Anim11, \ + .anim_B = ANIM_ShyGuy_Blue_Anim10, \ + .anim_C = ANIM_ShyGuy_Blue_Anim05, \ + .anim_D = ANIM_ShyGuy_Blue_Anim01, \ + .anim_E = ANIM_ShyGuy_Blue_Anim01, \ + .anim_F = ANIM_ShyGuy_Blue_Anim01, \ +} + +#define GREEN_AVOID_SHY_GUY_ANIMS \ +{ \ + .idle = ANIM_ShyGuy_Green_Anim01, \ + .walk = ANIM_ShyGuy_Green_Anim02, \ + .run = ANIM_ShyGuy_Green_Anim04, \ + .chase = ANIM_ShyGuy_Green_Anim04, \ + .anim_4 = ANIM_ShyGuy_Green_Anim01, \ + .anim_5 = ANIM_ShyGuy_Green_Anim01, \ + .death = ANIM_ShyGuy_Green_Anim0C, \ + .hit = ANIM_ShyGuy_Green_Anim0C, \ + .anim_8 = ANIM_ShyGuy_Green_Anim15, \ + .anim_9 = ANIM_ShyGuy_Green_Anim12, \ + .anim_A = ANIM_ShyGuy_Green_Anim11, \ + .anim_B = ANIM_ShyGuy_Green_Anim10, \ + .anim_C = ANIM_ShyGuy_Green_Anim05, \ + .anim_D = ANIM_ShyGuy_Green_Anim01, \ + .anim_E = ANIM_ShyGuy_Green_Anim01, \ + .anim_F = ANIM_ShyGuy_Green_Anim01, \ +} + +#define PINK_AVOID_SHY_GUY_ANIMS \ +{ \ + .idle = ANIM_ShyGuy_Pink_Anim01, \ + .walk = ANIM_ShyGuy_Pink_Anim02, \ + .run = ANIM_ShyGuy_Pink_Anim04, \ + .chase = ANIM_ShyGuy_Pink_Anim04, \ + .anim_4 = ANIM_ShyGuy_Pink_Anim01, \ + .anim_5 = ANIM_ShyGuy_Pink_Anim01, \ + .death = ANIM_ShyGuy_Pink_Anim0C, \ + .hit = ANIM_ShyGuy_Pink_Anim0C, \ + .anim_8 = ANIM_ShyGuy_Pink_Anim15, \ + .anim_9 = ANIM_ShyGuy_Pink_Anim12, \ + .anim_A = ANIM_ShyGuy_Pink_Anim11, \ + .anim_B = ANIM_ShyGuy_Pink_Anim10, \ + .anim_C = ANIM_ShyGuy_Pink_Anim05, \ + .anim_D = ANIM_ShyGuy_Pink_Anim01, \ + .anim_E = ANIM_ShyGuy_Pink_Anim01, \ + .anim_F = ANIM_ShyGuy_Pink_Anim01, \ +} + +#define YELLOW_AVOID_SHY_GUY_ANIMS \ +{ \ + .idle = ANIM_ShyGuy_Yellow_Anim01, \ + .walk = ANIM_ShyGuy_Yellow_Anim02, \ + .run = ANIM_ShyGuy_Yellow_Anim04, \ + .chase = ANIM_ShyGuy_Yellow_Anim04, \ + .anim_4 = ANIM_ShyGuy_Yellow_Anim01, \ + .anim_5 = ANIM_ShyGuy_Yellow_Anim01, \ + .death = ANIM_ShyGuy_Yellow_Anim0C, \ + .hit = ANIM_ShyGuy_Yellow_Anim0C, \ + .anim_8 = ANIM_ShyGuy_Yellow_Anim15, \ + .anim_9 = ANIM_ShyGuy_Yellow_Anim12, \ + .anim_A = ANIM_ShyGuy_Yellow_Anim11, \ + .anim_B = ANIM_ShyGuy_Yellow_Anim10, \ + .anim_C = ANIM_ShyGuy_Yellow_Anim05, \ + .anim_D = ANIM_ShyGuy_Yellow_Anim01, \ + .anim_E = ANIM_ShyGuy_Yellow_Anim01, \ + .anim_F = ANIM_ShyGuy_Yellow_Anim01, \ +} diff --git a/src/world/common/enemy/complete/ShyGuy_AvoidPlayer.inc.c b/src/world/common/enemy/complete/ShyGuy_AvoidPlayer.inc.c new file mode 100644 index 0000000000..d97126a43e --- /dev/null +++ b/src/world/common/enemy/complete/ShyGuy_AvoidPlayer.inc.c @@ -0,0 +1,32 @@ +#include "ShyGuy.h" + +#include "world/common/enemy/ai/AvoidPlayerAI.inc.c" + +MobileAISettings N(AISettings_ShyGuy_AvoidPlayer) = { + .moveSpeed = 2.5f, + .moveTime = 50, + .waitTime = 15, + .alertRadius = 100.0f, + .playerSearchInterval = 3, + .chaseSpeed = 3.9f, + .chaseTurnRate = 20, + .chaseUpdateInterval = 1, + .chaseRadius = 180.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_ShyGuy_AvoidPlayer) = { + EVT_CALL(N(AvoidPlayerAI_Main), EVT_PTR(N(AISettings_ShyGuy_AvoidPlayer))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_ShyGuy_AvoidPlayer) = { + .height = 23, + .radius = 22, + .level = 14, + .ai = &N(EVS_NpcAI_ShyGuy_AvoidPlayer), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; diff --git a/src/world/common/enemy/complete/ShyGuy_Guard.inc.c b/src/world/common/enemy/complete/ShyGuy_Guard.inc.c new file mode 100644 index 0000000000..7660e892b0 --- /dev/null +++ b/src/world/common/enemy/complete/ShyGuy_Guard.inc.c @@ -0,0 +1,31 @@ +#include "ShyGuy.h" + +#include "world/common/enemy/ai/GuardAI.inc.c" + +GuardAISettings N(AISettings_ShyGuy_Guard) = { + .alertRadius = 100.0f, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 4, + .chaseSpeed = 4.0f, + .chaseTurnRate = 6, + .chaseUpdateInterval = 1, + .chaseRadius = 160.0f, + .chaseOffsetDist = 50.0f, + .unk_AI_20 = 1, +}; + +EvtScript N(EVS_NpcAI_ShyGuy_Guard) = { + EVT_CALL(N(GuardAI_Main), EVT_PTR(N(AISettings_ShyGuy_Guard))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_ShyGuy_Guard) = { + .height = 23, + .radius = 22, + .level = 14, + .ai = &N(EVS_NpcAI_ShyGuy_Guard), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; diff --git a/src/world/common/enemy/complete/ShyGuy_NoAI.inc.c b/src/world/common/enemy/complete/ShyGuy_Stationary.inc.c similarity index 79% rename from src/world/common/enemy/complete/ShyGuy_NoAI.inc.c rename to src/world/common/enemy/complete/ShyGuy_Stationary.inc.c index 7b1ce0692d..4a8887222c 100644 --- a/src/world/common/enemy/complete/ShyGuy_NoAI.inc.c +++ b/src/world/common/enemy/complete/ShyGuy_Stationary.inc.c @@ -1,6 +1,6 @@ #include "ShyGuy.h" -NpcSettings N(NpcSettings_ShyGuy_NoAI) = { +NpcSettings N(NpcSettings_ShyGuy_Stationary) = { .height = 23, .radius = 22, .level = 14, diff --git a/src/world/common/enemy/complete/SpyGuy.inc.c b/src/world/common/enemy/complete/SpyGuy.inc.c index 0909a0d888..8b2b78c054 100644 --- a/src/world/common/enemy/complete/SpyGuy.inc.c +++ b/src/world/common/enemy/complete/SpyGuy.inc.c @@ -1,7 +1,12 @@ #include "SpyGuy.h" #include "world/common/enemy/ai/RangedAttackAI.inc.c" -#include "world/common/todo/SetInstigatorValue_3.inc.c" + +API_CALLABLE(N(SetSpyGuyInstigatorValue)) { + script->owner1.enemy->instigatorValue = 3; + return ApiStatus_DONE2; +} + #include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" EvtScript N(EVS_NpcDefeat_SpyGuyRock) = { @@ -37,7 +42,7 @@ MobileAISettings N(AISettings_SpyGuy) = { }; EvtScript N(EVS_NpcAI_SpyGuy) = { - EVT_CALL(N(SetInstigatorValue_3)) + EVT_CALL(N(SetSpyGuyInstigatorValue)) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 12) EVT_CALL(SetSelfVar, 2, 5) diff --git a/src/world/common/npc/BigLanternGhost.h b/src/world/common/npc/BigLanternGhost.h new file mode 100644 index 0000000000..9b9be8b965 --- /dev/null +++ b/src/world/common/npc/BigLanternGhost.h @@ -0,0 +1,29 @@ +#include "common.h" +#include "sprite/npc/BigLanternGhost.h" + +#define BIG_LANTERN_GHOST_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAG_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define BIG_LANTERN_GHOST_ANIMS \ +{ \ + .idle = ANIM_BigLanternGhost_Anim01, \ + .walk = ANIM_BigLanternGhost_Anim01, \ + .run = ANIM_BigLanternGhost_Anim01, \ + .chase = ANIM_BigLanternGhost_Anim01, \ + .anim_4 = ANIM_BigLanternGhost_Anim01, \ + .anim_5 = ANIM_BigLanternGhost_Anim01, \ + .death = ANIM_BigLanternGhost_Anim09, \ + .hit = ANIM_BigLanternGhost_Anim09, \ + .anim_8 = ANIM_BigLanternGhost_Anim01, \ + .anim_9 = ANIM_BigLanternGhost_Anim01, \ + .anim_A = ANIM_BigLanternGhost_Anim01, \ + .anim_B = ANIM_BigLanternGhost_Anim01, \ + .anim_C = ANIM_BigLanternGhost_Anim01, \ + .anim_D = ANIM_BigLanternGhost_Anim01, \ + .anim_E = ANIM_BigLanternGhost_Anim01, \ + .anim_F = ANIM_BigLanternGhost_Anim01, \ +} diff --git a/src/world/common/npc/BigLanternGhost.inc.c b/src/world/common/npc/BigLanternGhost.inc.c new file mode 100644 index 0000000000..5bb55881cd --- /dev/null +++ b/src/world/common/npc/BigLanternGhost.inc.c @@ -0,0 +1,7 @@ +#include "BigLanternGhost.h" + +NpcSettings N(NpcSettings_BigLanternGhost) = { + .height = 68, + .radius = 60, + .level = 99, +}; diff --git a/src/world/common/npc/Parakarry.h b/src/world/common/npc/Parakarry.h new file mode 100644 index 0000000000..1c7183d91d --- /dev/null +++ b/src/world/common/npc/Parakarry.h @@ -0,0 +1,22 @@ +#include "common.h" +#include "sprite/npc/WorldParakarry.h" + +#define PARAKARRY_ANIMS \ +{ \ + .idle = ANIM_WorldParakarry_Idle, \ + .walk = ANIM_WorldParakarry_Walk, \ + .run = ANIM_WorldParakarry_Run, \ + .chase = ANIM_WorldParakarry_Run, \ + .anim_4 = ANIM_WorldParakarry_Idle, \ + .anim_5 = ANIM_WorldParakarry_Idle, \ + .death = ANIM_WorldParakarry_Still, \ + .hit = ANIM_WorldParakarry_Still, \ + .anim_8 = ANIM_WorldParakarry_Idle, \ + .anim_9 = ANIM_WorldParakarry_Idle, \ + .anim_A = ANIM_WorldParakarry_Idle, \ + .anim_B = ANIM_WorldParakarry_Idle, \ + .anim_C = ANIM_WorldParakarry_Idle, \ + .anim_D = ANIM_WorldParakarry_Idle, \ + .anim_E = ANIM_WorldParakarry_Idle, \ + .anim_F = ANIM_WorldParakarry_Idle, \ +} diff --git a/src/world/common/npc/Parakarry.inc.c b/src/world/common/npc/Parakarry.inc.c new file mode 100644 index 0000000000..a9f11a1deb --- /dev/null +++ b/src/world/common/npc/Parakarry.inc.c @@ -0,0 +1,8 @@ +#include "Parakarry.h" + +NpcSettings N(NpcSettings_Parakarry) = { + .height = 35, + .radius = 24, + .level = 99, + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; diff --git a/src/world/common/npc/Toad_Guard.inc.c b/src/world/common/npc/Toad_Guard.inc.c index 23d682b37f..9aedf00691 100644 --- a/src/world/common/npc/Toad_Guard.inc.c +++ b/src/world/common/npc/Toad_Guard.inc.c @@ -1,15 +1,15 @@ #include "Toad.h" -#include "world/common/enemy/ai/StationaryAI.inc.c" +#include "world/common/enemy/ai/GuardAI.inc.c" -StationaryAISettings N(AISettings_Toad_Guard) = { +GuardAISettings N(AISettings_Toad_Guard) = { .playerSearchInterval = -1, .chaseRadius = 300.0f, - .unk_20 = 30, + .unk_AI_20 = 30, }; EvtScript N(EVS_NpcAI_Toad_Guard) = { - EVT_CALL(N(StationaryAI_Main), EVT_PTR(N(AISettings_Toad_Guard))) + EVT_CALL(N(GuardAI_Main), EVT_PTR(N(AISettings_Toad_Guard))) EVT_RETURN EVT_END }; diff --git a/src/world/common/npc/TrainConductorToad.h b/src/world/common/npc/TrainConductorToad.h deleted file mode 100644 index 6a26c8cc9d..0000000000 --- a/src/world/common/npc/TrainConductorToad.h +++ /dev/null @@ -1,50 +0,0 @@ -#include "common.h" -#include "sprite/npc/TrainStationToad.h" - -#define TRAIN_CONDUCTOR_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - -#define TRAIN_CONDUCTOR_ANIMS \ -{ \ - .idle = ANIM_TrainStationToad_Idle, \ - .walk = ANIM_TrainStationToad_Walk, \ - .run = ANIM_TrainStationToad_Idle, \ - .chase = ANIM_TrainStationToad_Idle, \ - .anim_4 = ANIM_TrainStationToad_Idle, \ - .anim_5 = ANIM_TrainStationToad_Idle, \ - .death = ANIM_TrainStationToad_Idle, \ - .hit = ANIM_TrainStationToad_Idle, \ - .anim_8 = ANIM_TrainStationToad_Idle, \ - .anim_9 = ANIM_TrainStationToad_Idle, \ - .anim_A = ANIM_TrainStationToad_Idle, \ - .anim_B = ANIM_TrainStationToad_Idle, \ - .anim_C = ANIM_TrainStationToad_Idle, \ - .anim_D = ANIM_TrainStationToad_Idle, \ - .anim_E = ANIM_TrainStationToad_Idle, \ - .anim_F = ANIM_TrainStationToad_Idle, \ -} - -// walk is different from the anims above -- maybe this NPC palette should have a distinct name -#define TRAIN_CONDUCTOR_WHITE_ANIMS \ -{ \ - .idle = ANIM_TrainStationToad_White_Idle, \ - .walk = ANIM_TrainStationToad_White_Idle, \ - .run = ANIM_TrainStationToad_White_Idle, \ - .chase = ANIM_TrainStationToad_White_Idle, \ - .anim_4 = ANIM_TrainStationToad_White_Idle, \ - .anim_5 = ANIM_TrainStationToad_White_Idle, \ - .death = ANIM_TrainStationToad_White_Idle, \ - .hit = ANIM_TrainStationToad_White_Idle, \ - .anim_8 = ANIM_TrainStationToad_White_Idle, \ - .anim_9 = ANIM_TrainStationToad_White_Idle, \ - .anim_A = ANIM_TrainStationToad_White_Idle, \ - .anim_B = ANIM_TrainStationToad_White_Idle, \ - .anim_C = ANIM_TrainStationToad_White_Idle, \ - .anim_D = ANIM_TrainStationToad_White_Idle, \ - .anim_E = ANIM_TrainStationToad_White_Idle, \ - .anim_F = ANIM_TrainStationToad_White_Idle, \ -} diff --git a/src/world/common/npc/TrainConductorToad.inc.c b/src/world/common/npc/TrainConductorToad.inc.c deleted file mode 100644 index fb47561c29..0000000000 --- a/src/world/common/npc/TrainConductorToad.inc.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "TrainConductorToad.h" - -EvtScript N(EVS_NpcAuxAI_TrainConductorToad) = { - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_TrainConductorToad) = { - .height = 32, - .radius = 24, - .level = 99, - .otherAI = &N(EVS_NpcAuxAI_TrainConductorToad), -}; diff --git a/src/world/common/npc/TrainToad.h b/src/world/common/npc/TrainToad.h new file mode 100644 index 0000000000..00e6bdd4fd --- /dev/null +++ b/src/world/common/npc/TrainToad.h @@ -0,0 +1,130 @@ +#include "common.h" +#include "sprite/npc/TrainToad.h" + +#define TRAIN_CONDUCTOR_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAG_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define TRAIN_CONDUCTOR_ANIMS \ +{ \ + .idle = ANIM_TrainToad_Idle, \ + .walk = ANIM_TrainToad_Walk, \ + .run = ANIM_TrainToad_Idle, \ + .chase = ANIM_TrainToad_Idle, \ + .anim_4 = ANIM_TrainToad_Idle, \ + .anim_5 = ANIM_TrainToad_Idle, \ + .death = ANIM_TrainToad_Idle, \ + .hit = ANIM_TrainToad_Idle, \ + .anim_8 = ANIM_TrainToad_Idle, \ + .anim_9 = ANIM_TrainToad_Idle, \ + .anim_A = ANIM_TrainToad_Idle, \ + .anim_B = ANIM_TrainToad_Idle, \ + .anim_C = ANIM_TrainToad_Idle, \ + .anim_D = ANIM_TrainToad_Idle, \ + .anim_E = ANIM_TrainToad_Idle, \ + .anim_F = ANIM_TrainToad_Idle, \ +} + +#define TRAIN_TOAD_PINK_ANIMS \ +{ \ + .idle = ANIM_TrainToad_Pink_Idle, \ + .walk = ANIM_TrainToad_Pink_Idle, \ + .run = ANIM_TrainToad_Pink_Idle, \ + .chase = ANIM_TrainToad_Pink_Idle, \ + .anim_4 = ANIM_TrainToad_Pink_Idle, \ + .anim_5 = ANIM_TrainToad_Pink_Idle, \ + .death = ANIM_TrainToad_Pink_Idle, \ + .hit = ANIM_TrainToad_Pink_Idle, \ + .anim_8 = ANIM_TrainToad_Pink_Idle, \ + .anim_9 = ANIM_TrainToad_Pink_Idle, \ + .anim_A = ANIM_TrainToad_Pink_Idle, \ + .anim_B = ANIM_TrainToad_Pink_Idle, \ + .anim_C = ANIM_TrainToad_Pink_Idle, \ + .anim_D = ANIM_TrainToad_Pink_Idle, \ + .anim_E = ANIM_TrainToad_Pink_Idle, \ + .anim_F = ANIM_TrainToad_Pink_Idle, \ +} + +#define TRAIN_TOAD_BLUE_ANIMS \ +{ \ + .idle = ANIM_TrainToad_Blue_Idle, \ + .walk = ANIM_TrainToad_Blue_Idle, \ + .run = ANIM_TrainToad_Blue_Idle, \ + .chase = ANIM_TrainToad_Blue_Idle, \ + .anim_4 = ANIM_TrainToad_Blue_Idle, \ + .anim_5 = ANIM_TrainToad_Blue_Idle, \ + .death = ANIM_TrainToad_Blue_Idle, \ + .hit = ANIM_TrainToad_Blue_Idle, \ + .anim_8 = ANIM_TrainToad_Blue_Idle, \ + .anim_9 = ANIM_TrainToad_Blue_Idle, \ + .anim_A = ANIM_TrainToad_Blue_Idle, \ + .anim_B = ANIM_TrainToad_Blue_Idle, \ + .anim_C = ANIM_TrainToad_Blue_Idle, \ + .anim_D = ANIM_TrainToad_Blue_Idle, \ + .anim_E = ANIM_TrainToad_Blue_Idle, \ + .anim_F = ANIM_TrainToad_Blue_Idle, \ +} + +#define TRAIN_TOAD_GREEN_ANIMS \ +{ \ + .idle = ANIM_TrainToad_Green_Idle, \ + .walk = ANIM_TrainToad_Green_Idle, \ + .run = ANIM_TrainToad_Green_Idle, \ + .chase = ANIM_TrainToad_Green_Idle, \ + .anim_4 = ANIM_TrainToad_Green_Idle, \ + .anim_5 = ANIM_TrainToad_Green_Idle, \ + .death = ANIM_TrainToad_Green_Idle, \ + .hit = ANIM_TrainToad_Green_Idle, \ + .anim_8 = ANIM_TrainToad_Green_Idle, \ + .anim_9 = ANIM_TrainToad_Green_Idle, \ + .anim_A = ANIM_TrainToad_Green_Idle, \ + .anim_B = ANIM_TrainToad_Green_Idle, \ + .anim_C = ANIM_TrainToad_Green_Idle, \ + .anim_D = ANIM_TrainToad_Green_Idle, \ + .anim_E = ANIM_TrainToad_Green_Idle, \ + .anim_F = ANIM_TrainToad_Green_Idle, \ +} + +#define TRAIN_TOAD_RED_ANIMS \ +{ \ + .idle = ANIM_TrainToad_Red_Idle, \ + .walk = ANIM_TrainToad_Red_Idle, \ + .run = ANIM_TrainToad_Red_Idle, \ + .chase = ANIM_TrainToad_Red_Idle, \ + .anim_4 = ANIM_TrainToad_Red_Idle, \ + .anim_5 = ANIM_TrainToad_Red_Idle, \ + .death = ANIM_TrainToad_Red_Idle, \ + .hit = ANIM_TrainToad_Red_Idle, \ + .anim_8 = ANIM_TrainToad_Red_Idle, \ + .anim_9 = ANIM_TrainToad_Red_Idle, \ + .anim_A = ANIM_TrainToad_Red_Idle, \ + .anim_B = ANIM_TrainToad_Red_Idle, \ + .anim_C = ANIM_TrainToad_Red_Idle, \ + .anim_D = ANIM_TrainToad_Red_Idle, \ + .anim_E = ANIM_TrainToad_Red_Idle, \ + .anim_F = ANIM_TrainToad_Red_Idle, \ +} + +#define TRAIN_TOAD_WHITE_ANIMS \ +{ \ + .idle = ANIM_TrainToad_White_Idle, \ + .walk = ANIM_TrainToad_White_Idle, \ + .run = ANIM_TrainToad_White_Idle, \ + .chase = ANIM_TrainToad_White_Idle, \ + .anim_4 = ANIM_TrainToad_White_Idle, \ + .anim_5 = ANIM_TrainToad_White_Idle, \ + .death = ANIM_TrainToad_White_Idle, \ + .hit = ANIM_TrainToad_White_Idle, \ + .anim_8 = ANIM_TrainToad_White_Idle, \ + .anim_9 = ANIM_TrainToad_White_Idle, \ + .anim_A = ANIM_TrainToad_White_Idle, \ + .anim_B = ANIM_TrainToad_White_Idle, \ + .anim_C = ANIM_TrainToad_White_Idle, \ + .anim_D = ANIM_TrainToad_White_Idle, \ + .anim_E = ANIM_TrainToad_White_Idle, \ + .anim_F = ANIM_TrainToad_White_Idle, \ +} + diff --git a/src/world/common/npc/TrainToad.inc.c b/src/world/common/npc/TrainToad.inc.c new file mode 100644 index 0000000000..63c196c959 --- /dev/null +++ b/src/world/common/npc/TrainToad.inc.c @@ -0,0 +1,13 @@ +#include "TrainToad.h" + +EvtScript N(EVS_NpcAuxAI_TrainToad) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_TrainToad) = { + .height = 32, + .radius = 24, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_TrainToad), +}; diff --git a/src/world/common/todo/SetGameStatusUnk84_1.inc.c b/src/world/common/todo/SetGameStatusUnk84_1.inc.c deleted file mode 100644 index 5701a4cb9c..0000000000 --- a/src/world/common/todo/SetGameStatusUnk84_1.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(SetGameStatusUnk84_1)(Evt* script, s32 isInitialCall) { - gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_REFLECT_FLOOR; - return ApiStatus_BLOCK; -} diff --git a/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c b/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c index a25b38c73a..68baf0ced7 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c +++ b/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c @@ -6,12 +6,7 @@ NpcSettings N(NpcSettings_Lakilester_Epilogue) = { .level = 99, }; -NpcSettings N(NpcSettings_Parakarry_Epilogue) = { - .height = 35, - .radius = 24, - .level = 99, - .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, -}; +#include "world/common/npc/Parakarry.inc.c" Vec3f N(D_80245E88_CA3DA8)[] = { { 266.0f, 20.0f, 322.0f }, @@ -88,11 +83,7 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .yaw = 90, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilester_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NPC_NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, .walk = ANIM_WorldLakilester_Idle, @@ -119,11 +110,7 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .yaw = 270, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = NPC_NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, .walk = ANIM_Lakilulu_Idle, @@ -145,34 +132,13 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { }, { .id = NPC_Parakarry_Epilogue, - .settings = &N(NpcSettings_Parakarry_Epilogue), + .settings = &N(NpcSettings_Parakarry), .pos = { 266.0f, 0.0f, 322.0f }, .yaw = 0, .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Parakarry_Epilogue), - .drops = { - .dropFlags = NPC_DROP_FLAG_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, - .animations = { - .idle = ANIM_WorldParakarry_Idle, - .walk = ANIM_WorldParakarry_Walk, - .run = ANIM_WorldParakarry_Run, - .chase = ANIM_WorldParakarry_Run, - .anim_4 = ANIM_WorldParakarry_Idle, - .anim_5 = ANIM_WorldParakarry_Idle, - .death = ANIM_WorldParakarry_Still, - .hit = ANIM_WorldParakarry_Still, - .anim_8 = ANIM_WorldParakarry_Idle, - .anim_9 = ANIM_WorldParakarry_Idle, - .anim_A = ANIM_WorldParakarry_Idle, - .anim_B = ANIM_WorldParakarry_Idle, - .anim_C = ANIM_WorldParakarry_Idle, - .anim_D = ANIM_WorldParakarry_Idle, - .anim_E = ANIM_WorldParakarry_Idle, - .anim_F = ANIM_WorldParakarry_Idle, - }, + .drops = NPC_NO_DROPS, + .animations = PARAKARRY_ANIMS, }, }; diff --git a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c index 2ad20e9b0b..9f7a5d7134 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c @@ -121,22 +121,22 @@ EvtScript N(EVS_SetExteriorVineGrowth) = { EVT_CALL(RotateModel, MODEL_o182, LVar1, 0, 1, 0) EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 1, 0) EVT_CALL(RotateModel, MODEL_o181, LVar1, 0, 1, 0) - EVT_CALL(TranslateModel, MODEL_o117, EVT_FLOAT(8.1220703125), EVT_FLOAT(56.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o141, EVT_FLOAT(-6.8779296875), EVT_FLOAT(91.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o140, EVT_FLOAT(13.1220703125), EVT_FLOAT(106.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o138, EVT_FLOAT(-9.8779296875), EVT_FLOAT(136.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o139, EVT_FLOAT(-7.8779296875), EVT_FLOAT(201.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o143, EVT_FLOAT(13.1220703125), EVT_FLOAT(221.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o144, EVT_FLOAT(8.126953125), EVT_FLOAT(261.2294921875), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o145, EVT_FLOAT(-12.8779296875), EVT_FLOAT(266.1533203125), EVT_FLOAT(1.166015625)) - EVT_CALL(TranslateModel, MODEL_o146, EVT_FLOAT(8.1220703125), EVT_FLOAT(316.1533203125), EVT_FLOAT(-13.833984375)) - EVT_CALL(TranslateModel, MODEL_o188, EVT_FLOAT(-10.943359375), EVT_FLOAT(391.1533203125), EVT_FLOAT(10.56640625)) - EVT_CALL(TranslateModel, MODEL_o187, EVT_FLOAT(-7.001953125), EVT_FLOAT(456.1533203125), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o186, EVT_FLOAT(12.998046875), EVT_FLOAT(471.1533203125), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o185, EVT_FLOAT(-10.001953125), EVT_FLOAT(501.1533203125), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o182, EVT_FLOAT(8.0029296875), EVT_FLOAT(536.2294921875), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o183, EVT_FLOAT(12.998046875), EVT_FLOAT(586.1533203125), EVT_FLOAT(0.947265625)) - EVT_CALL(TranslateModel, MODEL_o181, EVT_FLOAT(-13.001953125), EVT_FLOAT(631.1533203125), EVT_FLOAT(0.947265625)) + EVT_CALL(TranslateModel, MODEL_o117, EVT_FLOAT(8.122), EVT_FLOAT(56.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o141, EVT_FLOAT(-6.8779296875), EVT_FLOAT(91.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o140, EVT_FLOAT(13.122), EVT_FLOAT(106.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o138, EVT_FLOAT(-9.8779296875), EVT_FLOAT(136.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o139, EVT_FLOAT(-7.8779296875), EVT_FLOAT(201.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o143, EVT_FLOAT(13.122), EVT_FLOAT(221.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o144, EVT_FLOAT(8.127), EVT_FLOAT(261.229), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o145, EVT_FLOAT(-12.8779296875), EVT_FLOAT(266.153), EVT_FLOAT(1.166)) + EVT_CALL(TranslateModel, MODEL_o146, EVT_FLOAT(8.122), EVT_FLOAT(316.153), EVT_FLOAT(-13.833984375)) + EVT_CALL(TranslateModel, MODEL_o188, EVT_FLOAT(-10.943359375), EVT_FLOAT(391.153), EVT_FLOAT(10.566)) + EVT_CALL(TranslateModel, MODEL_o187, EVT_FLOAT(-7.001953125), EVT_FLOAT(456.153), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o186, EVT_FLOAT(12.998), EVT_FLOAT(471.153), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o185, EVT_FLOAT(-10.001953125), EVT_FLOAT(501.153), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o182, EVT_FLOAT(8.003), EVT_FLOAT(536.229), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o183, EVT_FLOAT(12.998), EVT_FLOAT(586.153), EVT_FLOAT(0.947)) + EVT_CALL(TranslateModel, MODEL_o181, EVT_FLOAT(-13.001953125), EVT_FLOAT(631.153), EVT_FLOAT(0.947)) EVT_SETF(LVar1, LVar0) EVT_SUBF(LVar1, EVT_FLOAT(-700.0)) EVT_DIVF(LVar1, EVT_FLOAT(300.0)) @@ -162,21 +162,21 @@ EvtScript N(EVS_SetExteriorVineGrowth) = { EVT_CALL(ScaleModel, MODEL_o183, LVar1, LVar1, LVar1) EVT_CALL(ScaleModel, MODEL_o181, LVar1, LVar1, LVar1) EVT_CALL(TranslateModel, MODEL_o117, EVT_FLOAT(-8.12109375), EVT_FLOAT(-56.15234375), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o141, EVT_FLOAT(6.87890625), EVT_FLOAT(-91.15234375), EVT_FLOAT(-1.1650390625)) + EVT_CALL(TranslateModel, MODEL_o141, EVT_FLOAT(6.879), EVT_FLOAT(-91.15234375), EVT_FLOAT(-1.1650390625)) EVT_CALL(TranslateModel, MODEL_o140, EVT_FLOAT(-13.12109375), EVT_FLOAT(-106.15234375), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o138, EVT_FLOAT(9.87890625), EVT_FLOAT(-136.15234375), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o139, EVT_FLOAT(7.87890625), EVT_FLOAT(-201.15234375), EVT_FLOAT(-1.1650390625)) + EVT_CALL(TranslateModel, MODEL_o138, EVT_FLOAT(9.879), EVT_FLOAT(-136.15234375), EVT_FLOAT(-1.1650390625)) + EVT_CALL(TranslateModel, MODEL_o139, EVT_FLOAT(7.879), EVT_FLOAT(-201.15234375), EVT_FLOAT(-1.1650390625)) EVT_CALL(TranslateModel, MODEL_o143, EVT_FLOAT(-13.12109375), EVT_FLOAT(-221.15234375), EVT_FLOAT(-1.1650390625)) EVT_CALL(TranslateModel, MODEL_o144, EVT_FLOAT(-8.1259765625), EVT_FLOAT(-261.228515625), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o145, EVT_FLOAT(12.87890625), EVT_FLOAT(-266.15234375), EVT_FLOAT(-1.1650390625)) - EVT_CALL(TranslateModel, MODEL_o146, EVT_FLOAT(-8.12109375), EVT_FLOAT(-316.15234375), EVT_FLOAT(13.8349609375)) - EVT_CALL(TranslateModel, MODEL_o188, EVT_FLOAT(10.9443359375), EVT_FLOAT(-391.15234375), EVT_FLOAT(-10.5654296875)) - EVT_CALL(TranslateModel, MODEL_o187, EVT_FLOAT(7.0029296875), EVT_FLOAT(-456.15234375), EVT_FLOAT(-0.9462890625)) + EVT_CALL(TranslateModel, MODEL_o145, EVT_FLOAT(12.879), EVT_FLOAT(-266.15234375), EVT_FLOAT(-1.1650390625)) + EVT_CALL(TranslateModel, MODEL_o146, EVT_FLOAT(-8.12109375), EVT_FLOAT(-316.15234375), EVT_FLOAT(13.835)) + EVT_CALL(TranslateModel, MODEL_o188, EVT_FLOAT(10.944), EVT_FLOAT(-391.15234375), EVT_FLOAT(-10.5654296875)) + EVT_CALL(TranslateModel, MODEL_o187, EVT_FLOAT(7.003), EVT_FLOAT(-456.15234375), EVT_FLOAT(-0.9462890625)) EVT_CALL(TranslateModel, MODEL_o186, EVT_FLOAT(-12.9970703125), EVT_FLOAT(-471.15234375), EVT_FLOAT(-0.9462890625)) - EVT_CALL(TranslateModel, MODEL_o185, EVT_FLOAT(10.0029296875), EVT_FLOAT(-501.15234375), EVT_FLOAT(-0.9462890625)) + EVT_CALL(TranslateModel, MODEL_o185, EVT_FLOAT(10.003), EVT_FLOAT(-501.15234375), EVT_FLOAT(-0.9462890625)) EVT_CALL(TranslateModel, MODEL_o182, EVT_FLOAT(-8.001953125), EVT_FLOAT(-536.228515625), EVT_FLOAT(-0.9462890625)) EVT_CALL(TranslateModel, MODEL_o183, EVT_FLOAT(-12.9970703125), EVT_FLOAT(-586.15234375), EVT_FLOAT(-0.9462890625)) - EVT_CALL(TranslateModel, MODEL_o181, EVT_FLOAT(13.0029296875), EVT_FLOAT(-631.15234375), EVT_FLOAT(-0.9462890625)) + EVT_CALL(TranslateModel, MODEL_o181, EVT_FLOAT(13.003), EVT_FLOAT(-631.15234375), EVT_FLOAT(-0.9462890625)) EVT_RETURN EVT_END }; @@ -230,7 +230,7 @@ EvtScript N(EVS_SetBigLeafGrowth) = { EvtScript N(EVS_SetBigLeafPosition) = { EVT_SETF(LVar1, LVar0) EVT_MULF(LVar1, EVT_FLOAT(-3.0)) - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), LVar0, EVT_FLOAT(1.4775391)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), LVar0, EVT_FLOAT(1.477)) EVT_CALL(RotateModel, MODEL_o142, LVar1, 0, 1, 0) EVT_CALL(UpdateColliderTransform, COLLIDER_o240) EVT_RETURN @@ -253,7 +253,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) EVT_CALL(PlaySound, SOUND_19C) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) EVT_CALL(N(GetPlayerAngles), LVar3, LVar4) EVT_SWITCH(LVar4) @@ -266,7 +266,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_SWITCH - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), EVT_FLOAT(2.0), EVT_FLOAT(1.4775391)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), EVT_FLOAT(2.0), EVT_FLOAT(1.477)) EVT_CALL(UpdateColliderTransform, COLLIDER_o240) EVT_SET(MV_BeanstalkSceneSync, FALSE) EVT_THREAD @@ -316,7 +316,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_SET(LVarE, EVT_FLOAT(145.0)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) EVT_SWITCH(AF_FLO_BeanstalkFacingRight) EVT_CASE_EQ(0) @@ -327,7 +327,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), EVT_FLOAT(2.0), EVT_FLOAT(1.4775391)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(-0.26), EVT_FLOAT(2.0), EVT_FLOAT(1.477)) EVT_CALL(UpdateColliderTransform, COLLIDER_o240) EVT_SET(LVarF, 0) EVT_LOOP(120) diff --git a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c b/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c index ab8b89bad5..0e5f778c57 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c @@ -27,7 +27,7 @@ EvtScript N(EVS_GrowFountain) = { EVT_SETF(LVar3, LVar0) EVT_DIVF(LVar2, EVT_FLOAT(333.0)) EVT_DIVF(LVar3, EVT_FLOAT(100.0)) - EVT_ADDF(LVar2, EVT_FLOAT(0.703125)) + EVT_ADDF(LVar2, EVT_FLOAT(0.703)) EVT_CALL(ScaleGroup, MODEL_g22, LVar2, LVar3, LVar2) EVT_IF_EQ(LVar1, 1) EVT_WAIT(1) @@ -156,7 +156,7 @@ EvtScript N(EVS_ShrinkFountain) = { EVT_SETF(LVar3, LVar0) EVT_DIVF(LVar2, EVT_FLOAT(333.0)) EVT_DIVF(LVar3, EVT_FLOAT(100.0)) - EVT_ADDF(LVar2, EVT_FLOAT(0.703125)) + EVT_ADDF(LVar2, EVT_FLOAT(0.703)) EVT_CALL(ScaleGroup, MODEL_g22, LVar2, LVar3, LVar2) EVT_IF_EQ(LVar1, 1) EVT_WAIT(1) diff --git a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c index a9f6fef764..f80ce483aa 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c @@ -327,17 +327,17 @@ EvtScript N(EVS_ManageBlownBubble) = { EVT_LOOP(LVar8) EVT_SETF(LVarE, LVar2) EVT_SUBF(LVarE, LVar0) - EVT_MULF(LVarE, EVT_FLOAT(0.046875)) + EVT_MULF(LVarE, EVT_FLOAT(0.046)) EVT_ADDF(LVar0, LVarE) EVT_SETF(LVarE, LVar3) EVT_SUBF(LVarE, LVar1) - EVT_MULF(LVarE, EVT_FLOAT(0.046875)) + EVT_MULF(LVarE, EVT_FLOAT(0.046)) EVT_ADDF(LVar1, LVarE) EVT_ADDF(LVar4, LVar0) EVT_ADDF(LVar5, LVar1) EVT_SETF(LVarE, LVar7) EVT_SUBF(LVarE, LVar9) - EVT_MULF(LVarE, EVT_FLOAT(0.203125)) + EVT_MULF(LVarE, EVT_FLOAT(0.203)) EVT_ADDF(LVar9, LVarE) EVT_CALL(TranslateModel, LVarF, LVar4, LVar5, LVar6) EVT_CALL(ScaleModel, LVarF, LVar9, LVar9, LVar9) diff --git a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c b/src/world/dead/area_flo/flo_15/flo_15_3_npc.c index 0e4f94989f..22a590605c 100644 --- a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c +++ b/src/world/dead/area_flo/flo_15/flo_15_3_npc.c @@ -71,7 +71,7 @@ EvtScript N(EVS_Scene_SunReturns) = { }; EvtScript N(EVS_NpcAux_Sun_02) = { - EVT_CALL(func_802CDE68, 11, 48) + EVT_CALL(SetNpcRotationPivot, NPC_Sun_02, 48) EVT_LOOP(0) EVT_CALL(MakeLerp, -30, 30, 20, EASING_SIN_OUT) EVT_LOOP(0) diff --git a/src/world/dead/area_flo/flo_18/flo_18_3_machine.c b/src/world/dead/area_flo/flo_18/flo_18_3_machine.c index 51e1f7f020..6ec3f5403d 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_3_machine.c +++ b/src/world/dead/area_flo/flo_18/flo_18_3_machine.c @@ -64,10 +64,10 @@ EvtScript N(EVS_UpdateSmokeParticle) = { EVT_MULF(LVar6, EVT_FLOAT(1.01)) EVT_ADDF(LVar7, EVT_FLOAT(0.01)) EVT_SETF(LVar8, LVar6) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0) EVT_ADDF(LVar8, LVarA) EVT_SETF(LVar9, LVar7) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203125), 20, 0, 90) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90) EVT_ADDF(LVar9, LVarA) EVT_SETF(LVarA, LVar0) EVT_MULF(LVarA, EVT_FLOAT(10.0)) @@ -95,8 +95,8 @@ EvtScript N(EVS_ManageSmoke) = { EVT_DIVF(LVar3, EVT_FLOAT(200.0)) EVT_SETF(LVar4, EVT_FLOAT(1.0)) EVT_SETF(LVar5, 0) - EVT_SETF(LVar6, EVT_FLOAT(0.296875)) - EVT_SETF(LVar7, EVT_FLOAT(0.296875)) + EVT_SETF(LVar6, EVT_FLOAT(0.296)) + EVT_SETF(LVar7, EVT_FLOAT(0.296)) EVT_SET(LVarF, LVarE) EVT_ADD(LVarF, CLONED_MODEL(0)) EVT_EXEC(N(EVS_UpdateSmokeParticle)) @@ -124,8 +124,8 @@ EvtScript N(EVS_ShakeMachine) = { EVT_SUB(LVar2, 25) EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 5, 10, 1, 1) EVT_ADD(LVarF, 1) - EVT_CALL(N(CosInterpMinMax), LVarF, LVarE, EVT_FLOAT(1.0), EVT_FLOAT(1.09375), 2, 0, 0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVarD, EVT_FLOAT(1.09375), EVT_FLOAT(1.0), 2, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVarE, EVT_FLOAT(1.0), EVT_FLOAT(1.093), 2, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVarD, EVT_FLOAT(1.093), EVT_FLOAT(1.0), 2, 0, 0) EVT_SETF(LVar0, LVarE) EVT_SETF(LVar1, LVarD) EVT_SETF(LVar2, LVarE) @@ -163,7 +163,7 @@ EvtScript N(EVS_ShakeMachine) = { EVT_CALL(ScaleModel, MODEL_o95, LVar0, LVar1, LVar2) EVT_CALL(ScaleModel, MODEL_o91, LVar0, LVar1, LVar2) EVT_CALL(ScaleModel, MODEL_o114, LVar0, LVar1, LVar2) - EVT_SUBF(LVar0, EVT_FLOAT(1.046875)) + EVT_SUBF(LVar0, EVT_FLOAT(1.046)) EVT_MULF(LVar0, EVT_FLOAT(100.0)) EVT_IF_EQ(GB_FLO18_MachineDamage_Left, 0) EVT_CALL(RotateModel, MODEL_o115, LVar0, 0, 0, 1) @@ -257,7 +257,7 @@ EvtScript N(EVS_DamagedLeftOnce) = { EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) - EVT_ADDF(LVar5, EVT_FLOAT(0.09375)) + EVT_ADDF(LVar5, EVT_FLOAT(0.093)) EVT_ADDF(LVar0, LVar3) EVT_ADDF(LVar1, LVar4) EVT_ADDF(LVar2, LVar5) @@ -421,7 +421,7 @@ EvtScript N(EVS_BreakSmokestack) = { EVT_END_THREAD EVT_LOOP(300) EVT_ADDF(LVar4, EVT_FLOAT(-0.5)) - EVT_ADDF(LVar5, EVT_FLOAT(0.09375)) + EVT_ADDF(LVar5, EVT_FLOAT(0.093)) EVT_ADDF(LVar0, LVar3) EVT_ADDF(LVar1, LVar4) EVT_ADDF(LVar2, LVar5) @@ -725,7 +725,7 @@ EvtScript N(EVS_SetupMachine) = { EVT_SETF(LVarE, EVT_FLOAT(1.0)) EVT_LABEL(0) EVT_IF_GE(GB_FLO18_MachineDamage_Right, 3) - EVT_MULF(LVarE, EVT_FLOAT(0.953125)) + EVT_MULF(LVarE, EVT_FLOAT(0.953)) EVT_END_IF EVT_ADDF(LVarF, LVarE) EVT_IF_EQ(LVarF, 1080) diff --git a/src/world/dead/area_flo/flo_19/flo_19_4_clouds.c b/src/world/dead/area_flo/flo_19/flo_19_4_clouds.c index 474c112ff1..318a56891c 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_4_clouds.c +++ b/src/world/dead/area_flo/flo_19/flo_19_4_clouds.c @@ -29,27 +29,27 @@ EvtScript N(EVS_AnimatePlatforms) = { EVT_SET(LVarF, 0) EVT_LABEL(0) EVT_SETF(LVar0, EVT_FLOAT(-215.4375)) - EVT_SETF(LVar1, EVT_FLOAT(128.59375)) + EVT_SETF(LVar1, EVT_FLOAT(128.593)) EVT_SETF(LVar2, EVT_FLOAT(-200.0)) EVT_ADDF(LVar1, MV_Distortion_Platform_01) EVT_CALL(TranslateGroup, MODEL_g17, LVar0, LVar1, LVar2) EVT_SETF(LVar0, EVT_FLOAT(-79.86)) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(5.0), EVT_FLOAT(136.76562), 300, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(5.0), EVT_FLOAT(136.765), 300, 0, 0) EVT_SETF(LVar2, EVT_FLOAT(-200.0)) EVT_ADDF(LVar1, MV_Distortion_Platform_02) EVT_CALL(TranslateGroup, MODEL_g21, LVar0, LVar1, LVar2) EVT_SETF(LVar0, EVT_FLOAT(-364.265625)) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(5.0), EVT_FLOAT(106.765625), 300, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(5.0), EVT_FLOAT(106.765), 300, 0, 0) EVT_SETF(LVar2, EVT_FLOAT(10.0)) EVT_ADDF(LVar1, MV_Distortion_Platform_03) EVT_CALL(TranslateGroup, MODEL_g22, LVar0, LVar1, LVar2) - EVT_SETF(LVar0, EVT_FLOAT(295.73438)) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(65.0), EVT_FLOAT(86.984375), 200, 0, 0) + EVT_SETF(LVar0, EVT_FLOAT(295.734)) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(65.0), EVT_FLOAT(86.984), 200, 0, 0) EVT_SETF(LVar2, EVT_FLOAT(-80.0)) EVT_ADDF(LVar1, MV_Distortion_Platform_04) EVT_CALL(TranslateGroup, MODEL_g23, LVar0, LVar1, LVar2) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar2, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar3, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar2, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar3, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) EVT_SETF(LVar0, MV_Distortion_Platform_01) EVT_SETF(LVar1, MV_Distortion_Platform_01) EVT_MULF(LVar0, EVT_FLOAT(-0.02)) @@ -98,10 +98,10 @@ EvtScript N(EVS_AnimatePlatforms) = { EVT_ADDF(MV_Distortion_Platform_02, LVar1) EVT_ADDF(MV_Distortion_Platform_03, LVar2) EVT_ADDF(MV_Distortion_Platform_04, LVar3) - EVT_MULF(MV_Distortion_Platform_01, EVT_FLOAT(0.84375)) - EVT_MULF(MV_Distortion_Platform_02, EVT_FLOAT(0.84375)) - EVT_MULF(MV_Distortion_Platform_03, EVT_FLOAT(0.84375)) - EVT_MULF(MV_Distortion_Platform_04, EVT_FLOAT(0.84375)) + EVT_MULF(MV_Distortion_Platform_01, EVT_FLOAT(0.843)) + EVT_MULF(MV_Distortion_Platform_02, EVT_FLOAT(0.843)) + EVT_MULF(MV_Distortion_Platform_03, EVT_FLOAT(0.843)) + EVT_MULF(MV_Distortion_Platform_04, EVT_FLOAT(0.843)) EVT_ADDF(LVarA, MV_Distortion_Platform_01) EVT_ADDF(LVarB, MV_Distortion_Platform_02) EVT_ADDF(LVarC, MV_Distortion_Platform_03) @@ -169,8 +169,8 @@ EvtScript N(EVS_SetupClouds) = { EVT_THREAD EVT_SET(LVarF, 0) EVT_LABEL(0) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar0, EVT_FLOAT(0.96875), EVT_FLOAT(1.03125), 15, 0, 0) - EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(1.03125), EVT_FLOAT(0.96875), 15, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) + EVT_CALL(N(CosInterpAbsMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) EVT_CALL(ScaleModel, MODEL_o73, LVar1, LVar0, 1) EVT_CALL(ScaleModel, MODEL_o74, LVar1, LVar0, 1) EVT_CALL(ScaleModel, MODEL_o75, LVar0, LVar1, 1) diff --git a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c index 3ff13dff6f..2ed998de2a 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c @@ -133,7 +133,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_SET(LVarE, EVT_FLOAT(10.0)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) EVT_SWITCH(AF_FLO_BeanstalkFacingRight) EVT_CASE_EQ(0) @@ -144,7 +144,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.3134766), EVT_FLOAT(3.0), EVT_FLOAT(-0.56640625)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.313), EVT_FLOAT(3.0), EVT_FLOAT(-0.56640625)) EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_THREAD EVT_SET(AF_FLO_BeanstalkFadedOut, FALSE) @@ -177,7 +177,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, -210, 0, 344, 0, 0) EVT_SETF(LVar1, LVar0) EVT_MULF(LVar1, EVT_FLOAT(-3.0)) - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.3134766), LVar0, EVT_FLOAT(-0.56640625)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.313), LVar0, EVT_FLOAT(-0.56640625)) EVT_CALL(RotateModel, MODEL_o142, LVar1, 0, 1, 0) EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_SETF(LVar2, LVar0) @@ -229,7 +229,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) EVT_CALL(PlaySound, SOUND_19D) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) - EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) EVT_CALL(N(GetPlayerAngles), LVar3, LVar4) EVT_SWITCH(LVar4) @@ -242,7 +242,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_END_SWITCH - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.3134766), EVT_FLOAT(3.0), EVT_FLOAT(-0.56640625)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.313), EVT_FLOAT(3.0), EVT_FLOAT(-0.56640625)) EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_SET(MV_BeanstalkSceneSync, FALSE) EVT_THREAD @@ -277,7 +277,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, 0, -210, 344, 0, 0) EVT_SETF(LVar1, LVar0) EVT_MULF(LVar1, EVT_FLOAT(-3.0)) - EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.3134766), LVar0, EVT_FLOAT(-0.56640625)) + EVT_CALL(TranslateModel, MODEL_o142, EVT_FLOAT(1.313), LVar0, EVT_FLOAT(-0.56640625)) EVT_CALL(RotateModel, MODEL_o142, LVar1, 0, 1, 0) EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_SETF(LVar2, LVar0) diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c index 4aa8e60e3e..ee8a44b0c1 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c @@ -42,7 +42,7 @@ EvtScript N(EVS_Kolorado_TrompPanic) = { EvtScript N(EVS_Kolorado_TrompImpact) = { EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) - EVT_CALL(func_802CDE68, 0, 13) + EVT_CALL(SetNpcRotationPivot, NPC_Kolorado, 13) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) @@ -67,7 +67,7 @@ EvtScript N(EVS_Kolorado_HurtInit) = { EVT_CALL(SetNpcPos, NPC_Kolorado, 447, 0, 70) EVT_CALL(SetNpcYaw, NPC_Kolorado, 270) EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) - EVT_CALL(func_802CDE68, 0, 13) + EVT_CALL(SetNpcRotationPivot, NPC_Kolorado, 13) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) EVT_CALL(func_802CFD30, 0, FOLD_TYPE_4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index a3f3bd9a9c..c3ad985579 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -753,42 +753,42 @@ EvtScript N(EVS_NpcAux_LavaPiranha) = { EVT_CALL(N(SetVineBonePos), VINE_0, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 9, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 7, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 7, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 7, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_0, 8, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_0, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_0, 8, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_0, 8, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_LavaBud_01, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 8, LVar0, LVar1, LVar2) @@ -804,32 +804,32 @@ EvtScript N(EVS_NpcAux_LavaPiranha) = { EVT_CALL(N(SetVineBonePos), VINE_1, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_1, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_1, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_1, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_1, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_LavaBud_02, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 8, LVar0, LVar1, LVar2) @@ -845,57 +845,57 @@ EvtScript N(EVS_NpcAux_LavaPiranha) = { EVT_CALL(N(SetVineBonePos), VINE_2, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 7, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 5, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 5, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_2, 6, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_2, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_2, 6, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_2, 6, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 0, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 0, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 0, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 1, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 6, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 1, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 1, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 2, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 2, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 3, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 5, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 3, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 3, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBonePos), VINE_3, 4, LVar0, LVar1, LVar2) EVT_CALL(GetAnimatedRotationByTreeIndex, VINE_3, 2, LVar0, LVar1, LVar2) EVT_CALL(N(SetVineBoneRot), VINE_3, 4, LVar0, LVar1, LVar2) - EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.71484375), EVT_FLOAT(0.71484375), EVT_FLOAT(1.0)) + EVT_CALL(N(SetVineBoneScale), VINE_3, 4, EVT_FLOAT(0.714), EVT_FLOAT(0.714), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c b/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c index 9a12cc1421..8952b3539d 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c @@ -7,7 +7,7 @@ EvtScript N(EVS_CrackFloor) = { EVT_SETF(LVar0, 0) EVT_THREAD EVT_LOOP(60) - EVT_ADDF(LVar0, EVT_FLOAT(0.33398438)) + EVT_ADDF(LVar0, EVT_FLOAT(0.334)) EVT_CALL(RotateModel, MODEL_o2, LVar0, 0, 0, -1) EVT_WAIT(1) EVT_END_LOOP diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c index 406c97759b..74273cf544 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c @@ -191,7 +191,7 @@ EvtScript N(EVS_NpcIdle_Misstar) = { EVT_GOTO(10) EVT_END_IF EVT_SET(AF_KZN23_GrabbedKolorado, TRUE) - EVT_CALL(func_802CDE68, 0, 10) + EVT_CALL(SetNpcRotationPivot, NPC_Kolorado, 10) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 180) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Panic) EVT_THREAD diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c index ad287a6438..b8a7f82808 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c @@ -81,7 +81,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EvtScript N(EVS_NpcInit_Kolorado) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_WAIT(1) - EVT_CALL(func_802CDE68, -1, 10) + EVT_CALL(SetNpcRotationPivot, NPC_SELF, 10) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 180) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado))) diff --git a/src/world/world.c b/src/world/world.c index c035794433..ca28ed7cd2 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -44,7 +44,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { sfx_stop_env_sounds(); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - gOverrideFlags &= ~GLOBAL_OVERRIDES_80; + gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_WORLD; func_8002D160(); @@ -563,6 +563,7 @@ MapConfig osr_maps[] = { /// Peach's Castle /// @bug There are two entries for kkj_26; the latter is unreachable. +#include "area_kkj/kkj.h" MapConfig kkj_maps[] = { { 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 }, @@ -754,20 +755,21 @@ MapConfig sam_maps[] = { }; /// Crystal Palace +#include "area_pra/pra.h" MapConfig pra_maps[] = { { 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_WITH_INIT(pra_06), .songVariation = 1, .sfxReverb = 1 }, { 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_WITH_INIT(pra_15), .bgName = "yki_bg", .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 }, @@ -786,28 +788,28 @@ MapConfig pra_maps[] = { { 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 }, + { MAP_WITH_INIT(pra_40), .songVariation = 1, .sfxReverb = 1 }, }; /// Shy Guy's Toy Box #include "area_omo/omo.h" MapConfig omo_maps[] = { - { 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(omo_01), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_02), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_03), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP(omo_04), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP(omo_05), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(omo_06, 0x80240B80), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_06), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP(omo_07), .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(omo_08), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_09), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_10), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_11), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_12), .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_13), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_14), .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_15), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(omo_16), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP(omo_17), .bgName = "omo_bg", .songVariation = 1, .sfxReverb = 2 }, }; diff --git a/tools/disasm_script.py b/tools/disasm_script.py index e0e947b24c..dafb49e0b1 100755 --- a/tools/disasm_script.py +++ b/tools/disasm_script.py @@ -151,7 +151,7 @@ def get_constants(): "AmbientSounds", "NpcIDs", "Emotes", "NpcFlags", "Statuses", "Elements", "DamageTypes", "ElementImmunityFlags", "HitResults", "ActorFlags", "ActorPartFlags", "ActorEventFlags", "ElementFlags", "EncounterTriggers", "Abilities", - "Easings", "DecorationIDs", "HitResults", "Phases", "ItemSpawnModes", + "EasingType", "DecorationIDs", "HitResults", "Phases", "ItemSpawnModes", "ActionStates", "Triggers", "Buttons", "ActionCommand", "MoveIDs", "BattleStatusFlags1", "BattleStatusFlags2", "BtlCameraPreset", "EffectID", "StatusFlags" } for enum in valid_enums: diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 420a947f86..ee5a39de31 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -230,7 +230,7 @@ dead_MakeLocalVertexCopy = 0x802D711C; dead_SetModelCustomGfx = 0x802D657C; dead_SetCustomGfxBuilders = 0x802D6920; dead_FindItem = 0x802E4168; -dead_func_802CDE68 = 0x802DB3C8; +dead_SetNpcRotationPivot = 0x802DB3C8; dead_GetNpcYaw = 0x802DBF70; dead_PlayAmbientSounds = 0x802E376C; dead_SetTexPanner = 0x802D6480; diff --git a/tools/splat_ext/npc.yaml b/tools/splat_ext/npc.yaml index 22a47de10b..4e60dd5d75 100644 --- a/tools/splat_ext/npc.yaml +++ b/tools/splat_ext/npc.yaml @@ -8323,7 +8323,7 @@ ConductorToad: - Run - Talk - BlowWhistle -TrainStationToad: +TrainToad: variations: - Variant00 - Variant01 diff --git a/ver/us/asm/data/world/area_jan/jan_23/B903A0.data.s b/ver/us/asm/data/world/area_jan/jan_23/B903A0.data.s index 68513fe4a3..2716680b10 100644 --- a/ver/us/asm/data/world/area_jan/jan_23/B903A0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_23/B903A0.data.s @@ -15,19 +15,19 @@ dlabel D_80240754_B90424 .word 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C40006, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000004, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C40003, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000004, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240984_B90654 -.word 0x00000043, 0x00000003, func_802CDE68, 0x00000001, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000001, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240AC4_B90794 -.word 0x00000043, 0x00000003, func_802CDE68, 0x00000002, 0x0000003C, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000002, 0x0000003C, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C04_B908D4 -.word 0x00000043, 0x00000003, func_802CDE68, 0x00000003, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0x00000003, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000003, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000003, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D44_B90A14 -.word 0x00000043, 0x00000003, func_802CDE68, 0x00000004, 0x0000003C, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0x00000004, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000004, 0x0000003C, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000004, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E84_B90B54 -.word 0x00000043, 0x00000003, func_802CDE68, 0x00000005, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0x00000005, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000005, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000005, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FC4_B90C94 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000021C, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s index 5af541aed6..0b9511066f 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s @@ -30,10 +30,10 @@ dlabel D_80242A5C_AF56FC .word 0x00000043, 0x00000006, PlaySoundAt, 0x000001CB, 0x00000000, 0x000000BE, 0x0000004E, 0xFFFFFFEC, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000030, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000033, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000030, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000033, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001CC, 0x00000000, 0x000000BE, 0x0000004E, 0xFFFFFFEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242C08_AF58A8 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A7AB4, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFFFFFFF8, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, func_802CDE68, 0x00000005, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A7B4D, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFFFFFFEC, 0xFE363C82, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveNpc, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A7AB4, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFFFFFFF8, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000005, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A7B4D, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFFFFFFEC, 0xFE363C82, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveNpc, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242D50_AF59F0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7AB4, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFFFFFFF8, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, func_802CDE68, 0x00000004, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7B4D, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFFFFFFEC, 0xFE363C82, 0xFFFFFF9C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveNpc, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7AB4, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFFFFFFF8, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000004, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000028, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7B4D, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFFFFFFEC, 0xFE363C82, 0xFFFFFF9C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, RemoveNpc, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242EB4_AF5B54 .word 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400AB, 0x000000A0, 0x00000028, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80242C08_AF58A8, 0x00000044, 0x00000001, D_80242D50_AF59F0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00C10007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000005A, 0x00000041, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000005A, 0x00000041, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000AA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000C, 0xF24A7080, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24C3280, 0xF24B3080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24ACA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000381, 0x00000000, 0x00000008, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24B7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9880, 0xF24A754D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000382, 0x00000000, 0x00000008, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8880, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000383, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000072, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AAA80, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000041, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000001, func_80240774_AF3414, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000078, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s index 8f3285cdac..38f6874479 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s @@ -21,4 +21,4 @@ dlabel D_8024ADF8_B117F8 .word 0x00000190, 0xFFFFFFF6, 0x00000190, 0x00000014, 0x0000015E, 0xFFFFFFCE, 0x00000172, 0x00000019, 0x0000012C, 0xFFFFFFE2, 0x00000154, 0x00000019, 0x0000015E, 0xFFFFFFD8, 0x00000136, 0x00000014, 0x0000012C, 0xFFFFFFB0, 0x00000118, 0x00000014, 0x00000118, 0xFFFFFFC4, 0x000000FA, 0x00000014, 0x0000012C, 0xFFFFFFCE, 0x000000DC, 0x00000014, 0x000000FA, 0xFFFFFF9C, 0x000000BE, 0x00000014, 0x00000118, 0xFFFFFFBA, 0x000000A0, 0x00000014, 0x000000FA, 0xFFFFFFCE, 0x00000082, 0x00000014, 0x000000E6, 0xFFFFFF9C, 0x00000064, 0x00000014 dlabel D_8024AEA8_B118A8 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x000002BC, 0xFFFFFFCE, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF8F8, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000011, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x00000011, 0x00000258, 0xFFFFFF06, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF790, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000011, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF6A, 0xFFFFFE52, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000073, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x000000A8, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_8024ADF8_B117F8, 0x00000005, 0x00000001, 0x0000000B, 0x00000034, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8280, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_8024AA8C_B1148C, 0x00000043, 0x00000004, SetPlayerPos, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000001, func_80240EB8_B078B8, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, func_80240F2C_B0792C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000096, 0x00000043, 0x00000002, ClearAmbientSounds, 0x00000096, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006F, 0x00000000, 0x00000008, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000E6, 0x00000012, 0x00000000, 0x00000019, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000BE, 0x00000012, 0x00000000, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000C, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x00000096, 0x0000003C, 0x00000000, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x0000000E, 0x00000096, 0x0000003C, 0x00000000, 0x00000001, 0x0000014A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000136, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300AA, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, PlaySound, 0x0000022D, 0x00000043, 0x00000002, RemoveNpc, 0x00000013, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00010009, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00020010, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0003000F, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00040007, 0x00000016, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x0005000A, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00060006, 0x00000016, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x00070006, 0x00000016, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x0008000D, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000007, 0x0000001D, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x0000001E, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AB, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000010, 0x000000C8, 0x00000000, 0x00000055, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000012, 0x000000E6, 0x0000001E, 0x00000055, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000006B, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000010, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000010, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A7480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002EE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0xF24A9A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000002, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8B, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000012, 0x0020000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x0000012C, 0x00000000, 0x00000028, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x001300AD, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0xF24A9280, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000012, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A8E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000001C2, 0x00000000, 0x0000008C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000004, 0x00000008, 0x00000001, 0x0000009B, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300AE, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000005, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00610006, 0x00610004, 0x00000200, 0x0000000F, 0x001300AF, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300B0, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, StopSound, 0x000003BC, 0x00000043, 0x00000006, PlaySoundAt, 0x00000230, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0xF24A9A80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300B1, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_80240D30_B07730, 0x00000043, 0x00000005, TranslateGroup, 0x000000AD, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7A80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000011, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_802CDE68, 0x0000000F, 0x00000022, 0x00000043, 0x00000003, func_802CDE68, 0x00000011, 0x0000000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240E54_B07854, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_8024AEA8_B118A8, 0x00000043, 0x00000003, GotoMap, 0x8024C718, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignSwitchFlag, 0x0000001A, 0x00000047, 0x00000005, 0x802463F4, 0x00020000, 0xF971889A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x000002BC, 0xFFFFFFCE, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF8F8, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000011, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x00000011, 0x00000258, 0xFFFFFF06, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF790, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000011, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF6A, 0xFFFFFE52, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000073, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x000000A8, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_8024ADF8_B117F8, 0x00000005, 0x00000001, 0x0000000B, 0x00000034, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8280, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_8024AA8C_B1148C, 0x00000043, 0x00000004, SetPlayerPos, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000001, func_80240EB8_B078B8, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, func_80240F2C_B0792C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000096, 0x00000043, 0x00000002, ClearAmbientSounds, 0x00000096, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006F, 0x00000000, 0x00000008, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000E6, 0x00000012, 0x00000000, 0x00000019, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000BE, 0x00000012, 0x00000000, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000C, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x00000096, 0x0000003C, 0x00000000, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x0000000E, 0x00000096, 0x0000003C, 0x00000000, 0x00000001, 0x0000014A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000136, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300AA, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, PlaySound, 0x0000022D, 0x00000043, 0x00000002, RemoveNpc, 0x00000013, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00010009, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00020010, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0003000F, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00040007, 0x00000016, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x0005000A, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00060006, 0x00000016, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x00070006, 0x00000016, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x0008000D, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000007, 0x0000001D, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x0000001E, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AB, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000010, 0x000000C8, 0x00000000, 0x00000055, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000012, 0x000000E6, 0x0000001E, 0x00000055, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000006B, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000010, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000010, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A7480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002EE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0xF24A9A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000002, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8B, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000012, 0x0020000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x0000012C, 0x00000000, 0x00000028, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x001300AD, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0xF24A9280, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000012, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A8E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000001C2, 0x00000000, 0x0000008C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000004, 0x00000008, 0x00000001, 0x0000009B, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300AE, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000005, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00610006, 0x00610004, 0x00000200, 0x0000000F, 0x001300AF, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300B0, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, StopSound, 0x000003BC, 0x00000043, 0x00000006, PlaySoundAt, 0x00000230, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0xF24A9A80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300B1, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_80240D30_B07730, 0x00000043, 0x00000005, TranslateGroup, 0x000000AD, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7A80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000011, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x0000000F, 0x00000022, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000011, 0x0000000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240E54_B07854, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_8024AEA8_B118A8, 0x00000043, 0x00000003, GotoMap, 0x8024C718, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignSwitchFlag, 0x0000001A, 0x00000047, 0x00000005, 0x802463F4, 0x00020000, 0xF971889A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_01/D9BB20.data.s b/ver/us/asm/data/world/area_omo/omo_01/D9BB20.data.s deleted file mode 100644 index 84563e8c87..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_01/D9BB20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C30_D9BB20 -.word 0x43AF0000, 0x00000000, 0xC3A50000, 0x43610000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240D38, D_80240C30_D9BB20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900D9, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_01/D9BBA0.data.s b/ver/us/asm/data/world/area_omo/omo_01/D9BBA0.data.s deleted file mode 100644 index 009f25a5c0..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_01/D9BBA0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CB0_D9BBA0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242440, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D0C_D9BBFC -.word 0x00000047, 0x00000005, D_80240CB0_D9BBA0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, 0xF840633C, 0x00000001, 0x00000024, 0x00000002, 0xF8405FD3, 0x00000001, 0x00000024, 0x00000002, 0xF8405C8C, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242310, 0x00000046, 0x00000001, 0x80242360, 0x00000046, 0x00000001, 0x802412C4, 0x00000046, 0x00000001, 0x80240C80, 0x00000024, 0x00000002, 0xFE363C80, D_80240D0C_D9BBFC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_01/D9BD50.data.s b/ver/us/asm/data/world/area_omo/omo_01/D9BD50.data.s deleted file mode 100644 index 37a4bb2273..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_01/D9BD50.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E60_D9BD50 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000061, 0xFE363C80, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C80, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000065, 0xFE363C80, 0x00000001, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F6C_D9BE5C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000A0, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000075, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000077, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000079, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000A0, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000075, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000077, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000079, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411D8_D9C0C8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000087, 0xFE363C80, 0x00000001, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412A0_D9C190 -.word 0x0000008D, 0x0000008E - -dlabel D_802412A8_D9C198 -.word 0x00000043, 0x00000001, func_80240000_D9AEF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240E60_D9BD50, 0x00000044, 0x00000001, D_80240F6C_D9BE5C, 0x00000044, 0x00000001, D_802411D8_D9C0C8, 0x00000044, 0x00000001, D_802412A8_D9C198, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s b/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s deleted file mode 100644 index de754735c9..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241310_D9C200 -.word 0x40200000, 0x00000032, 0x0000000F, 0x42C80000, 0x00000000, 0x00000003, 0x4079999A, 0x00000014, 0x00000001, 0x43340000, 0x00000000, 0x00000001 - -dlabel D_80241340_D9C230 -.word 0x00000043, 0x00000002, omo_01_UnkFloAI_Main, D_80241310_D9C200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241360_D9C250 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80241340_D9C230, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_8024138C_D9C27C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C8A, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001A, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C84, 0x00000001, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0xFE363C8A, 0x0000000A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C8D, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000C, 0xFE363C8E, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000D, 0xFE363C8E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000E, 0xFE363C8E, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415C0_D9C4B0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FD5, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416A0_D9C590 -.word 0x0000000A, 0x00000002, 0xF8405FD5, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FD4, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802415C0_D9C4B0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405FD4, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000030, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000025, 0x00000002, 0xFE363C83, 0xF8405FD4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x000000A3, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_8024138C_D9C27C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417A0_D9C690 -.word 0x00000000, D_80241360_D9C250, 0xC3250000, 0x00000000, 0xC2480000, 0x00000C00, D_802416A0_D9C590, 0x00000000, 0x00000000, 0x0000005A, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0xFFFFFF5B, 0x00000000, 0xFFFFFFCE, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF5B, 0x00000000, 0xFFFFFFCE, 0x0000012C, 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, 0x003B0001, 0x003B0002, 0x003B0004, 0x003B0004, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241990_D9C880 -.word 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802415C0_D9C4B0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000044, 0x00000001, D_8024138C_D9C27C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A00_D9C8F0 -.word 0x00000001, D_80241360_D9C250, 0xC1C80000, 0x00000000, 0xC3200000, 0x00000C00, D_80241990_D9C880, 0x00000000, 0x00000000, 0x0000010E, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0xFFFFFFE7, 0x00000000, 0xFFFFFF60, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFE7, 0x00000000, 0xFFFFFF60, 0x0000012C, 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, 0x003B0401, 0x003B0402, 0x003B0404, 0x003B0404, 0x003B0401, 0x003B0401, 0x003B040C, 0x003B040C, 0x003B0415, 0x003B0412, 0x003B0411, 0x003B0410, 0x003B0405, 0x003B0401, 0x003B0401, 0x003B0401, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241BF0_D9CAE0 -.word 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802415C0_D9C4B0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000044, 0x00000001, D_8024138C_D9C27C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C60_D9CB50 -.word 0x00000002, D_80241360_D9C250, 0xC2700000, 0x00000000, 0x43C30000, 0x00000C00, D_80241BF0_D9CAE0, 0x00000000, 0x00000000, 0x0000010E, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0xFFFFFFC4, 0x00000000, 0x00000186, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000186, 0x0000012C, 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, 0x003B0401, 0x003B0402, 0x003B0404, 0x003B0404, 0x003B0401, 0x003B0401, 0x003B040C, 0x003B040C, 0x003B0415, 0x003B0412, 0x003B0411, 0x003B0410, 0x003B0405, 0x003B0401, 0x003B0401, 0x003B0401, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241E50_D9CD40 -.word 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802415C0_D9C4B0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000044, 0x00000001, D_8024138C_D9C27C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EC0_D9CDB0 -.word 0x00000003, D_80241360_D9C250, 0x42480000, 0x00000000, 0x43660000, 0x00000C00, D_80241E50_D9CD40, 0x00000000, 0x00000000, 0x0000010E, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000032, 0x00000000, 0x000000E6, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000032, 0x00000000, 0x000000E6, 0x0000012C, 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, 0x003B0101, 0x003B0102, 0x003B0104, 0x003B0104, 0x003B0101, 0x003B0101, 0x003B010C, 0x003B010C, 0x003B0115, 0x003B0112, 0x003B0111, 0x003B0110, 0x003B0105, 0x003B0101, 0x003B0101, 0x003B0101, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802420B0_D9CFA0 -.word 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802415C0_D9C4B0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000080, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000044, 0x00000001, D_8024138C_D9C27C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242120_D9D010 -.word 0x00000004, D_80241360_D9C250, 0x43AA0000, 0x00000000, 0x42F00000, 0x00000C00, D_802420B0_D9CFA0, 0x00000000, 0x00000000, 0x0000010E, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000154, 0x00000000, 0x00000078, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000154, 0x00000000, 0x00000078, 0x0000012C, 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, 0x003B0201, 0x003B0202, 0x003B0204, 0x003B0204, 0x003B0201, 0x003B0201, 0x003B020C, 0x003B020C, 0x003B0215, 0x003B0212, 0x003B0211, 0x003B0210, 0x003B0205, 0x003B0201, 0x003B0201, 0x003B0201, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802417A0_D9C690, 0x10000001, 0x00000001, D_80241A00_D9C8F0, 0x10020001, 0x00000001, D_80241C60_D9CB50, 0x10020001, 0x00000001, D_80241EC0_D9CDB0, 0x10010001, 0x00000001, D_80242120_D9D010, 0x10050001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_01/D9D250.data.s b/ver/us/asm/data/world/area_omo/omo_01/D9D250.data.s deleted file mode 100644 index a5d09f2912..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_01/D9D250.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242360_D9D250 -.word 0x0000000A, 0x00000002, 0xF8405FD5, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FD4, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000030, 0xFFFFFFA3, 0x00000000, 0x00000023, 0x00000011, 0xF8405FD4, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF15, 0x00000000, 0x00000096, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FD6, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFE2, 0x0000003C, 0xFFFFFF15, 0x00000000, 0x00000098, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FD7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA0080.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA0080.data.s deleted file mode 100644 index 1c1601bb0b..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_02/DA0080.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242BB0_DA0080 -.word 0xC4728000, 0x00000000, 0x00000000, 0x42B40000, 0x43B40000, 0x00000000, 0x41A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242D40, D_80242BB0_DA0080, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900DA, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA0110.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA0110.data.s deleted file mode 100644 index af57338d69..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_02/DA0110.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242C40_DA0110 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247860, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C9C_DA016C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247868, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CF8_DA01C8 -.word 0x00000047, 0x00000005, D_80242C40_DA0110, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242C9C_DA016C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, MakeNpcs, 0x00000001, 0x80247828, 0x00000046, 0x00000001, 0x80242FE0, 0x00000046, 0x00000001, 0x8024351C, 0x00000046, 0x00000001, 0x80242C10, 0x00000046, 0x00000001, 0x8024455C, 0x00000024, 0x00000002, 0xFE363C80, D_80242CF8_DA01C8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA0300.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA0300.data.s deleted file mode 100644 index e5f3c26f93..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_02/DA0300.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242E30_DA0300 -.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_80242E98_DA0368 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, omo_02_UnsetCamera0MoveFlag1, 0x00000045, 0x00000002, D_80242E30_DA0300, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFEDE, 0x00000055, 0xFFFFFFB2, 0x00000028, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000001, omo_02_SetCamera0MoveFlag1, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000001, omo_02_SetCamera0MoveFlag1, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000012C, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDA, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFF38, 0x0000003C, 0xFFFFFFB2, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDB, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFB0, 0x00000059, 0xFFFFFFB2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0xFFFFFFB0, 0x00000072, 0xFFFFFFB2, 0x0000000D, 0xF8405FDC, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFE9A, 0x00000000, 0xFFFFFFAE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242E98_DA0368, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA05B0.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA05B0.data.s deleted file mode 100644 index 29ffd0e831..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_02/DA05B0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802430E0_DA05B0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000089, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000008B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000091, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000093, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000095, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024324C_DA071C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000A0, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000076, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000078, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007A, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007E, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000080, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000A0, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000076, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000078, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007A, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000007E, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000080, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434C8_DA0998 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434D8_DA09A8 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434F8_DA09C8 -.word 0x0000004A, 0x0000004B - -dlabel D_80243500_DA09D0 -.word 0x00000043, 0x00000001, func_80240040_D9D510, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802430E0_DA05B0, 0x00000044, 0x00000001, D_8024324C_DA071C, 0x00000044, 0x00000001, D_802434C8_DA0998, 0x00000044, 0x00000001, D_802434D8_DA09A8, 0x00000044, 0x00000001, D_80243500_DA09D0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA0A50.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA0A50.data.s deleted file mode 100644 index 38ec653129..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_02/DA0A50.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243580_DA0A50 -.word 0x00000054, 0x00000056, 0x00000058, 0x0000005A, 0x0000005F, 0x00000061, 0x00000063, 0x00000065, 0x00000068, 0x0000006C, 0x0000006E, 0x00000070 - -dlabel D_802435B0_DA0A80 -.word 0x0000002C, 0x0000002E, 0x00000030, 0x00000032, 0x00000037, 0x00000039, 0x0000003B, 0x0000003D, 0x00000040, 0x00000044, 0x00000046, 0x00000048 - -dlabel D_802435E0_DA0AB0 -.word 0xC4020000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802435F0_DA0AC0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000074, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8024043C_D9D90C, 0x00000005, 0x00000001, 0x0000000A, 0x00000030, 0x00000001, D_80243580_DA0A50, 0x00000005, 0x00000001, 0x0000000C, 0x00000031, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000030, 0x00000001, D_80243580_DA0A50, 0x00000005, 0x00000001, 0x0000000C, 0x00000031, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000030, 0x00000001, D_802435B0_DA0A80, 0x00000005, 0x00000001, 0x0000000C, 0x00000031, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C80, 0x7FFFFE00, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFE84, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE84, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000007, 0x00000028, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000007, 0xFFFFFFA6, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000052, 0x000001F4, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000052, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000007, 0x00000028, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000007, 0xFFFFFFA6, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x0000005D, 0x000001F4, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000005D, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C80, 0xF24A8080, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFE363C80, 0xFE363C81, 0x00000000, 0xFE363C83, 0x00000014, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000042, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000007, 0x00000028, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000042, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000007, 0xFFFFFFA6, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000042, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x0000006A, 0x000001F4, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000006A, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, PlaySound, 0x8000004D, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C80, 0xF24A8080, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x0000000A, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFE363C80, 0xFE363C81, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000008, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C80, 0x00000000, 0x00000014, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x0000000C, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF83, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF83, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x000000A5, 0x00000043, 0x00000002, PlaySound, 0x0000076D, 0x00000043, 0x00000002, func_802D62E4, 0x0000036D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x003B0004, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFEE3, 0x00000000, 0x00000023, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF79, 0x00000017, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF92, 0xFFFFFFF3, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, func_802CDE68, 0x00000000, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF7, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x003B0010, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFD3, 0x00000000, 0xFFFFFFF8, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E3, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C89, 0x000003E4, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x003B0001, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFF8, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003A2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x003B0004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000064, 0x00000032, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, StopSound, 0x000003A2, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF8405FD9, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002A, 0x00000052, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002C, 0x00000054, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002E, 0x00000056, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000030, 0x00000058, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000032, 0x0000005A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000035, 0x0000005D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000037, 0x0000005F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x00000061, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003B, 0x00000063, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003D, 0x00000065, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000040, 0x00000068, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000042, 0x0000006A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000044, 0x0000006C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000046, 0x0000006E, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000048, 0x00000070, 0x0000000A, 0x00000002, 0xF8405FD9, 0x00000000, 0x00000047, 0x00000005, D_802435F0_DA0AC0, 0x00100000, D_802435E0_DA0AB0, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000074, 0x00000000, 0x00000030, 0x00000001, D_80243580_DA0A50, 0x00000005, 0x00000001, 0x0000000C, 0x00000031, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000006, 0x00000000, 0x00000030, 0x00000001, D_802435B0_DA0A80, 0x00000005, 0x00000001, 0x0000000C, 0x00000031, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C80, 0x7FFFFE00, 0x00000006, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFFFFFFA6, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFFFFFFA6, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFFFFFFA6, 0xF24A7C93, 0x00000000, 0xF24A823A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000042, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s deleted file mode 100644 index 0427a439e0..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244800_DA1CD0 -.word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 - -dlabel D_80244830_DA1D00 -.word 0x00000043, 0x00000002, omo_02_ShyGuyWanderAI_Main, D_80244800_DA1CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80244830_DA1D00, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_8024487C_DA1D4C -.word 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x43200000, 0x42480000, 0x00000001 - -dlabel D_802448A0_DA1D70 -.word 0x00000043, 0x00000002, omo_02_StationaryAI_Main, D_8024487C_DA1D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802448A0_DA1D70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_802448EC_DA1DBC -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_80244918_DA1DE8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802449E8_DA1EB8 -.word 0x3FC00000, 0x0000003C, 0x0000000F, 0x42B40000, 0x42480000, 0x00000003, 0x40733333, 0x00000008, 0x00000001, 0x430C0000, 0x42700000, 0x00000001 - -dlabel D_80244A18_DA1EE8 -.word 0x00000043, 0x00000001, omo_02_SetInstigatorValue_3, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, omo_02_RangedAttackAI_Main, D_802449E8_DA1EB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244A94_DA1F64 -.word 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80244A18_DA1EE8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 - -dlabel D_80244AC0_DA1F90 -.word 0x41000000, 0x00000000, 0x00000000, 0x40800000, 0x3F000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244AF0_DA1FC0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000D, 0x00000043, 0x00000002, omo_02_ProjectileAI_Main, D_80244AC0_DA1F90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B60_DA2030 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B70_DA2040 -.word 0x00000043, 0x00000001, omo_02_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244B60_DA2030, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, omo_02_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, SetBattleAsScripted, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244AF0_DA1FC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D38_DA2208 -.word 0x00000000, 0x00070007, 0x00000000, 0x00000000, D_80244AF0_DA1FC0, D_80244B70_DA2040, 0x00000000, D_80244918_DA1DE8, 0x00000000, 0x00000000, 0x00000008 - -dlabel D_80244D64_DA2234 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000004, GetCamPosB, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2411A80, 0xFE363C81, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244E44_DA2314 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000021, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244E8C_DA235C -.word 0x0000000A, 0x00000002, 0xF8405FD8, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDC6, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDC6, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000045, 0x00000002, D_80244E44_DA2314, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDC1, 0x00000000, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFE34, 0x00000000, 0xFFFFFFEC, 0x00000028, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000045, 0x00000002, D_80244D64_DA2234, 0xFD050F8A, 0x00000024, 0x00000002, 0xF8405FD8, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000045, 0x00000002, D_80244D64_DA2234, 0xFD050F8A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFDC1, 0x00000000, 0xFFFFFFEC, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFD08, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFE34, 0x00000000, 0xFFFFFFEC, 0x00000028, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245144_DA2614 -.word 0x0000000A, 0x00000002, 0xF8405FD9, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFCE0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80244E8C_DA235C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802451B4_DA2684 -.word 0x00000000, 0xFFFFFEC0, 0x0000001E, 0x00000000, 0xFFFFFF16, 0x00000017, 0x00000001, 0xFFFFFF54, 0x00000000, 0x00000019, 0x00000000, 0xFFFFFF88, 0x0000002B, 0x00000000, 0xFFFFFFC1, 0xFFFFFFF0, 0x00000001, 0xFFFFFFE8, 0x00000000, 0xFFFFFFF5, 0x00000000, 0x00000011, 0x0000002E, 0x00000001, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000073, 0x00000048, 0x00000001, 0x0000009A, 0x00000000, 0x00000021, 0x00000000, 0x000000C2, 0x00000000, 0x00000000, 0x000000F0, 0xFFFFFFFE, 0xFFFFFFFF - -dlabel D_80245258_DA2728 -.word 0x00000000, 0xFFFFFEE9, 0x00000014, 0x00000000, 0xFFFFFF58, 0x0000001E, 0x00000000, 0xFFFFFF96, 0xFFFFFFF5, 0x00000000, 0xFFFFFFC4, 0xFFFFFFBD, 0x00000000, 0xFFFFFFED, 0xFFFFFF98, 0x00000000, 0x0000001D, 0xFFFFFFB8, 0x00000000, 0x0000004C, 0x00000008, 0x00000000, 0x00000080, 0x00000063, 0x00000000, 0x000000C4, 0x0000004F, 0x00000000, 0x00000103, 0x0000000E, 0x00000000, 0x00000135, 0xFFFFFFEC, 0x00000000, 0x00000173, 0x0000001E, 0xFFFFFFFF - -dlabel D_802452EC_DA27BC -.word 0x00000000, 0xFFFFFEBA, 0x0000002A, 0x00000000, 0xFFFFFEE0, 0x00000045, 0x00000000, 0xFFFFFF00, 0x00000054, 0x00000000, 0xFFFFFF1B, 0x00000044, 0x00000000, 0xFFFFFF30, 0x0000002B, 0x00000000, 0xFFFFFF4B, 0x00000015, 0x00000000, 0xFFFFFF65, 0x00000015, 0x00000000, 0xFFFFFF87, 0x00000032, 0x00000000, 0xFFFFFF88, 0x00000067, 0x00000000, 0xFFFFFF6F, 0x0000006F, 0x00000000, 0xFFFFFF58, 0x00000049, 0x00000000, 0xFFFFFF5C, 0x00000016, 0x00000000, 0xFFFFFF85, 0xFFFFFFF3, 0x00000000, 0xFFFFFFB3, 0x00000000, 0x00000001, 0xFFFFFFE2, 0x00000000, 0x0000001B, 0x00000000, 0x00000005, 0x0000002D, 0x00000000, 0x00000028, 0x00000029, 0x00000000, 0x00000057, 0x00000000, 0x00000000, 0x00000078, 0xFFFFFFF9, 0x00000000, 0x000000B1, 0x00000012, 0x00000000, 0x000000DB, 0x0000002E, 0x00000000, 0x00000104, 0x00000036, 0xFFFFFFFF - -dlabel D_802453FC_DA28CC -.word 0x00000000, 0xFFFFFECB, 0x00000009, 0x00000000, 0xFFFFFF1A, 0x0000001B, 0x00000000, 0xFFFFFF6A, 0x00000010, 0x00000000, 0xFFFFFF9F, 0xFFFFFFE8, 0x00000000, 0xFFFFFFE1, 0xFFFFFFF3, 0x00000000, 0x00000019, 0x0000001E, 0x00000000, 0x00000054, 0x0000001B, 0x00000000, 0x00000085, 0xFFFFFFFD, 0xFFFFFFFF - -dlabel D_80245460_DA2930 -.word D_802451B4_DA2684, D_80245258_DA2728, D_802452EC_DA27BC, D_802453FC_DA28CC, D_802451B4_DA2684, D_80245258_DA2728, D_802451B4_DA2684, D_802453FC_DA28CC, D_802451B4_DA2684, D_80245258_DA2728 - -dlabel D_80245488_DA2958 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000000A, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000008, 0x00000001, 0xFE363C80, 0x00000006, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000100, 0x00000001, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000030, 0x00000001, D_80245460_DA2930, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000003, 0x00000001, 0x0000000A, 0x00000031, 0x00000001, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24AA280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000033, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000015, 0x00000016, 0x00000001, 0x00000015, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802459DC_DA2EAC -.word 0xFFFFFE32, 0x00000000, 0xFFFFFFB0, 0xFFFFFE41, 0x00000000, 0xFFFFFFD8, 0xFFFFFE50, 0x00000000, 0x00000000, 0xFFFFFE4B, 0x00000000, 0x00000050, 0xFFFFFE6E, 0x00000000, 0x00000050, 0xFFFFFE4A, 0x00000000, 0xFFFFFFB0, 0xFFFFFE59, 0x00000000, 0xFFFFFFD8, 0xFFFFFE68, 0x00000000, 0x00000000, 0xFFFFFE26, 0x00000000, 0xFFFFFFC5, 0xFFFFFE86, 0x00000000, 0x00000050 - -dlabel D_80245A54_DA2F24 -.word 0x0000000A, 0x00000002, 0xF8405FD9, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80245488_DA2958, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000000, 0x00000030, 0x00000001, D_802459DC_DA2EAC, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245B18_DA2FE8 -.word 0x00000000, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000A01, D_80245144_DA2614, 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_80245D08_DA31D8 -.word 0x00000001, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x00000002, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x00000003, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x00000004, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x00000005, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x00000006, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x00000007, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x00000008, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x00000009, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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, 0x0000000A, D_802448EC_DA1DBC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80245A54_DA2F24, 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_80247068_DA4538 -.word 0x00000032, D_80244A94_DA1F64, 0x43480000, 0x00000000, 0x41F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x00020000, 0x00820002, 0x00000084, 0x00020000, 0x00860002, 0x00000085, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000C8, 0x00000000, 0x0000001E, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x00000000, 0x0000001E, 0x000000C8, 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, 0x003F0002, 0x003F0004, 0x003F0005, 0x003F0004, 0x003F0002, 0x003F0002, 0x003F000B, 0x003F000B, 0x003F0015, 0x003F0016, 0x003F0002, 0x003F0002, 0x003F0002, 0x003F0002, 0x003F0002, 0x003F0002, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000033, D_80244D38_DA2208, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000034, D_80244D38_DA2208, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000035, D_80244D38_DA2208, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80245B18_DA2FE8, 0x00000000, 0x0000000A, D_80245D08_DA31D8, 0x00000000, 0x00000003, D_80247068_DA4538, 0x101B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_03/DA5AD0.data.s b/ver/us/asm/data/world/area_omo/omo_03/DA5AD0.data.s deleted file mode 100644 index a511b57f95..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_03/DA5AD0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240890_DA5AD0 -.word 0xC3A00000, 0x00000000, 0x43A00000, 0x42340000, 0x43AA0000, 0x00000000, 0x43A50000, 0x439D8000, 0xC3A00000, 0x41200000, 0xC3A00000, 0x43070000, 0x43A00000, 0x41200000, 0xC3A00000, 0x43610000, 0xC3750000, 0x43870000, 0x437A0000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0xC3A00000, 0x00000000, 0x43A00000, 0x42340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240C88_DA5EC8, D_80240890_DA5AD0, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900DB - -dlabel D_80240940_DA5B80 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000002, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000020, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A40_DA5C80 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80248170, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A9C_DA5CDC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80248178, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AF8_DA5D38 -.word 0x00000047, 0x00000005, D_80240A40_DA5C80, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A9C_DA5CDC, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B40_DA5D80 -.word 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240AF8_DA5D38, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80240AF8_DA5D38, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000044, 0x00000001, D_80240AF8_DA5D38, 0x00000044, 0x00000001, 0x802417B0, 0x00000016, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80247E60, 0x00000016, 0x00000001, 0x00000006, 0x00000044, 0x00000001, 0x802476AC, 0x0000001C, 0x00000000, 0x00000044, 0x00000001, D_80240AF8_DA5D38, 0x00000008, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C88_DA5EC8 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF7, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF7, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF840633C, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242F0C, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242F24, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802419C8, 0x00000046, 0x00000001, 0x802414B4, 0x00000046, 0x00000001, D_80240940_DA5B80, 0x00000046, 0x00000001, 0x8024746C, 0x00000044, 0x00000001, D_80240B40_DA5D80, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s b/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s deleted file mode 100644 index a8f819fdbf..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E10_DA6050 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F1C_DA615C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000A0, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004C, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000A0, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004C, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024108C_DA62CC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000046, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241138_DA6378 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000046, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000057, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001F1, 0x00000000, 0xFFFFFE48, 0x0000000A, 0x00000028, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001C, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF48, 0x0000000A, 0xFFFFFF1B, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF48, 0x0000000A, 0xFFFFFF1B, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF252901A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF247AA80, 0xF2457280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADE80, 0xF24A6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x000001F2, 0x00000000, 0xFFFFFF7E, 0x00000000, 0xFFFFFF29, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000051, 0x00000000, 0xFFFFFF7E, 0x00000000, 0xFFFFFF29, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000043, 0x00000002, GetModelCenter, 0x00000017, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240E10_DA6050, 0x00000044, 0x00000001, D_80240F1C_DA615C, 0x00000044, 0x00000001, D_8024108C_DA62CC, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x00000057, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000000, 0x00000047, 0x00000005, D_80241138_DA6378, 0x00000100, 0x0000001B, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001C, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000057, 0x00000046, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000006, RotateModel, 0x0000005B, 0x000000B4, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0x000000B4, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005A, 0x000000B4, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415E0_DA6820 -.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_80241648_DA6888 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000001, omo_03_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GotoMap, 0x80248180, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF0B, 0x0000010E, 0x000000FA, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFA1, 0x00000000, 0x000000FA, 0x00000019, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000009, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000025, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF92, 0x00000000, 0x000000BE, 0x00000014, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000019, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFF6A, 0x00000000, 0x000000FA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241648_DA6888, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x000000CB, 0x00000000, 0x000000C8, 0x00000000, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406026, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000190, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000088, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AA0_DA6CE0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AB0_DA6CF0 -.word 0x00000000, 0x00200018, D_80241AA0_DA6CE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241ADC_DA6D1C -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80241B08_DA6D48 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_80241B34_DA6D74 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFB, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000043, 0x00000001, CloseChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000021, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0002, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000000, 0x000F0000, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000000, 0x000F0001, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405FCC, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0003, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0003, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0005, 0x00000024, 0x00000002, 0xF8405FCC, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0004, 0x00000024, 0x00000002, 0xF8405FCC, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000046, 0x00000001, 0x8024705C, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x80246108, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E78_DA70B8 -.word 0x00000021, 0x00000000 - -dlabel D_80241E80_DA70C0 -.word 0x0000004E, 0x00000006, D_80241B34_DA6D74, 0x00000010, 0x00000000, D_80241E78_DA70B8, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EB0_DA70F0 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x008C0002, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241E80_DA70C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F00_DA7140 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF8, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0206, 0x008C0202, 0x00000000, 0x000F0017, 0x00000018, 0x00000001, 0xFFFFFFF9, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F0018, 0x00000018, 0x00000001, 0xFFFFFFFB, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F0019, 0x00000018, 0x00000001, 0xFFFFFFFC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F001A, 0x00000018, 0x00000001, 0xFFFFFFFD, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F001B, 0x00000018, 0x00000001, 0xFFFFFFFE, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F001C, 0x00000018, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F001D, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000025, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F001E, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F001F, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F0020, 0x00000018, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F0021, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0204, 0x008C0201, 0x00000000, 0x000F0022, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242158_DA7398 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241F00_DA7140, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024217C_DA73BC -.word 0x00000000, D_80241AB0_DA6CF0, 0x432A0000, 0x42480000, 0xC2E60000, 0x00400D05, D_80241EB0_DA70F0, 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, 0x008C0001, 0x008C0003, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00B8, 0x00000001, D_80241AB0_DA6CF0, 0x431E0000, 0x00000000, 0x42AA0000, 0x00400D05, D_80242158_DA7398, 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, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x008C0201, 0x00000000, 0x00000000, 0x00000000, 0x001A00B8 - -dlabel D_8024255C_DA779C -.word 0x00000002, D_80241ADC_DA6D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000005, 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, 0x00040001, 0x00040002, 0x00040003, 0x00040003, 0x00040001, 0x00040001, 0x00040000, 0x00040000, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80241B08_DA6D48, 0x42480000, 0x41700000, 0x43200000, 0x00000005, 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, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80241B08_DA6D48, 0x42C80000, 0x00000000, 0x43200000, 0x00000005, 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, 0x00000005, D_80241B08_DA6D48, 0x42E60000, 0x00000000, 0x43480000, 0x00000005, 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, 0x00000006, D_80241B08_DA6D48, 0x43110000, 0x00000000, 0x43160000, 0x00000005, 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, 0x00000002, D_8024217C_DA73BC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024217C_DA73BC, 0x00000000, 0x00000005, D_8024255C_DA779C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s b/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s deleted file mode 100644 index 854b29c45c..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s +++ /dev/null @@ -1,120 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242F50_DA8190 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_03_AdvanceBuffer, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_03_CosInterpMinMax, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_03_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_03_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_03_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_03_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_03_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_03_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_03_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_03_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_03_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000008A, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000008A, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000008A, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x0000008C, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000008A, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000008C, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000088, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244118_DA9358 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244180_DA93C0 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244244_DA9484 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024435C_DA959C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024475C_DA999C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000032, 0x00000030, 0x00000001, 0xFE363C89, 0x00000034, 0x00000004, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8480, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFE363C85, 0x00000032, 0xFE363C86, 0x0000000F, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7AE7, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24B6A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BE4_DA9E24 -.word 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244EE0_DAA120 -.word 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8880, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BCE80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24BBA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B4280, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24BCE80, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245178_DAA3B8 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248198, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248190, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248188, 0x00000003, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245238_DAA478 -.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248198, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248190, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248188, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248198, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248188, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248198, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248190, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802454DC_DAA71C -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_03_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80245178_DAA3B8, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80245238_DAA478, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024556C_DAA7AC -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000008E, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008E, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x00000099, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000093, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000093, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000099, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024598C_DAABCC -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000092, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000037, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000092, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000037, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245BC4_DAAE04 -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245DFC_DAB03C -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245E98_DAB0D8 -.word 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000044, 0x00000001, D_8024556C_DAA7AC, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000037, 0x00000092, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000038, 0x00000093, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003D, 0x00000098, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003E, 0x00000099, 0x00000047, 0x00000005, D_8024598C_DAABCC, 0x00000080, 0x00000037, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024598C_DAABCC, 0x00001000, 0x00000038, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245BC4_DAAE04, 0x00000080, 0x0000003D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245BC4_DAAE04, 0x00001000, 0x0000003E, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFBB4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 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_80245DFC_DAB03C, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246080_DAB2C0 -.word 0x000000AA, 0xFFFFFF8D - -dlabel D_80246088_DAB2C8 -.word 0xFFFFFE81, 0xFFFFFF10 - -dlabel D_80246090_DAB2D0 -.word 0xFFFFFE98, 0xFFFFFF3D, 0xFFFFFEB1, 0xFFFFFF29 - -dlabel D_802460A0_DAB2E0 -.word 0xF245CEC8, 0xF245F806, 0xF24CAA80, 0xF2466080, 0xF246A528, 0xF24A7A80, 0xF247BE80, 0xF24D2210, 0xF247088B, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_802460D0_DAB310 -.word 0xF245CEC8, 0xF245F806, 0xF24CAA80, 0xF2466080, 0xF246A528, 0xF24A7A80, 0xF247BE80, 0xF24E9480, 0xF246A528, 0xF251F729, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000000, 0x000F0014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0015, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x00000045, 0x00000002, D_80244244_DA9484, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C80, D_802460A0_DAB2E0, 0x00000024, 0x00000002, 0xFE363C89, D_80246090_DAB2D0, 0x00000046, 0x00000001, D_8024475C_DA999C, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802460A0_DAB2E0, 0x00000024, 0x00000002, 0xFD050F82, 0x00000003, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_80244180_DA93C0, 0x00000043, 0x00000001, dup_omo_03_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C89, D_80246080_DAB2C0, 0x00000046, 0x00000001, D_80244BE4_DA9E24, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F000E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000045, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802460D0_DAB310, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802454DC_DAA71C, 0x00000003, 0x00000001, 0x0000001E, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802481A8, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246510_DAB750 -.word 0xF24C8781, 0xF24731D4, 0xF24BA67D, 0xF24E9480, 0xF246A528, 0xF251F729, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246538_DAB778 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x00000044, 0x00000001, D_80244244_DA9484, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246510_DAB750, 0x00000046, 0x00000001, D_8024435C_DA959C, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246510_DAB750, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802481A8, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802466C0_DAB900 -.word 0xF24C8781, 0xF24731D4, 0xF24E767D, 0xF24A7A80, 0xF247BE80, 0xF2466080, 0xF246A528, 0xF244F4D4, 0xF244F3C0, 0xF242FDD8, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_802466F8_DAB938 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x00000044, 0x00000001, D_80244244_DA9484, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802466C0_DAB900, 0x00000046, 0x00000001, D_8024435C_DA959C, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802466C0_DAB900, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFEA2, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802481A8, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246880_DABAC0 -.word 0xF250F60B, 0xF243CEBC, 0xF24DEA2E, 0xF25000B7, 0xF244F44A, 0xF24E9480, 0xF246A528, 0xF24BECF1, 0xF2475C8B, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_802468B0_DABAF0 -.word 0xF250F60B, 0xF243CEBC, 0xF24DEA2E, 0xF25000B7, 0xF244F44A, 0xF24E9480, 0xF246A528, 0xF24A7A80, 0xF247BE80, 0xF2466080, 0xF246A528, 0xF244F4D4, 0xF244F3C0, 0xF242FDD8, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_802468F8_DABB38 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246880_DABAC0, 0x00000024, 0x00000002, 0xFD050F82, 0x00000002, 0x00000044, 0x00000001, D_80242F50_DA8190, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80244118_DA9358, 0xFE363C8B, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_80244180_DA93C0, 0x00000043, 0x00000001, dup_omo_03_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C89, D_80246080_DAB2C0, 0x00000046, 0x00000001, D_80244BE4_DA9E24, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F000E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000045, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244118_DA9358, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802468B0_DABAF0, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80242F50_DA8190, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802454DC_DAA71C, 0x00000003, 0x00000001, 0x00000014, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFEA2, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802481A8, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246BE0_DABE20 -.word 0xF243FEF6, 0xF243CEBC, 0xF24CAACD, 0xF244F4D4, 0xF244F3C0, 0xF2466080, 0xF246A528, 0xF24A7A80, 0xF247BE80, 0xF24D2210, 0xF247088B, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246C18_DABE58 -.word 0xF243FEF6, 0xF243CEBC, 0xF24CAACD, 0xF244F4D4, 0xF244F3C0, 0xF2463580, 0xF24672B4, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246C40_DABE80 -.word 0xF243FEF6, 0xF243CEBC, 0xF24CAACD, 0xF244F4D4, 0xF244F3C0, 0xF2466080, 0xF246A528, 0xF24A7A80, 0xF247BE80, 0xF24E9480, 0xF246A528, 0xF251F729, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246C80_DABEC0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246C18_DABE58, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246BE0_DABE20, 0x00000012, 0x00000000, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000002, 0x00000044, 0x00000001, D_80242F50_DA8190, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80244118_DA9358, 0xFE363C8B, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_80244180_DA93C0, 0x00000043, 0x00000001, dup_omo_03_UnsetCamera0MoveFlag1, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, D_80246080_DAB2C0, 0x00000046, 0x00000001, D_80244BE4_DA9E24, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F000E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, D_80246088_DAB2C8, 0x00000046, 0x00000001, D_80244EE0_DAA120, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000000, 0x000F0013, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000045, 0x7FFFFE00, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000044, 0x00000001, D_80244118_DA9358, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246C40_DABE80, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80242F50_DA8190, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802454DC_DAA71C, 0x00000003, 0x00000001, 0x00000014, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802481A8, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247044_DAC284 -.word 0x00000003, 0x00000002, 0x00000001 - -dlabel D_80247050_DAC290 -.word 0x00000001, 0x00000002, 0x00000003, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0006, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000005, 0x000F0012, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000043, 0x00000002, ShowChoice, 0x001E003A, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80247044_DAC284, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_802466F8_DAB938, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, ShowChoice, 0x001E0037, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80247050_DAC290, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246538_DAB778, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0038, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80247050_DAC290, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246538_DAB778, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0039, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80247050_DAC290, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246538_DAB778, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247454_DAC694 -.word 0xF24C8781, 0xF24731D4, 0xF24BA67D, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80245E98_DAB0D8, 0x00000043, 0x00000003, EnableGroup, 0x000000AC, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFB, 0x00000043, 0x00000003, EnableGroup, 0x0000008D, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000008, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247454_DAC694, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80242F50_DA8190, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80246C80_DABEC0, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_802468F8_DABB38, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000003, EnableGroup, 0x0000008D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000AC, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247454_DAC694, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80242F50_DA8190, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247640_DAC880 -.word 0xC32A0000, 0x43C80000, 0xC3440000, 0xC2C80000, 0x43610000, 0xC3440000, 0xC28C0000, 0x42340000, 0xC3410000 - -dlabel D_80247664_DAC8A4 -.word 0xC28C0000, 0x00000000, 0xC3410000, 0xC0E00000, 0x42C80000, 0xC33F0000, 0x42580000, 0x41A00000, 0xC33D0000 - -dlabel D_80247688_DAC8C8 -.word 0x42580000, 0x00000000, 0xC33D0000, 0x42B80000, 0x425C0000, 0xC3470000, 0x43030000, 0x00000000, 0xC3520000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24BE280, 0x00000052, 0x00000018, 0x0000000C, 0x00000244, 0xF24ABC80, 0xF24A5880, 0x00000043, 0x00000005, TranslateGroup, 0x000000AC, 0xFFFFFF56, 0x00000190, 0xFFFFFF3C, 0x00000024, 0x00000002, 0xFD050F8A, 0x0000001E, 0x00000008, 0x00000001, 0x0000002D, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFD050F8A, 0x00000028, 0x0000001D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80247640_DAC880, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, TranslateGroup, 0x000000AC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, RotateGroup, 0x000000AC, 0xFD050F8A, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x000000AB, 0x000000A1, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8680, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x008C0201, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFD050F8A, 0x00000012, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000014, D_80247664_DAC8A4, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, TranslateGroup, 0x000000AC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, RotateGroup, 0x000000AC, 0xFD050F8A, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x000000AB, 0x000000A1, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000008, 0xF24A8280, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFD050F8A, 0x00000000, 0x0000000E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80247688_DAC8C8, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, TranslateGroup, 0x000000AC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, RotateGroup, 0x000000AC, 0xFD050F8A, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x000000AB, 0x000000A1, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFFB, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000003, GotoMap, 0x802481B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247E30_DAD070 -.word 0xC2C80000, 0x43480000, 0x43020000, 0xC28C0000, 0x42700000, 0x430C0000, 0xC2200000, 0x41C80000, 0x43160000, 0xC1200000, 0x41700000, 0x43200000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000043, 0x0000000F, PlayEffect, 0x00000073, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E1A, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000032, 0x00000000, 0x000000A0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x000000A0, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x003B0011, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x003B0011, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x003B0011, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00060004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x003B0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x003B0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00040002, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80247E30_DAD070, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00040001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x003B0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00060001, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00040006, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x802481B8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DB8440.data.s b/ver/us/asm/data/world/area_omo/omo_06/DB8440.data.s deleted file mode 100644 index 4e6306fe35..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_06/DB8440.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B30_DB8440 -.word 0xC3ED8000, 0x00000000, 0x430C0000, 0x42B40000, 0xC3ED8000, 0x00000000, 0xC3200000, 0x42B40000, 0xC3E90000, 0x41200000, 0x40A00000, 0x42B40000, 0x43AA0000, 0x41200000, 0xC3A50000, 0x43610000, 0x43A88000, 0x00000000, 0x43A88000, 0x439D8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240EDC_DB87EC, D_80240B30_DB8440, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900DE - -dlabel D_80240BC0_DB84D0 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000002, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C90_DB85A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245960, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CEC_DB85FC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245960, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D48_DB8658 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245968, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DA4_DB86B4 -.word 0x00000047, 0x00000005, D_80240C90_DB85A0, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240CEC_DB85FC, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240D48_DB8658, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E08_DB8718 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240DA4_DB86B4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000002, 0x00000003, 0x00000044, 0x00000001, D_80240DA4_DB86B4, 0x00000008, 0x00000001, 0x00000003, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240DA4_DB86B4, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EDC_DB87EC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, 0x802456A0, 0x00000046, 0x00000001, 0x80245868, 0x00000046, 0x00000001, 0x80241628, 0x00000046, 0x00000001, D_80240BC0_DB84D0, 0x00000046, 0x00000001, 0x80244F40, 0x00000044, 0x00000001, D_80240E08_DB8718, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DB88E0.data.s b/ver/us/asm/data/world/area_omo/omo_06/DB88E0.data.s deleted file mode 100644 index 38c4258463..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_06/DB88E0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240FD0_DB88E0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000008B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000008D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000091, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410DC_DB89EC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000A0, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000084, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000086, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000088, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000A0, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000084, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000086, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000088, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412D8_DB8BE8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000046, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000004B, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001F1, 0x00000000, 0xFFFFFE75, 0x00000000, 0xFFFFFF47, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000049, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000DF, 0x0000000A, 0xFFFFFF5B, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000DF, 0x0000000A, 0xFFFFFF5B, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF242AA80, 0xF2475A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x000001F2, 0x00000000, 0x00000109, 0x00000000, 0xFFFFFF15, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000035, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000036, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000034, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000051, 0x00000000, 0x00000109, 0x00000000, 0xFFFFFF15, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000043, 0x00000002, GetModelCenter, 0x00000034, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFFF, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240FD0_DB88E0, 0x00000044, 0x00000001, D_802410DC_DB89EC, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000004B, 0x0000003B, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFF, 0x00000047, 0x00000005, D_802412D8_DB8BE8, 0x00000100, 0x00000047, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000049, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0x00000046, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000004B, 0x00000043, 0x00000006, RotateModel, 0x00000035, 0x000000B4, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000036, 0x000000B4, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000034, 0x000000B4, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s b/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s deleted file mode 100644 index 2171abed95..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s +++ /dev/null @@ -1,111 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241750_DB9060 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_06_AdvanceBuffer, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_06_CosInterpMinMax, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_06_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_06_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_06_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_06_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_06_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_06_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_06_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_06_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_06_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000068, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000006B, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000071, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000068, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000006B, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000071, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000071, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000071, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006D, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242918_DBA228 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242980_DBA290 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A44_DBA354 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B5C_DBA46C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F5C_DBA86C -.word 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243258_DBAB68 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245980, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245978, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245970, 0x00000003, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243318_DBAC28 -.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245980, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245978, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245970, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245980, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245970, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245980, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245978, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435BC_DBAECC -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_06_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80243258_DBAB68, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80243318_DBAC28, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024364C_DBAF5C -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000073, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000073, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000073, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007E, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000078, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000078, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007E, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x00000073, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A6C_DBB37C -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000078, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000078, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243CA4_DBB5B4 -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000040, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000040, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243EDC_DBB7EC -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243F78_DBB888 -.word 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000044, 0x00000001, D_8024364C_DBAF5C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x00000077, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003A, 0x00000078, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003F, 0x0000007D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000040, 0x0000007E, 0x00000047, 0x00000005, D_80243A6C_DBB37C, 0x00000080, 0x00000039, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243A6C_DBB37C, 0x00001000, 0x0000003A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CA4_DBB5B4, 0x00000080, 0x0000003F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CA4_DBB5B4, 0x00001000, 0x00000040, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFBB4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 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_80243EDC_DBB7EC, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244160_DBBA70 -.word 0x00000032, 0x0000002D - -dlabel D_80244168_DBBA78 -.word 0xF24A7334, 0xF249ED67, 0xF24B82A7, 0xF24D062B, 0xF248C887, 0xF2500045, 0xF244F3A2, 0xF250F60B, 0xF243CEBC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80244198_DBBAA8 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000044, 0x00000001, D_80242A44_DBA354, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80244168_DBBA78, 0x00000046, 0x00000001, D_80242B5C_DBA46C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80244168_DBBA78, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80245990, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244308_DBBC18 -.word 0xF24A7334, 0xF249ED67, 0xF24E52A7, 0xF247E07A, 0xF24B122B, 0xF242AA80, 0xF24A7B9E, 0xF2411A80, 0xF24A7CBC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80244338_DBBC48 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000044, 0x00000001, D_80242A44_DBA354, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80244308_DBBC18, 0x00000046, 0x00000001, D_80242B5C_DBA46C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80244308_DBBC18, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFE20, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80245990, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802444A8_DBBDB8 -.word 0xF250F60B, 0xF243CEBC, 0xF24DEA34, 0xF2500045, 0xF244F3A2, 0xF24D062B, 0xF248C887, 0xF249E0FB, 0xF24A2E4D, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_802444D8_DBBDE8 -.word 0xF250F60B, 0xF243CEBC, 0xF24DEA34, 0xF2500045, 0xF244F3A2, 0xF24D062B, 0xF248C887, 0xF247E07A, 0xF24B122B, 0xF242AA80, 0xF24A7B9E, 0xF2411A80, 0xF24A7CBC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80244518_DBBE28 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802444A8_DBBDB8, 0x00000024, 0x00000002, 0xFD050F82, 0x00000002, 0x00000044, 0x00000001, D_80241750_DB9060, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80242918_DBA228, 0xFE363C8B, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_80242980_DBA290, 0x00000043, 0x00000001, omo_06_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C89, D_80244160_DBBA70, 0x00000046, 0x00000001, D_80242F5C_DBA86C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F000F, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242918_DBA228, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802444D8_DBBDE8, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80241750_DB9060, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802435BC_DBAECC, 0x00000003, 0x00000001, 0x00000014, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFE20, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80245990, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802447D0_DBC0E0 -.word 0xF2411A80, 0xF24A7CBC, 0xF24BE200, 0xF242AA80, 0xF24A7B9E, 0xF247E07A, 0xF24B122B, 0xF24B0576, 0xF249AC80, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80244800_DBC110 -.word 0xF2411A80, 0xF24A7CBC, 0xF24BE200, 0xF242AA80, 0xF24A7B9E, 0xF247E07A, 0xF24B122B, 0xF24D062B, 0xF248C887, 0xF2500045, 0xF244F3A2, 0xF250F60B, 0xF243CEBC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80244840_DBC150 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000044, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802447D0_DBC0E0, 0x00000024, 0x00000002, 0xFD050F82, 0x00000002, 0x00000044, 0x00000001, D_80241750_DB9060, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80242918_DBA228, 0xFE363C8B, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_80242980_DBA290, 0x00000043, 0x00000001, omo_06_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C89, D_80244160_DBBA70, 0x00000046, 0x00000001, D_80242F5C_DBA86C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F000F, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000044, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242918_DBA228, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80244800_DBC110, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80241750_DB9060, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802435BC_DBAECC, 0x00000003, 0x00000001, 0x00000014, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80245990, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244AF8_DBC408 -.word 0x00000000, 0x00000003, 0x00000002 - -dlabel D_80244B04_DBC414 -.word 0x00000002, 0x00000003, 0x00000000 - -dlabel D_80244B10_DBC420 -.word 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0006, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E003D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80244AF8_DBC408, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80244338_DBBC48, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E003E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80244AF8_DBC408, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80244338_DBBC48, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000000, 0x000F0012, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000043, 0x00000002, ShowChoice, 0x001E003B, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80244B04_DBC414, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80244198_DBBAA8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000043, 0x00000002, ShowChoice, 0x001E003C, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80244B04_DBC414, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80244198_DBBAA8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244F28_DBC838 -.word 0xF24A7334, 0xF249ED67, 0xF24B82A7, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80243F78_DBB888, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80244F28_DBC838, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80241750_DB9060, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80244840_DBC150, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80244518_DBBE28, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80244F28_DBC838, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80241750_DB9060, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245080_DBC990 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245090_DBC9A0 -.word 0x00000000, 0x00200018, D_80245080_DBC990, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802450BC_DBC9CC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80244B10_DBC420, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802450F8_DBCA08 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802450BC_DBC9CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024511C_DBCA2C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFFC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0104, 0x008C0101, 0x00000000, 0x000F0023, 0x00000018, 0x00000001, 0xFFFFFFFD, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0104, 0x008C0101, 0x00000000, 0x000F0024, 0x00000018, 0x00000001, 0xFFFFFFFE, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0104, 0x008C0101, 0x00000000, 0x000F0025, 0x00000018, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0104, 0x008C0101, 0x00000000, 0x000F0026, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0104, 0x008C0101, 0x00000000, 0x000F0027, 0x00000018, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0104, 0x008C0101, 0x00000000, 0x000F0028, 0x00000018, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0104, 0x008C0101, 0x00000000, 0x000F0029, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0104, 0x008C0101, 0x00000000, 0x000F002A, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024529C_DBCBAC -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024511C_DBCA2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802452C0_DBCBD0 -.word 0x00000000, D_80245090_DBC9A0, 0x42480000, 0x42480000, 0x42340000, 0x00400D05, D_802450F8_DBCA08, 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, 0x008C0001, 0x008C0003, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00B8, 0x00000001, D_80245090_DBC9A0, 0x425C0000, 0x00000000, 0x43700000, 0x00400D05, D_8024529C_DBCBAC, 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, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x008C0101, 0x00000000, 0x00000000, 0x00000000, 0x001A00B8, 0x00000002, D_802452C0_DBCBD0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s deleted file mode 100644 index 306cbcf1b9..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel omo_06_varStash -.word 0x00000000 - -dlabel D_802456C4_DBCFD4 -.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_8024572C_DBD03C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802456C4_DBCFD4, 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_8024580C_DBD11C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000069, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF2, 0x00000001, 0x00000046, 0x00000001, D_8024572C_DBD03C, 0x00000024, 0x00000002, 0xF8405C8D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFEE8, 0x0000003C, 0xFFFFFEDE, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF3, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000190, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF2, 0x00000043, 0x00000002, AssignScript, D_8024580C_DBD11C, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000064, 0x00000000, 0x00000190, 0x00000000, 0x00000028, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406027, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DC51B0.data.s b/ver/us/asm/data/world/area_omo/omo_08/DC51B0.data.s deleted file mode 100644 index e187c87e02..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_08/DC51B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240DE0_DC51B0 -.word 0x43A68000, 0x00000000, 0x43A68000, 0x439D8000, 0xC3A78000, 0x41200000, 0xC3A78000, 0x43070000, 0x43AA0000, 0x41200000, 0xC3AA0000, 0x43610000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241070, D_80240DE0_DC51B0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900E0, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DC52F0.data.s b/ver/us/asm/data/world/area_omo/omo_08/DC52F0.data.s deleted file mode 100644 index 9556f23a52..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_08/DC52F0.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F20_DC52F0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80248730, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F7C_DC534C -.word 0x00000047, 0x00000005, D_80240F20_DC52F0, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FA8_DC5378 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240F7C_DC534C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240F7C_DC534C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80240F7C_DC534C, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, 0x802486DC, 0x00000046, 0x00000001, 0x80247590, 0x00000046, 0x00000001, 0x80240E50, 0x00000046, 0x00000001, 0x80247450, 0x00000046, 0x00000001, D_80243A68_DC7E38, 0x00000044, 0x00000001, D_80240FA8_DC5378, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241160_DC5530 -.word 0x00000000, 0x0000005D, 0x0000005A, 0x0000005C, 0x00000059 - -dlabel D_80241174_DC5544 -.word 0x00000001, 0x00000064, 0x00000061, 0x00000063, 0x00000060 - -dlabel D_80241188_DC5558 -.word 0x00000002, 0x0000006B, 0x00000068, 0x0000006A, 0x00000067 - -dlabel D_8024119C_DC556C -.word 0x00000003, 0x00000072, 0x0000006F, 0x00000071, 0x0000006E - -dlabel D_802411B0_DC5580 -.word 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241210_DC55E0 -.word 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000060, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241270_DC5640 -.word 0x00000043, 0x00000003, EnableModel, 0x0000006A, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000068, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412D0_DC56A0 -.word 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006E, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000072, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241330_DC5700 -.word 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241390_DC5760 -.word 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000060, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413F0_DC57C0 -.word 0x00000043, 0x00000003, EnableModel, 0x0000006A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000068, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241450_DC5820 -.word 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000072, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414B0_DC5880 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFF060, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000044, 0x00000001, D_802411B0_DC5580, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000044, 0x00000001, D_80241210_DC55E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000064, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000044, 0x00000001, D_80241270_DC5640, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_802412D0_DC56A0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000072, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8F, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241160_DC5530, 0x00000047, 0x00000005, D_80243648_DC7A18, 0x00001000, 0x00000029, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241174_DC5544, 0x00000047, 0x00000005, D_80243648_DC7A18, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000068, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241188_DC5558, 0x00000047, 0x00000005, D_80243648_DC7A18, 0x00001000, 0x0000002D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000072, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024119C_DC556C, 0x00000047, 0x00000005, D_80243648_DC7A18, 0x00001000, 0x0000002F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A30_DC5E00 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000005, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_802411B0_DC5580, 0x00000008, 0x00000001, 0xFE363C80, 0x00000044, 0x00000001, D_80241210_DC55E0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000044, 0x00000001, D_80241270_DC5640, 0x00000008, 0x00000001, 0xFE363C80, 0x00000044, 0x00000001, D_802412D0_DC56A0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000029, 0x000001A6, 0x00000000, 0x00000044, 0x00000001, D_80241330_DC5700, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x000001A5, 0x00000000, 0x00000044, 0x00000001, D_80241390_DC5760, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002D, 0x000001A7, 0x00000000, 0x00000044, 0x00000001, D_802413F0_DC57C0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002F, 0x000001A8, 0x00000000, 0x00000044, 0x00000001, D_80241450_DC5820, 0x00000008, 0x00000001, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000005, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_802411B0_DC5580, 0x00000044, 0x00000001, D_80241210_DC55E0, 0x00000044, 0x00000001, D_80241270_DC5640, 0x00000044, 0x00000001, D_802412D0_DC56A0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000002, PlaySound, 0x000001A9, 0x00000044, 0x00000001, D_80241330_DC5700, 0x00000044, 0x00000001, D_80241390_DC5760, 0x00000044, 0x00000001, D_802413F0_DC57C0, 0x00000044, 0x00000001, D_80241450_DC5820, 0x00000008, 0x00000001, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000059, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C80, 0x00000028, 0xFE363C82, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000064, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000060, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C80, 0x00000028, 0xFE363C82, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000067, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C80, 0x00000028, 0xFE363C82, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000072, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000006E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C80, 0x00000028, 0xFE363C82, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024205C_DC642C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_802411B0_DC5580, 0x00000008, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80241210_DC55E0, 0x00000008, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80241270_DC5640, 0x00000008, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_802412D0_DC56A0, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000029, 0x000001A6, 0x00000000, 0x00000044, 0x00000001, D_80241330_DC5700, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x000001A5, 0x00000000, 0x00000044, 0x00000001, D_80241390_DC5760, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002D, 0x000001A7, 0x00000000, 0x00000044, 0x00000001, D_802413F0_DC57C0, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002F, 0x000001A8, 0x00000000, 0x00000044, 0x00000001, D_80241450_DC5820, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A0, 0x0000000A, 0xFFFFFF38, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A0, 0x0000000A, 0xFFFFFF38, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002BC, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000028, 0xF24A6880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000028, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000048, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000044, 0x00000043, 0x00000006, PlaySoundAt, 0x000001F3, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7DB4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000028, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000004D, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000049, 0x00000043, 0x00000006, PlaySoundAt, 0x000001F3, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7DB4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000028, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000052, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000004E, 0x00000043, 0x00000006, PlaySoundAt, 0x000001F3, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7DB4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000028, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000057, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000053, 0x00000043, 0x00000006, PlaySoundAt, 0x000001F3, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7DB4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000064, 0x00000000, 0x00000172, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000064, 0x00000000, 0x00000172, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFE3E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000059, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005F, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000029, 0x00002098, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C86, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C88, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000060, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000066, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x00002098, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C86, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C88, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000067, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006D, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002D, 0x00002098, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C86, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C88, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000006E, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000074, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002F, 0x00002098, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C86, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C88, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000002, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E6C_DC723C -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000005, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_802411B0_DC5580, 0x00000008, 0x00000001, 0xFE363C80, 0x00000044, 0x00000001, D_80241210_DC55E0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000044, 0x00000001, D_80241270_DC5640, 0x00000008, 0x00000001, 0xFE363C80, 0x00000044, 0x00000001, D_802412D0_DC56A0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000029, 0x000001A6, 0x00000000, 0x00000044, 0x00000001, D_80241450_DC5820, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x000001A5, 0x00000000, 0x00000044, 0x00000001, D_802413F0_DC57C0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002D, 0x000001A7, 0x00000000, 0x00000044, 0x00000001, D_80241390_DC5760, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002F, 0x000001A8, 0x00000000, 0x00000044, 0x00000001, D_80241330_DC5700, 0x00000008, 0x00000001, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000005, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_802411B0_DC5580, 0x00000044, 0x00000001, D_80241210_DC55E0, 0x00000044, 0x00000001, D_80241270_DC5640, 0x00000044, 0x00000001, D_802412D0_DC56A0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000002, PlaySound, 0x000001A9, 0x00000044, 0x00000001, D_80241330_DC5700, 0x00000044, 0x00000001, D_80241390_DC5760, 0x00000044, 0x00000001, D_802413F0_DC57C0, 0x00000044, 0x00000001, D_80241450_DC5820, 0x00000008, 0x00000001, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000029, 0x0000032C, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000059, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000064, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x0000032C, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000060, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002D, 0x0000032C, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000067, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000072, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002F, 0x0000032C, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000006E, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000040, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_802414B0_DC5880, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243648_DC7A18 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, D_80241160_DC5530, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000029, 0x000001A2, 0x00000000, 0x00000016, 0x00000001, D_80241174_DC5544, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x000001A1, 0x00000000, 0x00000016, 0x00000001, D_80241188_DC5558, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002D, 0x000001A3, 0x00000000, 0x00000016, 0x00000001, D_8024119C_DC556C, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002F, 0x000001A4, 0x00000000, 0x00000023, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C82, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000029, 0x00000002, 0xFD050F8F, 0x00000004, 0x00000041, 0x00000002, 0xFD050F8F, 0xFE363C81, 0x00000027, 0x00000002, 0xFD050F8E, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000004, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000064, 0x00000000, 0x00000172, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000064, 0x00000000, 0x00000172, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFE3E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000014, 0x00000001, 0xFD050F8F, 0x00000016, 0x00000001, 0x0000001B, 0x00000046, 0x00000001, D_80241A30_DC5E00, 0x00000016, 0x00000001, 0x0000004B, 0x00000046, 0x00000001, D_8024205C_DC642C, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_80242E6C_DC723C, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C82, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000B, 0x00000002, 0xFD050F8E, 0x00000004, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A68_DC7E38 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8F, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241160_DC5530, 0x00000047, 0x00000005, D_80243648_DC7A18, 0x00001000, 0x00000029, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000064, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241174_DC5544, 0x00000047, 0x00000005, D_80243648_DC7A18, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000068, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241188_DC5558, 0x00000047, 0x00000005, D_80243648_DC7A18, 0x00001000, 0x0000002D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000072, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024119C_DC556C, 0x00000047, 0x00000005, D_80243648_DC7A18, 0x00001000, 0x0000002F, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000075, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000007, 0x7FFFFE00, 0x00000043, 0x00000006, RotateGroup, 0x00000048, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000004D, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000052, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000057, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s deleted file mode 100644 index 270d20e942..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s +++ /dev/null @@ -1,87 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243D30_DC8100 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_08_AdvanceBuffer, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_08_CosInterpMinMax, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_08_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_08_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_08_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_08_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_08_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_08_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_08_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_08_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_08_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_08_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000087, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008E, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008E, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008E, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000087, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000089, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244EF8_DC92C8 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244F60_DC9330 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245024_DC93F4 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024513C_DC950C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024553C_DC990C -.word 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245838_DC9C08 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248748, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248740, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248738, 0x00000003, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802458F8_DC9CC8 -.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248748, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248740, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248738, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248748, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248738, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248748, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248740, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245B9C_DC9F6C -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_08_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80245838_DC9C08, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802458F8_DC9CC8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245C2C_DC9FFC -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000008F, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008F, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000009A, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000094, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000094, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000009A, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024604C_DCA41C -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000094, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000093, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000094, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246284_DCA654 -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000009A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000009A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802464BC_DCA88C -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246558_DCA928 -.word 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000044, 0x00000001, D_80245C2C_DC9FFC, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000034, 0x00000093, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000035, 0x00000094, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003B, 0x00000099, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003A, 0x0000009A, 0x00000047, 0x00000005, D_8024604C_DCA41C, 0x00000080, 0x00000034, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024604C_DCA41C, 0x00001000, 0x00000035, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246284_DCA654, 0x00000080, 0x0000003B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246284_DCA654, 0x00001000, 0x0000003A, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFBB4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 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_802464BC_DCA88C, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246740_DCAB10 -.word 0xFFFFFF6F, 0xFFFFFF92 - -dlabel D_80246748_DCAB18 -.word 0xF2486D98, 0xF247316B, 0xF24C1E84, 0xF24A7A80, 0xF247BE80, 0xF24E9480, 0xF246A528, 0xF251F729, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246778_DCAB48 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000044, 0x00000001, D_80245024_DC93F4, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80246748_DCAB18, 0x00000046, 0x00000001, D_8024513C_DC950C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003F, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246748_DCAB18, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80248758, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802468E8_DCACB8 -.word 0xF2486D98, 0xF247316B, 0xF24EEE84, 0xF2466080, 0xF246A528, 0xF244F4D4, 0xF244F3C0, 0xF242FDD8, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246918_DCACE8 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000044, 0x00000001, D_80245024_DC93F4, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_802468E8_DCACB8, 0x00000046, 0x00000001, D_8024513C_DC950C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003F, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802468E8_DCACB8, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFEA2, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80248758, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246A88_DCAE58 -.word 0xF250F60B, 0xF243CEBC, 0xF24DEA2E, 0xF25000B7, 0xF244F44A, 0xF24E9480, 0xF246A528, 0xF24A7A80, 0xF247BE80, 0xF247D306, 0xF2470824, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246AC0_DCAE90 -.word 0xF250F60B, 0xF243CEBC, 0xF24DEA2E, 0xF25000B7, 0xF244F44A, 0xF24E9480, 0xF246A528, 0xF24A7A80, 0xF247BE80, 0xF2466080, 0xF246A528, 0xF244F4D4, 0xF244F3C0, 0xF242FDD8, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246B08_DCAED8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003F, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000002, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246A88_DCAE58, 0x00000024, 0x00000002, 0xFD050F82, 0x00000002, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80244EF8_DC92C8, 0xFE363C8B, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_80244F60_DC9330, 0x00000043, 0x00000001, omo_08_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C89, D_80246740_DCAB10, 0x00000046, 0x00000001, D_8024553C_DC990C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0010, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003F, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244EF8_DC92C8, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246AC0_DCAE90, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80245B9C_DC9F6C, 0x00000003, 0x00000001, 0x00000014, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFEA2, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80248758, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246DC0_DCB190 -.word 0xF243FEF6, 0xF243CEBC, 0xF24CAACD, 0xF244F4D4, 0xF244F3C0, 0xF2466080, 0xF246A528, 0xF249082F, 0xF2475AB4, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246DF0_DCB1C0 -.word 0xF243FEF6, 0xF243CEBC, 0xF24CAACD, 0xF244F4D4, 0xF244F3C0, 0xF2466080, 0xF246A528, 0xF24A7A80, 0xF247BE80, 0xF24E9480, 0xF246A528, 0xF251F729, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80246E30_DCB200 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003F, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000002, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246DC0_DCB190, 0x00000024, 0x00000002, 0xFD050F82, 0x00000002, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80244EF8_DC92C8, 0xFE363C8B, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_80244F60_DC9330, 0x00000043, 0x00000001, omo_08_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C89, D_80246740_DCAB10, 0x00000046, 0x00000001, D_8024553C_DC990C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0010, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003F, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80244EF8_DC92C8, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80246DF0_DCB1C0, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80245B9C_DC9F6C, 0x00000003, 0x00000001, 0x00000014, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80248758, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802470E8_DCB4B8 -.word 0x00000001, 0x00000000, 0x00000003 - -dlabel D_802470F4_DCB4C4 -.word 0x00000003, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0006, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470E8_DCB4B8, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246918_DCACE8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0041, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470E8_DCB4B8, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246918_DCACE8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000000, 0x000F0016, 0x0000001B, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000043, 0x00000002, ShowChoice, 0x001E003F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470F4_DCB4C4, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246778_DCAB48, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247438_DCB808 -.word 0xF2486D98, 0xF247316B, 0xF24C1E84, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80246558_DCA928, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80246E30_DCB200, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80246B08_DCAED8, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFEA2, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x0000015E, 0x0000003C, 0x0000003C, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF9, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFF38, 0x00000000, 0x000000C8, 0x00000000, 0x00000014, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DCBA10.data.s b/ver/us/asm/data/world/area_omo/omo_08/DCBA10.data.s deleted file mode 100644 index 54ddd9062f..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_08/DCBA10.data.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80247640_DCBA10 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247650_DCBA20 -.word 0x00000000, 0x00200018, D_80247640_DCBA10, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024767C_DCBA4C -.word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 - -dlabel D_802476AC_DCBA7C -.word 0x00000043, 0x00000002, omo_08_ShyGuyWanderAI_Main, D_8024767C_DCBA4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802476CC_DCBA9C -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802476AC_DCBA7C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_802476F8_DCBAC8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, 0x80247100, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247734_DCBB04 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802476F8_DCBAC8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247758_DCBB28 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000025, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF8405FFA, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0304, 0x008C0301, 0x00000000, 0x000F002B, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405FFB, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0304, 0x008C0301, 0x00000000, 0x000F002C, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0304, 0x008C0301, 0x00000000, 0x000F002F, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0304, 0x008C0301, 0x00000000, 0x000F002D, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0304, 0x008C0301, 0x00000000, 0x000F002E, 0x00000018, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0304, 0x008C0301, 0x00000000, 0x000F002F, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0304, 0x008C0301, 0x00000000, 0x000F0030, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802478FC_DCBCCC -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80247758_DCBB28, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247920_DCBCF0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802476AC_DCBA7C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247A78_DCBE48 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80247920_DCBCF0, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B04_DCBED4 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80247920_DCBCF0, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80247A78_DCBE48, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B3C_DCBF0C -.word 0x00000000, D_80247650_DCBA20, 0xC3110000, 0x42480000, 0xC2DC0000, 0x00400D05, D_80247734_DCBB04, 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, 0x008C0001, 0x008C0003, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00B8, 0x00000001, D_80247650_DCBA20, 0xC37A0000, 0x00000000, 0x42480000, 0x00400D05, D_802478FC_DCBCCC, 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, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x008C0301, 0x00000000, 0x00000000, 0x00000000, 0x001A00B8 - -dlabel D_80247F1C_DCC2EC -.word 0x00000002, D_802476CC_DCBA9C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F04, D_80247B04_DCBED4, 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, 0xFFFFFFF1, 0x00000000, 0x0000016D, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x0000016D, 0x00000078, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024810C_DCC4DC -.word 0x00000003, D_802476CC_DCBA9C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F04, D_80247B04_DCBED4, 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, 0x00000040, 0x00000000, 0x00000113, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000040, 0x00000000, 0x00000113, 0x00000078, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802482FC_DCC6CC -.word 0x00000004, D_802476CC_DCBA9C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F04, D_80247B04_DCBED4, 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, 0x00000091, 0x00000000, 0x0000016D, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000091, 0x00000000, 0x0000016D, 0x00000078, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802484EC_DCC8BC -.word 0x00000005, D_802476CC_DCBA9C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F04, D_80247B04_DCBED4, 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, 0x000000E0, 0x00000000, 0x00000113, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000E0, 0x00000000, 0x00000113, 0x00000078, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80247B3C_DCBF0C, 0x00000000, 0x00000001, D_80247F1C_DCC2EC, 0x120A0007, 0x00000001, D_8024810C_DCC4DC, 0x120A0007, 0x00000001, D_802482FC_DCC6CC, 0x120A0007, 0x00000001, D_802484EC_DCC8BC, 0x120A0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD03C0.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD03C0.data.s deleted file mode 100644 index 2d96bcf42e..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_09/DD03C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802436F0_DD03C0 -.word 0xC4750000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243838, D_802436F0_DD03C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900E1, 0x0000000A, 0x00000002, 0xF8405FFA, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000046, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD0480.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD0480.data.s deleted file mode 100644 index bf2feafa47..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_09/DD0480.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802437B0_DD0480 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024A620, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024380C_DD04DC -.word 0x00000047, 0x00000005, D_802437B0_DD0480, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000024, 0x00000002, 0xF8405FFA, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FFA, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80249EA4, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405FD0, 0x00000000, 0x00000014, 0x00000001, 0xF5DE025A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80249D6C, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80249DD8, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80249E44, 0x00000043, 0x00000007, MakeItemEntity, 0x0000009B, 0x0000076C, 0x00000096, 0x00000000, 0x00000011, 0xF8405FD0, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80249E44, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802471B8, 0x00000046, 0x00000001, 0x80246F98, 0x00000046, 0x00000001, 0x80243740, 0x00000046, 0x00000001, 0x80243AB0, 0x00000046, 0x00000001, 0x8024637C, 0x0000000A, 0x00000002, 0xF8405FFA, 0x00000000, 0x00000044, 0x00000001, 0x8024A194, 0x00000008, 0x00000001, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024380C_DD04DC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD0750.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD0750.data.s deleted file mode 100644 index 425ca8800e..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_09/DD0750.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243A80_DD0750 -.word 0x0000000B, 0x0000000C, 0x0000000D, 0x0000000E - -dlabel D_80243A90_DD0760 -.word 0xC079999A, 0x00000000, 0x4079999A, 0x00000000, 0x00000000, 0x4079999A, 0x00000000, 0xC079999A, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, EnableTexPanning, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000051, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000052, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000053, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240054_DCCD24, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFB00, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000000, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000008, 0x00000000, 0x00000000, 0xFE363C81, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240078_DCCD48, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD0900.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD0900.data.s deleted file mode 100644 index 8dfe865fa7..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_09/DD0900.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243C30_DD0900 -.word 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000001, omo_09_SetCamera0Flag1000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000217, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000217, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243CBC_DD098C -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000217, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000217, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A0280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D70_DD0A40 -.word 0x00000003, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000002, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000001, 0x00000000, 0xFFFFFFFF, 0x00000000 - -dlabel D_80243DA0_DD0A70 -.word 0x00000030, 0x00000001, D_80243D70_DD0A40, 0x00000005, 0x00000001, 0x0000000C, 0x00000031, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E04_DD0AD4 -.word 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000029, 0x80000015, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005C, 0x00000046, 0x00000001, D_80243DA0_DD0A70, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243EEC_DD0BBC -.word 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000027, 0x00000002, 0xFD050F86, 0x00000002, 0x00000024, 0x00000002, 0xFD050F83, 0xFD050F86, 0x0000000A, 0x00000002, 0xFD050F86, 0x00000006, 0x00000044, 0x00000001, D_80243C30_DD0900, 0x00000024, 0x00000002, 0xFD050F86, 0x00000007, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000046, 0x00000001, D_80243DA0_DD0A70, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FF4_DD0CC4 -.word 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000027, 0x00000002, 0xFD050F86, 0x00000002, 0x00000024, 0x00000002, 0xFD050F84, 0xFD050F86, 0x0000000A, 0x00000002, 0xFD050F86, 0x00000006, 0x00000044, 0x00000001, D_80243C30_DD0900, 0x00000024, 0x00000002, 0xFD050F86, 0x00000007, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000046, 0x00000001, D_80243DA0_DD0A70, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802440FC_DD0DCC -.word 0x0000000A, 0x00000002, 0xFAA2B583, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000027, 0x00000002, 0xFD050F86, 0x00000002, 0x00000024, 0x00000002, 0xFD050F85, 0xFD050F86, 0x0000000A, 0x00000002, 0xFD050F86, 0x00000006, 0x00000044, 0x00000001, D_80243C30_DD0900, 0x00000024, 0x00000002, 0xFD050F86, 0x00000007, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000063, 0x00000046, 0x00000001, D_80243DA0_DD0A70, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244204_DD0ED4 -.word 0x00000024, 0x00000002, 0xFAA2B584, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFD050F80, 0xFE363C82, 0x00000032, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C88, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFE363C87, 0x00000029, 0x00000002, 0xFE363C87, 0x0000002D, 0x00000027, 0x00000002, 0xFE363C87, 0x000009D8, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x0000002A, 0x00000002, 0xFE363C86, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002B, 0x00000002, 0xFE363C89, 0x0000002D, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000028, 0x00000002, 0xFD050F83, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F83, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000027, 0x00000002, 0xFD050F86, 0x00000002, 0x00000024, 0x00000002, 0xFD050F83, 0xFD050F86, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x00000438, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C84, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x000003F3, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024473C_DD140C -.word 0x00000024, 0x00000002, 0xFAA2B585, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xFD050F81, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFD050F81, 0xFE363C82, 0x00000032, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006F, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000070, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000072, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C88, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFE363C87, 0x00000029, 0x00000002, 0xFE363C87, 0x0000002D, 0x00000027, 0x00000002, 0xFE363C87, 0x00000CA8, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x0000002A, 0x00000002, 0xFE363C86, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006F, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000070, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000072, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002B, 0x00000002, 0xFE363C89, 0x0000002D, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000028, 0x00000002, 0xFD050F84, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F84, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000027, 0x00000002, 0xFD050F86, 0x00000002, 0x00000024, 0x00000002, 0xFD050F84, 0xFD050F86, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x00000438, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006F, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000070, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000072, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C84, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002D, 0x000003F3, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C74_DD1944 -.word 0x00000024, 0x00000002, 0xFAA2B586, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xFD050F82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFD050F82, 0xFE363C82, 0x00000032, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000074, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000075, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000076, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000077, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C88, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFE363C87, 0x00000029, 0x00000002, 0xFE363C87, 0x0000002D, 0x00000027, 0x00000002, 0xFE363C87, 0x00000F78, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x0000002A, 0x00000002, 0xFE363C86, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000074, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000075, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000076, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000077, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002B, 0x00000002, 0xFE363C89, 0x0000002D, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000028, 0x00000002, 0xFD050F85, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000027, 0x00000002, 0xFD050F86, 0x00000002, 0x00000024, 0x00000002, 0xFD050F85, 0xFD050F86, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x00000438, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000074, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000075, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000076, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000077, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C84, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002F, 0x000003F3, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802451AC_DD1E7C -.word 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000001, 0x00000002, 0x00000001, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000001, 0x00000002, 0x00000001, 0x00000002 - -dlabel D_8024520C_DD1EDC -.word 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF971888C, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024534C_DD201C -.word 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF971888D, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024548C_DD215C -.word 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF971888E, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802455CC_DD229C -.word 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF971888B, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000044, 0x00000001, D_8024520C_DD1EDC, 0x00000044, 0x00000001, D_8024534C_DD201C, 0x00000044, 0x00000001, D_8024548C_DD215C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802456FC_DD23CC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0x00000000, 0x00000044, 0x00000001, D_80244204_DD0ED4, 0x00000044, 0x00000001, D_8024473C_DD140C, 0x00000044, 0x00000001, D_80244C74_DD1944, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000005, IsPlayerWithin, 0x0000020D, 0x00000000, 0x000001F4, 0xF70F2E83, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000015, 0x00000008, 0x00000001, 0x00000064, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFAA2B584, 0x00000027, 0x00000002, 0xFE363C81, 0xFAA2B585, 0x00000027, 0x00000002, 0xFE363C81, 0xFAA2B586, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B584, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFD050F81, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFFFFFFFF, 0xFD050F82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFFFFFFFF, 0xFD050F81, 0xFD050F82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x00000B88, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, StopSound, 0x80000015, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802402D0_DCCFA0, 0xFD050F80, 0xFD050F81, 0xFD050F82, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24BE280, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001E5, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000001CC, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001FE, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000001F1, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000217, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0x00000217, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000230, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x0000023D, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000249, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0x00000262, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001FE, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000001F1, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000230, 0x00000082, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7DB4, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0x0000023D, 0x00000000, 0x00000032, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000040, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000001E0, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000217, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000001E0, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0xFE363C81, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80243CBC_DD098C, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000217, 0x00000096, 0x00000032, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xF24A8280, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000001, omo_09_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xFD050F8B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000003, 0x00000001, 0x00000063, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000044, 0x00000001, D_802455CC_DD229C, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024636C_DD303C -.word 0x0000005C, 0x0000005F, 0x00000061, 0x00000063, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x0000005C, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002B, 0x0000005F, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002D, 0x00000061, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002F, 0x00000063, 0x00000047, 0x00000005, D_80243E04_DD0AD4, 0x00040000, 0x00000029, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243EEC_DD0BBC, 0x00040000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243FF4_DD0CC4, 0x00040000, 0x0000002D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802440FC_DD0DCC, 0x00040000, 0x0000002F, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFD050F80, 0x00000029, 0x00000002, 0xFD050F80, 0x0000002D, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFD050F80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFD050F80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFD050F80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFD050F80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFD050F81, 0x00000029, 0x00000002, 0xFD050F81, 0x0000002D, 0x00000043, 0x00000006, RotateModel, 0x0000006F, 0xFD050F81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000070, 0xFD050F81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFD050F81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000072, 0xFD050F81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000007, 0xFD050F82, 0x00000029, 0x00000002, 0xFD050F82, 0x0000002D, 0x00000043, 0x00000006, RotateModel, 0x00000074, 0xFD050F82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000075, 0xFD050F82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000076, 0xFD050F82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000077, 0xFD050F82, 0x00000001, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007C, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFBAA, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C81, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240534_DCD204, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005D, 0x00000000, 0x00000044, 0x00000001, D_802455CC_DD229C, 0x00000043, 0x00000003, EnableModel, 0x0000005F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000065, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000061, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000066, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000063, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000067, 0x00000000, 0x00000044, 0x00000001, D_802456FC_DD23CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s deleted file mode 100644 index df4676c2b8..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246850_DD3520 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000034, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000036, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000038, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024697C_DD364C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000A0, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003F, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000047, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000049, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000A0, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003F, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000047, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000049, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246C78_DD3948 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000095, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246D44_DD3A14 -.word 0x00000018, 0x00000083, 0x00000028, 0x00000029, 0x00000019, 0x00000084, 0x0000003C, 0x00000033, 0x0000001A, 0x00000085, 0x00000046, 0x00000001, 0x0000001B, 0x00000086, 0x0000001E, 0x0000003D, 0x0000001C, 0x00000087, 0x00000032, 0x00000047, 0x0000001D, 0x00000088, 0x00000046, 0x00000065 - -dlabel D_80246DA4_DD3A74 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, ParentColliderToModel, 0xFE363C86, 0xFE363C87, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C88, 0xFE363C88, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C86, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C88, 0x00000000, 0xFE363C88, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C86, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802406E0_DCD3B0, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80246850_DD3520, 0x00000044, 0x00000001, D_8024697C_DD364C, 0x00000044, 0x00000001, D_80246C78_DD3948, 0x00000030, 0x00000001, D_80246D44_DD3A14, 0x00000005, 0x00000001, 0x00000006, 0x00000034, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000044, 0x00000001, D_80246DA4_DD3A74, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel omo_09_varStash -.word 0x00000000 - -dlabel D_80247014_DD3CE4 -.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_8024707C_DD3D4C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80247014_DD3CE4, 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_8024715C_DD3E2C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000024, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FFB, 0x00000001, 0x00000046, 0x00000001, D_8024707C_DD3D4C, 0x00000024, 0x00000002, 0xF8405C73, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD08, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFE, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD44, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFF, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000000A, 0x00000000, 0x00000011, 0xF8406000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE48, 0x0000000A, 0x00000064, 0x00000011, 0xF8406001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE84, 0x0000000A, 0x00000064, 0x00000011, 0xF8406002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFEC0, 0x0000000A, 0x00000064, 0x00000011, 0xF8406003, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000708, 0x00000019, 0x00000000, 0x00000011, 0xF8406016, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406008, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406009, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006D6, 0x00000019, 0x00000000, 0x00000011, 0xF840600D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000073A, 0x00000019, 0x00000000, 0x00000011, 0xF840600E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0x00000032, 0x00000011, 0xF8406012, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0x00000032, 0x00000011, 0xF8406013, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000505, 0x000000E6, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406017, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000079E, 0x00000096, 0xFFFFFFE1, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FFB, 0x00000043, 0x00000002, AssignScript, D_8024715C_DD3E2C, 0x0000000A, 0x00000002, 0xF8405FFC, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FFD, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000025, 0x0000008E, 0x0000000A, 0xFFFFFFA0, 0x00000011, 0xF8405FFD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s deleted file mode 100644 index cce25cb32b..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s +++ /dev/null @@ -1,138 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80247480_DD4150 -.word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 - -dlabel D_802474B0_DD4180 -.word 0x00000043, 0x00000002, omo_09_ShyGuyWanderAI_Main, D_80247480_DD4150, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802474D0_DD41A0 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802474B0_DD4180, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_802474FC_DD41CC -.word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 - -dlabel D_8024752C_DD41FC -.word 0x00000043, 0x00000002, BasicAI_Main, D_802474FC_DD41CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_8024752C_DD41FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0000 - -dlabel D_80247578_DD4248 -.word 0x40000000, 0x0000003C, 0x00000000, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x43200000, 0x42480000, 0x00000001 - -dlabel D_802475A8_DD4278 -.word 0x00000043, 0x00000002, omo_09_ShyGuyPatrolAI_Main, D_80247578_DD4248, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802475C8_DD4298 -.word 0x00000043, 0x00000002, omo_09_PatrolNoAttackAI_Main, D_80247578_DD4248, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802475E8_DD42B8 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802475A8_DD4278, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802475C8_DD4298, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_80247640_DD4310 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247710_DD43E0 -.word 0x3FC00000, 0x0000003C, 0x0000000F, 0x42B40000, 0x42480000, 0x00000003, 0x40733333, 0x00000008, 0x00000001, 0x430C0000, 0x42700000, 0x00000001 - -dlabel D_80247740_DD4410 -.word 0x00000043, 0x00000001, omo_09_SetInstigatorValue_3, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, omo_09_RangedAttackAI_Main, D_80247710_DD43E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802477BC_DD448C -.word 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80247740_DD4410, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 - -dlabel D_802477E8_DD44B8 -.word 0x41000000, 0x00000000, 0x00000000, 0x40800000, 0x3F000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80247818_DD44E8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000D, 0x00000043, 0x00000002, omo_09_ProjectileAI_Main, D_802477E8_DD44B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247888_DD4558 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247898_DD4568 -.word 0x00000043, 0x00000001, omo_09_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80247888_DD4558, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, omo_09_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, SetBattleAsScripted, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80247818_DD44E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247A60_DD4730 -.word 0x00000000, 0x00070007, 0x00000000, 0x00000000, D_80247818_DD44E8, D_80247898_DD4568, 0x00000000, D_80247640_DD4310, 0x00000000, 0x00000000, 0x00000008 - -dlabel D_80247A8C_DD475C -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80247AB8_DD4788 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80247AE8_DD47B8 -.word 0x00000043, 0x00000001, dup_omo_09_SetInstigatorValue_3, 0x00000043, 0x00000002, BasicAI_Main, D_80247AB8_DD4788, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B14_DD47E4 -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80247AE8_DD47B8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_80247B40_DD4810 -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80247B6C_DD483C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C8A, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001A, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001A, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0xFE363C8A, 0x0000000A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C8D, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000C, 0xFE363C8E, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000D, 0xFE363C8E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000E, 0xFE363C8E, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247D90_DD4A60 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FFC, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF8405FFC, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247E48_DD4B18 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000073A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000096, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, omo_09_SetCamera0Flag1000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8E80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24AAE80, 0xF24A5480, 0x0000000A, 0x00000002, 0xF5DE025A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00310004, 0x00310004, 0x00000000, 0x000F003E, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00580008, 0x00580001, 0x00000000, 0x000F003F, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_09_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247FE4_DD4CB4 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FD0, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248058_DD4D28 -.word 0x0000000A, 0x00000002, 0xF5DE025A, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80247E48_DD4B18, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80247FE4_DD4CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802480CC_DD4D9C -.word 0x0000000A, 0x00000002, 0xF5DE025A, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80247E48_DD4B18, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80247FE4_DD4CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248140_DD4E10 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80249F08, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248164_DD4E34 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802474B0_DD4180, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802482BC_DD4F8C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80248164_DD4E34, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248348_DD5018 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80248164_DD4E34, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802482BC_DD4F8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248380_DD5050 -.word 0x00000005, D_80247B14_DD47E4, 0x44ED8000, 0x43160000, 0xC1F00000, 0x00440F00, D_80248058_DD4D28, 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, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80248570_DD5240 -.word 0x00000006, D_80247A8C_DD475C, 0x44ED8000, 0x43160000, 0xC1F00000, 0x00440F00, D_802480CC_DD4D9C, 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, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80248760_DD5430 -.word 0x00000000, D_802474D0_DD41A0, 0x00000000, 0xC47A0000, 0x00000000, 0x00200004, D_80248348_DD5018, 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, 0x000001CC, 0x00000000, 0x00000032, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001CC, 0x00000000, 0x00000032, 0x000000C8, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80248950_DD5620 -.word 0x00000001, D_802474D0_DD41A0, 0x00000000, 0xC47A0000, 0x00000000, 0x00200004, D_80248348_DD5018, 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, 0x000001F1, 0x00000000, 0x00000032, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001F1, 0x00000000, 0x00000032, 0x000000C8, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80248B40_DD5810 -.word 0x00000002, D_802474D0_DD41A0, 0x00000000, 0xC47A0000, 0x00000000, 0x00200004, D_80248348_DD5018, 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, 0x00000217, 0x00000000, 0x00000032, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000217, 0x00000000, 0x00000032, 0x000000C8, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80248D30_DD5A00 -.word 0x00000003, D_802474D0_DD41A0, 0x00000000, 0xC47A0000, 0x00000000, 0x00200004, D_80248348_DD5018, 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, 0x0000023D, 0x00000000, 0x00000032, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000023D, 0x00000000, 0x00000032, 0x000000C8, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80248F20_DD5BF0 -.word 0x00000004, D_802474D0_DD41A0, 0x00000000, 0xC47A0000, 0x00000000, 0x00200004, D_80248348_DD5018, 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, 0x00000262, 0x00000000, 0x00000032, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000262, 0x00000000, 0x00000032, 0x000000C8, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80249110_DD5DE0 -.word 0x0060000E, 0x0060000F, 0x00600010, 0x00600013, 0x00600015, 0x00600016, 0xFFFFFFFF - -dlabel D_8024912C_DD5DFC -.word 0x00000007, D_80247B40_DD4810, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F04, D_80248140_DD4E10, 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, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_80249110_DD5DE0, 0x00000000 - -dlabel D_8024931C_DD5FEC -.word 0x0000000A, 0x00000002, 0xF8405FFC, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80247D90_DD4A60, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x00000025, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000025, 0x00000002, 0xFE363C83, 0xF8405FFD, 0x00000044, 0x00000001, D_80247B6C_DD483C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802493BC_DD608C -.word 0x00000008, D_802475E8_DD42B8, 0x431B0000, 0x41200000, 0xC2C00000, 0x00000C00, D_8024931C_DD5FEC, 0x00000000, 0x00000000, 0x0000010E, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000002, 0x0000009B, 0x0000000A, 0xFFFFFFA0, 0x0000005A, 0x0000000A, 0xFFFFFFA0, 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, 0x00000087, 0x0000000A, 0x00000000, 0x00000069, 0x0000008C, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x003B0401, 0x003B0402, 0x003B0403, 0x003B0403, 0x003B0401, 0x003B0401, 0x003B040C, 0x003B040C, 0x003B0415, 0x003B0412, 0x003B0411, 0x003B0410, 0x003B0405, 0x003B0401, 0x003B0401, 0x003B0401, 0x00000001, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_802495AC_DD627C -.word 0x00000014, D_802477BC_DD448C, 0x44548000, 0x00000000, 0x00000000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x00020000, 0x00820002, 0x00000084, 0x00020000, 0x00860002, 0x00000085, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000352, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000352, 0x00000000, 0x00000000, 0x000000C8, 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, 0x003F0002, 0x003F0004, 0x003F0005, 0x003F0004, 0x003F0002, 0x003F0002, 0x003F000B, 0x003F000B, 0x003F0015, 0x003F0016, 0x003F0002, 0x003F0002, 0x003F0002, 0x003F0002, 0x003F0002, 0x003F0002, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000015, D_80247A60_DD4730, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000016, D_80247A60_DD4730, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000017, D_80247A60_DD4730, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 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, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x003F0010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80248380_DD5050, 0x12080005, 0x00000001, D_80248760_DD5430, 0x120A0005, 0x00000001, D_80248950_DD5620, 0x120A0005, 0x00000001, D_80248B40_DD5810, 0x120A0005, 0x00000001, D_80248D30_DD5A00, 0x120A0005, 0x00000001, D_80248F20_DD5BF0, 0x120A0005, 0x00000001, D_802493BC_DD608C, 0x10090001, 0x00000004, D_802495AC_DD627C, 0x10190001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80248570_DD5240, 0x12090005, 0x00000001, D_80248760_DD5430, 0x120A0005, 0x00000001, D_80248950_DD5620, 0x120A0005, 0x00000001, D_80248B40_DD5810, 0x120A0005, 0x00000001, D_80248D30_DD5A00, 0x120A0005, 0x00000001, D_80248F20_DD5BF0, 0x120A0005, 0x00000001, D_802493BC_DD608C, 0x10090001, 0x00000004, D_802495AC_DD627C, 0x10190001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80248760_DD5430, 0x120A0005, 0x00000001, D_80248950_DD5620, 0x120A0005, 0x00000001, D_80248B40_DD5810, 0x120A0005, 0x00000001, D_80248D30_DD5A00, 0x120A0005, 0x00000001, D_80248F20_DD5BF0, 0x120A0005, 0x00000001, D_802493BC_DD608C, 0x10090001, 0x00000004, D_802495AC_DD627C, 0x10190001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024912C_DD5DFC, 0x00000000, 0x00000001, D_80248380_DD5050, 0x12080005, 0x00000001, D_80248570_DD5240, 0x12090005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD6BB0.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD6BB0.data.s deleted file mode 100644 index 478568bd44..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_09/DD6BB0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80249EE0_DD6BB0 -.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80249EE0_DD6BB0, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C85, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000031, 0x00000001, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, omo_09_GetKammyBroomEmitterPos, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405FFA, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E84, 0xF5DE025A, 0x00000014, 0x00000001, 0xF70F2E84, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000005, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000006, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F8A, 0x0000009B, 0x00000023, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x0000071C, 0x000000A5, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000007, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000076C, 0x00000096, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000076C, 0x00000096, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000E, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000027, 0x00000002, 0xFE363C81, 0x00000026, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x0000004B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000043, 0x00000006, PlaySoundAt, 0x00002098, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0x00000096, 0x00000000, 0x00000001, 0x0000000F, 0x00000003, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0xFE363C80, 0x00000096, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F8A, 0xFE363C80, 0x00000096, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFD050F8A, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFD050F8A, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024ACD0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DD8220.data.s b/ver/us/asm/data/world/area_omo/omo_10/DD8220.data.s deleted file mode 100644 index 8104df76d6..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_10/DD8220.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240870_DD8220 -.word 0xC3A50000, 0x00000000, 0x43A50000, 0x42340000, 0x43A50000, 0x00000000, 0x43A50000, 0x439D8000, 0xC3A50000, 0x41200000, 0xC3A50000, 0x43070000, 0x43A50000, 0x41200000, 0xC3A50000, 0x43610000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240B94_DD8544, D_80240870_DD8220, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900E2 - -dlabel D_802408F0_DD82A0 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409C0_DD8370 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244E40, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A1C_DD83CC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244E48, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A78_DD8428 -.word 0x00000047, 0x00000005, D_802409C0_DD8370, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A1C_DD83CC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AC0_DD8470 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240A78_DD8428, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80240A78_DD8428, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x0000001C, 0x00000000, 0x00000044, 0x00000001, D_80240A78_DD8428, 0x00000008, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B94_DD8544 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, 0x80244D54, 0x00000046, 0x00000001, 0x80244D70, 0x00000046, 0x00000001, 0x80241078, 0x00000046, 0x00000001, D_802408F0_DD82A0, 0x00000046, 0x00000001, 0x802446D0, 0x00000044, 0x00000001, D_80240AC0_DD8470, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DD8640.data.s b/ver/us/asm/data/world/area_omo/omo_10/DD8640.data.s deleted file mode 100644 index e5c888ef75..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_10/DD8640.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C90_DD8640 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DBC_DD876C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000A0, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000040, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000A0, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000040, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FAC_DD895C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000031, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000036, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240C90_DD8640, 0x00000044, 0x00000001, D_80240DBC_DD876C, 0x00000044, 0x00000001, D_80240FAC_DD895C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s b/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s deleted file mode 100644 index 111989305d..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s +++ /dev/null @@ -1,111 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410B0_DD8A60 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_10_AdvanceBuffer, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_10_CosInterpMinMax, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_10_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_10_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_10_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_10_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_10_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_10_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_10_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_10_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_10_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000077, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000080, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000081, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000081, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000081, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000077, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000080, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000080, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000080, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007C, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242278_DD9C28 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422E0_DD9C90 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423A4_DD9D54 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424BC_DD9E6C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428BC_DDA26C -.word 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BB8_DDA568 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E60, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E58, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E50, 0x00000003, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C78_DDA628 -.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E60, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E58, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E50, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E60, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E50, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E60, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E58, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F1C_DDA8CC -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_10_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80242BB8_DDA568, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80242C78_DDA628, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FAC_DDA95C -.word 0x00000043, 0x00000003, SetTexPanner, 0x00000082, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000082, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008D, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000087, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000087, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008D, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433CC_DDAD7C -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000087, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000033, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000087, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000033, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000034, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243604_DDAFB4 -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024383C_DDB1EC -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802438D8_DDB288 -.word 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000044, 0x00000001, D_80242FAC_DDA95C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000033, 0x00000086, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000034, 0x00000087, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x0000008C, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003A, 0x0000008D, 0x00000047, 0x00000005, D_802433CC_DDAD7C, 0x00000080, 0x00000033, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802433CC_DDAD7C, 0x00001000, 0x00000034, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243604_DDAFB4, 0x00000080, 0x00000039, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243604_DDAFB4, 0x00001000, 0x0000003A, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFBB4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 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_8024383C_DDB1EC, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243AC0_DDB470 -.word 0x0000000A, 0xFFFFFF97 - -dlabel D_80243AC8_DDB478 -.word 0xF24A7170, 0xF2473487, 0xF24BE280, 0xF24C6B4F, 0xF2473487, 0xF24E9480, 0xF246A528, 0xF251F729, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80243AF8_DDB4A8 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000044, 0x00000001, D_802423A4_DD9D54, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80243AC8_DDB478, 0x00000046, 0x00000001, D_802424BC_DD9E6C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003E, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80243AC8_DDB478, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244E70, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C68_DDB618 -.word 0xF24A7170, 0xF2473487, 0xF24EB280, 0xF2487792, 0xF2473487, 0xF2466080, 0xF246A528, 0xF244F4D4, 0xF244F3C0, 0xF242FDD8, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80243CA0_DDB650 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000044, 0x00000001, D_802423A4_DD9D54, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80243C68_DDB618, 0x00000046, 0x00000001, D_802424BC_DD9E6C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003E, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80243C68_DDB618, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFEA2, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244E70, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E10_DDB7C0 -.word 0xF250F60B, 0xF243CEBC, 0xF24DEA2E, 0xF25000B7, 0xF244F44A, 0xF24E9480, 0xF246A528, 0xF24C6B4F, 0xF2473487, 0xF249D16C, 0xF247348B, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80243E48_DDB7F8 -.word 0xF250F60B, 0xF243CEBC, 0xF24DEA2E, 0xF25000B7, 0xF244F44A, 0xF24E9480, 0xF246A528, 0xF24C6B4F, 0xF2473487, 0xF2487792, 0xF2473487, 0xF2466080, 0xF246A528, 0xF244F4D4, 0xF244F3C0, 0xF242FDD8, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80243E98_DDB848 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003E, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000003, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80243E10_DDB7C0, 0x00000024, 0x00000002, 0xFD050F82, 0x00000002, 0x00000044, 0x00000001, D_802410B0_DD8A60, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80242278_DD9C28, 0xFE363C8B, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_802422E0_DD9C90, 0x00000043, 0x00000001, omo_10_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C89, D_80243AC0_DDB470, 0x00000046, 0x00000001, D_802428BC_DDA26C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0011, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003E, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242278_DD9C28, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80243E48_DDB7F8, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_802410B0_DD8A60, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80242F1C_DDA8CC, 0x00000003, 0x00000001, 0x00000014, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFEA2, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244E70, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244150_DDBB00 -.word 0xF243FEF6, 0xF243CEBC, 0xF24CAACD, 0xF244F4D4, 0xF244F3C0, 0xF2466080, 0xF246A528, 0xF2487792, 0xF2473487, 0xF24B116C, 0xF247348B, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_80244188_DDBB38 -.word 0xF243FEF6, 0xF243CEBC, 0xF24CAACD, 0xF244F4D4, 0xF244F3C0, 0xF2466080, 0xF246A528, 0xF2487792, 0xF2473487, 0xF24C6B4F, 0xF2473487, 0xF24E9480, 0xF246A528, 0xF251F729, 0xF2429C51, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_802441D0_DDBB80 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003E, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000003, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80244150_DDBB00, 0x00000024, 0x00000002, 0xFD050F82, 0x00000002, 0x00000044, 0x00000001, D_802410B0_DD8A60, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80242278_DD9C28, 0xFE363C8B, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000044, 0x00000001, D_802422E0_DD9C90, 0x00000043, 0x00000001, omo_10_UnsetCamera0MoveFlag1, 0x00000024, 0x00000002, 0xFE363C89, D_80243AC0_DDB470, 0x00000046, 0x00000001, D_802428BC_DDA26C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0011, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000003E, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242278_DD9C28, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80244188_DDBB38, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_802410B0_DD8A60, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80242F1C_DDA8CC, 0x00000003, 0x00000001, 0x00000014, 0x0000000C, 0x00000002, 0xFD050F8B, 0x0000015E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244E70, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0257, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244488_DDBE38 -.word 0x00000002, 0x00000001, 0x00000000 - -dlabel D_80244494_DDBE44 -.word 0x00000000, 0x00000001, 0x00000002 - -dlabel D_802444A0_DDBE50 -.word 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0006, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000043, 0x00000002, ShowChoice, 0x001E0043, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80244488_DDBE38, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80243CA0_DDB650, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000043, 0x00000002, ShowChoice, 0x001E0042, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_80244494_DDBE44, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80243AF8_DDB4A8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802446B8_DDC068 -.word 0xF24A7170, 0xF2473487, 0xF24BE280, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000046, 0x00000001, D_802438D8_DDB288, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802446B8_DDC068, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_802410B0_DD8A60, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_802441D0_DDBB80, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80243E98_DDB848, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802446B8_DDC068, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_802410B0_DD8A60, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244810_DDC1C0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244820_DDC1D0 -.word 0x00000000, 0x00200018, D_80244810_DDC1C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024484C_DDC1FC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802444A0_DDBE50, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244888_DDC238 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024484C_DDC1FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802448AC_DDC25C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0404, 0x008C0401, 0x00000000, 0x000F0031, 0x00000018, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0404, 0x008C0401, 0x00000000, 0x000F0032, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008C0404, 0x008C0401, 0x00000000, 0x000F0033, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244950_DDC300 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802448AC_DDC25C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244974_DDC324 -.word 0x00000000, D_80244820_DDC1D0, 0x41200000, 0x42480000, 0xC2D20000, 0x00400D05, D_80244888_DDC238, 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, 0x008C0001, 0x008C0003, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00B8, 0x00000001, D_80244820_DDC1D0, 0xC2480000, 0x00000000, 0x42A00000, 0x00400D05, D_80244950_DDC300, 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, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x008C0401, 0x00000000, 0x00000000, 0x00000000, 0x001A00B8, 0x00000002, D_80244974_DDC324, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s b/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s deleted file mode 100644 index 2e8918d8ea..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244D70_DDC720 -.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFEA2, 0x0000003C, 0x0000003C, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406018, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x000000FA, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000096, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000020, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406029, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDDD00.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDDD00.data.s deleted file mode 100644 index 31cb3352eb..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_11/DDDD00.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802414D0_DDDD00 -.word 0xC4200000, 0x00000000, 0x41A00000, 0x42B40000, 0x44368000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241660, D_802414D0_DDDD00, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900E3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s deleted file mode 100644 index 090f4e3a74..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241560_DDDD90 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242AD0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415BC_DDDDEC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242AD8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241618_DDDE48 -.word 0x00000047, 0x00000005, D_80241560_DDDD90, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802415BC_DDDDEC, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, MakeNpcs, 0x00000001, 0x80242AAC, 0x00000046, 0x00000001, D_80242488_DDECB8, 0x00000046, 0x00000001, 0x80241530, 0x00000046, 0x00000001, D_80241BF8_DDE428, 0x00000024, 0x00000002, 0xFE363C80, D_80241618_DDDE48, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241740_DDDF70 -.word 0x00000041, 0x00000044, 0x00000047, 0x0000004D, 0x00000050, 0x00000053, 0x00000056, 0x00000059 - -dlabel D_80241760_DDDF90 -.word 0x00000041, 0x00000042, 0x00000044, 0x00000045, 0x00000047, 0x00000048 - -dlabel D_80241778_DDDFA8 -.word 0x00000029, 0x0000002A, 0x0000002C, 0x0000002D, 0x0000002F, 0x00000030 - -dlabel D_80241790_DDDFC0 -.word 0x0000004D, 0x00000035, 0x0000004E, 0x00000036 - -dlabel D_802417A0_DDDFD0 -.word 0x00000050, 0x00000038, 0x00000051, 0x00000039 - -dlabel D_802417B0_DDDFE0 -.word 0x00000053, 0x0000003B, 0x00000054, 0x0000003C - -dlabel D_802417C0_DDDFF0 -.word 0x00000056, 0x0000003E, 0x00000057, 0x0000003F - -dlabel D_802417D0_DDE000 -.word 0x00000059, 0x00000041, 0x0000005A, 0x00000042 - -dlabel D_802417E0_DDE010 -.word 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C8A, 0x00000008, 0x00000001, 0xFE363C8A, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFAE, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C86, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C88, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C87, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFAE, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C86, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C88, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C87, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419DC_DDE20C -.word 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C8A, 0x00000008, 0x00000001, 0xFE363C8A, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000085, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000046, 0x00000033, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C86, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C88, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C87, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00000087, 0x00000043, 0x00000005, MakeLerp, 0x00000046, 0x00000000, 0x00000033, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C86, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C88, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C87, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BF8_DDE428 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x0000003F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000032, 0x0000004A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x00000041, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002A, 0x00000042, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002C, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002D, 0x00000045, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002F, 0x00000047, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000030, 0x00000048, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802401A0_DDC9D0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000035, 0x0000004D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000036, 0x0000004E, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000038, 0x00000050, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x00000051, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003B, 0x00000053, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003C, 0x00000054, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003E, 0x00000056, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003F, 0x00000057, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000041, 0x00000059, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000042, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C80, D_80241790_DDDFC0, 0x00000044, 0x00000001, D_802417E0_DDE010, 0x00000024, 0x00000002, 0xFE363C80, D_802417A0_DDDFD0, 0x00000044, 0x00000001, D_802417E0_DDE010, 0x00000024, 0x00000002, 0xFE363C80, D_802417B0_DDDFE0, 0x00000044, 0x00000001, D_802417E0_DDE010, 0x00000024, 0x00000002, 0xFE363C80, D_802417C0_DDDFF0, 0x00000044, 0x00000001, D_802419DC_DDE20C, 0x00000024, 0x00000002, 0xFE363C80, D_802417D0_DDE000, 0x00000044, 0x00000001, D_802417E0_DDE010, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_DDC830, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel omo_11_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel omo_11_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel omo_11_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel omo_11_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80241EA4_DDE6D4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, omo_11_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, omo_11_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, omo_11_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, omo_11_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, omo_11_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, omo_11_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, omo_11_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242008_DDE838 -.word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, omo_11_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_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, omo_11_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_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, omo_11_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, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, omo_11_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, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242488_DDECB8 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFF8D, 0x0000010E, 0xFFFFFF88, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840602A, 0x00000043, 0x00000002, AssignScript, D_80242008_DDE838, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x0000013B, 0x0000010E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406019, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000002AD, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601D, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFDA8, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000081, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601E, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601C, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenRedBlock, 0xFFFFFF6A, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000132, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601A, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF38, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDEE80.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDEE80.data.s deleted file mode 100644 index afb0b691fb..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_11/DDEE80.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242650_DDEE80 -.word 0x40400000, 0x0000001E, 0x0000003C, 0x42C80000, 0x41F00000, 0x00000004, 0x40A00000, 0x00000008, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 - -dlabel D_80242680_DDEEB0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80242650_DDEE80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426A0_DDEED0 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80242680_DDEEB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 - -dlabel D_802426CC_DDEEFC -.word 0x00000000, D_802426A0_DDEED0, 0xC3340000, 0x00000000, 0x428C0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFF4C, 0x00000000, 0x00000046, 0x0000001E, 0x0000000A, 0xFFFF8001, 0x00000001, 0xFFFFFF4C, 0x00000000, 0x00000046, 0x000000C8, 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, 0x003E0001, 0x003E0002, 0x003E0003, 0x003E0002, 0x003E0001, 0x003E0001, 0x003E0006, 0x003E0006, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802428BC_DDF0EC -.word 0x00000001, D_802426A0_DDEED0, 0x43A50000, 0x00000000, 0x42A60000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x0000014A, 0x00000000, 0x00000053, 0x0000001E, 0x0000000A, 0xFFFF8001, 0x00000001, 0x0000014A, 0x00000000, 0x00000053, 0x000000C8, 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, 0x003E0001, 0x003E0002, 0x003E0003, 0x003E0002, 0x003E0001, 0x003E0001, 0x003E0006, 0x003E0006, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x003E0001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802426CC_DDEEFC, 0x10220008, 0x00000001, D_802428BC_DDF0EC, 0x10240008, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_12/DDF7D0.data.s b/ver/us/asm/data/world/area_omo/omo_12/DDF7D0.data.s deleted file mode 100644 index 856ceebe52..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_12/DDF7D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404C0_DDF7D0 -.word 0x43820000, 0x00000000, 0x41A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802406D8, D_802404C0_DDF7D0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900E4, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000022, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_12/DDF960.data.s b/ver/us/asm/data/world/area_omo/omo_12/DDF960.data.s deleted file mode 100644 index 8cf644255d..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_12/DDF960.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240650_DDF960 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243160, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406AC_DDF9BC -.word 0x00000047, 0x00000005, D_80240650_DDF960, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, 0x80243124, 0x00000046, 0x00000001, 0x80240510, 0x00000046, 0x00000001, 0x80240AF4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802406AC_DDF9BC, 0x00000044, 0x00000001, 0x80240BA0, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_802406AC_DDF9BC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x0000001B, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_802406AC_DDF9BC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s deleted file mode 100644 index 8115cba607..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240850_DDFB60 -.word 0x00000000, 0x0044003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024087C_DDFB8C -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_802408A8_DDFBB8 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_12_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408D4_DDFBE4 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, func_802403D8_DDF6E8, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C83, 0xF70F2E82, 0x00000027, 0x00000002, 0xFE363C83, 0x00000080, 0x00000043, 0x00000005, func_80240314_DDF624, 0x00000000, 0xFFFFFC18, 0x00000000, 0xFE363C83, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000016, 0x00000001, 0x00000006, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000005, 0x00000024, 0x00000002, 0xF70F2E82, 0x0000007F, 0x00000044, 0x00000001, D_802408D4_DDFBE4, 0x00000018, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000003, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000066, 0x00000044, 0x00000001, D_802408D4_DDFBE4, 0x0000001B, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000046, 0x00000014, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000F004E, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0x00000020, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000064, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006D0005, 0x006D0001, 0x00000000, 0x000F004F, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E82, 0xFFFFFFE4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D0006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D0001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006D0005, 0x006D0001, 0x00000000, 0x000F0050, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006D000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000A, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F38_DE0248 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060006, 0x00060001, 0x00000005, 0x000F005C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FF4_DE0304 -.word 0x00000000, 0x00000000, 0x00000000, 0x41C80000, 0xC0A00000, 0x00000000, 0x42700000, 0x41F00000, 0x00000000 - -dlabel D_80241018_DE0328 -.word 0x00000000, 0x00000000, 0x00000000, 0xC1C80000, 0xC0A00000, 0x00000000, 0xC2700000, 0x41F00000, 0x00000000, 0x00000000, 0x00000000, 0x41A00000, 0x00000000 - -dlabel D_8024104C_DE035C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, omo_12_SetCamera0Flag1000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8280, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF2518280, 0xF24AB680, 0xF24A6280, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060007, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, GetEncounterTriggerHitTier, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001F5, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x006D0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x006D0004, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0x00000006, 0xFE363C82, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000048, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x000F0058, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060006, 0x00060001, 0x00000000, 0x000F0057, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F0059, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080011, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240FF4_DE0304, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80241018_DE0328, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFF4, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F005A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, omo_12_ChangeNpcToPartner, 0x00000001, 0x00000006, 0x00000043, 0x00000001, omo_12_LoadPartyImage, 0x00000044, 0x00000001, 0x802405E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018E, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240608, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x000000FF, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, CloseMessage, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x000F005B, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, D_80240F38_DE0248, 0x00000043, 0x00000001, omo_12_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0x00000003, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E60_DE1170 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EE0_DE11F0 -.word 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000064, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006D0008, 0x006D0008, 0x00000000, 0x000F0054, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0x00000000, 0x00000000, 0x00000014, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0x00000000, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006D0007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24AA280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000190, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24B6A80, 0x0000002F, 0x00000002, 0xFE363C84, 0xF24B6A80, 0x0000002F, 0x00000002, 0xFE363C85, 0xF24B6A80, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A832B, 0x00000026, 0x00000002, 0xFE363C87, 0xF24C0A80, 0x00000005, 0x00000001, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000003, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000066, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242284_DE1594 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241E60_DE1170, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241EE0_DE11F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422EC_DE15FC -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFF7, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFF9, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFB, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x006D0002, 0x006D0002, 0x00000005, 0x000F0055, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424BC_DE17CC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFE363C80, 0xFE363C82, 0x00000064, 0x00000043, 0x00000002, PartnerCanUseAbility, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000010, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x006D0002, 0x006D0002, 0x00000000, 0x000F0056, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFE363C80, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024272C_DE1A3C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006D0002, 0x00000018, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006D0002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x0000001B, 0x00000001, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802424BC_DE17CC, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802422EC_DE15FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024280C_DE1B1C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006D0002, 0x00000018, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006D0002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x0000001B, 0x00000001, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_8024104C_DE035C, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428DC_DE1BEC -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x00000002, 0x0000001B, 0x00000001, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024293C_DE1C4C -.word 0x006D0001, 0x006D0006, 0x006D0007, 0x006D0008, 0x006D000F, 0x006D0005, 0x006D0002, 0x006D0003, 0x006D0004, 0xFFFFFFFF - -dlabel D_80242964_DE1C74 -.word 0x00000000, D_80240850_DDFB60, 0x00000000, 0xC47A0000, 0x00000000, 0x00040F04, D_80242284_DE1594, 0x00000001, 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, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0009, 0x006D0009, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x00000000, 0x00000000, D_8024293C_DE1C4C, 0x001A00B9 - -dlabel D_80242B54_DE1E64 -.word 0x00000001, D_8024087C_DDFB8C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D09, D_802428DC_DE1BEC, 0x00000001, 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, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00060001, 0x00000000, 0x00000000, 0x00000000, 0x001A00B9 - -dlabel D_80242D44_DE2054 -.word 0x00000002, D_8024087C_DDFB8C, 0x00000000, 0xC47A0000, 0x00000000, 0x00400D09, D_8024272C_DE1A3C, 0x00000001, 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, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0009, 0x006D0009, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x00000000, 0x00000000, D_8024293C_DE1C4C, 0x001A00B9 - -dlabel D_80242F34_DE2244 -.word 0x00000003, D_8024087C_DDFB8C, 0x00000000, 0xC47A0000, 0x00000000, 0x09100F08, D_8024280C_DE1B1C, 0x00000001, 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, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0009, 0x006D0009, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x006D0001, 0x00000000, 0x00000000, D_8024293C_DE1C4C, 0x001A00B9, 0x00000001, D_80242964_DE1C74, 0x12000000, 0x00000001, D_80242B54_DE1E64, 0x00000000, 0x00000001, D_80242D44_DE2054, 0x00000000, 0x00000001, D_80242F34_DE2244, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE3980.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE3980.data.s deleted file mode 100644 index 3cc2efead5..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_13/DE3980.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802414F0_DE3980 -.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x440D4000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241680, D_802414F0_DE3980, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900E5, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE3A10.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE3A10.data.s deleted file mode 100644 index d0a86e294d..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_13/DE3A10.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241580_DE3A10 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242ED0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415DC_DE3A6C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242ED8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241638_DE3AC8 -.word 0x00000047, 0x00000005, D_80241580_DE3A10, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802415DC_DE3A6C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FD1, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001F, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242C38, 0x00000046, 0x00000001, 0x80242E08, 0x00000046, 0x00000001, D_80241A98_DE3F28, 0x00000046, 0x00000001, 0x80241550, 0x00000024, 0x00000002, 0xFE363C80, D_80241638_DE3AC8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241790_DE3C20 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000037, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000039, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024185C_DE3CEC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000A0, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000A0, 0x00000000, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419CC_DE3E5C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFE98, 0x00000064, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000031, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A78_DE3F08 -.word 0x0000001B - -dlabel D_80241A7C_DE3F0C -.word 0x00000043, 0x00000001, func_80240000_DE2490, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A98_DE3F28 -.word 0x00000044, 0x00000001, D_80241790_DE3C20, 0x00000044, 0x00000001, D_8024185C_DE3CEC, 0x00000044, 0x00000001, D_802419CC_DE3E5C, 0x00000044, 0x00000001, D_80241A7C_DE3F0C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s deleted file mode 100644 index b8e57673b4..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241AE0_DE3F70 -.word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 - -dlabel D_80241B10_DE3FA0 -.word 0x00000043, 0x00000002, omo_13_ShyGuyWanderAI_Main, D_80241AE0_DE3F70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B30_DE3FC0 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80241B10_DE3FA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_80241B5C_DE3FEC -.word 0x3FD9999A, 0x00000050, 0x00000001, 0x42C80000, 0x00000000, 0x00000004, 0x40900000, 0x00000014, 0x00000001, 0x430C0000, 0x00000000, 0x00000001 - -dlabel D_80241B8C_DE401C -.word 0x00000043, 0x00000002, omo_13_GrooveGuyAI_Main, D_80241B5C_DE3FEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BAC_DE403C -.word 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80241B8C_DE401C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0001 - -dlabel D_80241BD8_DE4068 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel omo_13_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel omo_13_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80241C0C_DE409C -.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, omo_13_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, omo_13_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D40_DE41D0 -.word 0x00000043, 0x00000002, func_80240F8C_DE341C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C0C_DE409C, 0x00000010, 0x00000000, omo_13_80243220, 0x00000000, 0x00000001, 0x00000043, 0x00000002, omo_13_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D90_DE4220 -.word 0x000000D0, 0xFFFFFFFF - -dlabel D_80241D98_DE4228 -.word 0x0000000A, 0x00000002, 0xF8405FD1, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0515, 0x003B0515, 0x00000005, 0x000F004D, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x0000000A, 0xF24F2A80, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, FindItem, 0x000000D0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080011, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0046, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x003B0513, 0x003B0501, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0044, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0048, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0047, 0x00000043, 0x00000002, ShowChoice, 0x001E0044, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0048, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0049, 0x00000043, 0x00000004, SetNpcVar, 0xFFFFFFFF, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F004A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241D90_DE4220, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80241D40_DE41D0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F004B, 0x00000043, 0x00000002, ShowChoice, 0x001E0044, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0048, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0047, 0x00000043, 0x00000002, ShowChoice, 0x001E0044, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0048, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F0049, 0x00000043, 0x00000004, SetNpcVar, 0xFFFFFFFF, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x003B0511, 0x003B0501, 0x00000000, 0x000F004C, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF8405FD1, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001F, 0x7FFFFE00, 0x00000043, 0x00000004, SetNpcVar, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422A8_DE4738 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241028_DE34B8, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0502, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFFC4, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000006E, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000006E, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0515, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000003, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242538_DE49C8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FD1, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001F, 0x7FFFFE00, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425EC_DE4A7C -.word 0x0000000A, 0x00000002, 0xF8405FD1, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802422A8_DE4738, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241D98_DE4228, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242538_DE49C8, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveEncounter, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242668_DE4AF8 -.word 0x00000000, D_80241BD8_DE4068, 0x42DC0000, 0x00000000, 0xC1A00000, 0x00640D01, D_802425EC_DE4A7C, 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, 0x003B0501, 0x003B0502, 0x003B0503, 0x003B0502, 0x003B0501, 0x003B0501, 0x003B050C, 0x003B050C, 0x003B0515, 0x003B0512, 0x003B0511, 0x003B0510, 0x003B0505, 0x003B0501, 0x003B0501, 0x003B0501, 0x00000000, 0x00000000, 0x00000000, 0x001A00BA - -dlabel D_80242858_DE4CE8 -.word 0x00000001, D_80241B30_DE3FC0, 0x43960000, 0x00000000, 0x42480000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005009A, 0x00020000, 0x008C0002, 0x00000084, 0x00020000, 0x008D0002, 0x0000008F, 0x00020000, 0x00900002, 0x00000098, 0x00020000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x0000012C, 0x00000000, 0x00000032, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x000000C8, 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, 0x003B0401, 0x003B0402, 0x003B0403, 0x003B0403, 0x003B0401, 0x003B0401, 0x003B040C, 0x003B040C, 0x003B0415, 0x003B0412, 0x003B0411, 0x003B0410, 0x003B0405, 0x003B0401, 0x003B0401, 0x003B0401, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242A48_DE4ED8 -.word 0x00000002, D_80241BAC_DE403C, 0xC35E0000, 0x00000000, 0x420C0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80050096, 0x00050000, 0x00980005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFF22, 0x00000000, 0x00000023, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF22, 0x00000000, 0x00000023, 0x000000C8, 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, 0x003C0001, 0x003C0003, 0x003C0004, 0x003C0003, 0x003C0001, 0x003C0001, 0x003C0008, 0x003C0008, 0x003C0001, 0x003C0001, 0x003C0001, 0x003C0001, 0x003C0001, 0x003C0001, 0x003C0001, 0x003C0001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242668_DE4AF8, 0x102C0001, 0x00000001, D_80242858_DE4CE8, 0x10030001, 0x00000001, D_80242A48_DE4ED8, 0x10250001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s deleted file mode 100644 index 0e6cfef08e..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel omo_13_varStash -.word 0x00000000 - -dlabel D_80242C74_DE5104 -.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_80242CDC_DE516C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80242C74_DE5104, 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_80242DBC_DE524C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000013C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840601F, 0x00000001, 0x00000046, 0x00000001, D_80242CDC_DE516C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000006E, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840601F, 0x00000043, 0x00000002, AssignScript, D_80242DBC_DE524C, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFE89, 0x0000003C, 0xFFFFFFA1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406020, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000001D6, 0x0000003C, 0xFFFFFFC4, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406021, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_14/DE5C70.data.s b/ver/us/asm/data/world/area_omo/omo_14/DE5C70.data.s deleted file mode 100644 index 127dc33e6e..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_14/DE5C70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405C0_DE5C70 -.word 0xC3820000, 0x00000000, 0x41A00000, 0x42B40000, 0x43660000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024077C, D_802405C0_DE5C70, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900E6, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_14/DE5D00.data.s b/ver/us/asm/data/world/area_omo/omo_14/DE5D00.data.s deleted file mode 100644 index af45b447fd..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_14/DE5D00.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240650_DE5D00 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_14_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024067C_DE5D2C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802430B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406D8_DE5D88 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802430B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240734_DE5DE4 -.word 0x00000047, 0x00000005, D_8024067C_DE5D2C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802406D8_DE5D88, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, 0x80243080, 0x00000044, 0x00000001, 0x80240620, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x8000004C, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240650_DE5D00, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000003, 0x00000043, 0x00000003, EnableModel, 0x00000025, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000026, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240734_DE5DE4, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_14/DE5FA0.data.s b/ver/us/asm/data/world/area_omo/omo_14/DE5FA0.data.s deleted file mode 100644 index 7d80c41b72..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_14/DE5FA0.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408F0_DE5FA0 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_8024091C_DE5FCC -.word 0x000000C8, 0x00000000, 0x000000D2, 0xFFFFFFF6, 0x000000D2, 0x0000000A, 0x000000DC, 0xFFFFFFEC, 0x000000DC, 0x00000000, 0x000000DC, 0x00000014, 0x000000E6, 0x0000001E, 0x000000E6, 0x0000000A, 0x000000E6, 0x00000000, 0x000000E6, 0x0000000A, 0x000000E6, 0x0000001E - -dlabel D_80240974_DE6024 -.word 0x00000026, 0x00000002, 0xFE363C8A, 0xF24A8880, 0x00000024, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C8A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFF2E, 0x00000043, 0x00000001, func_80240564_DE5C14, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C8A, 0x00000043, 0x00000001, func_80240160_DE5810, 0x0000000D, 0x00000002, 0xFE363C8E, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003ED, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000001, 0x00000004, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001B, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000002, PlaySound, 0x000003EE, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000006, 0x00000030, 0x00000001, D_8024091C_DE5FCC, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000F, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718891, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x00000013, 0x00000000, 0x00000030, 0x00000001, D_8024091C_DE5FCC, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000003, func_802403FC_DE5AAC, 0xFE363C83, 0xFE363C84, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C83, 0x00000000, 0xFE363C84, 0x0000000F, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C83, 0x00000000, 0xFE363C84, 0x0000000F, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000C, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, func_802403FC_DE5AAC, 0x000000C8, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_802403FC_DE5AAC, 0xFFFFFF6A, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFD050F8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_802403FC_DE5AAC, 0x000000C8, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000096, 0x00000043, 0x00000001, func_80240564_DE5C14, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x000F005D, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000E6, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C80, 0x00000000, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x8000004C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x000F005E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000025, 0x00000025, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000028, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000025, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000026, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000025, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000026, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000012C, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000003, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241288_DE6938 -.word 0x00000043, 0x00000003, RandInt, 0x0000000F, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C8A, 0xF24AA280, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C8A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFF2E, 0x00000043, 0x00000001, func_80240564_DE5C14, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C8A, 0x00000043, 0x00000001, func_80240160_DE5810, 0x0000000D, 0x00000002, 0xFE363C8E, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C89, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C85, 0x00000030, 0x00000001, D_8024091C_DE5FCC, 0x00000005, 0x00000001, 0xFE363C85, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000032, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9680, 0x00000043, 0x00000003, func_802403FC_DE5AAC, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000C, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, func_802403FC_DE5AAC, 0x000000C8, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_802403FC_DE5AAC, 0xFFFFFF6A, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFD050F8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_802403FC_DE5AAC, 0x000000C8, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, RandInt, 0x00000168, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000002, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, func_80240564_DE5C14, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x0000000F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000EB, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000EB, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000012C, 0x00000000, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024195C_DE700C -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000003, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240974_DE6024, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000078, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0002, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419E0_DE7090 -.word 0x00000096, 0x00000000, 0xFFFFFF9C, 0x00000096, 0x00000000, 0xFFFFFFCE, 0x00000096, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x00000032, 0x00000096, 0x00000000, 0x00000064, 0x000000B4, 0x00000000, 0xFFFFFF9C, 0x000000B4, 0x00000000, 0xFFFFFFCE, 0x000000B4, 0x00000000, 0x00000000, 0x000000B4, 0x00000000, 0x00000032, 0x000000B4, 0x00000000, 0x00000064 - -dlabel D_80241A58_DE7108 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241288_DE6938, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000003, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000000, 0x00000030, 0x00000001, D_802419E0_DE7090, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0002, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B30_DE71E0 -.word 0x00000000, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000301, D_8024195C_DE700C, 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_80241D20_DE73D0 -.word 0x00000001, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000002, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000003, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000004, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000005, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000006, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000007, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000008, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000009, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x0000000A, D_802408F0_DE5FA0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000201, D_80241A58_DE7108, 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, 0x00000001, D_80241B30_DE71E0, 0x00000000, 0x0000000A, D_80241D20_DE73D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_15/DE8F70.data.s b/ver/us/asm/data/world/area_omo/omo_15/DE8F70.data.s deleted file mode 100644 index 422db591af..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_15/DE8F70.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240800_DE8F70 -.word 0xC3910000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240E00_DE9570, D_80240800_DE8F70, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900E7 - -dlabel D_80240850_DE8FC0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408E0_DE9050 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x0000001E, 0x00000000, 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, omo_15_StarSpiritEffectFunc2, 0x00000003, 0x000000B4, 0x000000D7, 0x0000003C, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_15_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, omo_15_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0xFFFFFF9C, 0x00000055, 0x00000000, 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, 0xFFFFFF9C, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, omo_15_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, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000002, omo_15_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 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, omo_15_StarSpiritEffectFunc5, 0x00000003, 0xFFFFFF9C, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, omo_15_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, omo_15_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000005, 0x00000043, 0x00000004, GotoMapSpecial, 0x80243744, 0x00000003, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D78_DE94E8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024374C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DD4_DE9544 -.word 0x00000047, 0x00000005, D_80240D78_DE94E8, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E00_DE9570 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, 0x8024370C, 0x00000046, 0x00000001, D_80240850_DE8FC0, 0x00000024, 0x00000002, 0xFE363C80, D_80240DD4_DE9544, 0x00000044, 0x00000001, EnterWalk, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000044, 0x00000001, D_802408E0_DE9050, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_15/DE9670.data.s b/ver/us/asm/data/world/area_omo/omo_15/DE9670.data.s deleted file mode 100644 index 552c4f91be..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_15/DE9670.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F00_DE9670 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_80240F2C_DE969C -.word 0x00000008, 0xFFFFFFDD, 0xFFFFFF10, 0x00000007, 0xFFFFFFFB, 0xFFFFFF4C, 0x00000006, 0x0000000A, 0xFFFFFF88, 0x00000006, 0x00000019, 0xFFFFFFC4, 0x00000006, 0x00000019, 0x0000003C, 0x00000006, 0x0000000A, 0x00000078, 0x00000007, 0xFFFFFFFB, 0x000000B4, 0x00000008, 0xFFFFFFDD, 0x000000F0, 0x00000006, 0x0000001E, 0x00000000 - -dlabel D_80240F98_DE9708 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F005F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0xFFFFFFCE, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0xFFFFFFCE, 0x0000000A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24DAE80, 0xF24AA680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0060, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0061, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0076000A, 0x00760002, 0x00000000, 0x000F0062, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x003B0002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0076000C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000F0063, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00760002, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x003B0001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00760002, 0x0076000A, 0x00000000, 0x000F0064, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x8000004D, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FA280, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F7A80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80240F2C_DE969C, 0x00000005, 0x00000001, 0x00000009, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C82, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000008, 0x00000001, 0x00000014, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetNpcVar, 0x00000009, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000028, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00000108, 0x00000106, 0x00000000, 0x000F0075, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000044, 0x00000001, D_802408E0_DE9050, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024157C_DE9CEC -.word 0x00000001, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000011, 0x0000002E, 0x00000001, 0xFFFFFFE8, 0x00000000, 0xFFFFFFF5, 0x00000000, 0xFFFFFFC1, 0xFFFFFFF0, 0x00000000, 0xFFFFFF88, 0x0000002B, 0x00000001, 0xFFFFFF54, 0x00000000, 0x00000019, 0x00000000, 0xFFFFFF16, 0x00000017, 0x00000000, 0xFFFFFEC0, 0x0000001E, 0x00000000, 0xFFFFFE70, 0x00000000, 0xFFFFFFFF - -dlabel D_802415F8_DE9D68 -.word 0x00000000, 0x0000001D, 0xFFFFFFB8, 0x00000000, 0xFFFFFFED, 0xFFFFFF98, 0x00000000, 0xFFFFFFC4, 0xFFFFFFBD, 0x00000000, 0xFFFFFF96, 0xFFFFFFCE, 0x00000000, 0xFFFFFF58, 0xFFFFFF9C, 0x00000000, 0xFFFFFEE9, 0xFFFFFFEC, 0x00000000, 0xFFFFFE70, 0x00000000, 0xFFFFFFFF - -dlabel D_80241650_DE9DC0 -.word 0x00000001, 0xFFFFFFE2, 0x00000000, 0x0000001B, 0x00000000, 0xFFFFFF85, 0xFFFFFFF3, 0x00000000, 0xFFFFFF58, 0x00000049, 0x00000000, 0xFFFFFF88, 0x00000067, 0x00000000, 0xFFFFFF65, 0x00000015, 0x00000000, 0xFFFFFF30, 0x0000002B, 0x00000000, 0xFFFFFF00, 0x00000054, 0x00000000, 0xFFFFFEBA, 0x0000002A, 0x00000000, 0xFFFFFE70, 0x00000000, 0xFFFFFFFF - -dlabel D_802416C4_DE9E34 -.word 0x00000000, 0x00000085, 0xFFFFFFFD, 0x00000000, 0x00000054, 0x0000001B, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0xFFFFFFE1, 0xFFFFFFE9, 0x00000000, 0xFFFFFF9F, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFF6A, 0xFFFFFFB5, 0x00000000, 0xFFFFFF1A, 0xFFFFFFA6, 0x00000000, 0xFFFFFECB, 0xFFFFFFC9, 0x00000000, 0xFFFFFE70, 0x00000000, 0xFFFFFFFF - -dlabel D_80241738_DE9EA8 -.word 0x00000000, 0xFFFFFFD8, 0x000000C8, 0x00000000, 0xFFFFFF9C, 0x00000100, 0x00000000, 0xFFFFFF4C, 0x0000010E, 0x00000000, 0xFFFFFF2E, 0x000000C8, 0x00000000, 0xFFFFFF4D, 0x00000066, 0x00000001, 0xFFFFFF59, 0x00000000, 0x00000034, 0x00000000, 0xFFFFFEFB, 0x00000076, 0x00000000, 0xFFFFFE70, 0x00000000, 0xFFFFFFFF - -dlabel D_802417A0_DE9F10 -.word 0x00000000, 0xFFFFFF9F, 0xFFFFFFE8, 0x00000000, 0xFFFFFFE7, 0x0000012C, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000032, 0x00000000, 0xFFFFFF9C, 0x0000001E, 0x00000000, 0xFFFFFF60, 0x0000003F, 0x00000002, 0x00000000, 0xFFFFFE70, 0x00000000, 0xFFFFFFFF - -dlabel D_802417FC_DE9F6C -.word 0x00000000, 0xFFFFFF67, 0x00000000, 0x00000000, 0xFFFFFF56, 0x00000046, 0x00000000, 0xFFFFFF30, 0x00000050, 0x00000000, 0xFFFFFF0A, 0x00000046, 0x00000000, 0xFFFFFEF9, 0x00000000, 0x00000000, 0xFFFFFF0A, 0xFFFFFFBA, 0x00000000, 0xFFFFFF30, 0xFFFFFFB0, 0x00000000, 0xFFFFFF56, 0xFFFFFFBA, 0x00000000, 0xFFFFFF67, 0x00000000, 0x00000000, 0xFFFFFF56, 0x00000046, 0x00000000, 0xFFFFFF30, 0x00000050, 0x00000000, 0xFFFFFE70, 0x00000000, 0xFFFFFFFF - -dlabel D_80241890_DEA000 -.word D_8024157C_DE9CEC, D_802415F8_DE9D68, D_80241650_DE9DC0, D_802416C4_DE9E34, D_80241738_DE9EA8, D_802415F8_DE9D68, D_8024157C_DE9CEC, D_802416C4_DE9E34, D_802417A0_DE9F10 - -dlabel D_802418B4_DEA024 -.word D_802417FC_DE9F6C - -dlabel D_802418B8_DEA028 -.word 0xFFFFFF12, 0xFFFFFFC9, 0x00000000, 0xFFFFFF26, 0xFFFFFFC4, 0x00000000, 0xFFFFFF3A, 0xFFFFFFC4, 0x00000000, 0xFFFFFF4E, 0xFFFFFFCE, 0x00000000, 0xFFFFFF4E, 0x00000023, 0x00000000, 0xFFFFFF40, 0x00000032, 0x00000000, 0xFFFFFF2E, 0x0000003C, 0x00000000, 0xFFFFFF1C, 0x00000037, 0x00000000, 0xFFFFFF5B, 0xFFFFFFF6, 0x00000000 - -dlabel D_80241924_DEA094 -.word 0xFFFFFF4A, 0x00000000, 0x00000000 - -dlabel D_80241930_DEA0A0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000000, 0x00000030, 0x00000001, D_802418B8_DEA028, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, StopSound, 0x8000004D, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x0000000C, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AC4_DEA234 -.word 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x8000004D, 0x00000030, 0x00000001, D_802418B4_DEA024, 0x00000031, 0x00000001, 0xFE363C81, 0x00000030, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C89, 0x0076000E, 0x00000005, 0x00000001, 0x00000000, 0x00000031, 0x00000001, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000033, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000076D, 0x00000043, 0x00000002, func_802D62E4, 0x0000036D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C89, 0x00000028, 0x00000002, 0xFE363C80, 0x00000000, 0x00000030, 0x00000001, D_80241890_DEA000, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0x00000000, 0x00000031, 0x00000001, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C89, 0x003B0004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C89, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C89, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000033, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C89, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFE363C89, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, func_802CDE68, 0xFE363C89, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C89, 0x00000000, 0x00000000, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFE363C89, 0xFFFFFF4C, 0x00000000, 0x0000003F, 0x00000004, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C89, 0x003B0010, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C89, 0x00000003, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFE363C89, 0xFFFFFF24, 0x00000000, 0x0000003F, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C89, 0x000003E3, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C89, 0x000003E4, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, func_802CDE68, 0xFE363C89, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C89, 0x003B0001, 0x00000043, 0x00000006, NpcJump0, 0xFE363C89, 0xFFFFFF1A, 0x00000000, 0x0000003F, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C89, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C89, 0x000003A2, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x000003A2, 0x00000043, 0x00000004, SetNpcVar, 0x00000009, 0x00000000, 0x00000028, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C89, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C89, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242084_DEA7F4 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000002, 0x00000001, 0x00000030, 0x00000001, D_802418B8_DEA028, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000009, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, NpcFacePlayer, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, D_80241924_DEA094, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241AC4_DEA234, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242200_DEA970 -.word 0x0000008C, 0x00000013, 0x00000005, 0x00000093, 0x00000013, 0x00000020, 0x0000009A, 0x00000013, 0x0000003B, 0x000000A1, 0x00000013, 0x00000056, 0x00000064, 0x00000000, 0x0000001E, 0x0000006A, 0x00000000, 0x00000037, 0x00000070, 0x00000000, 0x00000050, 0x00000076, 0x00000000, 0x00000069, 0x0000007C, 0x00000000, 0x00000082 - -dlabel D_8024226C_DEA9DC -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241930_DEA0A0, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242084_DEA7F4, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000000, 0x00000030, 0x00000001, D_80242200_DEA970, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024234C_DEAABC -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000044, 0x00000001, D_80240F98_DE9708, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242084_DEA7F4, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423AC_DEAB1C -.word 0x00000000, D_80240F00_DE9670, 0x433B0000, 0x42180000, 0x41A00000, 0x00041705, D_8024234C_DEAABC, 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, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00760002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x00000002, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x00000003, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x00000004, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x00000005, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x00000006, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x00000007, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x00000008, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x00000009, D_80240F00_DE9670, 0x00000000, 0xC47A0000, 0x00000000, 0x00041705, D_8024226C_DEA9DC, 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, 0x0000000A, D_802423AC_DEAB1C, 0x11000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_16/DEC4D0.data.s b/ver/us/asm/data/world/area_omo/omo_16/DEC4D0.data.s deleted file mode 100644 index e2622dcbc5..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_16/DEC4D0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240600_DEC4D0 -.word 0xC4B68000, 0x42480000, 0x00000000, 0x42B40000, 0x44B68000, 0x42480000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240660_DEC530, D_80240600_DEC4D0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000 - -dlabel D_80240660_DEC530 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000010, 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, MakeNpcs, 0x00000001, 0x80242F8C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000046, 0x00000001, 0x802429C4, 0x00000008, 0x00000001, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_16/DEC600.data.s b/ver/us/asm/data/world/area_omo/omo_16/DEC600.data.s deleted file mode 100644 index 08281caf76..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_16/DEC600.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240730_DEC600 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_16_AdvanceBuffer, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_16_CosInterpMinMax, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_16_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_16_CosInterpMinMax, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_16_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_16_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_16_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_16_AdvanceBuffer, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_16_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_16_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_16_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000060, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000063, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000006A, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000006A, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000006A, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000060, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000063, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x00000067, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000069, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000067, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000069, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000065, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242238_DEE108 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB0, 0x00000003, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422F8_DEE1C8 -.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB8, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB8, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_16_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80242238_DEE108, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802422F8_DEE1C8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024262C_DEE4FC -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000008C, 0x00000014, 0x00000001, 0xF5DE0257, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000B, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000D, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000A, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000008C, 0x00000014, 0x00000001, 0xF5DE0257, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000B, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000D, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428CC_DEE79C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFF830, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFF830, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000007D0, 0x00000024, 0x00000002, 0xFE363C80, 0x000007D0, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xF24B4280, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242984_DEE854 -.word 0xFFFFF9F2, 0xF24A7A80, 0xF24BE280, 0x0000060E, 0xF24A7A80, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF - -dlabel D_802429A4_DEE874 -.word 0x0000060E, 0xF24A7A80, 0xF24EB280, 0xFFFFF9F2, 0xF24A7A80, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_802428CC_DEE79C, 0x00000044, 0x00000001, D_8024262C_DEE4FC, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80242984_DEE854, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80240730_DEC600, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_8024055C_DEC42C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFD050F8B, 0x00000578, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0257, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80242FC0, 0x00000002, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x80242FB8, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, GotoMap, 0x80242FB0, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, GotoMap, 0x80242FC8, 0x00000002, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000046, 0x00000001, D_802422F8_DEE1C8, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_802429A4_DEE874, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80240730_DEC600, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_8024055C_DEC42C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001F, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFD050F8B, 0xFFFFFA88, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0257, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80242FC8, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x80242FC0, 0x00000003, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, GotoMap, 0x80242FB8, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, GotoMap, 0x80242FB0, 0x00000003, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0x0000001F, 0x00000046, 0x00000001, D_80242238_DEE108, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_16/DEEC30.data.s b/ver/us/asm/data/world/area_omo/omo_16/DEEC30.data.s deleted file mode 100644 index 295136d3d3..0000000000 --- a/ver/us/asm/data/world/area_omo/omo_16/DEEC30.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242D60_DEEC30 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D70_DEEC40 -.word 0x00000000, 0x00200018, D_80242D60_DEEC30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242D9C_DEEC6C -.word 0x00000000, D_80242D70_DEEC40, 0x00000000, 0xC47A0000, 0x00000000, 0x00400D05, 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, 0x008C0001, 0x008C0003, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242D9C_DEEC6C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_15/D69850.data.s b/ver/us/asm/data/world/area_pra/pra_15/D69850.data.s deleted file mode 100644 index eb27c2ed86..0000000000 --- a/ver/us/asm/data/world/area_pra/pra_15/D69850.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_D69850 -.word 0x43F38000, 0xC2700000, 0x42D40000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401B4, D_80240040_D69850, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190142, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_15/D698E0.data.s b/ver/us/asm/data/world/area_pra/pra_15/D698E0.data.s deleted file mode 100644 index 188b9c6e16..0000000000 --- a/ver/us/asm/data/world/area_pra/pra_15/D698E0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400D0_D698E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240300, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_D6993C -.word 0x00000047, 0x00000005, D_802400D0_D698E0, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240158_D69968 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024012C_D6993C, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 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, 0x00000046, 0x00000001, 0x802402C0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000008, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000002, 0x00000008, 0x00000043, 0x00000001, func_80240020_D69830, 0x00000044, 0x00000001, D_80240158_D69968, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240090, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_15/D69AD0.data.s b/ver/us/asm/data/world/area_pra/pra_15/D69AD0.data.s deleted file mode 100644 index 3afb053e6b..0000000000 --- a/ver/us/asm/data/world/area_pra/pra_15/D69AD0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802402C0_D69AD0 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x0000018B, 0xFFFFFFC4, 0x00000078, 0x00000011, 0xF8406162, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_32/D87DF0.data.s b/ver/us/asm/data/world/area_pra/pra_32/D87DF0.data.s index 9c50ca7459..a424dbd419 100644 --- a/ver/us/asm/data/world/area_pra/pra_32/D87DF0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_32/D87DF0.data.s @@ -15,7 +15,7 @@ dlabel D_80241660_D88060 .word 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000179, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0012016A, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000024C, 0x000000C8, 0x00000074, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFE2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000043, 0x00000004, SetPlayerPos, 0x000001DB, 0x00000064, 0x00000074, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000001C4, 0x00000074, 0x00000078, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000001C4, 0x00000064, 0x00000078, 0x00000013, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000032, 0x00000032, 0x00000001, 0x00000028, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000032, 0x00000032, 0x00000001, 0x00000028, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000032, 0x00000032, 0x00000001, 0x00000028, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000032, 0x00000032, 0x00000001, 0x00000014, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000032, 0x00000032, 0x00000001, 0x00000014, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000032, 0x00000032, 0x00000001, 0x00000014, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000030, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000030, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x00000078, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_802414A0_D87EA0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x007F0009, 0x007F0009, 0x00000000, 0x0012016B, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010005, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8480, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000234, 0x00000074, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E44_D88844 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x000001DB, 0x00000064, 0x00000074, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x007F0009, 0x007F0009, 0x00000000, 0x0012016C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, func_802CDE68, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00001AB8, 0x000000D2, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x000000C8, 0x000000D2, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7A8B, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xFE363C8A, 0xFE363C8A, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x0000007A, 0x0000001E, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000036B, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000082, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x0000001E, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000008, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, 0x80240900, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000056, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x000001DB, 0x00000064, 0x00000074, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x007F0009, 0x007F0009, 0x00000000, 0x0012016C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00001AB8, 0x000000D2, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x000000C8, 0x000000D2, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7A8B, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xFE363C8A, 0xFE363C8A, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x0000007A, 0x0000001E, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000036B, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000082, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000000, 0x0000001E, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000008, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, 0x80240900, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000056, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802423F4_D88DF4 .word 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241E44_D88844, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000056, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241660_D88060, 0x00000016, 0x00000001, 0x00000056, 0x00000044, 0x00000001, 0x80240D3C, 0x00000019, 0x00000001, 0x00000056, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x10000102, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_40/D9A8D0.data.s b/ver/us/asm/data/world/area_pra/pra_40/D9A8D0.data.s deleted file mode 100644 index e9cb4b7aa8..0000000000 --- a/ver/us/asm/data/world/area_pra/pra_40/D9A8D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F20_D9A8D0 -.word 0x41500000, 0x00000000, 0x00000000, 0x42B40000, 0x436D0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241400, D_80240F20_D9A8D0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190155, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_40/D9A970.data.s b/ver/us/asm/data/world/area_pra/pra_40/D9A970.data.s deleted file mode 100644 index da153c2569..0000000000 --- a/ver/us/asm/data/world/area_pra/pra_40/D9A970.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240FC0_D9A970 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_40_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_40_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_40_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_40_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241178_D9AB28 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000E, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241530, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024121C_D9ABCC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241538, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412C0_D9AC70 -.word 0x00000047, 0x00000005, D_80241178_D9AB28, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024121C_D9ABCC, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241308_D9ACB8 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802412C0_D9AC70, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000E, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_802412C0_D9AC70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x802414D0, 0x00000044, 0x00000001, 0x80240F80, 0x00000044, 0x00000001, D_80241308_D9ACB8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s b/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s deleted file mode 100644 index 74c5cfcd7c..0000000000 --- a/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802414D0_D9AE80 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000A5, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000055, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 483c4f084a..a8dd9b11c7 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -10755,7 +10755,7 @@ segments: - [0x9BD660, c, trd_09_0_header] - [0x9BD660, c, trd_09_1_main] - [0x9BD660, c, trd_09_2_entity] - - [0x9BD660, c, trd_09_3_npcs] + - [0x9BD660, c, trd_09_3_npc] - [0x9BD720, c, trd_09_4_demo] - [0x9BD830] - name: trd_10 @@ -14102,10 +14102,11 @@ segments: start: 0xD57430 vram: 0x80240000 subsegments: - - [0xD57430, c] - - [0xD58380, data] - - [0xD58410, data] - - [0xD58860] + - [0xD57430, c, pra_06_0_header] + - [0xD57430, c, pra_06_1_music] + - [0xD57430, c, pra_06_2_main] + - [0xD58380, c, pra_06_3_entity] + - [0xD58380] - name: pra_09 dir: world/area_pra/pra_09 type: code @@ -14180,12 +14181,11 @@ segments: start: 0xD69810 vram: 0x80240000 subsegments: - - [0xD69810, c] - - [0xD69830, c] - - [0xD69850, data] - - [0xD698E0, data] - - [0xD69AD0, data] - - [0xD69B10] + - [0xD69810, c, pra_15_0_header] + - [0xD69830, c, pra_15_1_music] + - [0xD69830, c, pra_15_2_main] + - [0xD69850, c, pra_15_3_entity] + - [0xD69850] - name: pra_16 dir: world/area_pra/pra_16 type: code @@ -14399,53 +14399,54 @@ segments: start: 0xD999B0 vram: 0x80240000 subsegments: - - [0xD999B0, c] - - [0xD999D0, c] - - [0xD9A8D0, data] - - [0xD9A970, data] - - [0xD9AE80, data] - - [0xD9AEE0] + - [0xD999B0, c, pra_40_0_header] + - [0xD999D0, c, pra_40_1_music] + - [0xD999D0, c, pra_40_2_main] + - [0xD9A8D0, c, pra_40_3_entity] + - [0xD9A8D0] - name: omo_01 dir: world/area_omo/omo_01 type: code start: 0xD9AEF0 vram: 0x80240000 subsegments: - - [0xD9AEF0, c] - - [0xD9B150, c] - - [0xD9BB20, data] - - [0xD9BBA0, data] - - [0xD9BD50, data] - - [0xD9C200, data] - - [0xD9D250, data] - - [0xD9D330] + - [0xD9AEF0, c, omo_01_0_header] + - [0xD9AEF0, c, omo_01_1_music] + - [0xD9AEF0, c, omo_01_2_main] + - [0xD9AEF0, c, omo_01_3_gizmos] + - [0xD9B150, c, omo_01_4_npc] + - [0xD9BB20, c, omo_01_5_entity] + - [0xD9BB20] - name: omo_02 dir: world/area_omo/omo_02 type: code start: 0xD9D4D0 vram: 0x80240000 subsegments: - - [0xD9D4D0, c] - - [0xD9D510, c] - - [0xDA0080, data] - - [0xDA0110, data] - - [0xDA0300, data] - - [0xDA05B0, data] - - [0xDA0A50, data] - - [0xDA1CD0, data] - - [0xDA4D30] + - [0xD9D4D0, c, omo_02_0_header] + - [0xD9D4D0, c, omo_02_1_music] + - [0xD9D4D0, c, omo_02_2_main] + - [0xD9D4D0, c, omo_02_3_entity] + - [0xD9D510, c, omo_02_4_gizmos] + - [0xD9D790, c, omo_02_5_barricade] + - [0xD9DE40, c, omo_02_6_npc] + - [0xDA0080] - name: omo_03 dir: world/area_omo/omo_03 type: code start: 0xDA5240 vram: 0x80240000 subsegments: - - [0xDA5240, c] - - [0xDA5260, c] - - [0xDA5AD0, data] - - [0xDA6050, data] - - [0xDA8190, data] - - [0xDAD3B0] + - [0xDA5240, c, omo_03_0_header] + - [0xDA5240, c, omo_03_1_music] + - [0xDA5240, c, omo_03_2_main] + - [0xDA5240, c, omo_03_3_gizmos] + - [0xDA5240, c, omo_03_4_entity] + - [0xDA5260, c, omo_03_5_npc] + - [0xDA5260, c, omo_03_6_train] + - [0xDA5AD0, c, omo_03_7_train_drop] + - [0xDA5AD0, c, omo_03_8_epilogue] + - [0xDA5AD0] - name: omo_04 dir: world/area_omo/omo_04 type: code @@ -14479,13 +14480,14 @@ segments: start: 0xDB7910 vram: 0x80240000 subsegments: - - [0xDB7910, c] - - [0xDB8180, c] - - [0xDB8440, data] - - [0xDB88E0, data] - - [0xDB9060, data] - - [0xDBCFD0, data] - - [0xDBD270] + - [0xDB7910, c, omo_06_0_header] + - [0xDB7910, c, omo_06_1_music] + - [0xDB7910, c, omo_06_2_main] + - [0xDB7910, c, omo_06_3_gizmos] + - [0xDB7910, c, omo_06_4_train] + - [0xDB8180, c, omo_06_5_npc] + - [0xDB8180, c, omo_06_6_entity] + - [0xDB8440] - name: omo_07 dir: world/area_omo/omo_07 type: code @@ -14506,116 +14508,115 @@ segments: start: 0xDC43D0 vram: 0x80240000 subsegments: - - [0xDC43D0, c] - - [0xDC4C40, c] - - [0xDC51B0, data] - - [0xDC52F0, data] - - [0xDC8100, data] - - [0xDCBA10, data] - - [0xDCCB00] + - [0xDC43D0, c, omo_08_0_header] + - [0xDC43D0, c, omo_08_1_music] + - [0xDC43D0, c, omo_08_2_main] + - [0xDC43D0, c, omo_08_3_boxes] + - [0xDC43D0, c, omo_08_4_train] + - [0xDC4C40, c, omo_08_5_entity] + - [0xDC4C40, c, omo_08_6_npc] + - [0xDC51B0] - name: omo_09 dir: world/area_omo/omo_09 type: code start: 0xDCCCD0 vram: 0x80240000 subsegments: - - [0xDCCCD0, c] - - [0xDCCFA0, c] - - [0xDCD3B0, c] - - [0xDCD3F0, c] - - [0xDCD6B0, c] - - [0xDD02E0, c] - - [0xDD03C0, data] - - [0xDD0480, data] - - [0xDD0750, data] - - [0xDD0900, data] - - [0xDD3520, data] - - [0xDD4150, data] - - [0xDD6BB0, data] - - [0xDD72F0] + - [0xDCCCD0, c, omo_09_0_header] + - [0xDCCCD0, c, omo_09_1_music] + - [0xDCCCD0, c, omo_09_2_main] + - [0xDCCCD0, c, omo_09_3_conveyors] + - [0xDCCFA0, c, omo_09_4_slot_machine] + - [0xDCD3B0, c, omo_09_5_gizmos] + - [0xDCD3F0, c, omo_09_6_entity] + - [0xDCD6B0, c, omo_09_7_npc] + - [0xDD02E0, c, omo_09_8_scenes] + - [0xDD03C0] - name: omo_10 dir: world/area_omo/omo_10 type: code start: 0xDD79B0 vram: 0x80240000 subsegments: - - [0xDD79B0, c] - - [0xDD8220, data] - - [0xDD8640, data] - - [0xDD8A60, data] - - [0xDDC720, data] - - [0xDDC7F0] + - [0xDD79B0, c, omo_10_0_header] + - [0xDD79B0, c, omo_10_1_music] + - [0xDD79B0, c, omo_10_2_main] + - [0xDD79B0, c, omo_10_3_gizmos] + - [0xDD79B0, c, omo_10_4_train] + - [0xDD8220, c, omo_10_5_npc] + - [0xDD8220, c, omo_10_6_entity] + - [0xDD8220] - name: omo_11 dir: world/area_omo/omo_11 type: code start: 0xDDC830 vram: 0x80240000 subsegments: - - [0xDDC830, c] - - [0xDDCFC0, c] - - [0xDDDD00, data] - - [0xDDDD90, data] - - [0xDDEE80, data] - - [0xDDF300] + - [0xDDC830, c, omo_11_0_header] + - [0xDDC830, c, omo_11_1_music] + - [0xDDC830, c, omo_11_2_main] + - [0xDDC830, c, omo_11_3_gizmos] + - [0xDDCFC0, c, omo_11_4_entity] + - [0xDDDD00, c, omo_11_5_npc] + - [0xDDDD00] - name: omo_12 dir: world/area_omo/omo_12 type: code start: 0xDDF310 vram: 0x80240000 subsegments: - - [0xDDF310, c] - - [0xDDF730, c] - - [0xDDF7D0, data] - - [0xDDF960, data] - - [0xDDFB60, data] - - [0xDE2470] + - [0xDDF310, c, omo_12_0_header] + - [0xDDF310, c, omo_12_1_music] + - [0xDDF310, c, omo_12_2_main] + - [0xDDF310, c, omo_12_3_npc] + - [0xDDF730, c, omo_12_4_partner] + - [0xDDF7D0] - name: omo_13 dir: world/area_omo/omo_13 type: code start: 0xDE2490 vram: 0x80240000 subsegments: - - [0xDE2490, c] - - [0xDE2710, c] - - [0xDE36C0, c] - - [0xDE3980, data] - - [0xDE3A10, data] - - [0xDE3F70, data] - - [0xDE5100, data] - - [0xDE5360] + - [0xDE2490, c, omo_13_0_header] + - [0xDE2490, c, omo_13_1_music] + - [0xDE2490, c, omo_13_2_main] + - [0xDE2490, c, omo_13_3_gizmos] + - [0xDE2710, c, omo_13_4_npc] + - [0xDE36C0, c, omo_13_5_entity] + - [0xDE3980] - name: omo_14 dir: world/area_omo/omo_14 type: code start: 0xDE56B0 vram: 0x80240000 subsegments: - - [0xDE56B0, c] - - [0xDE5810, c] - - [0xDE5C70, data] - - [0xDE5D00, data] - - [0xDE5FA0, data] - - [0xDE8760] + - [0xDE56B0, c, omo_14_0_header] + - [0xDE56B0, c, omo_14_1_music] + - [0xDE56B0, c, omo_14_2_main] + - [0xDE5810, c, omo_14_3_npc] + - [0xDE5C70] - name: omo_15 dir: world/area_omo/omo_15 type: code start: 0xDE8770 vram: 0x80240000 subsegments: - - [0xDE8770, c] - - [0xDE8F70, data] - - [0xDE9670, data] - - [0xDEBEA0] + - [0xDE8770, c, omo_15_0_header] + - [0xDE8770, c, omo_15_1_music] + - [0xDE8770, c, omo_15_2_main] + - [0xDE8F70, c, omo_15_3_npc] + - [0xDE8F70] - name: omo_16 dir: world/area_omo/omo_16 type: code start: 0xDEBED0 vram: 0x80240000 subsegments: - - [0xDEBED0, c] - - [0xDEC4D0, data] - - [0xDEC600, data] - - [0xDEEC30, data] - - [0xDEEE80] + - [0xDEBED0, c, omo_16_0_header] + - [0xDEBED0, c, omo_16_1_main] + - [0xDEBED0, c, omo_16_2_train] + - [0xDEC4D0, c, omo_16_3_npc] + - [0xDEC4D0] - name: omo_17 dir: world/area_omo/omo_17 type: code @@ -16713,7 +16714,7 @@ segments: - ToadMinister - Postmaster - ConductorToad - - TrainStationToad + - TrainToad - Fishmael - Musician - Koopa diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index b0fdaf5d47..d63a8c8317 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -5336,7 +5336,7 @@ DeleteNpc = 0x802CDC1C; // type:func rom:0xF25CC GetNpcPointer = 0x802CDC58; // type:func rom:0xF2608 SetNpcPos = 0x802CDCB0; // type:func rom:0xF2660 SetNpcRotation = 0x802CDDB0; // type:func rom:0xF2760 -func_802CDE68 = 0x802CDE68; // type:func rom:0xF2818 +SetNpcRotationPivot = 0x802CDE68; // type:func rom:0xF2818 SetNpcScale = 0x802CDED4; // type:func rom:0xF2884 SetNpcCollisionSize = 0x802CDF8C; // type:func rom:0xF293C SetNpcSpeed = 0x802CE01C; // type:func rom:0xF29CC @@ -6674,7 +6674,7 @@ ShowBattleChoice = 0x80253538; // type:func rom:0x181E18 func_802535B4 = 0x802535B4; // type:func rom:0x181E94 OverrideBattleDmaDest = 0x802535F8; // type:func rom:0x181ED8 LoadBattleDmaData = 0x80253624; // type:func rom:0x181F04 -func_802536A8 = 0x802536A8; // type:func rom:0x181F88 +EnableBattleFloorReflections = 0x802536A8; // type:func rom:0x181F88 func_80253734 = 0x80253734; // type:func rom:0x182014 func_802537C0 = 0x802537C0; // type:func rom:0x1820A0 PlaySoundAtActor = 0x8025385C; // type:func rom:0x18213C @@ -6726,11 +6726,11 @@ appendGfx_npc_actor = 0x80255FE0; // type:func rom:0x1848C0 func_802571F0 = 0x802571F0; // type:func rom:0x185AD0 appendGfx_enemy_actor = 0x80257B28; // type:func rom:0x186408 appendGfx_partner_actor = 0x80257B48; // type:func rom:0x186428 -appendGfx_enemy_actor_decorations = 0x80257B68; // type:func rom:0x186448 -func_80257B88 = 0x80257B88; // type:func rom:0x186468 +appendGfx_enemy_actor_reflection = 0x80257B68; // type:func rom:0x186448 +appendGfx_partner_actor_reflection = 0x80257B88; // type:func rom:0x186468 update_player_actor_shadow = 0x80257BAC; // type:func rom:0x18648C appendGfx_player_actor = 0x80257DA4; // type:func rom:0x186684 -func_80258E14 = 0x80258E14; // type:func rom:0x1876F4 +appendGfx_player_actor_reflection = 0x80258E14; // type:func rom:0x1876F4 func_802591EC = 0x802591EC; // type:func rom:0x187ACC func_80259494 = 0x80259494; // type:func rom:0x187D74 func_8025950C = 0x8025950C; // type:func rom:0x187DEC @@ -16069,16 +16069,16 @@ kmr_02_Quizmo_SpinPartner = 0x80241210; // type:func rom:0x8B1280 kmr_02_Quizmo_UpdatePartnerPosition = 0x802412A0; // type:func rom:0x8B1310 kmr_02_Quizmo_CreateReactionEffect = 0x80241388; // type:func rom:0x8B13F8 kmr_02_Quizmo_CreateWorker = 0x802413F4; // type:func rom:0x8B1464 -kmr_02_StationaryAI_IdleInit = 0x80241424; // type:func rom:0x8B1494 -kmr_02_StationaryAI_Idle = 0x802414D8; // type:func rom:0x8B1548 -kmr_02_StationaryAI_AlertInit = 0x802415F8; // type:func rom:0x8B1668 -kmr_02_StationaryAI_Alert = 0x80241658; // type:func rom:0x8B16C8 -kmr_02_StationaryAI_ChaseInit = 0x802416D0; // type:func rom:0x8B1740 -kmr_02_StationaryAI_Chase = 0x80241800; // type:func rom:0x8B1870 -kmr_02_StationaryAI_LosePlayer = 0x8024191C; // type:func rom:0x8B198C -kmr_02_StationaryAI_ReturnHomeInit = 0x80241964; // type:func rom:0x8B19D4 -kmr_02_StationaryAI_ReturnHome = 0x80241A10; // type:func rom:0x8B1A80 -kmr_02_StationaryAI_Main = 0x80241C18; // type:func rom:0x8B1C88 +kmr_02_GuardAI_IdleInit = 0x80241424; // type:func rom:0x8B1494 +kmr_02_GuardAI_Idle = 0x802414D8; // type:func rom:0x8B1548 +kmr_02_GuardAI_AlertInit = 0x802415F8; // type:func rom:0x8B1668 +kmr_02_GuardAI_Alert = 0x80241658; // type:func rom:0x8B16C8 +kmr_02_GuardAI_ChaseInit = 0x802416D0; // type:func rom:0x8B1740 +kmr_02_GuardAI_Chase = 0x80241800; // type:func rom:0x8B1870 +kmr_02_GuardAI_LosePlayer = 0x8024191C; // type:func rom:0x8B198C +kmr_02_GuardAI_ReturnHomeInit = 0x80241964; // type:func rom:0x8B19D4 +kmr_02_GuardAI_ReturnHome = 0x80241A10; // type:func rom:0x8B1A80 +kmr_02_GuardAI_Main = 0x80241C18; // type:func rom:0x8B1C88 kmr_02_ChangeNpcToPartner = 0x80241E90; // type:func rom:0x8B1F00 func_80242014_8B2084 = 0x80242014; // type:func rom:0x8B2084 func_80242040_8B20B0 = 0x80242040; // type:func rom:0x8B20B0 @@ -16242,16 +16242,16 @@ kmr_06_FlyingAI_JumpVels = 0x802420BC; // type:data rom:0x8D35CC D_80242850_8D3D60 = 0x80242850; // type:data rom:0x8D3D60 D_80242858_8D3D68 = 0x80242858; // type:data rom:0x8D3D68 D_80242860_8D3D70 = 0x80242860; // type:data rom:0x8D3D70 -kmr_07_StationaryAI_IdleInit = 0x80240000; // type:func rom:0x8D3DC0 -kmr_07_StationaryAI_Idle = 0x802400B4; // type:func rom:0x8D3E74 -kmr_07_StationaryAI_AlertInit = 0x802401D4; // type:func rom:0x8D3F94 -kmr_07_StationaryAI_Alert = 0x80240234; // type:func rom:0x8D3FF4 -kmr_07_StationaryAI_ChaseInit = 0x802402AC; // type:func rom:0x8D406C -kmr_07_StationaryAI_Chase = 0x802403DC; // type:func rom:0x8D419C -kmr_07_StationaryAI_LosePlayer = 0x802404F8; // type:func rom:0x8D42B8 -kmr_07_StationaryAI_ReturnHomeInit = 0x80240540; // type:func rom:0x8D4300 -kmr_07_StationaryAI_ReturnHome = 0x802405EC; // type:func rom:0x8D43AC -kmr_07_StationaryAI_Main = 0x802407F4; // type:func rom:0x8D45B4 +kmr_07_GuardAI_IdleInit = 0x80240000; // type:func rom:0x8D3DC0 +kmr_07_GuardAI_Idle = 0x802400B4; // type:func rom:0x8D3E74 +kmr_07_GuardAI_AlertInit = 0x802401D4; // type:func rom:0x8D3F94 +kmr_07_GuardAI_Alert = 0x80240234; // type:func rom:0x8D3FF4 +kmr_07_GuardAI_ChaseInit = 0x802402AC; // type:func rom:0x8D406C +kmr_07_GuardAI_Chase = 0x802403DC; // type:func rom:0x8D419C +kmr_07_GuardAI_LosePlayer = 0x802404F8; // type:func rom:0x8D42B8 +kmr_07_GuardAI_ReturnHomeInit = 0x80240540; // type:func rom:0x8D4300 +kmr_07_GuardAI_ReturnHome = 0x802405EC; // type:func rom:0x8D43AC +kmr_07_GuardAI_Main = 0x802407F4; // type:func rom:0x8D45B4 kmr_07_PlaySpringReboundAnimation = 0x80240A6C; // type:func rom:0x8D482C D_80241E90_8D5C50 = 0x80241E90; // type:data rom:0x8D5C50 D_80241E98_8D5C58 = 0x80241E98; // type:data rom:0x8D5C58 @@ -16287,16 +16287,16 @@ kmr_11_UnkFogFunc = 0x8024023C; // type:func rom:0x8DA33C UseSlowerFadeOnMapChange = 0x8024027C; // type:func rom:0x8DA37C MakeLensFlare = 0x802402A0; // type:func rom:0x8DA3A0 SetCameraVFov = 0x80240344; // type:func rom:0x8DA444 -kmr_11_StationaryAI_IdleInit = 0x80240370; // type:func rom:0x8DA470 -kmr_11_StationaryAI_Idle = 0x80240424; // type:func rom:0x8DA524 -kmr_11_StationaryAI_AlertInit = 0x80240544; // type:func rom:0x8DA644 -kmr_11_StationaryAI_Alert = 0x802405A4; // type:func rom:0x8DA6A4 -kmr_11_StationaryAI_ChaseInit = 0x8024061C; // type:func rom:0x8DA71C -kmr_11_StationaryAI_Chase = 0x8024074C; // type:func rom:0x8DA84C -kmr_11_StationaryAI_LosePlayer = 0x80240868; // type:func rom:0x8DA968 -kmr_11_StationaryAI_ReturnHomeInit = 0x802408B0; // type:func rom:0x8DA9B0 -kmr_11_StationaryAI_ReturnHome = 0x8024095C; // type:func rom:0x8DAA5C -kmr_11_StationaryAI_Main = 0x80240B64; // type:func rom:0x8DAC64 +kmr_11_GuardAI_IdleInit = 0x80240370; // type:func rom:0x8DA470 +kmr_11_GuardAI_Idle = 0x80240424; // type:func rom:0x8DA524 +kmr_11_GuardAI_AlertInit = 0x80240544; // type:func rom:0x8DA644 +kmr_11_GuardAI_Alert = 0x802405A4; // type:func rom:0x8DA6A4 +kmr_11_GuardAI_ChaseInit = 0x8024061C; // type:func rom:0x8DA71C +kmr_11_GuardAI_Chase = 0x8024074C; // type:func rom:0x8DA84C +kmr_11_GuardAI_LosePlayer = 0x80240868; // type:func rom:0x8DA968 +kmr_11_GuardAI_ReturnHomeInit = 0x802408B0; // type:func rom:0x8DA9B0 +kmr_11_GuardAI_ReturnHome = 0x8024095C; // type:func rom:0x8DAA5C +kmr_11_GuardAI_Main = 0x80240B64; // type:func rom:0x8DAC64 kmr_11_GetKammyBroomEmitterPos = 0x80240DDC; // type:func rom:0x8DAEDC func_80240EC0_8DAFC0 = 0x80240EC0; // type:func rom:0x8DAFC0 dup_kmr_11_foliage_setup_shear_mtx = 0x80240F20; // type:func rom:0x8DB020 @@ -16750,16 +16750,16 @@ sbk_30_get_tattle = 0x80240000; // type:func rom:0x93F5B0 sbk_30_UnkFunc27 = 0x80240040; // type:func rom:0x93F5F0 sbk_30_UnkFunc26 = 0x80240164; // type:func rom:0x93F714 sbk_30_SpawnSunEffect = 0x80240338; // type:func rom:0x93F8E8 -sbk_30_StationaryAI_IdleInit = 0x80240370; // type:func rom:0x93F920 -sbk_30_StationaryAI_Idle = 0x80240424; // type:func rom:0x93F9D4 -sbk_30_StationaryAI_AlertInit = 0x80240544; // type:func rom:0x93FAF4 -sbk_30_StationaryAI_Alert = 0x802405A4; // type:func rom:0x93FB54 -sbk_30_StationaryAI_ChaseInit = 0x8024061C; // type:func rom:0x93FBCC -sbk_30_StationaryAI_Chase = 0x8024074C; // type:func rom:0x93FCFC -sbk_30_StationaryAI_LosePlayer = 0x80240868; // type:func rom:0x93FE18 -sbk_30_StationaryAI_ReturnHomeInit = 0x802408B0; // type:func rom:0x93FE60 -sbk_30_StationaryAI_ReturnHome = 0x8024095C; // type:func rom:0x93FF0C -sbk_30_StationaryAI_Main = 0x80240B64; // type:func rom:0x940114 +sbk_30_GuardAI_IdleInit = 0x80240370; // type:func rom:0x93F920 +sbk_30_GuardAI_Idle = 0x80240424; // type:func rom:0x93F9D4 +sbk_30_GuardAI_AlertInit = 0x80240544; // type:func rom:0x93FAF4 +sbk_30_GuardAI_Alert = 0x802405A4; // type:func rom:0x93FB54 +sbk_30_GuardAI_ChaseInit = 0x8024061C; // type:func rom:0x93FBCC +sbk_30_GuardAI_Chase = 0x8024074C; // type:func rom:0x93FCFC +sbk_30_GuardAI_LosePlayer = 0x80240868; // type:func rom:0x93FE18 +sbk_30_GuardAI_ReturnHomeInit = 0x802408B0; // type:func rom:0x93FE60 +sbk_30_GuardAI_ReturnHome = 0x8024095C; // type:func rom:0x93FF0C +sbk_30_GuardAI_Main = 0x80240B64; // type:func rom:0x940114 sbk_30_StashVars = 0x80240DDC; // type:func rom:0x94038C sbk_30_GetItemName = 0x80240E90; // type:func rom:0x940440 sbk_30_GetNpcCollisionHeight = 0x80240EF4; // type:func rom:0x9404A4 @@ -17476,16 +17476,16 @@ trd_01_UnkDistFunc = 0x8024046C; // type:func rom:0x99CDFC trd_01_UnkNpcAIFunc12 = 0x802405A0; // type:func rom:0x99CF30 trd_01_set_script_owner_npc_col_height = 0x80240704; // type:func rom:0x99D094 trd_01_TackleAI_Main = 0x80240784; // type:func rom:0x99D114 -trd_01_StationaryAI_IdleInit = 0x80240BC4; // type:func rom:0x99D554 -trd_01_StationaryAI_Idle = 0x80240C78; // type:func rom:0x99D608 -trd_01_StationaryAI_AlertInit = 0x80240D98; // type:func rom:0x99D728 -trd_01_StationaryAI_Alert = 0x80240DF8; // type:func rom:0x99D788 -trd_01_StationaryAI_ChaseInit = 0x80240E70; // type:func rom:0x99D800 -trd_01_StationaryAI_Chase = 0x80240FA0; // type:func rom:0x99D930 -trd_01_StationaryAI_LosePlayer = 0x802410BC; // type:func rom:0x99DA4C -trd_01_StationaryAI_ReturnHomeInit = 0x80241104; // type:func rom:0x99DA94 -trd_01_StationaryAI_ReturnHome = 0x802411B0; // type:func rom:0x99DB40 -trd_01_StationaryAI_Main = 0x802413B8; // type:func rom:0x99DD48 +trd_01_GuardAI_IdleInit = 0x80240BC4; // type:func rom:0x99D554 +trd_01_GuardAI_Idle = 0x80240C78; // type:func rom:0x99D608 +trd_01_GuardAI_AlertInit = 0x80240D98; // type:func rom:0x99D728 +trd_01_GuardAI_Alert = 0x80240DF8; // type:func rom:0x99D788 +trd_01_GuardAI_ChaseInit = 0x80240E70; // type:func rom:0x99D800 +trd_01_GuardAI_Chase = 0x80240FA0; // type:func rom:0x99D930 +trd_01_GuardAI_LosePlayer = 0x802410BC; // type:func rom:0x99DA4C +trd_01_GuardAI_ReturnHomeInit = 0x80241104; // type:func rom:0x99DA94 +trd_01_GuardAI_ReturnHome = 0x802411B0; // type:func rom:0x99DB40 +trd_01_GuardAI_Main = 0x802413B8; // type:func rom:0x99DD48 trd_01_func_80241630_99DFC0 = 0x80241630; // type:func rom:0x99DFC0 trd_02_RemovePadlock = 0x80240000; // type:func rom:0x9A0FE0 trd_02_GetEntityPosition = 0x80240034; // type:func rom:0x9A1014 @@ -17619,16 +17619,16 @@ trd_10_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0x9C2F0C trd_10_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0x9C3018 trd_10_SetMapChangeFadeRate = 0x802407F4; // type:func rom:0x9C3104 trd_10_func_80240820_9C3130 = 0x80240820; // type:func rom:0x9C3130 -nok_01_StationaryAI_IdleInit = 0x80240000; // type:func rom:0x9C53E0 -nok_01_StationaryAI_Idle = 0x802400B4; // type:func rom:0x9C5494 -nok_01_StationaryAI_AlertInit = 0x802401D4; // type:func rom:0x9C55B4 -nok_01_StationaryAI_Alert = 0x80240234; // type:func rom:0x9C5614 -nok_01_StationaryAI_ChaseInit = 0x802402AC; // type:func rom:0x9C568C -nok_01_StationaryAI_Chase = 0x802403DC; // type:func rom:0x9C57BC -nok_01_StationaryAI_LosePlayer = 0x802404F8; // type:func rom:0x9C58D8 -nok_01_StationaryAI_ReturnHomeInit = 0x80240540; // type:func rom:0x9C5920 -nok_01_StationaryAI_ReturnHome = 0x802405EC; // type:func rom:0x9C59CC -nok_01_StationaryAI_Main = 0x802407F4; // type:func rom:0x9C5BD4 +nok_01_GuardAI_IdleInit = 0x80240000; // type:func rom:0x9C53E0 +nok_01_GuardAI_Idle = 0x802400B4; // type:func rom:0x9C5494 +nok_01_GuardAI_AlertInit = 0x802401D4; // type:func rom:0x9C55B4 +nok_01_GuardAI_Alert = 0x80240234; // type:func rom:0x9C5614 +nok_01_GuardAI_ChaseInit = 0x802402AC; // type:func rom:0x9C568C +nok_01_GuardAI_Chase = 0x802403DC; // type:func rom:0x9C57BC +nok_01_GuardAI_LosePlayer = 0x802404F8; // type:func rom:0x9C58D8 +nok_01_GuardAI_ReturnHomeInit = 0x80240540; // type:func rom:0x9C5920 +nok_01_GuardAI_ReturnHome = 0x802405EC; // type:func rom:0x9C59CC +nok_01_GuardAI_Main = 0x802407F4; // type:func rom:0x9C5BD4 nok_01_ToadHouse_DisableStatusMenu = 0x80240A6C; // type:func rom:0x9C5E4C nok_01_ToadHouse_ShowStatusMenu = 0x80240A8C; // type:func rom:0x9C5E6C nok_01_ToadHouse_UpdateScreenOverlay = 0x80240AB4; // type:func rom:0x9C5E94 @@ -22697,10 +22697,10 @@ flo_08_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xCAF9B8 flo_08_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xCAFA00 flo_08_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xCAFA48 flo_08_SpawnSunEffect = 0x80240D40; // type:func rom:0xCAFA80 -flo_08_UnkFloAI_ChaseInit = 0x80240D80; // type:func rom:0xCAFAC0 -flo_08_UnkFloAI_Chase = 0x80241364; // type:func rom:0xCB00A4 -flo_08_UnkFloAI_LosePlayer = 0x802414C8; // type:func rom:0xCB0208 -flo_08_UnkFloAI_Main = 0x8024150C; // type:func rom:0xCB024C +flo_08_AvoidPlayerAI_ChaseInit = 0x80240D80; // type:func rom:0xCAFAC0 +flo_08_AvoidPlayerAI_Chase = 0x80241364; // type:func rom:0xCB00A4 +flo_08_AvoidPlayerAI_LosePlayer = 0x802414C8; // type:func rom:0xCB0208 +flo_08_AvoidPlayerAI_Main = 0x8024150C; // type:func rom:0xCB024C flo_08_GetNpcCollisionHeight = 0x80241744; // type:func rom:0xCB0484 flo_08_AddPlayerHandsOffset = 0x802417A0; // type:func rom:0xCB04E0 flo_08_ItemChoice_WaitForSelection = 0x80241970; // type:func rom:0xCB06B0 @@ -24522,7 +24522,7 @@ func_80240000_D9AEF0 = 0x80240000; // type:func rom:0xD9AEF0 func_80240260_D9B150 = 0x80240260; // type:func rom:0xD9B150 func_80240844_D9B734 = 0x80240844; // type:func rom:0xD9B734 func_802409A8_D9B898 = 0x802409A8; // type:func rom:0xD9B898 -omo_01_UnkFloAI_Main = 0x802409EC; // type:func rom:0xD9B8DC +omo_01_AvoidPlayerAI_Main = 0x802409EC; // type:func rom:0xD9B8DC D_802412A0_D9C190 = 0x802412A0; // type:data rom:0xD9C190 omo_02_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xD9D4D0 omo_02_SetCamera0MoveFlag1 = 0x8024001C; // type:func rom:0xD9D4EC @@ -24534,16 +24534,16 @@ omo_02_ShyGuyWanderAI_15 = 0x802409E0; // type:func rom:0xD9DEB0 omo_02_ShyGuyWanderAI_16 = 0x80240AB0; // type:func rom:0xD9DF80 omo_02_ShyGuyWanderAI_17 = 0x80240B48; // type:func rom:0xD9E018 omo_02_ShyGuyWanderAI_Main = 0x80240BA8; // type:func rom:0xD9E078 -omo_02_StationaryAI_IdleInit = 0x80240EDC; // type:func rom:0xD9E3AC -omo_02_StationaryAI_Idle = 0x80240F90; // type:func rom:0xD9E460 -omo_02_StationaryAI_AlertInit = 0x802410B0; // type:func rom:0xD9E580 -omo_02_StationaryAI_Alert = 0x80241110; // type:func rom:0xD9E5E0 -omo_02_StationaryAI_ChaseInit = 0x80241188; // type:func rom:0xD9E658 -omo_02_StationaryAI_Chase = 0x802412B8; // type:func rom:0xD9E788 -omo_02_StationaryAI_LosePlayer = 0x802413D4; // type:func rom:0xD9E8A4 -omo_02_StationaryAI_ReturnHomeInit = 0x8024141C; // type:func rom:0xD9E8EC -omo_02_StationaryAI_ReturnHome = 0x802414C8; // type:func rom:0xD9E998 -omo_02_StationaryAI_Main = 0x802416D0; // type:func rom:0xD9EBA0 +omo_02_GuardAI_IdleInit = 0x80240EDC; // type:func rom:0xD9E3AC +omo_02_GuardAI_Idle = 0x80240F90; // type:func rom:0xD9E460 +omo_02_GuardAI_AlertInit = 0x802410B0; // type:func rom:0xD9E580 +omo_02_GuardAI_Alert = 0x80241110; // type:func rom:0xD9E5E0 +omo_02_GuardAI_ChaseInit = 0x80241188; // type:func rom:0xD9E658 +omo_02_GuardAI_Chase = 0x802412B8; // type:func rom:0xD9E788 +omo_02_GuardAI_LosePlayer = 0x802413D4; // type:func rom:0xD9E8A4 +omo_02_GuardAI_ReturnHomeInit = 0x8024141C; // type:func rom:0xD9E8EC +omo_02_GuardAI_ReturnHome = 0x802414C8; // type:func rom:0xD9E998 +omo_02_GuardAI_Main = 0x802416D0; // type:func rom:0xD9EBA0 omo_02_ProjectileHitbox_GetUsableProjectileID = 0x80241948; // type:func rom:0xD9EE18 omo_02_UnkNpcAIFunc48 = 0x80241B38; // type:func rom:0xD9F008 omo_02_ProjectileHitbox_30 = 0x80241C7C; // type:func rom:0xD9F14C @@ -24737,12 +24737,12 @@ omo_08_ShyGuyWanderAI_17 = 0x80240A48; // type:func rom:0xDC4E18 omo_08_ShyGuyWanderAI_Main = 0x80240AA8; // type:func rom:0xDC4E78 D_80248760_jan_02 = 0x80248760; // type:data rom:0xDCCB30 D_80248768_DCCB38 = 0x80248768; // type:data rom:0xDCCB38 -func_80240000_DCCCD0 = 0x80240000; // type:func rom:0xDCCCD0 -func_80240054_DCCD24 = 0x80240054; // type:func rom:0xDCCD24 -func_80240078_DCCD48 = 0x80240078; // type:func rom:0xDCCD48 -func_802402D0_DCCFA0 = 0x802402D0; // type:func rom:0xDCCFA0 -func_80240534_DCD204 = 0x80240534; // type:func rom:0xDCD204 -func_802406E0_DCD3B0 = 0x802406E0; // type:func rom:0xDCD3B0 +omo_09_ShouldPauseConveyor = 0x80240000; // type:func rom:0xDCCCD0 +omo_09_WaitWhileConveyorPaused = 0x80240054; // type:func rom:0xDCCD24 +omo_09_AddConveyorPush = 0x80240078; // type:func rom:0xDCCD48 +omo_09_CheckSlotsResult = 0x802402D0; // type:func rom:0xDCCFA0 +omo_09_UpdateSlotMachineBlockShadows = 0x80240534; // type:func rom:0xDCD204 +omo_09_AwaitPlayerNearPlatforms = 0x802406E0; // type:func rom:0xDCD3B0 omo_09_StashVars = 0x80240720; // type:func rom:0xDCD3F0 omo_09_GetItemName = 0x802407D4; // type:func rom:0xDCD4A4 omo_09_SomeItemEntityFunc = 0x80240838; // type:func rom:0xDCD508 @@ -24842,10 +24842,10 @@ omo_12_DarkRoomUpdate = 0x80240184; // type:func rom:0xDDF494 omo_12_SetCamera0Flag1000 = 0x802402DC; // type:func rom:0xDDF5EC omo_12_UnsetCamera0Flag1000 = 0x802402F8; // type:func rom:0xDDF608 func_80240314_DDF624 = 0x80240314; // type:func rom:0xDDF624 -func_802403D8_DDF6E8 = 0x802403D8; // type:func rom:0xDDF6E8 +SetLightOff = 0x802403D8; // type:func rom:0xDDF6E8 omo_12_LoadPartyImage = 0x80240420; // type:func rom:0xDDF730 D_80243168_DE2478 = 0x80243168; // type:data rom:0xDE2478 -func_80240000_DE2490 = 0x80240000; // type:func rom:0xDE2490 +UpdateRockingHorses = 0x80240000; // type:func rom:0xDE2490 omo_13_ShyGuyWanderAI_14 = 0x80240280; // type:func rom:0xDE2710 omo_13_ShyGuyWanderAI_15 = 0x802402F0; // type:func rom:0xDE2780 omo_13_ShyGuyWanderAI_16 = 0x802403C0; // type:func rom:0xDE2850 @@ -24859,7 +24859,7 @@ omo_13_AddPlayerHandsOffset = 0x80240D30; // type:func rom:0xDE31C0 omo_13_ItemChoice_WaitForSelection = 0x80240F00; // type:func rom:0xDE3390 func_80240F54_DE33E4 = 0x80240F54; // type:func rom:0xDE33E4 func_80240F8C_DE341C = 0x80240F8C; // type:func rom:0xDE341C -func_80241028_DE34B8 = 0x80241028; // type:func rom:0xDE34B8 +UpdateAntiGuyPosition = 0x80241028; // type:func rom:0xDE34B8 omo_13_StashVars = 0x80241230; // type:func rom:0xDE36C0 omo_13_GetItemName = 0x802412E4; // type:func rom:0xDE3774 omo_13_SomeItemEntityFunc = 0x80241348; // type:func rom:0xDE37D8 @@ -24891,7 +24891,7 @@ omo_16_SetPlayerStatusPosYaw = 0x802401EC; // type:func rom:0xDEC0BC omo_16_SetNpcPosYaw = 0x80240290; // type:func rom:0xDEC160 omo_16_CosInterpMinMax = 0x80240388; // type:func rom:0xDEC258 omo_16_IsAOrBPressed = 0x80240518; // type:func rom:0xDEC3E8 -func_8024055C_DEC42C = 0x8024055C; // type:func rom:0xDEC42C +omo_16_CheckForSceneSkip = 0x8024055C; // type:func rom:0xDEC42C omo_17_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xDEEEA0 omo_17_SetAngleClamped = 0x8024001C; // type:func rom:0xDEEEBC omo_17_CompareFloats = 0x802400E4; // type:func rom:0xDEEF84 @@ -25575,10 +25575,10 @@ dead_flo_08_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xECA978 dead_flo_08_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xECA9C0 dead_flo_08_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xECAA08 dead_flo_08_DeadUnkFunc1 = 0x80240D40; // type:func rom:0xECAA40 -dead_flo_08_UnkFloAI_ChaseInit = 0x80240D80; // type:func rom:0xECAA80 -dead_flo_08_UnkFloAI_Chase = 0x80241364; // type:func rom:0xECB064 -dead_flo_08_UnkFloAI_LosePlayer = 0x802414C8; // type:func rom:0xECB1C8 -dead_flo_08_UnkFloAI_Main = 0x8024150C; // type:func rom:0xECB20C +dead_flo_08_AvoidPlayerAI_ChaseInit = 0x80240D80; // type:func rom:0xECAA80 +dead_flo_08_AvoidPlayerAI_Chase = 0x80241364; // type:func rom:0xECB064 +dead_flo_08_AvoidPlayerAI_LosePlayer = 0x802414C8; // type:func rom:0xECB1C8 +dead_flo_08_AvoidPlayerAI_Main = 0x8024150C; // type:func rom:0xECB20C dead_flo_08_GetNpcCollisionHeight = 0x80241770; // type:func rom:0xECB470 dead_flo_08_AddPlayerHandsOffset = 0x802417CC; // type:func rom:0xECB4CC func_8024199C_ECB69C = 0x8024199C; // type:func rom:0xECB69C diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 84fd01bad1..24f5f752f5 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -356,7 +356,7 @@ dead_GetAnimatedRotationByTreeIndex = GetAnimatedRotationByTreeIndex + 0xD53C; dead_GetNpcPointer = GetNpcPointer + 0xD560; dead_SetNpcPos = SetNpcPos + 0xD560; dead_SetNpcRotation = SetNpcRotation + 0xD560; -dead_func_802CDE68 = func_802CDE68 + 0xD560; +dead_SetNpcRotationPivot = SetNpcRotationPivot + 0xD560; dead_SetNpcCollisionSize = SetNpcCollisionSize + 0xD560; dead_SetNpcSpeed = SetNpcSpeed + 0xD560; dead_SetNpcJumpscale = SetNpcJumpscale + 0xD560;